Compilation fixes (CAN bus)

paparazzi · Nov 7, 2017 · dcb1f62 · dcb1f62
1 parent f5df26d
commit dcb1f62
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/sw/airborne/arch/stm32/mcu_periph/can_arch.c b/sw/airborne/arch/stm32/mcu_periph/can_arch.c
@@ -196,9 +196,11 @@ int can_hw_transmit(uint32_t id, const uint8_t *buf, uint8_t len)
 #ifdef STM32F1
 void usb_lp_can_rx0_isr(void)
 {
-  uint32_t id, fmi;
+  uint32_t id;
+  uint8_t fmi;
   bool ext, rtr;
   uint8_t length, data[8];
+  uint16_t timestamp;
 
   can_receive(CAN1,
               0,     /* FIFO: 0 */
@@ -208,17 +210,20 @@ void usb_lp_can_rx0_isr(void)
               &rtr,
               &fmi,
               &length,
-              data);
+              data,
+              &timestamp);
 
   _can_run_rx_callback(id, data, length);
 
   can_fifo_release(CAN1, 0);
 }
 #elif STM32F4
 void can1_rx0_isr(void){
-  uint32_t id, fmi;
+  uint32_t id;
+  uint8_t fmi;
   bool ext, rtr;
   uint8_t length, data[8];
+  uint16_t timestamp;
 
   can_receive(CAN1,
               0,     /* FIFO: 0 */
@@ -228,7 +233,8 @@ void can1_rx0_isr(void){
               &rtr,
               &fmi,
               &length,
-              data);
+              data,
+              &timestamp);
 
   _can_run_rx_callback(id, data, length);