Merge pull request #59 from HamedJafarzadeh/master

Fix baudrate variable type | Fix Comm Reset | Fix Timer Issue

Author: MaJerle

CANopenNode_STM32/CO_app_STM32.c

@@ -215,10 +215,11 @@ canopen_app_process() {
 
         if (reset_status == CO_RESET_COMM) {
             /* delete objects from memory */
+        	HAL_TIM_Base_Stop_IT(canopenNodeSTM32->timerHandle);
             CO_CANsetConfigurationMode((void*)canopenNodeSTM32);
             CO_delete(CO);
             log_printf("CANopenNode Reset Communication request\n");
-            canopen_app_resetCommunication(); // Reset Communication routine
+            canopen_app_init(canopenNodeSTM32); // Reset Communication routine
         } else if (reset_status == CO_RESET_APP) {
             log_printf("CANopenNode Device Reset\n");
             HAL_NVIC_SystemReset(); // Reset the STM32 Microcontroller

CANopenNode_STM32/CO_app_STM32.h

@@ -31,7 +31,7 @@ typedef struct {
 	 * be the final NodeID, after calling canopen_app_init() you should check ActiveNodeID of CANopenNodeSTM32 structure for assigned Node ID.
 	 */
     uint8_t activeNodeID; /* Assigned Node ID */
-    uint8_t baudrate;     /* This is the baudrate you've set in your CubeMX Configuration */
+    uint16_t baudrate;     /* This is the baudrate you've set in your CubeMX Configuration */
     TIM_HandleTypeDef*
         timerHandle; /*Pass in the timer that is going to be used for generating 1ms interrupt for tmrThread function,
 	 * please note that CANOpenSTM32 Library will override HAL_TIM_PeriodElapsedCallback function, if you also need this function in your codes, please take required steps

examples/stm32f0xx_can/CANOpenNode-NUCLEO-STM32F072.ioc

@@ -3,12 +3,12 @@ CAN.ABOM=ENABLE
 CAN.AWUM=ENABLE
 CAN.BS1=CAN_BS1_13TQ
 CAN.BS2=CAN_BS2_2TQ
-CAN.CalculateBaudRate=125000
-CAN.CalculateTimeBit=8000
-CAN.CalculateTimeQuantum=500.0
+CAN.CalculateBaudRate=1000000
+CAN.CalculateTimeBit=1000
+CAN.CalculateTimeQuantum=62.5
 CAN.IPParameters=CalculateTimeQuantum,CalculateBaudRate,BS1,CalculateTimeBit,Prescaler,BS2,NART,ABOM,AWUM
 CAN.NART=ENABLE
-CAN.Prescaler=24
+CAN.Prescaler=3
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
@@ -125,7 +125,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
 ProjectManager.LibraryCopy=1
 ProjectManager.MainLocation=Core/Src
 ProjectManager.NoMain=false

examples/stm32f0xx_can/Core/Src/can.c

@@ -38,7 +38,7 @@ void MX_CAN_Init(void)
 
   /* USER CODE END CAN_Init 1 */
   hcan.Instance = CAN;
-  hcan.Init.Prescaler = 24;
+  hcan.Init.Prescaler = 3;
   hcan.Init.Mode = CAN_MODE_NORMAL;
   hcan.Init.SyncJumpWidth = CAN_SJW_1TQ;
   hcan.Init.TimeSeg1 = CAN_BS1_13TQ;

examples/stm32f0xx_can/Core/Src/main.c

@@ -114,7 +114,7 @@ int main(void)
   canOpenNodeSTM32.HWInitFunction = MX_CAN_Init;
   canOpenNodeSTM32.timerHandle = &htim17;
   canOpenNodeSTM32.desiredNodeID = 24;
-  canOpenNodeSTM32.baudrate = 125;
+  canOpenNodeSTM32.baudrate = 1000;
   canopen_app_init(&canOpenNodeSTM32);
   /* USER CODE END 2 */