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

Переструктурирован проект, перенесена ветка тестирования modbus и чуть скомпрессированная библиотека dallas

Browse Source
This commit is contained in:
Razvalyaev
2025-03-03 13:05:37 +03:00
parent 0f2736b8a5
commit b6978c385a
14 changed files with 387 additions and 4321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Core/Modbus/rs_message.c
View File

@@ -285,10 +285,13 @@ RS_StatusTypeDef RS_Abort(RS_HandleTypeDef *hRS, RS_AbortTypeDef AbortMode)
{
HAL_StatusTypeDef uart_res = 0;
hRS->htim->Instance->CNT = 0;
__HAL_TIM_CLEAR_IT(hRS->htim, TIM_IT_UPDATE);
if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout
{
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
if((AbortMode&ABORT_RS) == 0x00)
{
@@ -410,7 +413,11 @@ RS_StatusTypeDef RS_UART_RxCpltCallback(RS_HandleTypeDef *hRS)
RS_Set_RX_End(hRS);
if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout
{
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
// parse received data
RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message
@@ -440,7 +447,11 @@ RS_StatusTypeDef RS_UART_RxCpltCallback(RS_HandleTypeDef *hRS)
RS_Set_RX_End(hRS);
if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout
{
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
// parse received data
RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message
@@ -493,7 +504,9 @@ void RS_UART_Handler(RS_HandleTypeDef *hRS)
if(hRS->sRS_Timeout) // if timeout setted
if((hRS->huart->RxXferCount+1 == hRS->huart->RxXferSize) && RS_Is_RX_Busy(hRS)) // if first byte is received and receive is active
{
HAL_TIM_Base_Start_IT(hRS->htim);
TIM14->DIER |= (TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 |= (TIM_CR1_CEN);
RS_Set_RX_Active_Flags(hRS);
}
@@ -528,8 +541,12 @@ void RS_UART_Handler(RS_HandleTypeDef *hRS)
*/
void RS_TIM_Handler(RS_HandleTypeDef *hRS)
{
HAL_TIM_IRQHandler(hRS->htim);
HAL_TIM_Base_Stop_IT(hRS->htim);
TIM14->SR = ~(TIM_IT_UPDATE);
/* Disable the TIM Update interrupt */
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
RS_Abort(hRS, ABORT_RS);
RS_Handle_Receive_Start(hRS, hRS->pMessagePtr);