This commit is contained in:
parent
a26e8a73b5
commit
94650ff03c
|
@ -5,7 +5,7 @@
|
||||||
"type": "mrs-debugger",
|
"type": "mrs-debugger",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"name": "ble_bjq_ch303rct6_ml307",
|
"name": "ble_bjq_ch303rct6_ml307",
|
||||||
"cwd": "d:\\SXDT\\Project\\CH32\\ble_bjq_ch303rct6_ml307",
|
"cwd": "c:\\Users\\1\\Desktop\\yhq\\ble_-tyq_-bjq_-ch32-v303",
|
||||||
"openOCDCfg": {
|
"openOCDCfg": {
|
||||||
"useLocalOpenOCD": true,
|
"useLocalOpenOCD": true,
|
||||||
"executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe",
|
"executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe",
|
||||||
|
@ -39,8 +39,8 @@
|
||||||
"additionalCommands": []
|
"additionalCommands": []
|
||||||
},
|
},
|
||||||
"loadedFiles": {
|
"loadedFiles": {
|
||||||
"executableFile": "d:\\SXDT\\Project\\CH32\\ble_bjq_ch303rct6_ml307\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
"executableFile": "c:\\Users\\1\\Desktop\\yhq\\ble_-tyq_-bjq_-ch32-v303\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
||||||
"symbolFile": "d:\\SXDT\\Project\\CH32\\ble_bjq_ch303rct6_ml307\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
"symbolFile": "c:\\Users\\1\\Desktop\\yhq\\ble_-tyq_-bjq_-ch32-v303\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
||||||
"executableFileOffset": 0,
|
"executableFileOffset": 0,
|
||||||
"symbolFileOffset": 0
|
"symbolFileOffset": 0
|
||||||
},
|
},
|
||||||
|
|
|
@ -904,7 +904,7 @@ int BSP_Flash_Init (void)
|
||||||
|
|
||||||
Flash_SetProductTimeLimit (2025, 2, 10, 13, 50, 20, kFactoryTimeId);
|
Flash_SetProductTimeLimit (2025, 2, 10, 13, 50, 20, kFactoryTimeId);
|
||||||
Set_ExpirationTime (MAX_EXPIRATION_DAYS);
|
Set_ExpirationTime (MAX_EXPIRATION_DAYS);
|
||||||
Flash_Set_Calibration_State(kNotCalibrated); // 标定状态
|
Flash_Set_Calibration_State(kSysGasCalibStatus); // 标定状态
|
||||||
Flash_Set_Valve_Num(0);
|
Flash_Set_Valve_Num(0);
|
||||||
sci.hw_ver = SYS_HW_VERSION;
|
sci.hw_ver = SYS_HW_VERSION;
|
||||||
sci.sw_ver = SYS_SW_VERSION;
|
sci.sw_ver = SYS_SW_VERSION;
|
||||||
|
|
|
@ -986,6 +986,7 @@ int Ml307_Process_Events (Ml307Event ml307_recv_event, struct at_device *device,
|
||||||
#ifdef TEST_ENABLE
|
#ifdef TEST_ENABLE
|
||||||
RTC_ShowTime(); // 每次发送打印下时间,容易定位问题
|
RTC_ShowTime(); // 每次发送打印下时间,容易定位问题
|
||||||
#endif
|
#endif
|
||||||
|
cnt++;
|
||||||
LOG_D ("%s上报, cnt :%d", event->event_name, cnt);
|
LOG_D ("%s上报, cnt :%d", event->event_name, cnt);
|
||||||
|
|
||||||
int result = event->send_func (device, ml307_ops);
|
int result = event->send_func (device, ml307_ops);
|
||||||
|
@ -2015,7 +2016,7 @@ static void Ml307_Life_Thread_Entry (void *parameter)
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
/*设置心跳包*/
|
/*设置心跳包*/
|
||||||
if (at_obj_exec_cmd (device->client, resp, "AT+MIPTKA=0,1,120,60,3") != RT_EOK)
|
if (at_obj_exec_cmd (device->client, resp, "AT+MIPTKA=0,1,60,30,3") != RT_EOK)
|
||||||
{
|
{
|
||||||
result = -RT_ERROR;
|
result = -RT_ERROR;
|
||||||
goto __exit;
|
goto __exit;
|
||||||
|
@ -2097,11 +2098,11 @@ static void Ml307_Life_Thread_Entry (void *parameter)
|
||||||
result = -RT_ERROR;
|
result = -RT_ERROR;
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
if (at_obj_exec_cmd (device->client, resp, "AT+MIPCALL=1,1") != RT_EOK)
|
// if (at_obj_exec_cmd (device->client, resp, "AT+MIPCALL=1,1") != RT_EOK)
|
||||||
{
|
// {
|
||||||
result = -RT_ERROR;
|
// result = -RT_ERROR;
|
||||||
goto __exit;
|
// goto __exit;
|
||||||
}
|
// }
|
||||||
#if defined(AT_DEBUG)
|
#if defined(AT_DEBUG)
|
||||||
/* check the GPRS network IP address */
|
/* check the GPRS network IP address */
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
|
|
Loading…
Reference in New Issue