фиксы по модбас/кан и расширение функционала

CANEmu.ioc

@@ -44,13 +44,17 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
+NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
+PA10.Locked=true
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
 PA13.Mode=Serial_Wire
 PA13.Signal=SYS_JTMS-SWDIO
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
+PA9.Locked=true
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
 PB0.Locked=true
@@ -94,7 +98,7 @@ ProjectManager.ToolChainLocation=
 ProjectManager.UAScriptAfterPath=
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true,4-MX_TIM3_Init-TIM3-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true
 RCC.ADCFreqValue=36000000
 RCC.AHBFreq_Value=72000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2

Core/CANEmu/canEmu.h

@@ -28,6 +28,8 @@ typedef struct
   CAN_TxHeaderTypeDef header;
   uint8_t             data[8];
   uint32_t            bitrate_bps;
+  uint32_t            start_poll;
+  uint32_t            transmit;
   uint32_t            period_ms;
   CAN_ErrorFlags_t    errors;
 }CANEmu_HandleTypeDef;

Core/Inc/stm32f1xx_it.h

@@ -55,6 +55,8 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void TIM3_IRQHandler(void);
+void USART1_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

Core/Modbus/modbus_data.h

@@ -59,7 +59,7 @@ typedef struct //MB_DataInRegsTypeDef
   uint16_t CAN_ID_LO;         // 3
   uint16_t CAN_DLC;           // 4
   
-  uint16_t reserved[12];      // ...
+  uint16_t reserved[11];      // ...
   
   uint16_t CAN_DATA_0;        // 16
   uint16_t CAN_DATA_1;        // 17
@@ -78,7 +78,7 @@ typedef struct //MB_DataInRegsTypeDef
 
 // DEFINES FOR HOLDING REGISTERS ARRAYS
 #define   R_HOLDING_ADDR                   0
-#define   R_HOLDING_QNT                    23
+#define   R_HOLDING_QNT                    25
 
  
 /** MODBUS_DATA_RERISTERS_DEFINES
@@ -121,7 +121,7 @@ typedef struct //MB_DataCoilsTypeDef
   unsigned HEADER_IDE:1;          // 2
   unsigned HEADER_RTR:1;          // 3
   
-  unsigned reserved:13;           // ...
+  unsigned reserved:12;           // ...
   
   unsigned FLIP_SRS:1;            // 16
   unsigned FLIP_IDE:1;            // 17
@@ -136,7 +136,7 @@ typedef struct //MB_DataCoilsTypeDef
 
 // DEFINES FOR COIL ARRAYS
 #define C_CONTROL_ADDR                0
-#define C_CONTROL_QNT                 24
+#define C_CONTROL_QNT                 25
 
 /** MODBUS_DATA_COILS_DEFINES
   * @} 

Core/Src/main.c

@@ -102,10 +102,14 @@ int main(void)
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
+  int transmit_prev = hcanemu.transmit;
   while (1)
   {
     if(flag_manual == 0)
     {
+      hcanemu.start_poll          = MB_DATA.Coils.START_POLLING;
+      hcanemu.transmit            = MB_DATA.Coils.START_SINGLE_FRAME;
+      hcanemu.period_ms           = MB_DATA.HoldRegs.CAN_PERIOD;
       // can message
       hcanemu.header.IDE    = MB_DATA.Coils.HEADER_IDE;
       hcanemu.header.RTR    = MB_DATA.Coils.HEADER_RTR;      
@@ -132,10 +136,22 @@ int main(void)
       hcanemu.errors.DATA         = MB_DATA.Coils.FLIP_DATA_BIT;
       hcanemu.errors.CRC_ERR      = MB_DATA.Coils.FLIP_CRC_BIT;
       hcanemu.errors.STUFF_BITS   = MB_DATA.Coils.DISABLE_STUFF_BITS;
+      
     }
     
+    
+    
+    if(hcanemu.start_poll)
+    {
+      hcanemu.transmit = 0;
       HAL_Delay(hcanemu.period_ms);
       CANEmu_SendFrame(&hcanemu);
+    }
+    else if((hcanemu.transmit == 1) && (transmit_prev == 0))
+    {
+      CANEmu_SendFrame(&hcanemu);
+    }
+    transmit_prev = hcanemu.transmit;
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */

Core/Src/stm32f1xx_it.c

@@ -22,6 +22,7 @@
 #include "stm32f1xx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include "rs_message.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -55,7 +56,8 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
-
+extern TIM_HandleTypeDef htim3;
+extern UART_HandleTypeDef huart1;
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -198,6 +200,34 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/
 
+/**
+  * @brief This function handles TIM3 global interrupt.
+  */
+void TIM3_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM3_IRQn 0 */
+
+  /* USER CODE END TIM3_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim3);
+  /* USER CODE BEGIN TIM3_IRQn 1 */
+  RS_TIM_Handler(&hmodbus1);
+  /* USER CODE END TIM3_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART1 global interrupt.
+  */
+void USART1_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART1_IRQn 0 */
+
+  /* USER CODE END USART1_IRQn 0 */
+  HAL_UART_IRQHandler(&huart1);
+  /* USER CODE BEGIN USART1_IRQn 1 */
+  RS_UART_Handler(&hmodbus1);
+  /* USER CODE END USART1_IRQn 1 */
+}
+
 /* USER CODE BEGIN 1 */
 
 /* USER CODE END 1 */

Core/Src/tim.c

@@ -129,6 +129,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
   /* USER CODE END TIM3_MspInit 0 */
     /* TIM3 clock enable */
     __HAL_RCC_TIM3_CLK_ENABLE();
+
+    /* TIM3 interrupt Init */
+    HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(TIM3_IRQn);
   /* USER CODE BEGIN TIM3_MspInit 1 */
 
   /* USER CODE END TIM3_MspInit 1 */
@@ -156,6 +160,9 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
   /* USER CODE END TIM3_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_TIM3_CLK_DISABLE();
+
+    /* TIM3 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TIM3_IRQn);
   /* USER CODE BEGIN TIM3_MspDeInit 1 */
 
   /* USER CODE END TIM3_MspDeInit 1 */

Core/Src/usart.c

@@ -39,7 +39,7 @@ void MX_USART1_UART_Init(void)
 
   /* USER CODE END USART1_Init 1 */
   huart1.Instance = USART1;
-  huart1.Init.BaudRate = 115200;
+  huart1.Init.BaudRate = 256000;
   huart1.Init.WordLength = UART_WORDLENGTH_8B;
   huart1.Init.StopBits = UART_STOPBITS_1;
   huart1.Init.Parity = UART_PARITY_NONE;
@@ -83,6 +83,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* USART1 interrupt Init */
+    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspInit 1 */
 
   /* USER CODE END USART1_MspInit 1 */
@@ -106,6 +109,8 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
+    /* USART1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspDeInit 1 */
 
   /* USER CODE END USART1_MspDeInit 1 */

MDK-ARM/CANEmu.uvoptx

@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
+          <Name>-U37FF71064E57343625581443 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -165,6 +165,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>flag_manual</ItemText>
         </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>hmodbus1</ItemText>
+        </Ww>
+        <Ww>
+          <count>4</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>\\CANEmu\../Core/Modbus/modbus.c\hmodbus1.pMessagePtr-&gt;DevId</ItemText>
+        </Ww>
       </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>

MDK-ARM/CANEmu.uvprojx

@@ -341,7 +341,7 @@
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Core/CANEmu;..\Core\Modbus</IncludePath>
+              <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Core/CANEmu;../Core/Modbus</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>