Revision 30:cebc6f21046e, committed 2017-05-28

Comitter:

hudakz

Date:

Sun May 28 09:18:54 2017 +0000

Parent:

29:5a6ce4dc88c6

Commit message:

Updated.

Changed in this revision

diff -r 5a6ce4dc88c6 -r cebc6f21046e CANnucleo.cpp
--- a/CANnucleo.cpp	Sat Mar 11 10:13:27 2017 +0000
+++ b/CANnucleo.cpp	Sun May 28 09:18:54 2017 +0000
@@ -257,7 +257,7 @@
     lock();
     HAL_NVIC_DisableIRQ(CAN_IRQ);
     if (func)
-        _irq[(CanIrqType)type].attach(func);
+        _irq[(CanIrqType)type] = func;
     HAL_NVIC_EnableIRQ(CAN_IRQ);
     unlock();
 }

diff -r 5a6ce4dc88c6 -r cebc6f21046e stm32f0xx_hal_msp.c
--- a/stm32f0xx_hal_msp.c	Sat Mar 11 10:13:27 2017 +0000
+++ b/stm32f0xx_hal_msp.c	Sun May 28 09:18:54 2017 +0000
@@ -252,3 +252,4 @@
 #endif
 
 
+

diff -r 5a6ce4dc88c6 -r cebc6f21046e stm32f0xx_hal_msp.h
--- a/stm32f0xx_hal_msp.h	Sat Mar 11 10:13:27 2017 +0000
+++ b/stm32f0xx_hal_msp.h	Sun May 28 09:18:54 2017 +0000
@@ -94,3 +94,4 @@
 
 #endif
 
+

diff -r 5a6ce4dc88c6 -r cebc6f21046e stm32f1xx_hal_msp.c
--- a/stm32f1xx_hal_msp.c	Sat Mar 11 10:13:27 2017 +0000
+++ b/stm32f1xx_hal_msp.c	Sun May 28 09:18:54 2017 +0000
@@ -113,7 +113,7 @@
 
         GPIO_InitStruct.Pin = GPIO_PIN_12;
         GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
         HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
     }
     else
@@ -137,7 +137,7 @@
 
         GPIO_InitStruct.Pin = GPIO_PIN_9;
         GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
         HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
     }
     else
@@ -222,9 +222,9 @@
         rxCompleteCallback();
 
     if (_canHandle->State == HAL_CAN_STATE_BUSY_TX)
-        _canHandle->State = HAL_CAN_STATE_BUSY_TX_RX;
+        _canHandle->State = HAL_CAN_STATE_BUSY_TX_RX0;
     else {
-        _canHandle->State = HAL_CAN_STATE_BUSY_RX;
+        _canHandle->State = HAL_CAN_STATE_BUSY_RX0;
 
         /* Set CAN error code to none */
         _canHandle->ErrorCode = HAL_CAN_ERROR_NONE;