修复三项问题-日志日期0214

This commit is contained in:
leixiang111 2025-02-24 09:06:19 +08:00
parent e87cd8ff0c
commit 91ac34683e
39 changed files with 4000 additions and 4161 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
{"lastUsed":1737524518509,"path":"E:\/project\/software_2025\/app_0107\/workspace1","projectCount":1,"recentFiles":[{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"app_iot_data.c","lastModified":1736732947472,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/app\/app_iot_data.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"app_ble_data.c","lastModified":1736404661101,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/app\/app_ble_data.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"app_iot_ctl.c","lastModified":1736404661101,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/app\/app_iot_ctl.c"},{"path":"\/wells\/linkscripts\/STM32L071RB","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"link.lds","lastModified":1736404624801,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/linkscripts\/STM32L071RB\/link.lds"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"app_ble_at.c","lastModified":1736404662119,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/app\/app_ble_at.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"app_dev.c","lastModified":1736405679223,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/app\/app_dev.c"},{"path":"\/wells\/rt-thread\/src","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"components.c","lastModified":1736404405596,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/rt-thread\/src\/components.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"bsp_gas.h","lastModified":1736499311421,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/bsp\/bsp_gas.h"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_0107\/workspace1","name":"bsp_gas.c","lastModified":1736732947472,"locationURI":"file:\/E:\/project\/software_2025\/app_0107\/workspace1\/wells\/bsp\/bsp_gas.c"}]}
{"lastUsed":1740358782666,"path":"E:\/project\/software_2025\/app_wells_0213\/workspace1","projectCount":1,"recentFiles":[{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_iic_extend.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_iic_extend.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_iot_data.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_iot_data.c"},{"path":"\/wells\/linkscripts\/STM32L071RB","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"link.lds","lastModified":1739412632836,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/linkscripts\/STM32L071RB\/link.lds"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_iot_ctl.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_iot_ctl.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_dev.c","lastModified":1739413207140,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_dev.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_temperature.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_temperature.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_sensor_ctl.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_sensor_ctl.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_iot.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_iot.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_iic.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_iic.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_iot_at.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_iot_at.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_power.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_power.c"},{"path":"\/wells\/app","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"app_ble_ctl.c","lastModified":1739777461604,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/app\/app_ble_ctl.c"},{"path":"\/wells\/rt-thread\/src","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"components.c","lastModified":1739412551691,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/rt-thread\/src\/components.c"},{"path":"\/wells\/bsp","parentWorkspace":"E:\/project\/software_2025\/app_wells_0213\/workspace1","name":"bsp_gas.c","lastModified":1739777461605,"locationURI":"file:\/E:\/project\/software_2025\/app_wells_0213\/workspace1\/wells\/bsp\/bsp_gas.c"}]}

View File

@ -1,44 +1,45 @@
#MyEclipse Usage Data
#Wed Jan 22 13:41:59 CST 2025
#Mon Feb 24 08:59:43 CST 2025
bundle/com.genuitec.eclipse.theming.css=-1
misc/ws=win32
misc/core_version=<unknown>
misc/eclipseVersion/4.10.0.v20211027-1200=1
misc/timestamp=2025-1-22 5\:41\:59
editor/org.rt-thread.studio.lds.edit.editor=4
misc/timestamp=2025-2-24 0\:59\:43
editor/org.rt-thread.studio.lds.edit.editor=3
bundle/com.genuitec.eclipse.theming.base.win=-1
misc/productType/devstyle=1
misc/arch=x86_64
perspective/org.eclipse.cdt.ui.CPerspective=2
editor/org.eclipse.cdt.ui.editor.CEditor=8
bundle/com.genuitec.eclipse.inlinesearch=3
bundle/com.genuitec.eclipsecolortheme.api=6
editor/org.eclipse.cdt.ui.editor.CEditor=18
bundle/com.genuitec.eclipse.inlinesearch=15
bundle/com.genuitec.eclipsecolortheme.api=18
misc/installmode/standalone=0
bundle/com.genuitec.eclipse.startup=3
misc/workspace_hash=-341706209
bundle/com.genuitec.eclipse.core.common.platform=6
bundle/com.genuitec.eclipse.startup=15
misc/workspace_hash=-162139819
bundle/com.genuitec.eclipse.core.common.platform=18
devstyle/state/workbenchColor/Dark_Gray=1
bundle/com.genuitec.eclipse.monitor=3
bundle/com.genuitec.eclipse.monitor=15
misc/product/org.rt-thread.studio.application.product=1
bundle/com.genuitec.eclipse.ui.common.platform=6
misc/count=6
bundle/com.genuitec.eclipse.ui.common.platform=18
misc/count=18
devstyle/state/inlinesearch=1
bundle/com.genuitec.eclipse.theming.scrollbar=3
view/org.eclipse.ui.views.ProblemView=3
bundle/com.genuitec.eclipse.theming.scrollbar=15
misc/locale=zh_CN
bundle/com.genuitec.eclipse.theming.scrollbar.win=-1
misc/os=win32
bundle/com.genuitec.eclipse.theming.base=3
bundle/com.genuitec.eclipse.theming.base=15
devstyle/state/enabled=1
misc/period=3308067
view/org.eclipse.ui.console.ConsoleView=1
misc/period=25731935
view/org.eclipse.ui.console.ConsoleView=3
bundle/com.genuitec.eclipse.theming.epl=-1
devstyle/state/iconsColor/primary=1
bundle/com.genuitec.eclipse.theming.core=3
bundle/com.genuitec.eclipse.webclipse.evergreen=3
bundle/com.genuitec.eclipse.meexplorer=3
bundle/com.genuitec.eclipse.theming.ui=3
bundle/com.genuitec.eclipse.theming.core=15
bundle/com.genuitec.eclipse.meexplorer=15
bundle/com.genuitec.eclipse.theming.ui=15
bundle/com.genuitec.eclipse.webclipse.evergreen=15
misc/installmode/stable=0
view/org.eclipse.ui.navigator.ProjectExplorer=5
bundle/com.genuitec.eclipse.patches=6
bundle/com.genuitec.eclipse.startup.workspace=3
bundle/com.genuitec.eclipse.webicons=6
view/org.eclipse.ui.navigator.ProjectExplorer=14
bundle/com.genuitec.eclipse.startup.workspace=15
bundle/com.genuitec.eclipse.patches=18
bundle/com.genuitec.eclipse.webicons=18

View File

@ -1,6 +1,5 @@
*** SESSION 1月 07, 2025 10:13:55.41 --------------------------------------------
*** SESSION 1月 08, 2025 13:21:31.06 --------------------------------------------
*** SESSION 1月 09, 2025 14:23:45.41 --------------------------------------------
*** SESSION 1月 10, 2025 15:48:02.45 --------------------------------------------
*** SESSION 1月 13, 2025 09:32:56.66 --------------------------------------------
*** SESSION 1月 22, 2025 13:38:22.81 --------------------------------------------
*** SESSION 2月 13, 2025 09:59:25.42 --------------------------------------------
*** SESSION 2月 14, 2025 09:54:32.61 --------------------------------------------
*** SESSION 2月 17, 2025 09:35:17.24 --------------------------------------------
*** SESSION 2月 20, 2025 11:18:59.15 --------------------------------------------
*** SESSION 2月 24, 2025 08:55:49.59 --------------------------------------------

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,2 @@
eclipse.preferences.version=1
last.upload.time=1736498967147
last.upload.time=1739759798709

View File

@ -1,2 +1,2 @@
codemix.dont.show.upsell.until=1739165918787
codemix.dont.show.upsell.until=1741740962390
eclipse.preferences.version=1

View File

@ -1,7 +1,9 @@
LaunchTargetManager/org.eclipse.launchbar.core.launchTargetType.local,Local/arch=x86_64
LaunchTargetManager/org.eclipse.launchbar.core.launchTargetType.local,Local/name=Local
LaunchTargetManager/org.eclipse.launchbar.core.launchTargetType.local,Local/os=win32
configDescList=org.eclipse.launchbar.core.descriptorType.default\:wells.STLink.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.Qemu.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.DAPLink.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.JLink.Debug
configDescList=org.eclipse.launchbar.core.descriptorType.default\:wells.DAPLink.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.JLink.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.STLink.Debug,org.eclipse.launchbar.core.descriptorType.default\:wells.Qemu.Debug
eclipse.preferences.version=1
org.eclipse.launchbar.core.descriptorType.default\:wells.DAPLink.Debug/activeLaunchMode=run
org.eclipse.launchbar.core.descriptorType.default\:wells.DAPLink.Debug/activeLaunchTarget=org.eclipse.launchbar.core.launchTargetType.local\:Local
org.eclipse.launchbar.core.descriptorType.default\:wells.Qemu.Debug/activeLaunchMode=run
org.eclipse.launchbar.core.descriptorType.default\:wells.Qemu.Debug/activeLaunchTarget=org.eclipse.launchbar.core.launchTargetType.local\:Local

View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.search.defaultPerspective=org.eclipse.search.defaultPerspective.none

View File

@ -1,5 +1,5 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1737524253625
platformState=1740358413464
quickStart=false
tipsAndTricks=false

View File

@ -0,0 +1,3 @@
dvendor=\u663E\u793A\u6240\u6709
eclipse.preferences.version=1
version=\u663E\u793A\u6240\u6709

View File

@ -21,7 +21,7 @@
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.enableSemihostingIoclientTelnet" value="true"/>
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.enableSwo" value="true"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseEndAddress" value=""/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseMode" value="1"/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseMode" value="0"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseStartAddress" value=""/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.firstResetSpeed" value="4000"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.firstResetType" value=""/>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="SearchDialog.ScopePart">
<item value="0" key="scope"/>
</section>
<section name="">
<item value="1000" key="org.eclipse.search.resultpage.limit"/>
</section>
<section name="TextSearchPage">
<item value="2" key="HISTORY_SIZE"/>
<item value="false" key="CASE_SENSITIVE"/>
<item value="false" key="REG_EX_SEARCH"/>
<item value="false" key="WHOLE_WORD"/>
<item value="false" key="SEARCH_DERIVED"/>
<item value="false" key="SEARCH_IN_BINARIES"/>
<section name="EXTENSIONS">
<item value="*.c" key="0"/>
</section>
<section name="HISTORY0">
<item value="true" key="ignoreCase"/>
<item value="0" key="scope"/>
<item value="false" key="isWholeWord"/>
<item value="i_nb_err" key="textPattern"/>
<item value="false" key="isRegExSearch"/>
<list key="fileNamePatterns">
<item value="*.c"/>
</list>
<list key="workingSets">
</list>
</section>
<section name="HISTORY1">
<item value="true" key="ignoreCase"/>
<item value="0" key="scope"/>
<item value="false" key="isWholeWord"/>
<item value="temp1" key="textPattern"/>
<item value="false" key="isRegExSearch"/>
<list key="fileNamePatterns">
<item value="*.c"/>
</list>
<list key="workingSets">
</list>
</section>
</section>
<section name="org.eclipse.search.text.FileSearchResultPage">
<item value="1000" key="org.eclipse.search.resultpage.limit"/>
</section>
<section name="Search">
<list key="Search.processedPageIds">
<item value="org.eclipse.search.internal.ui.text.TextSearchPage"/>
<item value="org.eclipse.cdt.ui.pdomSearchPage"/>
<item value="org.eclipse.egit.ui.commitSearchPage"/>
</list>
<list key="Search.enabledPageIds">
<item value="org.eclipse.search.internal.ui.text.TextSearchPage"/>
<item value="org.eclipse.cdt.ui.pdomSearchPage"/>
<item value="org.eclipse.egit.ui.commitSearchPage"/>
</list>
</section>
<section name="SearchDialog">
<item value="org.eclipse.search.internal.ui.text.TextSearchPage" key="PREVIOUS_PAGE"/>
</section>
<section name="DialogBounds_SearchDialog">
<item value="505" key="DIALOG_WIDTH"/>
<item value="1|Microsoft YaHei UI|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|Microsoft YaHei UI" key="DIALOG_FONT_NAME"/>
<item value="492" key="DIALOG_HEIGHT"/>
<item value="402" key="DIALOG_X_ORIGIN"/>
<item value="168" key="DIALOG_Y_ORIGIN"/>
</section>
</section>

View File

@ -1,4 +1,4 @@
#Tue Jan 07 10:13:53 CST 2025
#Thu Feb 13 09:59:23 CST 2025
0.Path=C\:\\Program Files\\Git\\bin\\sh.exe
0.Name=Git Bash
0.Args=--login -i

View File

@ -5,7 +5,7 @@
<item value="false" key="WizardProjectsImportPage.STORE_COPY_PROJECT_ID"/>
<item value="false" key="WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"/>
<list key="WizardProjectsImportPage.STORE_DIRECTORIES">
<item value="E:\project\software_2025\app_0107\workspace1"/>
<item value="E:\project\software_2025\app_wells_0213\workspace1"/>
</list>
<list key="WizardProjectsImportPage.STORE_ARCHIVES">
<item value=""/>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1736216037963_0" label="窗口工作集" name="Aggregate for window 1736216037963"/>
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1739411967599_0" label="窗口工作集" name="Aggregate for window 1739411967599"/>
</workingSetManager>

View File

@ -1,3 +1,3 @@
#Wed Jan 22 13:38:17 CST 2025
#Mon Feb 24 08:55:45 CST 2025
org.eclipse.core.runtime=2
org.eclipse.platform=4.10.0.v20211027-1200

View File

@ -357,6 +357,16 @@ eeprom已经测试完成
*******************************************
*****************************************
修改日期2025-02-14
修改版本 V0.00031
1-修复判断零下温度报警时数值格式转换问题
2-修改模组上电搜索频段指令
3-修复网络时间获取失败本地备份数据逻辑
*******************************************

View File

@ -145,7 +145,7 @@
</tool>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.506412204" name="GNU ARM Cross Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.1461589245" name="GNU ARM Cross Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash">
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.1937707052" name="Output file format (-O)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.binary" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.1937707052" name="Output file format (-O)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.createflash.choice.ihex" valueType="enumerated"/>
</tool>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.82359725" name="GNU ARM Cross Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.601724476" name="Display source (--source|-S)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" value="true" valueType="boolean"/>

View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-725153297977101593" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-770510488545986605" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

View File

@ -1,5 +1,5 @@
#RT-Thread Studio Project Configuration
#Tue Jan 07 10:15:00 CST 2025
#Thu Feb 13 10:02:36 CST 2025
project_type=rtt
chip_name=STM32L071RB
cpu_name=None
@ -18,6 +18,6 @@ tool_chain=gcc
uart_name=uart1
tx_pin_name=PA9
rtt_nano_path=
output_project_path=E\:\\project\\software_2025\\app_0107\\workspace1
output_project_path=E\:\\project\\software_2025\\app_wells_0213\\workspace1
hardware_adapter=J-Link
project_name=wells

View File

@ -21,7 +21,7 @@
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.enableSemihostingIoclientTelnet" value="true"/>
<booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.enableSwo" value="true"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseEndAddress" value=""/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseMode" value="1"/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseMode" value="0"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.eraseStartAddress" value=""/>
<intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.firstResetSpeed" value="4000"/>
<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.jlink.firstResetType" value=""/>

View File

@ -267,9 +267,9 @@ void iot_device_message_update_default(void)
//采集周期
//开GPS采集周期不能小于5
i_set_mess.collect_period = 120;
i_set_mess.collect_period = 2;
//上报周期
i_set_mess.up_period = 360;
i_set_mess.up_period = 2;
i_set_mess.collect_period_save = i_set_mess.collect_period;
i_set_mess.up_period_save = i_set_mess.up_period;
@ -285,7 +285,7 @@ void iot_device_message_update_default(void)
memset(i_set_mess.app_latitude, 0X00, 4);
//激活
i_set_mess.activate = false;
i_set_mess.activate = true;
//ip地址
i_set_mess.ip_port[0] = 39;

View File

@ -75,7 +75,7 @@ iot_cmd_list_t iot_list_csq[]=
*
*/
iot_cmd_list_t iot_list_poweron_tcpip[]=
{I_AT, I_QSCLK, I_QICLOSE, I_CGMI, I_CGSN, I_ATE, I_QBAND, I_CSCON1, I_CSCON, I_CEREG, I_CGPADDR,
{I_AT, I_QSCLK, I_QBAND, I_QICLOSE, I_CGMI, I_CGSN, I_ATE, I_CSCON1, I_CSCON, I_CEREG, I_CGPADDR,
I_CSQ , I_QENG, I_QCCID, I_QICFG, I_DNS, I_QNTP, I_FINISH};
/*
*
@ -92,23 +92,23 @@ iot_cmd_list_t iot_list_csq[]=
{
//指令=指令+应答+等待时间+重试次数+处理
{I_AT_NULL, "NULL", "NULL", 0, 0, NULL},
{I_AT, "AT\r\n", "OK", 1000, 3, i_default_deal},
{I_QRST, "AT+QRST=1\r\n", "+IP", 15000, 3, i_default_deal},
{I_QSCLK, "AT+QSCLK=0\r\n", "OK", 1000, 3, i_default_deal},
{I_CGMI, "AT+CGMI\r\n", "OK", 1000, 3, i_default_deal},
{I_CGSN, "AT+CGSN=1\r\n", "OK", 1000, 3, i_imei_deal},
{I_ATE, "ATE0\r\n", "OK", 1000, 3, i_default_deal},
{I_QBAND, "AT+QBAND?\r\n", "OK", 1000, 3, i_default_deal},
{I_CGPADDR, "AT+CGPADDR?\r\n", "OK", 1000, 3, i_default_deal},
{I_NNMI, "AT+NNMI=1\r\n", "OK", 1000, 3, i_default_deal},
{I_NCFG, "AT+NCFG=0,300\r\n", "OK", 1000, 3, i_default_deal},
{I_CSCON1, "AT+CSCON=1\r\n", "OK", 1000, 3, i_default_deal},
{I_CSCON, "AT+CSCON?\r\n", "OK", 1000, 3, i_default_deal},
{I_CEREG, "AT+CEREG?\r\n", "OK", 1000, 3, i_default_deal},
{I_NCDPOPEN, "AT+NCDPOPEN=\"221.229.214.202\",5683\r\n", "+QLWEVTIND: 3", 5000, 3, i_default_deal},
{I_CSQ, "AT+CSQ\r\n", "OK", 1000, 3, i_csq_deal},
{I_NMSTATUS, "AT+NMSTATUS?\r\n", "REGISTERED_AND_OBSERVED", 1000, 3, i_default_deal},
{I_NMGS, iot_send_buff, "OK", 5000, 3, i_default_deal},
{I_AT, "AT\r\n", "OK", 1000, 5, i_default_deal},
{I_QRST, "AT+QRST=1\r\n", "+IP", 15000, 5, i_default_deal},
{I_QSCLK, "AT+QSCLK=0\r\n", "OK", 1000, 5, i_default_deal},
{I_CGMI, "AT+CGMI\r\n", "OK", 1000, 5, i_default_deal},
{I_CGSN, "AT+CGSN=1\r\n", "OK", 1000, 5, i_imei_deal},
{I_ATE, "ATE0\r\n", "OK", 1000, 5, i_default_deal},
{I_QBAND, "AT+QBAND=0\r\n", "OK", 1000, 5, i_default_deal},
{I_CGPADDR, "AT+CGPADDR?\r\n", "OK", 1000, 5, i_default_deal},
{I_NNMI, "AT+NNMI=1\r\n", "OK", 1000, 5, i_default_deal},
{I_NCFG, "AT+NCFG=0,300\r\n", "OK", 1000, 5, i_default_deal},
{I_CSCON1, "AT+CSCON=1\r\n", "OK", 1000, 5, i_default_deal},
{I_CSCON, "AT+CSCON?\r\n", "OK", 1000, 5, i_default_deal},
{I_CEREG, "AT+CEREG?\r\n", "OK", 1000, 5, i_default_deal},
{I_NCDPOPEN, "AT+NCDPOPEN=\"221.229.214.202\",5683\r\n", "+QLWEVTIND: 3", 5000, 5, i_default_deal},
{I_CSQ, "AT+CSQ\r\n", "OK", 1000, 5, i_csq_deal},
{I_NMSTATUS, "AT+NMSTATUS?\r\n", "REGISTERED_AND_OBSERVED", 1000, 5, i_default_deal},
{I_NMGS, iot_send_buff, "OK", 5000, 5, i_default_deal},
//上传的IP_自定义修改
//内网测试
@ -254,6 +254,8 @@ uint8_t i_rtc_deal(char* data, uint8_t len)
i_dev_mess.collect_time[2] = (timestamp >>8) & 0xFF;
i_dev_mess.collect_time[3] = (timestamp ) & 0xFF;
iot_ctl.i_nb_err = NB_OPEN_SUCC;
return 1;
}
else

View File

@ -38,7 +38,7 @@ extern CircularBuffer ccbuff;
//临时变量
uint32_t methane_temp1 =0;
uint32_t voltage_temp2 =0;
int16_t temperature_temp_3 =0;
int32_t temperature_temp_3 =0;
uint8_t temp1 = 0;
/*
@ -147,7 +147,7 @@ void iot_ctl_thread_task(void *parameter)
if((strstr(iot_read_buff, "+IP" ) != NULL))
{
rt_timer_stop(iot_timer_4);
iot_ctl.i_nb_err = NB_OPEN_SUCC;
LOG_OUT("ip_ready\r\n");
iot_ctl.i_run_ste = I_WORK;
@ -198,8 +198,13 @@ void iot_ctl_thread_task(void *parameter)
LOG_OUT("methane=%d\r\n", methane_temp1);
voltage_temp2 = i_dev_mess.voltage[0]<<8 | i_dev_mess.voltage[1];
LOG_OUT("voltage=%d\r\n", voltage_temp2);
temperature_temp_3 = i_dev_mess.temperature[0]<<8 | i_dev_mess.temperature[1];
LOG_OUT("temper=%d\r\n", temperature_temp_3);
temperature_temp_3 = (i_dev_mess.temperature[0]<<8 | i_dev_mess.temperature[1]) ;
if( (temperature_temp_3 >> 15) & 0x01 )
temperature_temp_3 = - (temperature_temp_3 & 0x7FFF);
else
temperature_temp_3 = (temperature_temp_3 & 0x7FFF);
LOG_OUT("temper=%d\r\n",temperature_temp_3);
//临时测试
#if 0
temp1 = 100;
@ -376,22 +381,22 @@ void iot_ctl_thread_task(void *parameter)
}
}
break;
//失败关闭
//失败
case I_EVT_RET_FAIL:
{
LOG_OUT("I_EVT_RET_FAIL\r\n");
if( ccbuff.read_flag_1 == true)
if(iot_ctl.i_nb_err == NB_OPEN_SUCC)
{
app_iot_collect_read_retreat(NORMAL_SAVE);
//进入低功耗
rt_mb_send_wait(iot_mb_ctl, I_EVT_SLEEP, 1000);
}
if( ccbuff.read_flag_2 == true)
else
{
app_iot_collect_read_retreat(ALARM_SAVE);
}
//进入低功耗
rt_mb_send_wait(iot_mb_ctl, I_EVT_SLEEP, 1000);
//数据处理
iot_ctl.i_send_cmd = I_CMD_POWER;
rt_mb_send_wait(iot_mb_ctl, I_EVT_RET_SUCC, 1000);
}
}
break;

View File

@ -189,6 +189,7 @@ rt_size_t temper_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t siz
temp = (short int)((Temperature+0.05)*10);
//xu
if(temp >= 0)
{
}
@ -197,6 +198,11 @@ rt_size_t temper_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t siz
temp = (-temp)|0x8000;
}
//测试
#if 0
temp = 33063;
#endif
temp_buff[0] = (temp>>8)&0xFF;
temp_buff[1] = (temp)&0xFF;
LOG_OUT("temp=%d \r\n", temp);

View File

@ -5,7 +5,7 @@
/* Program Entry, set to mark it as "used" and avoid gc */
MEMORY
{
ROM (rx) : ORIGIN =0x08004000,LENGTH =112k
ROM (rx) : ORIGIN =0x08000000,LENGTH =112k
RAM (rw) : ORIGIN =0x20000000,LENGTH =20k
}
ENTRY(Reset_Handler)

View File

@ -254,7 +254,7 @@ int rtthread_startup(void)
#endif /*RT_USING_SMP*/
jump_app_init();
//jump_app_init();
/* start scheduler */
rt_system_scheduler_start();