Templates/DS18B20_Library
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Прога ужата до 20 кб флеш: удален HAL_TIM и HAL_GPIO

Browse Source 
удалена ненужна по сути MyLibs библиотека
This commit is contained in:
Razvalyaev
2025-03-06 12:44:55 +03:00
parent fad121a9fd
commit dbc9388f67
20 changed files with 484 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
py_project/Core/Modbus/modbus.c
View File

@@ -88,7 +88,7 @@ UART_SettingsTypeDef modbus1_suart;
TIM_SettingsTypeDef modbus1_stim;
#else
extern UART_HandleTypeDef rs_huart;
extern TIM_HandleTypeDef rs_htim;
//extern TIM_HandleTypeDef rs_htim;
#endif
RS_HandleTypeDef hmodbus1;
@@ -136,7 +136,7 @@ void MODBUS_FirstInit(void)
#ifdef INCLUDE_GENERAL_PERIPH_LIBS
hmodbus1.RS_STATUS = RS_Init(&hmodbus1, &modbus1_suart, &modbus1_stim, 0);
#else
hmodbus1.RS_STATUS = RS_Init(&hmodbus1, &rs_huart, &rs_htim, 0);
hmodbus1.RS_STATUS = RS_Init(&hmodbus1, &rs_huart, NULL, 0);
#endif
RS_EnableReceive();
@@ -738,12 +738,12 @@ RS_StatusTypeDef RS_Response(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *modbus_ms
if(hmodbus->f.MessageHandled == 0)
{
TrackerCnt_Err(hmodbus->rs_err);
modbus_msg->Func_Code += ERR_VALUES_START;
}
else
{
TrackerCnt_Ok(hmodbus->rs_err);
}
@@ -798,7 +798,7 @@ RS_StatusTypeDef RS_Collect_Message(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *mo
if (modbus_msg->ByteCnt > DATA_SIZE*2) // if ByteCnt less than DATA_SIZE
{
TrackerCnt_Err(hmodbus->rs_err);
return RS_COLLECT_MSG_ERR;
}
@@ -820,7 +820,7 @@ RS_StatusTypeDef RS_Collect_Message(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *mo
modbus_uart_buff[ind++] = modbus_msg->ByteCnt;
else // otherwise return data_size err
{
TrackerCnt_Err(hmodbus->rs_err);
return RS_COLLECT_MSG_ERR;
}
@@ -908,7 +908,7 @@ RS_StatusTypeDef RS_Parse_Message(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *modb
//check that data size is correct
if (modbus_msg->ByteCnt > DATA_SIZE*2)
{
TrackerCnt_Err(hmodbus->rs_err);
modbus_msg->Func_Code += ERR_VALUES_START;
return RS_PARSE_MSG_ERR;
}
@@ -935,7 +935,7 @@ RS_StatusTypeDef RS_Parse_Message(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *modb
// compare crc
if (modbus_msg->MB_CRC != CRC_VALUE)
{
TrackerCnt_Err(hmodbus->rs_err);
modbus_msg->Func_Code += ERR_VALUES_START;
}
// hmodbus->MB_RESPONSE = MB_CRC_ERR; // set func code - error about wrong crc