Исправления по скоростям
This commit is contained in:
parent
19396e63d5
commit
f48e3cc041
|
|
@ -4,7 +4,7 @@ ENABLE_LANGUAGE(ASM)
|
||||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0)
|
CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0)
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ")
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 ")
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O1 ")
|
||||||
|
|
||||||
|
|
||||||
#set_source_files_properties(
|
#set_source_files_properties(
|
||||||
|
|
|
||||||
|
|
@ -267,7 +267,7 @@ static void Mma_InitSubSystems(tMma *env) {
|
||||||
|
|
||||||
tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler);
|
tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler);
|
||||||
Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger);
|
Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger);
|
||||||
// Lin4_StartThread(&env->linTaskSensor4);
|
Lin4_StartThread(&env->linTaskSensor4);
|
||||||
|
|
||||||
tLinData *linData5 = Lin5_Init(GetLin123CallbackHandler);
|
tLinData *linData5 = Lin5_Init(GetLin123CallbackHandler);
|
||||||
Lin_5_Init(&env->linTaskSensor5, linData5, &env->linPorts->lin5_Io, &env->slog.logger);
|
Lin_5_Init(&env->linTaskSensor5, linData5, &env->linPorts->lin5_Io, &env->slog.logger);
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ void GetLin123CallbackHandler(tLinData *env, uint8_t u8LinIndex, void *state) {
|
||||||
|
|
||||||
switch (pXferState->currentEventId) {
|
switch (pXferState->currentEventId) {
|
||||||
case LIN_PID_OK:
|
case LIN_PID_OK:
|
||||||
|
case LIN_NOISE:
|
||||||
|
|
||||||
if (env->direction == LIN_DIRECTION_SET) {
|
if (env->direction == LIN_DIRECTION_SET) {
|
||||||
LIN_DrvSendFrameNonBlocking(u8LinIndex, env->g_aTxBuffer, env->g_aTxBufferLen);
|
LIN_DrvSendFrameNonBlocking(u8LinIndex, env->g_aTxBuffer, env->g_aTxBufferLen);
|
||||||
|
|
|
||||||
|
|
@ -947,7 +947,6 @@ static void Lin5_Output_Set_Model(tLin5TaskSensor *env) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static lin_event_id_t Lin5_Scheduler(tLin5TaskSensor *env) {
|
static lin_event_id_t Lin5_Scheduler(tLin5TaskSensor *env) {
|
||||||
// volatile lin_event_id_t ret = LIN_NO_EVENT;
|
|
||||||
lin_event_id_t ret = LIN_NO_EVENT;
|
lin_event_id_t ret = LIN_NO_EVENT;
|
||||||
|
|
||||||
++env->step_probe;
|
++env->step_probe;
|
||||||
|
|
@ -961,9 +960,9 @@ static lin_event_id_t Lin5_Scheduler(tLin5TaskSensor *env) {
|
||||||
|
|
||||||
ret = Get_DRS_Stat(env->linIo, env->linData, &env->linStateSensor.d_DRS_Stat[i], LIN5_SENSON_ADR_Stat[i]);
|
ret = Get_DRS_Stat(env->linIo, env->linData, &env->linStateSensor.d_DRS_Stat[i], LIN5_SENSON_ADR_Stat[i]);
|
||||||
|
|
||||||
// if (ret != LIN_RX_COMPLETED) {
|
if (ret != LIN_RX_COMPLETED) {
|
||||||
// volatile uint32_t as = 0;
|
volatile uint32_t as = 0;
|
||||||
// }
|
}
|
||||||
|
|
||||||
uint8_t current_btn_state = env->linStateSensor.d_DRS_Stat[i].DRS_Btn_Stat;
|
uint8_t current_btn_state = env->linStateSensor.d_DRS_Stat[i].DRS_Btn_Stat;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -848,7 +848,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
|
||||||
|
|
||||||
//#pragma GCC push_options
|
//#pragma GCC push_options
|
||||||
//#pragma GCC optimize("O3")
|
//#pragma GCC optimize("O3")
|
||||||
// HVAC_model_step();
|
HVAC_model_step();
|
||||||
//#pragma GCC pop_options
|
//#pragma GCC pop_options
|
||||||
|
|
||||||
rtDW.sleep_model = 0;
|
rtDW.sleep_model = 0;
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,9 @@ void LIN_Initial(
|
||||||
LIN_DrvGetDefaultConfig(LIN_NODE_MASTER, &env->g_linMasterConfig);
|
LIN_DrvGetDefaultConfig(LIN_NODE_MASTER, &env->g_linMasterConfig);
|
||||||
env->g_linMasterConfig.baudRate = BoundRate;
|
env->g_linMasterConfig.baudRate = BoundRate;
|
||||||
env->g_linMasterConfig.clockSrcFreq = PCC_GetPccFunctionClock(s_ePccUartTable[UART_INDEX]);
|
env->g_linMasterConfig.clockSrcFreq = PCC_GetPccFunctionClock(s_ePccUartTable[UART_INDEX]);
|
||||||
|
// env->g_linMasterConfig.u32CoreClk = SCG_GetScgClockFreq(SCG_CORE_CLK);
|
||||||
|
|
||||||
|
// env->g_linMasterConfig.xferDlyCnt = (uint16_t)(env->g_linMasterConfig.clockSrcFreq / env->g_linMasterConfig.u32CoreClk);
|
||||||
|
|
||||||
env->g_linMasterConfig.getIntervalTimeValueCallback = LIN_TimerGetTimeIntervalValue;
|
env->g_linMasterConfig.getIntervalTimeValueCallback = LIN_TimerGetTimeIntervalValue;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,74 @@ static FCUART_ErrorType FCUART_LL_CheckInstance(uint8_t u8UartIndex) {
|
||||||
return tRetVal;
|
return tRetVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Process get OverSamp and SBR
|
||||||
|
*
|
||||||
|
* @param u32Smb the value OverSame*SBR
|
||||||
|
* @param u32OverSamp out OverSampe
|
||||||
|
* @param u32Sbr out
|
||||||
|
* @return FCUART_ERROR_OK is ok, others are not ok
|
||||||
|
*/
|
||||||
|
static FCUART_ErrorType FCUART_LL_ProcessBaud2(uint32_t u32ClkSrcHz, uint32_t u32Baudrate, uint32_t *u32OverSamp, uint32_t *u32Sbr) {
|
||||||
|
uint32_t clockFreq = u32ClkSrcHz;
|
||||||
|
|
||||||
|
uint32_t sbr = 1U;
|
||||||
|
uint32_t osr = 1U;
|
||||||
|
uint32_t sbrTmp;
|
||||||
|
uint32_t index;
|
||||||
|
uint32_t minDiff = 0xFFFFFFFFU;
|
||||||
|
uint32_t baudDiff;
|
||||||
|
uint32_t temp;
|
||||||
|
|
||||||
|
for (index = 16U; index <= 32U; index++)
|
||||||
|
{
|
||||||
|
temp = u32Baudrate * index;
|
||||||
|
sbrTmp = (clockFreq + (temp >> 1U)) / temp;
|
||||||
|
if (sbrTmp == 0U)
|
||||||
|
{
|
||||||
|
sbrTmp = 1U;
|
||||||
|
}
|
||||||
|
else if (sbrTmp >= 8192U)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* do nothing */
|
||||||
|
}
|
||||||
|
|
||||||
|
temp = temp * sbrTmp;
|
||||||
|
if (temp == clockFreq)
|
||||||
|
{
|
||||||
|
baudDiff = 0U;
|
||||||
|
osr = index;
|
||||||
|
sbr = sbrTmp;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (temp > clockFreq)
|
||||||
|
{
|
||||||
|
baudDiff = temp - clockFreq;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
baudDiff = clockFreq - temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (baudDiff < minDiff)
|
||||||
|
{
|
||||||
|
minDiff = baudDiff;
|
||||||
|
osr = index;
|
||||||
|
sbr = sbrTmp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*u32OverSamp = (uint16_t)osr;
|
||||||
|
*u32Sbr = (uint16_t)sbr;
|
||||||
|
|
||||||
|
return FCUART_ERROR_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Process get OverSamp and SBR
|
* @brief Process get OverSamp and SBR
|
||||||
*
|
*
|
||||||
|
|
@ -531,7 +599,8 @@ FCUART_ErrorType FCUART_Init(uint8_t u8UartIndex, FCUART_InitType *pInitCfg) {
|
||||||
pUart = (FCUART_Type *) s_aFCUART_InstanceTable[u8UartIndex];
|
pUart = (FCUART_Type *) s_aFCUART_InstanceTable[u8UartIndex];
|
||||||
|
|
||||||
/* process for baud-rate */
|
/* process for baud-rate */
|
||||||
if ((FCUART_ErrorType) FCUART_ERROR_OK == FCUART_LL_ProcessBaud(u32Smb, &u32OverSamp, &u32Sbr)) {
|
//if ((FCUART_ErrorType) FCUART_ERROR_OK == FCUART_LL_ProcessBaud(u32Smb, &u32OverSamp, &u32Sbr)) {
|
||||||
|
if ((FCUART_ErrorType) FCUART_ERROR_OK == FCUART_LL_ProcessBaud2(pInitCfg->u32ClkSrcHz, pInitCfg->u32Baudrate, &u32OverSamp, &u32Sbr)) {
|
||||||
/* temporary BAUD register */
|
/* temporary BAUD register */
|
||||||
u32TempBaudReg = (uint32_t) 0U |
|
u32TempBaudReg = (uint32_t) 0U |
|
||||||
/* initial value */
|
/* initial value */
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,22 @@ static void LIN_DrvWakeupHandle(uint8_t u8LinIndex);
|
||||||
|
|
||||||
/* ################################################################################## */
|
/* ################################################################################## */
|
||||||
/* ################################ Local Functions ################################# */
|
/* ################################ Local Functions ################################# */
|
||||||
|
/*
|
||||||
|
LOCAL_INLINE void LIN_DelayFunctionClk(uint8_t u8LinIndex, uint32 u32Tick)
|
||||||
|
{
|
||||||
|
uint32 u32CountLimit = s_aLinConfig[u8LinIndex]->xferDlyCnt * u32Tick / 4;
|
||||||
|
|
||||||
|
__asm volatile(
|
||||||
|
"1: subs %[cnt], %[cnt], #1 \n\t"
|
||||||
|
" nop \n\t"
|
||||||
|
" dsb \n\t"
|
||||||
|
" bne 1b \n\t"
|
||||||
|
: [cnt] "+r"(u32CountLimit)
|
||||||
|
:
|
||||||
|
: "cc", "memory"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
*/
|
||||||
/**
|
/**
|
||||||
* @brief LIN instance generate baudrate value, include oversample value and sbr value.
|
* @brief LIN instance generate baudrate value, include oversample value and sbr value.
|
||||||
*/
|
*/
|
||||||
|
|
@ -765,7 +780,8 @@ LIN_StatusType LIN_DrvInit(uint8_t u8LinIndex, lin_config_t *pConfig)
|
||||||
* - RX pin active edge disabled, for checking the wakeup signal;
|
* - RX pin active edge disabled, for checking the wakeup signal;
|
||||||
* - Stop bit set to 1;
|
* - Stop bit set to 1;
|
||||||
*/
|
*/
|
||||||
tRetVal = LIN_DrvCalBaudrate(u8LinIndex, &u32OverSamp, &u32Sbr);
|
// tRetVal = LIN_DrvCalBaudrate(u8LinIndex, &u32OverSamp, &u32Sbr);
|
||||||
|
tRetVal = LIN_DrvCalBaudrate2(u8LinIndex, &u32OverSamp, &u32Sbr);
|
||||||
|
|
||||||
u32BaudRegValue |= FCUART_BAUD_OVR_SAMP(u32OverSamp - 1U) | FCUART_BAUD_BEDGE_SAMP(
|
u32BaudRegValue |= FCUART_BAUD_OVR_SAMP(u32OverSamp - 1U) | FCUART_BAUD_BEDGE_SAMP(
|
||||||
1U) | FCUART_BAUD_SBR(u32Sbr);
|
1U) | FCUART_BAUD_SBR(u32Sbr);
|
||||||
|
|
@ -782,7 +798,7 @@ LIN_StatusType LIN_DrvInit(uint8_t u8LinIndex, lin_config_t *pConfig)
|
||||||
* - 8 bits transfer mode enabled;
|
* - 8 bits transfer mode enabled;
|
||||||
* - Parity check mode disable;
|
* - Parity check mode disable;
|
||||||
*/
|
*/
|
||||||
//FCUART_CTRL_IDLECFG(FCUART_IDLE_CHARCTER_128)
|
//FCUART_CTRL_IDLECFG(FCUART_IDLE_CHARCTER_128);
|
||||||
|
|
||||||
u32CtrlRegValue |= FCUART_CTRL_FEIE(1U) | FCUART_CTRL_RIE(1U) | FCUART_CTRL_BMSEL(0U) | FCUART_CTRL_PE(0U);
|
u32CtrlRegValue |= FCUART_CTRL_FEIE(1U) | FCUART_CTRL_RIE(1U) | FCUART_CTRL_BMSEL(0U) | FCUART_CTRL_PE(0U);
|
||||||
FCUART_HWA_SetCtrl(base, u32CtrlRegValue);
|
FCUART_HWA_SetCtrl(base, u32CtrlRegValue);
|
||||||
|
|
@ -1645,7 +1661,7 @@ void LIN_DrvIRQHandler(uint8_t u8LinIndex)
|
||||||
xferState->currentEventId = LIN_RX_OVERRUN;
|
xferState->currentEventId = LIN_RX_OVERRUN;
|
||||||
else if ((stat & FCUART_STAT_NF) != 0U) {
|
else if ((stat & FCUART_STAT_NF) != 0U) {
|
||||||
xferState->currentEventId = LIN_NOISE; // помеха
|
xferState->currentEventId = LIN_NOISE; // помеха
|
||||||
// LIN_DrvFrameHandle(u8LinIndex);
|
LIN_DrvFrameHandle(u8LinIndex);
|
||||||
} else if ((stat & FCUART_STAT_FEF) != 0U)
|
} else if ((stat & FCUART_STAT_FEF) != 0U)
|
||||||
xferState->currentEventId = LIN_FRAME_ERROR; // framing
|
xferState->currentEventId = LIN_FRAME_ERROR; // framing
|
||||||
else if ((stat & FCUART_STAT_PEF) != 0U)
|
else if ((stat & FCUART_STAT_PEF) != 0U)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue