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

Добавлено автоотключение polling, если модбас больше не приходит

Browse Source
This commit is contained in:
Razvalyaev 2025-09-12 13:14:12 +03:00
parent b024569ca4
commit 43ac7e90fc
3 changed files with 221 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/CANEmu/canWorking.c
View File

@ -3,7 +3,7 @@
CANEmu_HandleTypeDef hcanemu; CANEmu_HandleTypeDef hcanemu;
uint32_t mbox; uint32_t mbox;
CANEmu_HandleTypeDef hcanemu; int disable_poll_timeout = 1000;
int flag_manual = 0; int flag_manual = 0;
int transmit_prev = 0; int transmit_prev = 0;
@ -41,9 +41,14 @@ void CAN_SendFrame(CANEmu_HandleTypeDef *canemu)
void CANEmu_Working(CANEmu_HandleTypeDef *canemu) void CANEmu_Working(CANEmu_HandleTypeDef *canemu)
{ {
uint32_t tick_now = HAL_GetTick();
if(flag_manual == 0) if(flag_manual == 0)
{ {
if(tick_now - hmodbus1.lastRxTick > disable_poll_timeout)
MB_DATA.Coils.START_POLLING = 0;
canemu->start_poll = MB_DATA.Coils.START_POLLING; canemu->start_poll = MB_DATA.Coils.START_POLLING;
canemu->transmit = MB_DATA.Coils.START_SINGLE_FRAME; canemu->transmit = MB_DATA.Coils.START_SINGLE_FRAME;
canemu->period_ms = MB_DATA.HoldRegs.CAN_PERIOD; canemu->period_ms = MB_DATA.HoldRegs.CAN_PERIOD;
if(canemu->period_ms < CAN_MIN_PERIOD) if(canemu->period_ms < CAN_MIN_PERIOD)

6
Core/Modbus/rs_message.h
View File

@ -59,8 +59,8 @@
#define RS_Reset_RX_Flags(_hRS_) RS_Reset_RX_Active_Flags(_hRS_); _hRS_->f.RX_Busy = 0; _hRS_->f.RX_Done = 0; _hRS_->f.RX_Half = 0 #define RS_Reset_RX_Flags(_hRS_) RS_Reset_RX_Active_Flags(_hRS_); _hRS_->f.RX_Busy = 0; _hRS_->f.RX_Done = 0; _hRS_->f.RX_Half = 0
#define RS_Reset_TX_Flags(_hRS_) _hRS_->f.TX_Busy = 0; _hRS_->f.TX_Done = 0 #define RS_Reset_TX_Flags(_hRS_) _hRS_->f.TX_Busy = 0; _hRS_->f.TX_Done = 0
#define RS_Set_RX_End_Flag(_hRS_) _hRS_->f.RX_Done = 1; #define RS_Set_RX_End_Flag(_hRS_) _hRS_->f.RX_Done = 1; _hRS_->lastRxTick = uwTick;
#define RS_Set_TX_End_Flag(_hRS_) _hRS_->f.TX_Done = 1 #define RS_Set_TX_End_Flag(_hRS_) _hRS_->f.TX_Done = 1; _hRS_->lastTxTick = uwTick;
#define RS_Set_RX_End(_hRS_) RS_Reset_RX_Flags(_hRS_); RS_Set_RX_End_Flag(_hRS_) #define RS_Set_RX_End(_hRS_) RS_Reset_RX_Flags(_hRS_); RS_Set_RX_End_Flag(_hRS_)
#define RS_Set_TX_End(_hRS_) RS_Reset_TX_Flags(_hRS_); RS_Set_TX_End_Flag(_hRS_) #define RS_Set_TX_End(_hRS_) RS_Reset_TX_Flags(_hRS_); RS_Set_TX_End_Flag(_hRS_)
@ -186,6 +186,8 @@ typedef struct // RS_HandleTypeDef
/* RS STATUS */ /* RS STATUS */
RS_StatusTypeDef RS_STATUS; ///< RS status RS_StatusTypeDef RS_STATUS; ///< RS status
uint32_t lastRxTick;
uint32_t lastTxTick;
}RS_HandleTypeDef; }RS_HandleTypeDef;
extern RS_HandleTypeDef hmodbus1; extern RS_HandleTypeDef hmodbus1;

306
MDK-ARM/CANEmu.uvguix.I
View File

File diff suppressed because one or more lines are too long