增加了写设备地址,波特率,风速平均时间,温湿度平均时间 时的判断
This commit is contained in:
parent
93e48fc389
commit
5f0b0ae9ea
|
@ -462,6 +462,10 @@ static u_int16_t FRT_WriteRegDeviceAddr(void *pMsg)
|
||||||
{
|
{
|
||||||
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
||||||
uint16_t data = *pMsgAddr;
|
uint16_t data = *pMsgAddr;
|
||||||
|
if(data > 0xFF || data < 0x00)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
g_usrConfigInfo.addr = data;
|
g_usrConfigInfo.addr = data;
|
||||||
save_usr_config_info(g_usrConfigInfo);
|
save_usr_config_info(g_usrConfigInfo);
|
||||||
|
|
||||||
|
@ -477,9 +481,15 @@ static u_int16_t FRT_WriteRegCommuBaudRate(void *pMsg)
|
||||||
{
|
{
|
||||||
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
||||||
uint16_t data = *pMsgAddr;
|
uint16_t data = *pMsgAddr;
|
||||||
|
if(data != 2400 && data != 4800 && data != 9600 && data != 19200 && data != 38400)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
//存
|
||||||
g_usrConfigInfo.uart_baud = data;
|
g_usrConfigInfo.uart_baud = data;
|
||||||
save_usr_config_info(g_usrConfigInfo);
|
save_usr_config_info(g_usrConfigInfo);
|
||||||
|
//改
|
||||||
MX_USART3_UART_Init(g_usrConfigInfo.uart_baud);
|
MX_USART3_UART_Init(g_usrConfigInfo.uart_baud);
|
||||||
MX_USART1_UART_Init(g_usrConfigInfo.uart_baud);
|
MX_USART1_UART_Init(g_usrConfigInfo.uart_baud);
|
||||||
|
|
||||||
|
@ -495,6 +505,10 @@ static u_int16_t FRT_WriteRegSpeedAverageTime(void *pMsg)
|
||||||
{
|
{
|
||||||
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
||||||
uint16_t data = *pMsgAddr;
|
uint16_t data = *pMsgAddr;
|
||||||
|
if(data > 600 || data < 1)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
g_usrConfigInfo.speed_average_time = data;
|
g_usrConfigInfo.speed_average_time = data;
|
||||||
save_usr_config_info(g_usrConfigInfo);
|
save_usr_config_info(g_usrConfigInfo);
|
||||||
|
@ -511,6 +525,10 @@ static u_int16_t FRT_WriteRegTempHumUpdateTime(void *pMsg)
|
||||||
{
|
{
|
||||||
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
uint16_t *pMsgAddr = (uint16_t *)pMsg;
|
||||||
uint16_t data = *pMsgAddr;
|
uint16_t data = *pMsgAddr;
|
||||||
|
if(data > 600 || data < 1)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
g_usrConfigInfo.temp_hum_update_time = data;
|
g_usrConfigInfo.temp_hum_update_time = data;
|
||||||
save_usr_config_info(g_usrConfigInfo);
|
save_usr_config_info(g_usrConfigInfo);
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OCDynDriverList</name>
|
<name>OCDynDriverList</name>
|
||||||
<state>STLINK_ID</state>
|
<state>CMSISDAP_ID</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OCLastSavedByProductVersion</name>
|
<name>OCLastSavedByProductVersion</name>
|
||||||
|
|
Loading…
Reference in New Issue