暂存+1
This commit is contained in:
parent
01d51d4309
commit
a7bbacbe48
|
@ -5,7 +5,7 @@
|
|||
"type": "mrs-debugger",
|
||||
"request": "launch",
|
||||
"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": {
|
||||
"useLocalOpenOCD": true,
|
||||
"executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe",
|
||||
|
@ -39,8 +39,8 @@
|
|||
"additionalCommands": []
|
||||
},
|
||||
"loadedFiles": {
|
||||
"executableFile": "d:\\SXDT\\Project\\CH32\\ble_bjq_ch303rct6_ml307\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
||||
"symbolFile": "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": "c:\\Users\\1\\Desktop\\yhq\\ble_-tyq_-bjq_-ch32-v303\\obj\\ble_bjq_ch303rct6_ml307.elf",
|
||||
"executableFileOffset": 0,
|
||||
"symbolFileOffset": 0
|
||||
},
|
||||
|
|
|
@ -202,6 +202,7 @@ uint16_t Get_Stable_Reading(uint8_t cnt, uint32_t timeout_ms)
|
|||
else
|
||||
{
|
||||
stable_count = 0;
|
||||
rt_memset(gas_buf, 0, sizeof(gas_buf));
|
||||
}
|
||||
last = current;
|
||||
rt_thread_mdelay(100);
|
||||
|
@ -739,4 +740,13 @@ static void SYS_SW_Version(void)
|
|||
|
||||
MSH_CMD_EXPORT(SYS_SW_Version, "软件版本和编译时间");
|
||||
|
||||
|
||||
static void TEST_Get_SYS_Calibartion(void)
|
||||
{
|
||||
LOG_D("标定值 = %d", Flash_Get_SysCfg(kAlarmLValueId));
|
||||
}
|
||||
|
||||
MSH_CMD_EXPORT(TEST_Get_SYS_Calibartion, "标定值");
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1057,23 +1057,23 @@ static void ml307_init_thread_entry (void *parameter)
|
|||
result = -RT_ERROR;
|
||||
goto __exit;
|
||||
}
|
||||
if (at_obj_exec_cmd (device->client, resp, "AT+CGATT=1") != RT_EOK)
|
||||
{
|
||||
result = -RT_ERROR;
|
||||
goto __exit;
|
||||
}
|
||||
char parsed_data[10] = {0};
|
||||
for (i = 0; i < CGATT_RETRY; i++)
|
||||
{
|
||||
AT_SEND_CMD (client, resp, 0, ML307_AT_DEFAULT_TIMEOUT, "AT+CGATT?");
|
||||
at_resp_parse_line_args_by_kw (resp, "+CGATT:", "+CGATT: %s", &parsed_data);
|
||||
if (!rt_strncmp (parsed_data, "1", 1))
|
||||
{
|
||||
LOG_D ("%s device Packet domain attach.", device->name);
|
||||
break;
|
||||
}
|
||||
rt_thread_mdelay (1000);
|
||||
}
|
||||
// if (at_obj_exec_cmd (device->client, resp, "AT+CGATT=1") != RT_EOK)
|
||||
// {
|
||||
// result = -RT_ERROR;
|
||||
// goto __exit;
|
||||
// }
|
||||
// char parsed_data[10] = {0};
|
||||
// for (i = 0; i < CGATT_RETRY; i++)
|
||||
// {
|
||||
// AT_SEND_CMD (client, resp, 0, ML307_AT_DEFAULT_TIMEOUT, "AT+CGATT?");
|
||||
// at_resp_parse_line_args_by_kw (resp, "+CGATT:", "+CGATT: %s", &parsed_data);
|
||||
// if (!rt_strncmp (parsed_data, "1", 1))
|
||||
// {
|
||||
// LOG_D ("%s device Packet domain attach.", device->name);
|
||||
// break;
|
||||
// }
|
||||
// rt_thread_mdelay (1000);
|
||||
// }
|
||||
/* set network interface device hardware iccid */
|
||||
// LOG_D("*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR = %#X", *(rt_uint16_t *)FLASH_IOT_ICCID_ADDR);
|
||||
if ((*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR == 0xE339) || (*(uint16_t *)FLASH_IOT_ICCID_ADDR == 0x39E3))
|
||||
|
|
Loading…
Reference in New Issue