Razvalyaev/CANEmu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Razvalyaev
2025-08-04 18:12:48 +03:00
parent 4df0d28751
commit 59ea98c0c7
11 changed files with 169 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/CANEmu/canEmu.h
View File

@@ -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;

2
Core/Inc/stm32f1xx_it.h
View File

@@ -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 */

8
Core/Modbus/modbus_data.h
View File

@@ -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
* @}

20
Core/Src/main.c
View File

@@ -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;
}
HAL_Delay(hcanemu.period_ms);
CANEmu_SendFrame(&hcanemu);
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 */

32
Core/Src/stm32f1xx_it.c
View File

@@ -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 */

7
Core/Src/tim.c
View File

@@ -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 */

7
Core/Src/usart.c
View File

@@ -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 */