yf_zjb 5 лет назад
Родитель
Сommit
a42c156757

+ 1 - 1
Application_BZY/.settings/language.settings.xml

@@ -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="-127453641507294465" 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="-189375026113136009" 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>

+ 4 - 0
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,11 @@
 			<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"/>
+<<<<<<< HEAD
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-164989539578436777" 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="-210075347803492721" 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">
+>>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 3 - 0
Application_CBD/applications/control.c

@@ -475,6 +475,7 @@ void calorstat(uint16_t heat_time)
         //如果触发异常退出加热
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
         {
+            rt_kprintf("============================触发异常退出加热==========================");
             ctr_lamp(OFF);
             ctr_Heat(OFF);
             break;
@@ -589,6 +590,7 @@ void SunTest(void)
     }
     HMI_WRITE("sysTest.switchSun.val=%d",0);
     device_status.sun_test = 0;
+    device_status.work_status=0;
 }
 
 /*上电初始化*/
@@ -825,6 +827,7 @@ void WorkTast(void)
         //1.打开灯管
         ctr_lamp(ON);
         rt_kprintf("打开灯管!!!\n");
+        rt_thread_delay(5000);  //待灯管启动再往下执行,否则会触发电机过流
         //2.打开上仓门
         rt_kprintf("打开上仓门!!!\n");
         device_status.ctr_up_motor = 1;

+ 7 - 0
Application_CBD/applications/control.h

@@ -13,10 +13,17 @@
 #include <board.h>
 
 #include <rtdevice.h>
+<<<<<<< HEAD
 #define VERSION_HK "1.15.41(HK)"         //版本
 #define VERSION_ZP "1.15.1(ZP)"         //版本
 
 #define CompileTime "20210601"
+=======
+#define VERSION_HK "1.16.41(HK)"         //版本
+#define VERSION_ZP "1.16.1(ZP)"         //版本
+
+#define CompileTime "20210527"
+>>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 
 /*******************************测试任务****************************************/
 /*********************************************************************/

+ 5 - 5
Application_CBD/applications/hmi.c

@@ -576,7 +576,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 //入口函数-电机控制及
 static void Ctr_Mortor_entry(void* parameter)
 {
-   rt_uint32_t limit_current = 2000;     //推杆电击限制电流1A
+   rt_uint32_t limit_current = 3000;     //推杆电击限制电流1A
    static rt_uint16_t num_up_open = 200;    //20s
    static rt_uint16_t num_up_close = 200;   //
    static rt_uint16_t num_down_open = 200;  //
@@ -921,14 +921,14 @@ void ResetParamDefault(void)
     device_status.startBar = 20;    //定时开始时间
     device_status.stopBar = 5;      //定时结束时间
     device_status.heattime = 20;    //加热时间
-    device_status.shake_ws = 0;     //针对开关
+    device_status.shake_ws = 1;     //针对开关
     device_status.shake_sec = 1;    //震动时间1-100ms
     device_status.sunBar = 8;       //光控定时时长
     device_status.tph = 70;         //高温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=110;//加热温度
-    device_status.ds = 0;           //设备状态开机
+    device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
@@ -954,14 +954,14 @@ void ResetParamDefault_DC(void)
     device_status.startBar = 20;    //定时开始时间
     device_status.stopBar = 0;      //定时结束时间
     device_status.heattime = 20;    //加热时间
-    device_status.shake_ws = 0;     //针对开关
+    device_status.shake_ws = 1;     //针对开关
     device_status.shake_sec = 1;    //震动时间1-100ms
     device_status.sunBar = 4;       //光控定时时长
     device_status.tph = 70;         //高温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=110;
-    device_status.ds = 0;           //设备状态开机
+    device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
     device_status.timeSwitch = 0;

+ 1 - 0
Application_CBD/applications/sht30_collect.c

@@ -190,6 +190,7 @@ static void Power_ReadCheck(void *parameter)
         if(Read_Rain_Voltage()==1)
         {
             device_status.rain_status = 1;
+            ctr_lamp(OFF);
             rain_cnt = 0;
         }
         else {

+ 1 - 1
Application_CBD/makefile.targets

@@ -4,4 +4,4 @@ clean2:
 	-@echo ' '
 
 
-*.elf: $(wildcard D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/Application_CBD/link.lds)
+*.elf: $(wildcard E:/WorkSpace/IOT_CBD_BZY_CTRL/Application_CBD/link.lds)

+ 1 - 1
Application_CBD/packages/ota_downloader-latest/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="" SAVEFILE="" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="" VERSION="" />
+  <configs SELEFILE="E:\WorkSpace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\rtthread.bin" SAVEFILE="E:\WorkSpace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\rtthread.rbl" COMPRESS="1" CRYPT="1" KEY="0123456789ABCDEF0123456789ABCDEF" IV="0123456789ABCDEF" NAME="app" VERSION="1.14.41" />
 </configuration>

+ 34 - 0
Application_CBD/readme.md

@@ -115,6 +115,7 @@ static int num_updata = 60;
 Flash:         242604 B              236.92 KB
 RAM:            19072 B               18.62 KB
 
+<<<<<<< HEAD
 #define VERSION_HK "1.15.41(HK)"         //版本
 #define VERSION_ZP "1.15.1(ZP)"         //版本
 #define CompileTime "20210601"
@@ -129,4 +130,37 @@ RAM:            19072 B               18.62 KB
 
 
 
+=======
+#define VERSION_HK "1.16.41(HK)"         //版本
+#define VERSION_ZP "1.16.1(ZP)"         //版本
+#define CompileTime "20210527"
+- 1.修复恢复出厂设置震动状态和关机状态被关闭
+- 2.时控模式下测试光控测试灯管
+- 3.出发雨控立即关灯
+============================================================================
+[2021-05-27 16:54:35.338] [I]-[testHttp.cbFncFile] true 200 rtthread.rbl
+[2021-05-27 16:54:35.338] [I]-[audio.play] 30 FILE /lua/fdsuccess.mp3 nil nil nil nil
+[2021-05-27 16:54:35.338] [I]-[testHttp.cbFncFile] Connection: close
+[2021-05-27 16:54:35.364] [I]-[testHttp.cbFncFile] Content-Type: application/octet-stream
+[2021-05-27 16:54:35.376] [I]-[testHttp.cbFncFile] Date: Thu, 27 May 2021 08:54:35 GMT
+[2021-05-27 16:54:35.376] [I]-[testHttp.cbFncFile] Accept-Ranges: bytes
+[2021-05-27 16:54:35.376] [I]-[testHttp.cbFncFile] content_Length: 160064
+[2021-05-27 16:54:35.376] [I]-[testHttp.cbFncFile] Server: nginx/1.13.10
+[2021-05-27 16:54:35.376] [I]-[testHttp.cbFncFile] fileSize=160064
+[2021-05-27 16:54:35.376] [W]-[update file size:] 160064
+[2021-05-27 16:54:35.376] [W]-[free system filesize:] 1154500
+[2021-05-27 16:54:35.376] [I]-[socket:sock_close] 1
+==========================================================================
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] true 200 rtthread.rbl
+[2021-05-27 16:47:15.885] [I]-[audio.play] 30 FILE /lua/fdsuccess.mp3 nil nil nil nil
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] Connection: close
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] Content-Type: application/octet-stream
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] Date: Thu, 27 May 2021 08:47:15 GMT
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] Accept-Ranges: bytes
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] content_Length: 160064
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] Server: nginx/1.13.10
+[2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] fileSize=800336
+[2021-05-27 16:47:15.885] [W]-[update file size:] 800336
+[2021-05-27 16:47:15.885] [W]-[free system filesize:] 507000
+>>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 

+ 4 - 0
Application_GK_CBD/.settings/language.settings.xml

@@ -5,7 +5,11 @@
 			<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"/>
+<<<<<<< HEAD
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-139343116707329832" 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="-128865325716200071" 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">
+>>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -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="-168307560337915404" 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="-150875593399114980" 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>

+ 1 - 1
CBD_FOTA_BootLoader/makefile.targets

@@ -4,4 +4,4 @@ clean2:
 	-@echo ' '
 
 
-*.elf: $(wildcard D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/linkscripts/STM32F103RE/link.lds)
+*.elf: $(wildcard E:/WorkSpace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/linkscripts/STM32F103RE/link.lds)