yf_zjb 4 лет назад
Родитель
Сommit
45e24a2089

+ 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="1297872936118873969" 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.g++"/>
 			</provider>

+ 0 - 1
Application_BZY/applications/control.c

@@ -474,7 +474,6 @@ void ResetInit(void)
     ctr_led(OFF);
     //
     ctr_turn(0);
-
 }
 /*入口函数-工作流程*/
 static void Work_Loop_thread_entry(void *parameter)

+ 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="1370599309796052585" 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.g++"/>
 			</provider>

+ 258 - 9
Application_CBD/applications/control.c

@@ -351,6 +351,73 @@ uint8_t ctr_Collect_Fan(uint8_t status_collect)
     }
     return device_status.collect_fan_status;
 }
+/*************************************************
+Function:       ctr_develop
+Description:    培养载玻片孢子
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          v=0(复位) v=90转90度
+Output:         NULL
+Return:         NULL
+Others:         NULL
+*************************************************/
+void ctr_develop(void)
+{
+    rt_kprintf("===============开始培养=================:%d\n",device_status.cul_time);
+    //已经培养的时间-分钟
+    device_status.stay_time = 0;
+    rt_uint32_t ii = 0;
+    while(device_status.develop_flag==1)
+    {
+        ii++;
+        LOG_I("developing...................................%d\n",ii);
+        LOG_I("============================设定的培养温度:%d\n",device_status.heatvalue);
+        LOG_I("============================培养仓实时温度:%d\n",device_status.heattem);
+        if(device_status.heattem<(device_status.heatvalue-10))
+        {
+            //未制冷
+            if(device_status.cold_status==0)
+            {
+                ctr_Heat(ON);
+            }
+        }
+        else
+        {
+            ctr_Heat(OFF);
+        }
+        LOG_I("============================制冷开关:%d\n",device_status.cold_sw);
+        if(device_status.cold_sw==1)
+        {
+            if(device_status.heattem>(device_status.heatvalue-10))
+            {
+                if(device_status.heat_status==0)
+                {
+                    ctr_Cold(ON);
+                }
+            }
+            else
+            {
+                ctr_Cold(OFF);
+            }
+        }
+        if(ii%60==0)
+        {
+            device_status.stay_time++;
+            if(device_status.stay_time / 60 == device_status.cul_time) device_status.develop_flag = 0;
+            LOG_I("developed...................................%d分钟\n",device_status.stay_time);
+            float stayedtime = 0.1;
+            char stayed[5];
+            stayedtime = device_status.stay_time / 60;
+            rt_sprintf(stayed,"%s",stayedtime);
+            HMI_WRITE("workSta.staytime.txt=\"%s\"",stayed);
+        }
+        rt_thread_delay(1000);
+    }
+    ctr_Cold(OFF);
+    ctr_Heat(OFF);
+    LOG_I("=========!!!培养完成!!!==========");
+}
 /*上仓门*/
 uint8_t ctr_cangmen_up(uint8_t status_up)
 {
@@ -465,6 +532,8 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
+    if(device_status.dtype==3)
+    DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     if(status_shake==ON&&device_status.shake_ws==1)
     {
@@ -516,7 +585,7 @@ Output:         NULL
 Return:         NULL
 Others:         NULL
 *************************************************/
-void ctr_turn(uint8_t v)
+void ctr_turn(uint8_t v,uint8_t sta)
 {
     DTU_Write("turn.mp3");
     LOG_I("================v===============:%d",v);
@@ -525,7 +594,7 @@ void ctr_turn(uint8_t v)
     rt_pin_mode(TURN_ZP_L, PIN_MODE_OUTPUT);
     rt_pin_mode(LIMIT_0, PIN_MODE_INPUT);
     rt_pin_mode(LIMIT_90, PIN_MODE_INPUT);
-    if(v==0&&rt_pin_read(LIMIT_0)==0) return;               //如果在初始位置,则不再往下执行
+    //if(v==0&&rt_pin_read(LIMIT_0)==0) return;               //如果在初始位置,则不再往下执行
     while(rt_pin_read(LIMIT_0)==0||rt_pin_read(LIMIT_90)==0)
     {
         rt_pin_write(TURN_ZP_R, ON);
@@ -555,7 +624,7 @@ void ctr_turn(uint8_t v)
             turn_cnt = 0;
             rt_pin_write(TURN_ZP_R, OFF);
             rt_pin_write(TURN_ZP_L, OFF);
-            char *turn_warn ="turn timrout!!!";
+            char *turn_warn ="turn timeout!!!";
             DTU_Write(makeJson_Warn(turn_warn, "ERR"));
             rt_free(turn_warn);
             break;
@@ -579,6 +648,12 @@ void ctr_turn(uint8_t v)
             break;
         }
     }
+    if(sta!=0)
+    {
+        //保存位置
+        device_status.run_sta = sta;
+        ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
+    }
     turn_cnt = 0;
     rt_pin_write(TURN_ZP_R, OFF);
     rt_pin_write(TURN_ZP_L, OFF);
@@ -1200,6 +1275,18 @@ void SunTest(void)
 /*上电初始化*/
 void ResetInit(void)
 {
+    if(device_status.dtype==7)
+    {
+        ctr_Motor_Driver(0, 0, 0, 0);
+        //关闭电磁阀
+        ctr_shake(OFF, 0);
+        //关闭加热
+        ctr_Heat(OFF);
+        //关闭制冷
+        ctr_Cold(OFF);
+        //关闭补光灯
+        ctr_led(OFF);
+    }
     if(device_status.version_type!=6)
     {
         device_status.work_done = 1;
@@ -1465,7 +1552,164 @@ void WorkCheck(void)
     device_status.work_status = 0;
     rt_thread_delay(1000);
 }
+void WorkTask_BZY(void)
+{
+    if(device_status.ds==1)
+    {
+        //时间段判断
+        //先判断第一个时间段
+        time_t now;
+        time(&now);
+        static struct tm now_stamp;       //现在
+        static struct tm cul_sh1_stamp;   //开始1
+        static struct tm cul_eh1_stamp;   //结束1
+        static struct tm cul_sh2_stamp;   //开始2
+        static struct tm cul_eh2_stamp;   //结束2
+        static struct tm cul_sh3_stamp;   //开始3
+        static struct tm cul_eh3_stamp;   //结束3
+        now_stamp = *localtime(&now);
+        //获取定时开始的时间戳
+        cul_sh1_stamp = *localtime(&now);
+        cul_sh1_stamp.tm_hour = device_status.collecting_sh1;
+        cul_sh1_stamp.tm_min = 0;
+        cul_sh1_stamp.tm_sec = 0;
+        cul_sh2_stamp = *localtime(&now);
+        cul_sh2_stamp.tm_hour = device_status.collecting_sh2;
+        cul_sh2_stamp.tm_min = 0;
+        cul_sh2_stamp.tm_sec = 0;
+        cul_sh3_stamp = *localtime(&now);
+        cul_sh3_stamp.tm_hour = device_status.collecting_sh3;
+        cul_sh3_stamp.tm_min = 0;
+        cul_sh3_stamp.tm_sec = 0;
+        //获取定时结束的时间戳
+        cul_eh1_stamp = *localtime(&now);
+        cul_eh1_stamp.tm_hour = device_status.collecting_eh1;
+        cul_eh1_stamp.tm_min = 0;
+        cul_eh1_stamp.tm_sec = 0;
+        cul_eh2_stamp = *localtime(&now);
+        cul_eh2_stamp.tm_hour = device_status.collecting_eh2;
+        cul_eh2_stamp.tm_min = 0;
+        cul_eh2_stamp.tm_sec = 0;
+        cul_eh3_stamp = *localtime(&now);
+        cul_eh3_stamp.tm_hour = device_status.collecting_eh3;
+        cul_eh3_stamp.tm_min = 0;
+        cul_eh3_stamp.tm_sec = 0;
+        LOG_I("采集时间1-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_sh1_stamp.tm_year+1900,cul_sh1_stamp.tm_mon+1,cul_sh1_stamp.tm_mday,cul_sh1_stamp.tm_hour,cul_sh1_stamp.tm_min,cul_sh1_stamp.tm_sec);
+        LOG_I("采集时间2-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_sh2_stamp.tm_year+1900,cul_sh2_stamp.tm_mon+1,cul_sh2_stamp.tm_mday,cul_sh2_stamp.tm_hour,cul_sh2_stamp.tm_min,cul_sh2_stamp.tm_sec);
+        LOG_I("采集时间3-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_sh3_stamp.tm_year+1900,cul_sh3_stamp.tm_mon+1,cul_sh3_stamp.tm_mday,cul_sh3_stamp.tm_hour,cul_sh3_stamp.tm_min,cul_sh3_stamp.tm_sec);
+        LOG_I("结束时间1-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_eh1_stamp.tm_year+1900,cul_eh1_stamp.tm_mon+1,cul_eh1_stamp.tm_mday,cul_eh1_stamp.tm_hour,cul_eh1_stamp.tm_min,cul_eh1_stamp.tm_sec);
+        LOG_I("结束时间2-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_eh2_stamp.tm_year+1900,cul_eh2_stamp.tm_mon+1,cul_eh2_stamp.tm_mday,cul_eh2_stamp.tm_hour,cul_eh2_stamp.tm_min,cul_eh2_stamp.tm_sec);
+        LOG_I("结束时间3-%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_eh3_stamp.tm_year+1900,cul_eh3_stamp.tm_mon+1,cul_eh3_stamp.tm_mday,cul_eh3_stamp.tm_hour,cul_eh3_stamp.tm_min,cul_eh3_stamp.tm_sec);
+        //此处判断,一个一个时间段判断,判断当前时间是否大于开始时间:
+        while(difftime(mktime(&now_stamp), mktime(&cul_sh1_stamp)) < 0)
+        {
+            time_t now;
+            time(&now);
+            cul_sh1_stamp = *localtime(&now);
+            cul_sh1_stamp.tm_hour = device_status.collecting_sh1;
+            cul_sh1_stamp.tm_min = 0;
+            cul_sh1_stamp.tm_sec = 0;
+            now_stamp = *localtime(&now);
+            LOG_I("======收集时间1:%04d年%02d月%02d日%02d时%02d分%02d秒.",cul_sh1_stamp.tm_year+1900,cul_sh1_stamp.tm_mon+1,cul_sh1_stamp.tm_mday,cul_sh1_stamp.tm_hour,cul_sh1_stamp.tm_min,cul_sh1_stamp.tm_sec);
+            LOG_I("======未到收集时间1:%04d年%02d月%02d日%02d时%02d分%02d秒.",now_stamp.tm_year+1900,now_stamp.tm_mon+1,now_stamp.tm_mday,now_stamp.tm_hour,now_stamp.tm_min,now_stamp.tm_sec);
+            rt_thread_delay(1000);
+        }
+        while(difftime(mktime(&now_stamp), mktime(&cul_sh2_stamp)) < 0&&difftime(mktime(&now_stamp), mktime(&cul_eh1_stamp)) > 0)
+        {
+            time_t now;
+            time(&now);
+            cul_sh2_stamp = *localtime(&now);
+            cul_sh2_stamp.tm_hour = device_status.collecting_sh2;
+            cul_sh2_stamp.tm_min = 0;
+            cul_sh2_stamp.tm_sec = 0;
+            now_stamp = *localtime(&now);
+            LOG_I("==============收集时间2:%04d年%02d月%02d日%02d时%02d分%02d秒.\n",cul_sh2_stamp.tm_year+1900,cul_sh2_stamp.tm_mon+1,cul_sh2_stamp.tm_mday,cul_sh2_stamp.tm_hour,cul_sh2_stamp.tm_min,cul_sh2_stamp.tm_sec);
+            LOG_I("==============未到收集时间2:%04d年%02d月%02d日%02d时%02d分%02d秒.\n",now_stamp.tm_year+1900,now_stamp.tm_mon+1,now_stamp.tm_mday,now_stamp.tm_hour,now_stamp.tm_min,now_stamp.tm_sec);
+            rt_thread_delay(1000);
+        }
+        if((difftime(mktime(&now_stamp), mktime(&cul_sh1_stamp)) >= 0&&difftime(mktime(&now_stamp), mktime(&cul_eh1_stamp)) < 0)||(difftime(mktime(&now_stamp), mktime(&cul_sh2_stamp)) >= 0&&difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) < 0))
+        {
+            LOG_I("start to collect!!!");
+            DTU_Write("collect.mp3");
 
+            //转盘到涂凡士林位置
+            if(device_status.run_sta!=4)
+            ctr_turn(90,4);
+            rt_thread_delay(2000);
+            //涂凡士林
+            ctr_Petroleum_jelly(10);
+            rt_thread_delay(5000);
+            /*转盘到采集位置*/
+            if(device_status.run_sta!=1)
+            ctr_turn(90,1);
+
+            //只有开始和结束时刻不同的时间段,才有效
+            if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0)||(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0))
+            {
+                device_status.work_status = 1;
+                rt_uint32_t collect_cnt = 0;
+                ctr_Collect_Fan(ON);
+                if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0))
+                {
+                    collect_cnt = difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp));
+                    while(collect_cnt--)
+                    {
+                        LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
+                        rt_thread_delay(10000);
+                    }
+                    collect_cnt = 2;
+                }
+                if(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0)
+                {
+                    collect_cnt = difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp));
+                    while(collect_cnt--)
+                    {
+                        LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
+                        rt_thread_delay(10000);
+                    }
+                }
+                ctr_Collect_Fan(OFF);
+            }
+            else
+            {
+                LOG_I("this collect time is 0s,The wait time cannot be negative!");
+            }
+        }
+        else
+        {
+            LOG_I("next collect time is not arrivd!!! >>> .. start now time:%d",mktime(&now_stamp));
+        }
+        if(device_status.work_status==1)
+        {
+            LOG_I("===============collect ok,turn to drop!!!");
+            device_status.develop_flag=1;
+            device_status.work_status=2;    //现在是培养
+            DTU_Write("develop.mp3");
+            if(device_status.run_sta!=2)
+            ctr_turn(90,2); /*转盘到培养位置*/
+            rt_thread_delay(1000);
+            ctr_shake(ON,device_status.shake_sec);
+            rt_thread_delay(1000);
+            ctr_develop();                  //培养
+            if(device_status.run_sta!=3)
+            ctr_turn(90,3);   /*转盘到拍照位置*/
+            rt_thread_delay(1000);
+            DTU_Write("takephoto.mp3");
+            device_status.work_status=3;    //现在是拍照
+            device_status.autotakepic=1;    //对焦拍照
+            while(device_status.autotakepic==0)
+            {
+                rt_thread_delay(1000);
+                LOG_I("正在对焦拍照............\n");
+            }
+            device_status.work_status = 0;  //待机
+            DTU_Write("wait.mp3");
+            LOG_I("=====================work finished==================");
+         }
+        rt_thread_delay(1000);
+    }
+    LOG_W("==================!!!设备已关机!!!===================");
+}
 //工作任务流程s
 void WorkTask(void)
 {
@@ -1595,7 +1839,7 @@ void WorkTask(void)
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //        }
             //5.加热
-            if(device_status.heat_ws==1)
+            if(device_status.heat_sw==1)
             {
                 calorstat(device_status.heattime*60);
             }
@@ -1711,7 +1955,11 @@ static void Work_Loop_thread_entry(void *parameter)
     ResetInit();
     while(1)
     {
-        if(device_status.version_type!=6)
+        if(device_status.dtype==7)
+        {
+            WorkTask_BZY();
+        }
+        if(device_status.version_type!=6&&device_status.dtype==3)
         {
             WorkTask();
         }
@@ -1787,8 +2035,9 @@ static void Control_Heat_thread_entry(void *parameter)
         }
 
         #else
-        if(device_status.work_status==1&&device_status.heat_ws==0)
+        if(device_status.work_status==1&&device_status.heat_sw==0)
         {
+            ctr_lamp(ON, 1);
             rt_thread_delay(10000);
             calorstat(device_status.heattime*60);
         }
@@ -1800,7 +2049,7 @@ static void Control_Heat_thread_entry(void *parameter)
         rt_thread_delay(1000);
     }
 }
-/**/
+/*清扫线程*/
 int Control_clear(void)
 {
     /* 创建线程*/
@@ -1815,7 +2064,7 @@ int Control_clear(void)
     }
     return 0;
 }
-/**/
+/*恒温加热线程*/
 int Control_heat(void)
 {
     /* 创建线程*/
@@ -1830,7 +2079,7 @@ int Control_heat(void)
     }
     return 0;
 }
-/* 创建线程 -是否置位工作状态*/
+/* 创建线程 -工作状态检测*/
 int Workstatus_check(void)
 {
 

+ 4 - 5
Application_CBD/applications/control.h

@@ -39,9 +39,8 @@ typedef struct  _packed
     uint8_t iSave;           //存储标志位
     uint8_t dtype;           //设备类型?7-孢子仪,3-测报灯
     /*孢子仪*/
-    uint8_t run_sta;              //运行状态
-    uint8_t cul_time;             //收集时间
-    uint8_t culture_time;         //培养时间
+    uint8_t run_sta;              //转盘的位置:0原始;1收集;2培养;3拍照;4凡士林,其他-测试
+    uint8_t cul_time;             //培养时间
     uint8_t stay_time;            //已培养时间
     uint8_t pre_temp;             //培养仓温度
     uint8_t auto_test_sw;         //一键测试   0-关   1-开
@@ -60,7 +59,7 @@ typedef struct  _packed
     uint8_t collecting_sh3;       //采集开启3
     uint8_t collecting_eh3;       //采集关闭3
     /*测报灯*/
-    uint8_t heat_ws;         //加热开关
+    uint8_t heat_sw;         //加热开关
     uint8_t photo_ws;        //拍照
     uint8_t power_status;    //电源
     uint8_t sun_test;        //光控测测试标志位
@@ -236,7 +235,7 @@ uint8_t ctr_Motor_xifu(uint8_t status_ws);
 //步进电机驱动
 #define Motor_EN    GET_PIN(B,14)
 #define Motor_DIR   GET_PIN(B,15)
-void ctr_turn(uint8_t v);
+void ctr_turn(uint8_t v,uint8_t sta);
 uint8_t ctr_Cold(uint8_t status_cold);
 uint8_t ctr_Cool_Fan(uint8_t status_cool);          //散热风机
 uint8_t ctr_Collect_Fan(uint8_t status_collect);    //采集风机

+ 78 - 8
Application_CBD/applications/dtu_uart2.c

@@ -405,7 +405,7 @@ char *makeJson_Warn(char * s,char *t)
 /*生成JSON数据*/
 char * makeJson()
 {
-    char utos[4];
+    char utos[5];
     if(device_status.gps==NULL)
     rt_sprintf(device_status.gps, "0");
     //如果设备工作并且电流小于500,并且不是上电启动灯管异常
@@ -569,10 +569,6 @@ char * makeJson()
     }
     else if(device_status.dtype==7)
     {
-        device_status.collecting_sh1 = 1;
-        device_status.collecting_eh1 = 2;
-        device_status.collecting_sh2 = 10;
-        device_status.collecting_eh2 = 11;
         char ct1[10],ct2[10];
         rt_sprintf(ct1,"%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
         rt_sprintf(ct2,"%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
@@ -588,9 +584,9 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.run_sta);
         cJSON_AddStringToObject(pSubJson,"run_sta",utos);
         //箱体温度-box_tem
-        rt_sprintf(utos, "%d",device_status.heattem);
+        rt_sprintf(utos, "%d.%d",Get_Temprate()/100,Get_Temprate()%100);
         cJSON_AddStringToObject(pSubJson,"box_tem",utos);
-        //收集时间-cul_time
+        //培养时间-cul_time
         rt_sprintf(utos, "%d",device_status.cul_time);
         cJSON_AddStringToObject(pSubJson,"cul_time",utos);
         //制冷状态
@@ -1122,7 +1118,7 @@ int parseDtu(char *json_string)
               {
                           hst = cJSON_GetObjectItem(item_ext,"hst");
                           et  = cJSON_GetObjectItem(item_ext,"et");
-                          collt = cJSON_GetObjectItem(item_ext,"collt");
+
                           datt = cJSON_GetObjectItem(item_ext,"datt");
                           shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
                           tpl = cJSON_GetObjectItem(item_ext,"tpl");
@@ -1134,6 +1130,80 @@ int parseDtu(char *json_string)
                           htim = cJSON_GetObjectItem(item_ext,"htim");
                           ds = cJSON_GetObjectItem(item_ext,"ds");
                           vt = cJSON_GetObjectItem(item_ext,"vt");
+                          if(device_status.dtype==3)
+                          collt = cJSON_GetObjectItem(item_ext,"collt");
+                          if(device_status.dtype==7)
+                          collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
+                          cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time");   //培养时间1~24
+                          cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
+                          if(drop_sec->valueint>=1&&drop_sec->valueint<=30)
+                          {
+                              device_status.shake_sec = shake_sec->valueint;
+                              ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
+                              rt_kprintf("下发设置滴液时间:%d\n",shake_sec->valueint);
+                          }
+                          if(collt!=NULL)
+                          {
+                               int array_size = cJSON_GetArraySize(collt);
+                               int icnt = 0;
+                               for(icnt=0;icnt < array_size;icnt++)
+                               {
+                                   cJSON *pSub = cJSON_GetArrayItem(collt, icnt);
+                                   uint8_t itmp = 0;
+                                   if(NULL==pSub) {continue;}
+                                   char * ivalue = pSub->valuestring;
+                                   if(icnt==0)
+                                   {
+                                       for(itmp = 0;itmp<10;itmp++)
+                                       {
+                                           if(strstr(&ivalue[itmp],"-")!=NULL&&itmp==1)
+                                           {
+                                               device_status.collecting_sh1 = atoi(&ivalue[0]);
+                                               device_status.collecting_eh1 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
+                                               ef_set_env_blob("collecting_sh1", device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+                                               ef_set_env_blob("collecting_eh1", device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+                                           }
+                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
+                                           {
+                                               device_status.collecting_sh1 = atoi(&ivalue[1])<<8|atoi(&ivalue[0]);
+                                               device_status.collecting_eh1 = atoi(&ivalue[4])<<8|atoi(&ivalue[3]);
+                                               ef_set_env_blob("collecting_sh1", device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+                                               ef_set_env_blob("collecting_eh1", device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+                                           }
+                                       }
+                                       rt_kprintf("开始结束时间1:%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
+                                   }
+                                   else if (icnt==1)
+                                   {
+                                       for(itmp = 0;itmp<10;itmp++)
+                                       {
+                                           if(strstr(&ivalue[itmp],"-")!=NULL&&itmp==1)
+                                           {
+                                               device_status.collecting_sh2 = atoi(&ivalue[0]);
+                                               device_status.collecting_eh2 = atoi(&ivalue[3])<<8|atoi(&ivalue[2]);
+                                               ef_set_env_blob("collecting_sh2", device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+                                               ef_set_env_blob("collecting_eh2", device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+                                           }
+                                           else if (strstr(&ivalue[itmp],"-")!=NULL&&itmp==2)
+                                           {
+                                               device_status.collecting_sh2 = (atoi(&ivalue[1])<<8)|atoi(&ivalue[0]);
+                                               device_status.collecting_eh2 = (atoi(&ivalue[4])<<8)|atoi(&ivalue[3]);
+                                               ef_set_env_blob("collecting_sh2", device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+                                               ef_set_env_blob("collecting_eh2", device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+                                           }
+                                       }
+                                       rt_kprintf("开始结束时间2:%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
+                                   }
+                                   rt_kprintf("下发设置收集:%d-%s\n",icnt,ivalue);
+                               }
+                          }
+                          if(cul_time->valueint>=1&&cul_time->valueint<=24)
+                          {
+                              device_status.cul_time = cul_time->valueint;
+                              ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
+                              rt_kprintf("下发设置培养时间:%d\n",cul_time->valueint);
+                          }
+                          /*加热温度*/
                           if(hst!=NULL)
                           {
                               if(hst->type==cJSON_Number)

+ 204 - 16
Application_CBD/applications/hmi.c

@@ -292,6 +292,9 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         }
         if(device_status.dtype==7)
         {
+            //更新温湿度数据
+            HMI_WRITE("workSta.env_hum.txt=\"%s\"",device_status.humidity);
+            HMI_WRITE("workSta.env_tem.txt=\"%s\"",device_status.tempture);
             HMI_WRITE("workSta.on_off.val=%d",device_status.ds);
             HMI_WRITE("workSta.work_sta.val=%d",device_status.work_status);
             HMI_WRITE("workSta.collect_fan.val=%d",device_status.collect_fan_status);
@@ -304,13 +307,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             //更新工作状态
             HMI_WRITE("workSta.work_sta.val=%d",device_status.work_status);
             //箱内温度-外壳
-            HMI_WRITE("workSta.box_tmp.txt=\"%s\"",device_status.tempture);
-            HMI_WRITE("temHum.box_tmp.txt=\"%s\"",device_status.tempture);
+            HMI_WRITE("workSta.box_tmp.txt=\"%d.%d\"",Get_Temprate()/100,Get_Temprate()%100);
+            HMI_WRITE("temHum.box_tmp.txt=\"%d.%d\"",Get_Temprate()/100,Get_Temprate()%100);
             //制冷开关
             HMI_WRITE("workSta.cold_sw.val=%d",device_status.cold_sw);
             HMI_WRITE("sysSet.cold_sw.val=%d",device_status.cold_sw);
             //制冷状态
             HMI_WRITE("workSta.cold_sta.val=%d",device_status.cold_status);
+            HMI_WRITE("sysSet.cold_sw.val=%d",device_status.cold_sw);
             //培养温度
             HMI_WRITE("workSta.set_temp.val=%d",device_status.heatvalue);
             HMI_WRITE("sysSet.keep.val=%d",device_status.heatvalue);
@@ -331,6 +335,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_sh2);
             //采集结束时间2
             HMI_WRITE("clockSet.end2.val=%d",device_status.collecting_eh2);
+            //数据上传间隔
+            HMI_WRITE("sysSet.datt.val=%d",device_status.dattim);
         }
         /**********************************吸虫塔*********************************/
         if(device_status.version_type==6)
@@ -395,12 +401,12 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //转盘复位
     else if (strstr(rx_buffer,"turn_init")!=NULL) {
         LOG_I("转仓复位!");
-        ctr_turn(0);
+        ctr_turn(0,0);
     }
     //转盘
     else if (strstr(rx_buffer,"turn")!=NULL) {
         LOG_I("转仓!");
-        ctr_turn(90);
+        ctr_turn(90,0);
     }
     //打开电磁阀
     else if (strstr(rx_buffer,"putTest.switchDrop=1")!=NULL) {
@@ -504,6 +510,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         pwm_off(2, 0);
         pwm_off(3,0);
     }
+    else if (strstr(rx_buffer,"putTest.switchAutotest=1")!=NULL)
+    {
+        LOG_I("开始一键测试!!!");
+        device_status.auto_test_sw=1;
+    }
+    else if (strstr(rx_buffer,"putTest.switchAutotest=1")!=NULL)
+    {
+        LOG_I("停止一键测试!!!");
+        device_status.auto_test_sw=0;
+    }
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
@@ -619,10 +635,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             device_status.shake_sec = *((int *)var);    //滴液时间
             ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
             var+=4;
-            device_status.culture_time = *((int *)var); //培养时间
-            ef_set_env_blob("culture_time", &device_status.culture_time, sizeof(device_status.culture_time));
+            device_status.cul_time = *((int *)var); //培养时间
+            ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
             MA_save();
-            LOG_I("参数已保存:%d-%d-%d-%d-%d-%d",device_status.collecting_sh1,device_status.collecting_eh1,device_status.collecting_sh2,device_status.collecting_eh2,device_status.shake_sec,device_status.culture_time);
+            LOG_I("参数已保存:%d-%d-%d-%d-%d-%d",device_status.collecting_sh1,device_status.collecting_eh1,device_status.collecting_sh2,device_status.collecting_eh2,device_status.shake_sec,device_status.cul_time);
+            return;
         }
         char value_str[10];
         memset(value_str,0,sizeof(value_str));
@@ -714,6 +731,30 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         rt_kprintf("工作时间参数已保存:模式-%d,光控时间-%d,时控开始时间-%d,时控结束时间-%d\n",device_status.timeSwitch,device_status.sunBar,device_status.startBar,device_status.stopBar);
     }
     else if (strstr(rx_buffer,"saveSystemSet")!=NULL) {
+        if(device_status.dtype==7)
+        {
+            LOG_I("系统设置,孢子仪!");
+            var = strstr(rx_buffer,"=");
+            var ++;
+            device_status.cold_sw = *((int *)var); //制冷开关
+            ef_set_env_blob("cold_sw", &device_status.cold_sw, sizeof(device_status.cold_sw));
+            var+=4;
+            device_status.vol = *((int *)var);   //音量
+            var+=4;
+            device_status.heatvalue = *((int *)var); //设定培养温度
+            ef_set_env_blob("heatvalue", &device_status.heatvalue, sizeof(device_status.heatvalue));
+            var+=4;
+            device_status.dattim = *((int *)var);   //数据上传间隔
+            ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
+            var+=4;
+            device_status.thsp = *((int *)var); //自动熄屏
+            ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
+            MA_save();
+            LOG_I("制冷开关:%d",device_status.cold_sw);
+            LOG_I("系统设置已保存:\n自动熄屏-%d\n音量-%d\n培养温度-%d\n数据上传间隔-%d",device_status.thsp,device_status.vol,device_status.heatvalue,device_status.dattim);
+            MA_save();
+            return;
+        }
         char clt_time_str[3],heattime_str[3],heatvale_str[4],vol_str[4],thsp_str[5];
         rt_kprintf("系统设置!\n");
         var = strstr(rx_buffer,"=");
@@ -1090,7 +1131,8 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint16_t num_down_open = 200;  //
    rt_uint16_t num_down_close = 200;  //
    rt_uint16_t photo_led_sec = 450;  //45S
-
+   /*孢子仪拍照数量*/
+   rt_uint16_t photo_setup = 0;
     while(1)
     {
         time_t time_reset12V;
@@ -1206,6 +1248,7 @@ static void Ctr_Mortor_entry(void* parameter)
         {
             SunTest();
         }
+        //拍照
         if(device_status.photo_ws==1)
         {
             ctr_led(ON);
@@ -1215,7 +1258,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 DTU_Write("takephoto.mp3");
                 //延时
                 rt_thread_delay(1000);
-                rt_kprintf("\n测试拍照!\n");
+                LOG_I("测试拍照!");
                 Hk_Take_io();
                 char *takephotojson = makeJson_takephoto();
                 DTU_Write("%s",takephotojson);
@@ -1231,8 +1274,130 @@ static void Ctr_Mortor_entry(void* parameter)
                 HMI_WRITE("sysTest.switchFill.val=0");
             }
         }
+        /*对焦拍照*/
+        if(device_status.autotakepic==1)
+        {
+            DTU_Write("autotakephoto");
+            //打开补光灯
+            ctr_led(ON);
+            //电机向下运动
+            ctr_Motor_Driver(1, 1, 500000,200);
+            rt_thread_delay(1000);
+            LOG_I("电机到达下方!!!");
+            Hk_Take_io();
+            rt_thread_delay(1000);
+            LOG_I("电机开始向上!!!");
+            rt_pin_write(Motor_EN, 1);
+            rt_pin_write(Motor_DIR, 0);
+            beep_set(500000, 500000/5);      //2kzh - 50%
+            while(rt_pin_read(LIMIT_UP)==1)
+            {
+                rt_thread_delay(10);
+                photo_setup++;
+                rt_pin_write(Motor_EN, 0); //驱动器失能
+                Hk_Take_io();
+                rt_thread_delay(1000);
+                rt_pin_write(Motor_EN, 1); //驱动器使能
+                if(photo_setup>300)
+                {
+                    ctr_led(OFF);
+                    device_status.autotakepic=0;
+                    rt_pin_write(Motor_EN, 0); //驱动器失能
+                    beep_set(500000, 0);      //2kzh - 50%
+                    HMI_WRITE("sysTest.switchAutopic.val=%d",0);
+                    break;
+                }
+                LOG_I("对焦拍照:%d",photo_setup);
+            }
+            ctr_led(OFF);
+            rt_pin_write(Motor_EN, 0); //驱动器失能
+            beep_set(500000, 0);      //2kzh - 50%
+            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
+            char w_temp[20];
+            rt_sprintf(w_temp,"%s%d","autoTakePhoto success!!!",photo_setup);
+            char *autotake_warn = makeJson_Warn(w_temp, "Motor");
+            DTU_Write("%s",autotake_warn);
+            rt_free(autotake_warn);
+            device_status.autotakepic=0;
+            photo_setup = 0;
+            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
+            DTU_Write("takephotodone");
+         }
+        if(device_status.fsl_sw==1)
+        {
+            ctr_Petroleum_jelly(10);
+        }
+        //一键测试
+        if(device_status.auto_test_sw==1)
+        {
+            //转盘复位
+            LOG_I("转盘复位!!!");
+            rt_thread_delay(2000);
+            ctr_turn(0,0);
+            //转90
+            LOG_I("第一次转盘!!!");
+            ctr_turn(90,0);
+            rt_thread_delay(2000);
+            //推杆电机:测试粘附:
+            LOG_I("涂凡士林!!!");
+            ctr_Petroleum_jelly(10);
+            rt_thread_delay(2000);
+            //转90
+            LOG_I("第二次转盘!!!");
+            ctr_turn(90,0);
+            rt_thread_delay(2000);
+            //采集,打开风机
+            LOG_I("采集,打开风机!!!");
+            ctr_Collect_Fan(ON);
+            rt_thread_delay(5000);
+            LOG_I("采集结束,关闭风机!!!");
+            rt_thread_delay(2000);
+            ctr_Collect_Fan(OFF);
+            //散热
+            LOG_I("打开散热!!!");
+            rt_thread_delay(2000);
+            ctr_Cool_Fan(ON);
+            rt_thread_delay(5000);
+            LOG_I("关闭散热!!!");
+            rt_thread_delay(2000);
+            ctr_Cool_Fan(OFF);
+            //转90
+            LOG_I("第三次转盘!!!");
+            ctr_turn(90,0);
+            rt_thread_delay(5000);
+            //滴液
+            LOG_I("开始滴液!!!");
+            rt_thread_delay(2000);
+            ctr_shake(ON,device_status.shake_sec);
+            rt_thread_delay(5000);
+            LOG_I("停止滴液!!!");
+            rt_thread_delay(2000);
+            //加热
+            LOG_I("开始加热!!!");
+            rt_thread_delay(2000);
+            ctr_Heat(ON);
+            rt_thread_delay(5000);
+            LOG_I("停止加热!!!");
+            rt_thread_delay(2000);
+            ctr_Heat(OFF);
+            //制冷
+            LOG_I("开始制冷!!!");
+            rt_thread_delay(2000);
+            ctr_Cold(ON);
+            rt_thread_delay(5000);
+            LOG_I("停止制冷!!!");
+            rt_thread_delay(2000);
+            ctr_Cold(OFF);
+            //转90
+            LOG_I("第四次转盘!!!");
+            ctr_turn(90,0);
+            LOG_I("打开补光灯!!!");
+            rt_thread_delay(2000);
+            ctr_led(ON);
+            device_status.autotakepic=1;
+            device_status.auto_test_sw=0;
+        }
         rt_thread_delay(100);
-        //rt_kprintf("action num is:%d%d%d",num_up_open,num_up_close,num_down_open,num_down_close,num_clear);
     }
 }
 /*屏幕写数据*/
@@ -1318,6 +1483,16 @@ void Check_ParamConfig(void)
         device_status.dattim = 20;      //数据上传间隔
         device_status.ds = 1;           //设备状态
         device_status.update_flag = 0;
+        /*孢子仪*/
+        device_status.collecting_sh1 = 9;
+        device_status.collecting_eh1 = 10;
+        device_status.collecting_sh2 = 14;
+        device_status.collecting_eh2 = 16;
+        device_status.cold_sw = 0;
+        device_status.heat_sw =0;
+        device_status.cul_time = 1;
+        device_status.run_sta = 0;
+
         sprintf(device_status.driver, "%s",VERSION_HK);
         rt_sprintf(device_status.tempture, "26");
         rt_sprintf(device_status.humidity, "31");
@@ -1343,6 +1518,14 @@ void Check_ParamConfig(void)
         ef_set_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity));        //湿度
         ef_set_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1));        //上传平台
 
+        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+        ef_set_env_blob("cold_sw",&device_status.cold_sw,sizeof(device_status.cold_sw));        //制冷开关
+        ef_set_env_blob("heat_sw",&device_status.heat_sw,sizeof(device_status.heat_sw));        //加热开关
+        ef_set_env_blob("collecting_sh1",&device_status.collecting_sh1,sizeof(device_status.collecting_sh1));        //风机开关
+        ef_set_env_blob("collecting_eh1",&device_status.collecting_eh1,sizeof(device_status.collecting_eh1));        //采集时间
+        ef_set_env_blob("collecting_sh2",&device_status.collecting_sh2,sizeof(device_status.collecting_sh2));        //采集时间
+        ef_set_env_blob("collecting_eh2",&device_status.collecting_eh2,sizeof(device_status.collecting_eh2));        //采集时间
+        ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));  //
         LOG_I("SOFTWARE VERSION:%s",device_status.driver);
         LOG_I("Default paramconf is:");
         LOG_I("stime:%d",device_status.iSave);
@@ -1387,6 +1570,15 @@ void Check_ParamConfig(void)
         ef_get_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL);        //版本类型
         ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL);                 //BL版本号 进BL的时候存储到FLASH
         ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL);                    //平台地址
+        /*孢子仪*/
+        ef_get_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time),NULL);                    //培养时间
+        ef_get_env_blob("cold_sw",&device_status.cold_sw,sizeof(device_status.cold_sw),NULL);                       //制冷开关
+        ef_get_env_blob("heat_sw",&device_status.heat_sw,sizeof(device_status.heat_sw),NULL);                       //加热开关
+        ef_get_env_blob("collecting_sh1",&device_status.collecting_sh1,sizeof(device_status.collecting_sh1),NULL);  //采集开始1
+        ef_get_env_blob("collecting_eh1",&device_status.collecting_eh1,sizeof(device_status.collecting_eh1),NULL);  //采集结束1
+        ef_get_env_blob("collecting_sh2",&device_status.collecting_sh2,sizeof(device_status.collecting_sh2),NULL);  //采集开始2
+        ef_get_env_blob("collecting_eh2",&device_status.collecting_eh2,sizeof(device_status.collecting_eh2),NULL);  //采集结束2
+        ef_get_env_blob("run_sta",&device_status.run_sta,sizeof(device_status.run_sta),NULL);                       //运行状态
         device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
         device_status.work_done = 0;
         //工作完成标志位
@@ -1439,10 +1631,7 @@ void Check_ParamConfig(void)
         else if (device_status.version_type==30) {
             rt_sprintf(device_status.driver, "%s",VERSION_Robot);
         }
-        if(device_status.iccid[0]!=8)
-        {
-            rt_sprintf(device_status.iccid,"87654321000000000000");
-        }
+        /*定制三色光源*/
         #if LAMP_EN == 1
             device_status.sunBar = 9;
             device_status.timeSwitch = 0;
@@ -1466,10 +1655,9 @@ void Check_ParamConfig(void)
         LOG_I("数据上传间隔:%d",device_status.dattim);
         LOG_I("温湿度数据:%d-%d",atoi(device_status.tempture),atoi(device_status.humidity));
         LOG_I("上传平台:%s",device_status.mqttcfg1);
+        LOG_I("孢子仪运行状态:%d",device_status.run_sta);
     }
-    LOG_I("当前时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
     //RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
-
     if(device_status.update_flag==1)
     {
         device_status.update_flag = 0;

+ 1 - 0
Application_CBD/applications/main.c

@@ -61,6 +61,7 @@ int main(void)
         //开机自检
         HardWare_Check(0);
         //工作状态置位线程
+        if(device_status.dtype!=7)
         Workstatus_check();
         /***************/
         //工作流程

+ 3 - 1
Application_CBD/applications/sample_mb_master.c

@@ -35,7 +35,7 @@
 Device_Status_typedef device_status;
 
 extern USHORT   usMRegInBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_INPUT_NREGS];
-extern USHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
+extern SHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
 
 
 static void send_thread_entry(void *parameter)
@@ -65,6 +65,8 @@ static void send_thread_entry(void *parameter)
 //            {
                 rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (uint)usMRegHoldBuf[0][0] % 100);
                 rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (uint)usMRegHoldBuf[0][1] % 100);
+//                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
+//                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
 //            }
         }
         rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1

+ 5 - 5
Application_CBD/applications/sht30_collect.c

@@ -141,7 +141,7 @@ static void sht30_collect_thread_entry(void *parameter)
         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);
+        LOG_I("光控计数:%d-%d",checklightnum,checknightnum);
         rt_thread_mdelay(5000);
     }
 }
@@ -183,7 +183,7 @@ static void Power_ReadCheck(void *parameter)
         RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
         if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
         {
-            rt_kprintf("temp value err!!!!");
+            LOG_E("temp value err!!!!");
         }
         else {
             device_status.heattem = TempCalculate(RV, 3950, 10000);
@@ -207,7 +207,7 @@ static void Power_ReadCheck(void *parameter)
         else {
             rain_cnt++;
             //雨控消抖,1分钟
-            rt_kprintf("rain_cnt:%d-%d\n",rain_cnt,Read_Rain_Voltage());
+            LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());
             if(rain_cnt==60&&Read_Rain_Voltage()<100)
             {
                 rain_cnt = 0;
@@ -215,7 +215,7 @@ static void Power_ReadCheck(void *parameter)
             }
         }
        #endif
-        rt_thread_mdelay(1);
+        rt_thread_mdelay(10);
     }
 }
 /*读取电流值*/
@@ -306,7 +306,7 @@ int Read_Light_Voltage(void)
        adc10_rain = rt_adc_read(adc_dev,ADC_DEV_CHANNLE_2);
        rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_2);
        HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
-       rt_kprintf("read light value:%d\n",adc10_rain);
+       //rt_kprintf("read light value:%d\n",adc10_rain);
        return adc10_rain;
 }
 //获取内部温度传感器值

BIN
Application_CBD/bin/Application_CBD-1.47.41-20221128.bin


+ 9 - 0
Application_CBD/packages/EasyFlash-latest/src/ef_fal_port.c

@@ -76,6 +76,15 @@ static const ef_env default_env_set[] = {
         {"json_w_clock","0"},
         {"json_w_reset","0"},
         {"json_w_platform","0"},
+        {"run_sta","0"},    //孢子仪,运行状态
+        {"cul_time","1"},   //孢子仪,培养时间
+        {"cold_sw","0"},    //
+        {"wind_sw","0"},    //
+        {"run_sta","0"},    //
+        {"collecting_sh1","0"},    //
+        {"collecting_eh1","0"},    //
+        {"collecting_sh2","0"},    //
+        {"collecting_eh2","0"},    //
 };
 static char log_buf[RT_CONSOLEBUF_SIZE];
 static struct rt_semaphore env_cache_lock;

+ 1 - 1
Application_CBD/rt-thread/include/rtdbg.h

@@ -138,7 +138,7 @@ struct tm *p;
         time(&timep);                                       \
         p = localtime(&timep);                              \
         _DBG_LOG_HDR(lvl, color_n);                         \
-        rt_kprintf("%04d-%02d-%02d %02d:%02d:%02d ", (1900 + p->tm_year), ( 1 + p->tm_mon), p->tm_mday,(p->tm_hour + 12), p->tm_min, p->tm_sec);      \
+        rt_kprintf("%04d-%02d-%02d %02d:%02d:%02d ", (1900 + p->tm_year), ( 1 + p->tm_mon), p->tm_mday,p->tm_hour, p->tm_min, p->tm_sec);      \
         rt_kprintf(fmt, ##__VA_ARGS__);                     \
         _DBG_LOG_X_END;                                     \
     }                                                       \

+ 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="1370230865913647974" 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.g++"/>
 			</provider>