Worked version 1kHz

This commit is contained in:
2022-01-31 18:52:06 +03:00
parent 0ffac93746
commit 3163656574
2 changed files with 19 additions and 25 deletions

View File

@@ -154,10 +154,8 @@ int8_t comand_mes(uint8_t* pOut, size_t nLen)
int8_t status_mes(uint8_t* pMes, size_t nLen, struct sData *pOut)
{
uint8_t rate_range_val = 0;
uint8_t scale_rate = 0;
uint16_t rate_val = 0;
uint16_t temp_val = 0;
float scale_temp = 2.75;
if (nLen < 6u) return (-ERROR_SIZE_SMALL);
@@ -185,13 +183,13 @@ int8_t status_mes(uint8_t* pMes, size_t nLen, struct sData *pOut)
temp_val = ((uint16_t)pMes[3] << 8) | pMes[4];
if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_75) scale_rate = SCALE_RATE_RANGE_75;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_150) scale_rate = SCALE_RATE_RANGE_150;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_300) scale_rate = SCALE_RATE_RANGE_300;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_900) scale_rate = SCALE_RATE_RANGE_900;
if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_75) pOut->rate = (int16_t)rate_val / SCALE_RATE_RANGE_75;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_150) pOut->rate = (int16_t)rate_val / SCALE_RATE_RANGE_150;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_300) pOut->rate = (int16_t)rate_val / SCALE_RATE_RANGE_300;
else if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_900) pOut->rate = (int16_t)rate_val / SCALE_RATE_RANGE_900;
pOut->temp = (temp_val - 531) / scale_temp;
pOut->rate = (int16_t)rate_val / scale_rate;
pOut->temp = (temp_val - 531) / 2.75;
return 0;
}