yf_zjb %!s(int64=4) %!d(string=hai) anos
pai
achega
2c3cdaa722

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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1297603847426260181" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370330221103438797" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 53 - 16
Application_CBD/applications/control.c

@@ -34,6 +34,7 @@ Device_Status_typedef device_status;
 rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
 rt_thread_t tid_ctr = RT_NULL;
 rt_thread_t tid_ctr = RT_NULL;
+rt_thread_t tid_heat = RT_NULL;
 /**************************1.0定制2000W*************************************/
 /**************************1.0定制2000W*************************************/
 uint8_t ctr_Fan_PUT(uint8_t status_ws)
 uint8_t ctr_Fan_PUT(uint8_t status_ws)
 {
 {
@@ -807,13 +808,13 @@ void Hk_Take_io(void)
 
 
 void calorstat(uint16_t heat_time)
 void calorstat(uint16_t heat_time)
 {
 {
-    uint8_t heat_up_cnt = 0;
+    //uint8_t heat_up_cnt = 0;
     uint16_t n = 0;
     uint16_t n = 0;
     uint16_t delay_heat = 60;
     uint16_t delay_heat = 60;
     FlagStatus heat_flg = RESET;
     FlagStatus heat_flg = RESET;
     device_status.heat_time_min = 0;
     device_status.heat_time_min = 0;
     ctr_Heat(ON);
     ctr_Heat(ON);
-    UpLoad_Data();      //开始加热时的第一条数据
+//    UpLoad_Data();      //开始加热时的第一条数据
     //恒温模式
     //恒温模式
     for(n=0;n < heat_time;n++)
     for(n=0;n < heat_time;n++)
     {
     {
@@ -833,25 +834,25 @@ void calorstat(uint16_t heat_time)
         }
         }
         if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         {
         {
-            heat_up_cnt = 0;
+            //heat_up_cnt = 0;
             ctr_Heat(ON);
             ctr_Heat(ON);
         }
         }
         else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         {
         {
-            if(heat_up_cnt==0)
-            {
-                UpLoad_Data();      //加热到设定温度的数据
-                heat_up_cnt = 1;
-            }
+//            if(heat_up_cnt==0)
+//            {
+//                UpLoad_Data();      //加热到设定温度的数据
+//                heat_up_cnt = 1;
+//            }
             ctr_Heat(OFF);
             ctr_Heat(OFF);
         }
         }
         if((n % 60)==0)
         if((n % 60)==0)
         {
         {
             device_status.heat_time_min = device_status.heat_time_min + 1;
             device_status.heat_time_min = device_status.heat_time_min + 1;
-            if(device_status.heat_time_min % 2 == 0)
-            {
-                UpLoad_Data();      //从加热开始每两分钟上传的数据
-            }
+//            if(device_status.heat_time_min % 2 == 0)
+//            {
+//                UpLoad_Data();      //从加热开始每两分钟上传的数据
+//            }
         }
         }
         //如果触发异常退出加热
         //如果触发异常退出加热
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
@@ -1264,6 +1265,7 @@ void WorkTask(void)
 {
 {
     ctr_router(ON); //打开路由器供电
     ctr_router(ON); //打开路由器供电
     static int clt_time = 0; //收集时间差秒数
     static int clt_time = 0; //收集时间差秒数
+    static int heat_time = 0;
     static uint16_t controltime = 6;
     static uint16_t controltime = 6;
     rt_kprintf("工作状态:%d\n",device_status.work_status);
     rt_kprintf("工作状态:%d\n",device_status.work_status);
     rt_kprintf("开关机状态:%d\n",device_status.ds);
     rt_kprintf("开关机状态:%d\n",device_status.ds);
@@ -1387,8 +1389,13 @@ void WorkTask(void)
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //        }
 //        }
             //5.加热
             //5.加热
-            rt_kprintf("加热!!!\n");
-            calorstat(device_status.heattime*60);
+            heat_time = device_status.heattime * 60;
+            while(heat_time!=0)
+            {
+                heat_time--;
+                rt_kprintf("正在加热状态!!!\n");
+                rt_thread_delay(1000);
+            }
             //6.打开下仓门
             //6.打开下仓门
             if(device_status.rain_status==0)
             if(device_status.rain_status==0)
             {
             {
@@ -1530,14 +1537,44 @@ static void Control_Clear_thread_entry(void *parameter)
         rt_thread_delay(100);
         rt_thread_delay(100);
     }
     }
 }
 }
+/*入口函数加热*/
+static void Control_Heat_thread_entry(void *parameter)
+{
+    while(1)
+    {
+        if(device_status.work_status==1)
+        {
+            calorstat(device_status.heattime*60);
+        }
+        else {
+            rt_kprintf("not calorstat!\n");
+        }
+        rt_thread_delay(1000);
+    }
+}
 /**/
 /**/
 int Control_clear(void)
 int Control_clear(void)
 {
 {
     /* 创建线程*/
     /* 创建线程*/
-    tid_ctr  = rt_thread_create("Control_Clear_thread_entry",
+    tid_heat  = rt_thread_create("Control_Clear_thread_entry",
+            Control_Heat_thread_entry, RT_NULL,
+            512,       //2048
+            24,         //23
+            WORK_CHECK_THREAD_TIMESLICE);       //5
+    if(tid_heat!=RT_NULL)
+    {
+        rt_thread_startup(tid_heat);
+    }
+    return 0;
+}
+/**/
+int Control_heat(void)
+{
+    /* 创建线程*/
+    tid_heat  = rt_thread_create("Control_Heat_thread_entry",
             Control_Clear_thread_entry, RT_NULL,
             Control_Clear_thread_entry, RT_NULL,
             512,       //2048
             512,       //2048
-            13,         //23
+            25,         //23
             WORK_CHECK_THREAD_TIMESLICE);       //5
             WORK_CHECK_THREAD_TIMESLICE);       //5
     if(tid_ctr!=RT_NULL)
     if(tid_ctr!=RT_NULL)
     {
     {

+ 5 - 4
Application_CBD/applications/control.h

@@ -21,12 +21,12 @@
 #if LAMP_EN == 1
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
     #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
 #else
 #else
-    #define VERSION_HK          "1.46.41(HK)"       //4.0海康
+    #define VERSION_HK          "1.47.41(HK)"       //4.0海康
 #endif
 #endif
-#define VERSION_HK_2000W    "1.43.4(2000W)"         //4.0水稻
-#define VERSION_ZP          "1.39.1(ZP)"            //1.0转盘
+#define VERSION_HK_2000W    "1.44.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.40.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
-#define VERSION_XCT         "1.9.6(HK)"             //吸虫塔-海康
+#define VERSION_XCT         "1.10.6(HK)"             //吸虫塔-海康
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"               //展厅机器人
 #define VERSION_Robot       "1.0(robot)"               //展厅机器人
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
@@ -233,4 +233,5 @@ void WorkTask(void);                //工作任务
 int Control_clear(void);
 int Control_clear(void);
 int Workstatus_check(void);
 int Workstatus_check(void);
 int Work_Loop_Task(void);
 int Work_Loop_Task(void);
+int Control_heat(void);
 #endif /* APPLICATIONS_INC_CONTROL_H_ */
 #endif /* APPLICATIONS_INC_CONTROL_H_ */

+ 5 - 1
Application_CBD/applications/dtu_uart2.c

@@ -172,7 +172,7 @@ static void dtu_thread_entry_recv(void *parameter)
                             ctr_DTU_Power(OFF);
                             ctr_DTU_Power(OFF);
                         }
                         }
                     }
                     }
-                    else if (rx_err==54100) {
+                    if (rx_err>54100) {
                         rx_err = 0;
                         rx_err = 0;
                         ctr_photo(ON);
                         ctr_photo(ON);
                         ctr_DTU_Power(ON);
                         ctr_DTU_Power(ON);
@@ -459,6 +459,10 @@ char * makeJson()
     else if (device_status.version_type==6) {
     else if (device_status.version_type==6) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
         rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
     }
     }
+    if(device_status.sensor_485_sta==1)
+    {
+        strcat(device_status.driver,".485");
+    }
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型

+ 1 - 0
Application_CBD/applications/hmi.c

@@ -1264,6 +1264,7 @@ void Check_ParamConfig(void)
         ctr_router(ON);
         ctr_router(ON);
         Hmi_Fresh();
         Hmi_Fresh();
         Control_clear();
         Control_clear();
+        Control_heat();
         dtu_data_play();
         dtu_data_play();
         sht30_collect();
         sht30_collect();
 #if SENSOR_EN==1
 #if SENSOR_EN==1

+ 1 - 1
Application_CBD/applications/sht30_collect.c

@@ -236,7 +236,7 @@ int Read_Real_Current(void)
     /* 关闭通道 */
     /* 关闭通道 */
     rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_1);
     rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_1);
     //rt_adc_disable(adc_dev, 17);
     //rt_adc_disable(adc_dev, 17);
-    rt_kprintf("read in adc:ADC17:%d-ADC1:%d\n",in_adc_17,adc1_value);
+    //rt_kprintf("read in adc:ADC17:%d-ADC1:%d\n",in_adc_17,adc1_value);
     return  (int)((ADC_VOL_BASE * (adc1_value*1.0)/(in_adc_17*1.0))*100000);
     return  (int)((ADC_VOL_BASE * (adc1_value*1.0)/(in_adc_17*1.0))*100000);
 }
 }
 /*读取电压值*/
 /*读取电压值*/

+ 2 - 2
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -78,8 +78,8 @@ static void send_thread_entry(void *parameter)
             {
             {
                 error_count = 0;
                 error_count = 0;
                 device_status.sensor_485_sta = 0;
                 device_status.sensor_485_sta = 0;
-//                rt_sprintf(device_status.tempture,"25.0");
-//                rt_sprintf(device_status.humidity,"30.0");
+//                rt_sprintf(device_status.tempture,"20.0");
+//                rt_sprintf(device_status.humidity,"100.0");
             }
             }
         }
         }
     }
     }

+ 9 - 3
Application_CBD/readme.md

@@ -1,6 +1,12 @@
-## 2022-09-07更新说明:
-# #define VERSION_HK          "1.46.41(HK)"       //4.0海康- 
-# define VERSION_HK_2000W    "1.43.4(2000W)"      //4.0水稻
+# 2022-11-06更新说明:
+## define VERSION_HK          "1.47.41(HK)"        //4.0海康- 
+## define VERSION_HK_2000W    "1.44.4(2000W)"      //4.0水稻
+## define VERSION_ZP          "1.39.1(ZP)"         //1.0转盘
+- 1.温湿度
+- 2.恒温加热
+# 2022-09-07更新说明:
+## #define VERSION_HK          "1.46.41(HK)"       //4.0海康- 
+## define VERSION_HK_2000W    "1.43.4(2000W)"      //4.0水稻
 - 1.修复系统设置保存后导致时间设置失败问题,原因是重复使用数组未清零;
 - 1.修复系统设置保存后导致时间设置失败问题,原因是重复使用数组未清零;
 
 
 ## 2022-07-15更新说明:
 ## 2022-07-15更新说明:

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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1369961777221034186" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>