yf_zjb 4 vuotta sitten
vanhempi
commit
975222529e

+ 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="1331061671813945855" 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="924606094239392605" 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>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 229 - 229
Application_CBD/.cproject


BIN
Application_CBD/.settings/.rtmenus


+ 1 - 1
Application_CBD/.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="1286388905202992631" 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="879933327628439381" 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>

+ 3 - 3
Application_CBD/applications/control.h

@@ -15,14 +15,14 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0              //李新3灯管:0关闭,1打开
-#define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledv3).41(HK)" //4.0海康-三色光源
 #else
-    #define VERSION_HK          "1.42.41(HK)"       //4.0海康
+    #define VERSION_HK          "1.43.41(HK)"       //4.0海康
 #endif
-#define VERSION_HK_2000W    "1.39.4(2000W)"         //4.0水稻
+#define VERSION_HK_2000W    "1.40.4(2000W)"         //4.0水稻
 #define VERSION_ZP          "1.38.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
 #define VERSION_XCT         "1.6.6(HK)"             //吸虫塔-海康

+ 8 - 0
Application_CBD/applications/sht30_collect.c

@@ -151,6 +151,14 @@ static void sht30_collect_thread_entry(void *parameter)
                 checknightnum = 0;
             }
         }
+        //温控
+        if(atoi(device_status.tempture)>=device_status.tph||atoi(device_status.tempture)<=device_status.tpl)
+        {
+            device_status.temp_status = 1;
+        }
+        else if(atoi(device_status.tempture)>=(device_status.tpl+5)&&atoi(device_status.tempture)<=(device_status.tph-10)) {
+            device_status.temp_status = 0;
+        }
         rt_kprintf("光控计数:%d-%d\n",checklightnum,checknightnum);
         rt_thread_mdelay(5000);
     }

+ 13 - 7
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -28,8 +28,8 @@
 #define MB_POLL_THREAD_PRIORITY  11
 #define MB_SEND_THREAD_PRIORITY  RT_THREAD_PRIORITY_MAX - 1
 
-#define MB_SEND_REG_START  0
-#define MB_SEND_REG_NUM    2
+#define MB_SEND_REG_START  1034
+#define MB_SEND_REG_NUM    10
 
 #define MB_POLL_CYCLE_MS   500
 extern Device_Status_typedef device_status;
@@ -51,13 +51,18 @@ static void send_thread_entry(void *parameter)
 //                                                              MB_SEND_REG_NUM,     /* register total number */
 //                                                              data,                /* data to be written */
 //                                                              RT_WAITING_FOREVER); /* timeout */
-        error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,100);//读多个保持寄存器
+        error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
         rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         if(error_code==0)
         {
+            device_status.sensor_485_sta=1;
             error_count = 0;
-            rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/10, (uint)usMRegHoldBuf[0][0] % 10);
-            rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/10, (uint)usMRegHoldBuf[0][1] % 10);
+            //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
+            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
+            {
+                rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/10, (uint)usMRegHoldBuf[0][0] % 10);
+                rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/10, (uint)usMRegHoldBuf[0][1] % 10);
+            }
         }
         rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
         rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
@@ -69,8 +74,9 @@ static void send_thread_entry(void *parameter)
             if(error_count == 60)
             {
                 error_count = 0;
-                rt_sprintf(device_status.tempture,"25.0");
-                rt_sprintf(device_status.humidity,"30.0");
+                device_status.sensor_485_sta = 0;
+//                rt_sprintf(device_status.tempture,"25.0");
+//                rt_sprintf(device_status.humidity,"30.0");
             }
         }
     }

+ 5 - 0
Application_CBD/readme.md

@@ -1,3 +1,8 @@
+# 2022-04-22更新说明:
+# #define VERSION_HK          "1.43.41(HK)"       //4.0海康- 
+#define VERSION_HK_2000W    "1.40.4(2000W)"         //4.0水稻
+- 使能温湿度传感器-485
+- 修复温控逻辑不能触发
 # 2022-04-12更新说明:
 # #define VERSION_HK          "1.42.41(HK)"       //4.0海康
 - 1.解决偶发出现屏幕温湿度不显示:

+ 2 - 2
Application_CBD/rtconfig.h

@@ -158,8 +158,8 @@
 #define RT_M_COIL_NCOILS 64
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
-#define RT_M_REG_HOLDING_START 0
-#define RT_M_REG_HOLDING_NREGS 10
+#define RT_M_REG_HOLDING_START 1034
+#define RT_M_REG_HOLDING_NREGS 2
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4
 #define RT_M_CO_RESERVE 0

+ 1 - 1
Application_CBD_LED/.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="1340279823558517515" 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="933824245983964265" 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
Application_GK_CBD/.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="1266390344410446272" 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="859934766835893022" 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/.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="1290207752983324916" 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="883752175408771666" 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>