zhunk 1 год назад
Родитель
Сommit
035028ad26

+ 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="1296825131319521479" 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="1363365542629557379" 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_BZYV2-NHT/.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="1280218764172678676" 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="1267644166153193776" 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_BZYV2/.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="1337863401538509809" 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="1300392940592451158" 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

@@ -20,14 +20,14 @@
 #define Color_EN         0              //定制色诱
 
 #define BOOT_ERR         1              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
-#define DZ_250723        1              //触发雨控后隔天再解除
+#define DZ_250723        0              //触发雨控后隔天再解除
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
-    #define VERSION_HK          "1.56.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "1.56dz.40(2000W)"         //4.0水稻
+    #define VERSION_HK          "1.57.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.57.40(2000W)"         //4.0水稻
 #endif
 
 #define VERSION_ZP          "1.47.1(ZP)"            //1.0转盘

+ 24 - 33
Application_CBD/applications/dtu_uart2.c

@@ -71,29 +71,23 @@ static int DTU_uart2_init(void)
         rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);
         return RT_EOK;
 }
+
 /*数据发送*/
 void DTU_Write(char *fmt, ...)
 {
-    const char dtu_conf[4] = {device_status.vol,0x00,0x00,0x00};
-    va_list arg;
-    static char dtu_str[800];
+    va_list ap;
+    static char dtu_str[1024];
     rt_size_t str_length;
-    va_start(arg,fmt);
-    str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
-    if (str_length > 800 - 1)
-        str_length = 800 - 1;
+    va_start(ap,fmt);
+    //str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
+    str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str)-1, fmt, ap);
+    va_end(ap);
+    if (str_length > 1024 - 1)
+        str_length = 1024 - 1;
     rt_device_write(dtuserial, 0, dtu_str, str_length);
-    if(strstr(dtu_str,"volume")!=RT_NULL)
-    {
-        rt_device_write(dtuserial,0,dtu_conf,4);
-    }
-    else if (strstr(dtu_str,"reset")!=RT_NULL) {
-        const char dtu_conf[4] = {7,0x00,0x00,0x00};
-        rt_device_write(dtuserial,0,dtu_conf,4);
-    }
-    va_end(arg);
-    memset(dtu_str,'\0',sizeof(dtu_str));
+    LOG_D("DTU_Write:%s",dtu_str);
 }
+
 /* 接收数据回调函数 */
 static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
 {
@@ -105,7 +99,7 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
         if ( result == -RT_EFULL)
         {
             /* 消息队列满 */
-            rt_kprintf("message queue full!\n");
+            LOG_E("rx_mq_dtu message queue full!\n");
             rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
         }
         return result;
@@ -271,7 +265,6 @@ static void dtu_thread_entry_send(void *parameter)
                 }
                 else {
                     char *readinfo =  makeJson_ReadInfo();
-                    rt_kprintf("upload data:%s\n",readinfo);
                     DTU_Write("%s",readinfo);
                     rt_free(readinfo);
                     rt_thread_delay(1000);
@@ -1461,7 +1454,6 @@ int parseDtu(char *json_string)
 
                   char * readinfo = makeJson_ReadInfo();
                   DTU_Write("%s",readinfo);
-                  rt_kprintf("%s\n",readinfo);
                   rt_free(readinfo);
                   device_status.hmi_fresh = 2;
                   device_status.refresh_num = 15;
@@ -1502,6 +1494,7 @@ int parseDtu(char *json_string)
                         gettimeofday(&tv,NULL);
                         LOG_I("系统当前时间戳:%d",tv.tv_sec);
                     }
+                    free(tm_time);  //2025-0731
                   }
                   if(hum!=NULL&&tmp!=NULL)
                   {
@@ -1780,15 +1773,16 @@ int parseDtu(char *json_string)
                   }
                   else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
                   {
-                      if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
-                      {
-                          UpLoad_Data();
-                      }
-                      else
-                      {
-                          rt_thread_delay(2000);
-                          UpLoad_Data();
-                      }
+                      UpLoad_Data();
+//                      if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
+//                      {
+//
+//                      }
+//                      else
+//                      {
+//                          rt_thread_delay(2000);
+//                          UpLoad_Data();
+//                      }
                   }
                   device_status.hmi_fresh = 0;
               }
@@ -2341,11 +2335,8 @@ int parseDtu(char *json_string)
 void UpLoad_Data(void)
 {
     char *updata = makeJson();
-    LOG_I("upload data:%d%s",rt_strlen(updata),updata);
-    rt_free(updata);
-    #if Color_EN ==0
     DTU_Write("%s",updata);
-    #endif
+    rt_free(updata);
     list_mem();
     //播放数据上传中语音
 }

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -1471,7 +1471,7 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint16_t photo_setup = 0;
     while(1)
     {
-        #if 0
+        #if 1
         time_t time_reset12V;
         time(&time_reset12V);
         static struct tm alarm_reset12V;

+ 2 - 1
Application_CBD/applications/sht30_collect.c

@@ -293,6 +293,7 @@ static void Power_ReadCheck(void *parameter)
                 ctr_lamp(OFF,1);
                 ctr_lamp(OFF,2);
                 ctr_lamp(OFF,3);
+                device_status.ctr_up_motor = 2; //关闭上仓门
                 rain_cnt = 0;
             }
             else {
@@ -301,7 +302,7 @@ static void Power_ReadCheck(void *parameter)
                 if(rain_cnt==600&&Read_Rain_Voltage()<250)
                 {
                     rain_cnt = 0;
-                    #if DZ_250723 == 1
+                    #if DZ_250723 == 0
                     device_status.rain_status = 0;
                     #endif
                 }

+ 4 - 0
Application_CBD/readme.md

@@ -1,3 +1,7 @@
+# 2025-07-31 更新说明
+	1. 优化DTU串口发送
+	2. 雨控触发立即关闭上仓门
+	3. 修复设置温湿度没有free
 # 2025-07-23 更新说明
 	1. 定制:水稻版本更新1.56dz.40(2000W)
 	2. 8:20后触发雨控当天不再解除隔天解除;

+ 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="1264374808000527978" 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="1281525736493019208" 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>