yf_zjb 4 лет назад
Родитель
Сommit
30ef96d6ca

+ 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="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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 3 - 34
Application_CBD/.config

@@ -69,7 +69,7 @@ CONFIG_ARCH_ARM_CORTEX_M3=y
 #
 CONFIG_RT_USING_COMPONENTS_INIT=y
 CONFIG_RT_USING_USER_MAIN=y
-CONFIG_RT_MAIN_THREAD_STACK_SIZE=1024
+CONFIG_RT_MAIN_THREAD_STACK_SIZE=1440
 CONFIG_RT_MAIN_THREAD_PRIORITY=10
 
 #
@@ -205,39 +205,7 @@ CONFIG_RT_USING_LIBC=y
 CONFIG_RT_USING_RYM=y
 # CONFIG_YMODEM_USING_CRC_TABLE is not set
 # CONFIG_YMODEM_USING_FILE_TRANSFER is not set
-CONFIG_RT_USING_ULOG=y
-# CONFIG_ULOG_OUTPUT_LVL_EMERG is not set
-# CONFIG_ULOG_OUTPUT_LVL_ALERT is not set
-# CONFIG_ULOG_OUTPUT_LVL_CRIT is not set
-# CONFIG_ULOG_OUTPUT_LVL_ERROR is not set
-# CONFIG_ULOG_OUTPUT_LVL_WARNING is not set
-# CONFIG_ULOG_OUTPUT_LVL_NOTICE is not set
-# CONFIG_ULOG_OUTPUT_LVL_INFO is not set
-CONFIG_ULOG_OUTPUT_LVL_DEBUG=y
-CONFIG_ULOG_OUTPUT_LVL=7
-CONFIG_ULOG_USING_ISR_LOG=y
-CONFIG_ULOG_ASSERT_ENABLE=y
-CONFIG_ULOG_LINE_BUF_SIZE=128
-CONFIG_ULOG_USING_ASYNC_OUTPUT=y
-CONFIG_ULOG_ASYNC_OUTPUT_BUF_SIZE=2048
-CONFIG_ULOG_ASYNC_OUTPUT_BY_THREAD=y
-CONFIG_ULOG_ASYNC_OUTPUT_THREAD_STACK=512
-CONFIG_ULOG_ASYNC_OUTPUT_THREAD_PRIORITY=29
-
-#
-# log format
-#
-CONFIG_ULOG_OUTPUT_FLOAT=y
-CONFIG_ULOG_OUTPUT_TIME=y
-# CONFIG_ULOG_TIME_USING_TIMESTAMP is not set
-CONFIG_ULOG_OUTPUT_LEVEL=y
-CONFIG_ULOG_OUTPUT_TAG=y
-CONFIG_ULOG_OUTPUT_THREAD_NAME=y
-# end of log format
-
-CONFIG_ULOG_BACKEND_USING_CONSOLE=y
-CONFIG_ULOG_USING_FILTER=y
-CONFIG_ULOG_USING_SYSLOG=y
+# CONFIG_RT_USING_ULOG is not set
 # CONFIG_RT_USING_UTEST is not set
 # end of Utilities
 
@@ -1066,6 +1034,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_ARDUINO_SEEED_HM3301 is not set
 # CONFIG_PKG_USING_ARDUINO_SEEED_MCP9600 is not set
 # CONFIG_PKG_USING_ARDUINO_SEEED_LTC2941 is not set
+# CONFIG_PKG_USING_ARDUINO_SEEED_LDC1612 is not set
 # end of Sensors
 
 #

+ 2 - 33
Application_CBD/.config.old

@@ -205,39 +205,7 @@ CONFIG_RT_USING_LIBC=y
 CONFIG_RT_USING_RYM=y
 # CONFIG_YMODEM_USING_CRC_TABLE is not set
 # CONFIG_YMODEM_USING_FILE_TRANSFER is not set
-CONFIG_RT_USING_ULOG=y
-# CONFIG_ULOG_OUTPUT_LVL_EMERG is not set
-# CONFIG_ULOG_OUTPUT_LVL_ALERT is not set
-# CONFIG_ULOG_OUTPUT_LVL_CRIT is not set
-# CONFIG_ULOG_OUTPUT_LVL_ERROR is not set
-# CONFIG_ULOG_OUTPUT_LVL_WARNING is not set
-# CONFIG_ULOG_OUTPUT_LVL_NOTICE is not set
-# CONFIG_ULOG_OUTPUT_LVL_INFO is not set
-CONFIG_ULOG_OUTPUT_LVL_DEBUG=y
-CONFIG_ULOG_OUTPUT_LVL=7
-CONFIG_ULOG_USING_ISR_LOG=y
-CONFIG_ULOG_ASSERT_ENABLE=y
-CONFIG_ULOG_LINE_BUF_SIZE=128
-CONFIG_ULOG_USING_ASYNC_OUTPUT=y
-CONFIG_ULOG_ASYNC_OUTPUT_BUF_SIZE=2048
-CONFIG_ULOG_ASYNC_OUTPUT_BY_THREAD=y
-CONFIG_ULOG_ASYNC_OUTPUT_THREAD_STACK=512
-CONFIG_ULOG_ASYNC_OUTPUT_THREAD_PRIORITY=29
-
-#
-# log format
-#
-CONFIG_ULOG_OUTPUT_FLOAT=y
-CONFIG_ULOG_OUTPUT_TIME=y
-CONFIG_ULOG_TIME_USING_TIMESTAMP=y
-CONFIG_ULOG_OUTPUT_LEVEL=y
-CONFIG_ULOG_OUTPUT_TAG=y
-CONFIG_ULOG_OUTPUT_THREAD_NAME=y
-# end of log format
-
-CONFIG_ULOG_BACKEND_USING_CONSOLE=y
-CONFIG_ULOG_USING_FILTER=y
-CONFIG_ULOG_USING_SYSLOG=y
+# CONFIG_RT_USING_ULOG is not set
 # CONFIG_RT_USING_UTEST is not set
 # end of Utilities
 
@@ -1066,6 +1034,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_ARDUINO_SEEED_HM3301 is not set
 # CONFIG_PKG_USING_ARDUINO_SEEED_MCP9600 is not set
 # CONFIG_PKG_USING_ARDUINO_SEEED_LTC2941 is not set
+# CONFIG_PKG_USING_ARDUINO_SEEED_LDC1612 is not set
 # end of Sensors
 
 #

Разница между файлами не показана из-за своего большого размера
+ 1 - 5
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="1262070487633728199" 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="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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 14 - 0
Application_CBD/applications/beep.c

@@ -28,6 +28,20 @@ int beep_init(void)
     }
     return 0;
 }
+/*打开蜂鸣器*/
+int pwm_on(uint8_t pwn_ch,rt_uint32_t pwm_freq)
+{
+    rt_pwm_set(pwm_device, pwn_ch, pwm_freq, pwm_freq/2);
+    rt_pwm_enable(pwm_device, pwn_ch); //使能蜂鸣器对应的 PWM 通道
+    return 0;
+}
+/*关闭蜂鸣器*/
+int pwm_off(uint8_t pwn_ch,rt_uint32_t pwm_freq)
+{
+    rt_pwm_set(pwm_device, pwn_ch, pwm_freq, 0);
+    rt_pwm_disable(pwm_device, pwn_ch); //使能蜂鸣器对应的 PWM 通道
+    return 0;
+}
 int pwm8_init(void)
 {
     pwm_tim8 = (struct rt_device_pwm *)rt_device_find("pwm8");

+ 2 - 0
Application_CBD/applications/beep.h

@@ -17,6 +17,8 @@
 int beep_init(void);                            //蜂鸣器初始化
 int beep_on(void);                              //蜂鸣器开
 int beep_off(void);                             //蜂鸣器关
+int pwm_off(uint8_t pwn_ch,rt_uint32_t pwm_freq);
+int pwm_on(uint8_t pwn_ch,rt_uint32_t pwm_freq);
 void beep_set(uint32_t freq, uint32_t volume);    //蜂鸣器设定
 void Beep_Tip(uint16_t volnum);
 /*****************************4.0******************************/

+ 356 - 120
Application_CBD/applications/control.c

@@ -14,17 +14,20 @@
 #include "easyflash.h"
 #include "stdio.h"
 #include "sound.h"
-#define DBG_TAG "control.c"
-#define DBG_LVL LOG_LVL_INFO
 #include "dtu_uart2.h"
 #include "sht30_collect.h"
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "control"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
 //工作检测
-#define WORK_CHECK_THREAD_PRIORITY         23      //线程优先级
-#define WORK_CHECK_THREAD_STACK_SIZE       512    //栈大小
-#define WORK_CHECK_THREAD_TIMESLICE        5       //时间片
+#define WORK_CHECK_THREAD_PRIORITY        23      //线程优先级
+#define WORK_CHECK_THREAD_STACK_SIZE      1024    //栈大小
+#define WORK_CHECK_THREAD_TIMESLICE       5       //时间片
 //工作流程
 #define WORK_LOOP_THREAD_PRIORITY         12      //线程优先级
-#define WORK_LOOP_THREAD_STACK_SIZE       512    //栈大小
+#define WORK_LOOP_THREAD_STACK_SIZE       1024    //栈大小
 #define WORK_LOOP_THREAD_TIMESLICE        5       //时间片
 
 #define PWM_EN    1   //0关闭,1-打开
@@ -72,60 +75,78 @@ void ctr_Motor_Robot(uint8_t status_ws)
     rt_pin_mode(Motor_Direction_Ctr, PIN_MODE_OUTPUT);
     rt_pin_write(Motor_Power,OFF);
     rt_pin_write(Motor_Direction_Ctr,ON);
+    rt_pin_mode(CLEAR_R, PIN_MODE_OUTPUT);
+    rt_pin_mode(CLEAR_L, PIN_MODE_OUTPUT);
     if(status_ws == ON)
     {
         //检测按键状态
         while(rt_pin_read(Motor_Direction_Button)==1)
         {
-            while(rt_pin_read(LIMIT_CLOSE)==1)
+            if(rt_pin_read(LIMIT_CLOSE)==1)
             {
                 rt_pin_write(Motor_Direction_Ctr,ON);
                 close_timeout++;
                 //打开电机驱动器电源,默认关闭
                 rt_pin_write(Motor_Power,ON);
-                if(close_timeout==1)
+                if(close_timeout==2)
                 {
+                    rt_pin_write(CLEAR_R,ON);
+                    rt_pin_write(CLEAR_L,OFF);
                     rt_pin_write(Motor_Power,OFF);
-                    rt_thread_delay(50);
+                    rt_thread_delay(20);
                     rt_pin_write(Motor_Power,ON);
                 }
-                rt_thread_delay(50);
+                rt_thread_delay(20);
                 if(close_timeout>500)
                 {
-                    close_timeout = 500;
+                    close_timeout = 600;
                     rt_pin_write(Motor_Power,OFF);
+                    rt_pin_write(CLEAR_R,OFF);
+                    rt_pin_write(CLEAR_L,OFF);
                 }
-                ctr_led(ON);
             }
-            if(rt_pin_read(LIMIT_CLOSE)==0)
+            else
             {
+                close_timeout = 0;
                 rt_pin_write(Motor_Power,OFF);  //关闭驱动器电源
+                rt_pin_write(CLEAR_R,OFF);
+                rt_pin_write(CLEAR_L,OFF);
             }
-            rt_thread_delay(50);
-            open_timeout = 0;
+            rt_thread_delay(20);
         }
         rt_pin_write(Motor_Power,OFF);
         rt_thread_delay(1000*2);
         while(rt_pin_read(Motor_Direction_Button)==0)
         {
-            while(rt_pin_read(LIMIT_OPEN)==1)
+            if(rt_pin_read(LIMIT_OPEN)==1)
             {
                 open_timeout ++;
                 //打开电机驱动器电源,默认关闭
+                if(open_timeout==2){
+                    rt_pin_write(CLEAR_R,OFF);
+                    rt_pin_write(CLEAR_L,ON);
+                }
                 rt_pin_write(Motor_Power,ON);
                 rt_pin_write(Motor_Direction_Ctr,OFF);
                 if(open_timeout>500)
                 {
-                    open_timeout = 500;
+                    open_timeout = 600;
                     rt_pin_write(Motor_Power,OFF);
+                    rt_pin_write(CLEAR_R,OFF);
+                    rt_pin_write(CLEAR_L,OFF);
                 }
-                rt_thread_delay(50);
+                rt_thread_delay(20);
             }
             if(rt_pin_read(LIMIT_OPEN)==0)
-            rt_pin_write(Motor_Power,OFF);
-            rt_thread_delay(50);
+            {
+                open_timeout = 0;
+                rt_pin_write(Motor_Power,OFF);
+                rt_pin_write(CLEAR_R,OFF);
+                rt_pin_write(CLEAR_L,OFF);
+            }
+
+            rt_thread_delay(20);
             close_timeout = 0;
-            ctr_led(ON);
         }
         open_timeout = 0;
         close_timeout = 0;
@@ -263,13 +284,74 @@ uint8_t ctr_Heat(uint8_t status_heat)
     rt_pin_write(Heat_Pin,status_heat);
     return status_heat;
 }
+/*制冷*/
+uint8_t ctr_Cold(uint8_t status_cold)
+{
+    device_status.cold_status = status_cold;
+    rt_pin_mode(Cold_Pin, PIN_MODE_OUTPUT);
+    rt_pin_write(Cold_Pin,status_cold);
+    return status_cold;
+}
 /*相机供电*/
 void ctr_photo(uint8_t status_photo)
 {
     rt_pin_mode(PHOTO,PIN_MODE_OUTPUT);
     rt_pin_write(PHOTO,status_photo);
 }
-/*采集风机/上仓门*/
+/*************************************************
+Function:       ctr_Cool_Fan
+Description:    散热风机的开关
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          ON-开,OFF-关
+Output:         NULL
+Return:         ON-开,OFF-关
+Others:         NULL
+*************************************************/
+uint8_t ctr_Cool_Fan(uint8_t status_cool)
+{
+    device_status.cool_fan_status = status_cool;
+    rt_pin_mode(Cool_Fan_L, PIN_MODE_OUTPUT);
+    rt_pin_mode(Cool_Fan_R, PIN_MODE_OUTPUT);
+    if(status_cool==OFF)
+    {
+       rt_pin_write(Cool_Fan_L,OFF);
+       rt_pin_write(Cool_Fan_R,OFF);
+    }
+   if(status_cool==ON)
+    {
+       rt_pin_write(Cool_Fan_L,ON);
+       rt_pin_write(Cool_Fan_R,OFF);
+    }
+    return device_status.cool_fan_status;
+}
+/*************************************************
+Function:       ctr_Collect_Fan
+Description:    采集风机的开关
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          ON-开,OFF-关
+Output:         NULL
+Return:         ON-开,OFF-关
+Others:         NULL
+*************************************************/
+uint8_t ctr_Collect_Fan(uint8_t status_collect)
+{
+    device_status.collect_fan_status = status_collect;
+    rt_pin_mode(Collect_Fan, PIN_MODE_OUTPUT);
+    if(status_collect==OFF)
+    {
+       rt_pin_write(Collect_Fan,OFF);
+    }
+    if(status_collect==ON)
+    {
+       rt_pin_write(Collect_Fan,ON);
+    }
+    return device_status.collect_fan_status;
+}
+/*上仓门*/
 uint8_t ctr_cangmen_up(uint8_t status_up)
 {
    rt_pin_mode(Collect_fan_R, PIN_MODE_OUTPUT);
@@ -387,7 +469,8 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
     if(status_shake==ON&&device_status.shake_ws==1)
     {
         rt_pin_write(SHAKE_SW,ON);
-        rt_thread_delay(shake_sec*100);
+        if(device_status.dtype==3)  rt_thread_delay(shake_sec*100);
+        if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }
@@ -396,6 +479,8 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }
+    if(device_status.dtype==7)
+    HMI_WRITE("sysTest.switchDrop.val=%d",OFF);
     return status_shake;
 }
 //补光
@@ -420,7 +505,165 @@ uint8_t ctr_led(uint8_t status_led)
     }
     return status_led;
 }
-//转仓
+/*************************************************
+Function:       ctr_turn
+Description:    转盘驱动
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          v=0(复位) v=90转90度
+Output:         NULL
+Return:         NULL
+Others:         NULL
+*************************************************/
+void ctr_turn(uint8_t v)
+{
+    DTU_Write("turn.mp3");
+    LOG_I("================v===============:%d",v);
+    rt_uint16_t turn_cnt = 0;
+    rt_pin_mode(TURN_ZP_R, PIN_MODE_OUTPUT);
+    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;               //如果在初始位置,则不再往下执行
+    while(rt_pin_read(LIMIT_0)==0||rt_pin_read(LIMIT_90)==0)
+    {
+        rt_pin_write(TURN_ZP_R, ON);
+        rt_pin_write(TURN_ZP_L, OFF);
+        turn_cnt ++;
+        rt_thread_delay(100);
+        if(turn_cnt==1000)
+        {
+            turn_cnt = 0;
+            rt_pin_write(TURN_ZP_R, OFF);
+            rt_pin_write(TURN_ZP_L, OFF);
+            char *turn_warn ="limit timeout!!!";
+            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            rt_free(turn_warn);
+            break;
+        }
+    }
+    turn_cnt = 0;
+    while(v==0&&rt_pin_read(LIMIT_0)==1)
+    {
+        rt_pin_write(TURN_ZP_R, ON);
+        rt_pin_write(TURN_ZP_L, OFF);
+        rt_thread_delay(10);
+        turn_cnt ++;
+        if(turn_cnt==5000)
+        {
+            turn_cnt = 0;
+            rt_pin_write(TURN_ZP_R, OFF);
+            rt_pin_write(TURN_ZP_L, OFF);
+            char *turn_warn ="turn timrout!!!";
+            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            rt_free(turn_warn);
+            break;
+        }
+    }
+    turn_cnt = 0;
+    while(v==90&&rt_pin_read(LIMIT_90)==1)
+    {
+        rt_pin_write(TURN_ZP_R, ON);
+        rt_pin_write(TURN_ZP_L, OFF);
+        rt_thread_delay(10);
+        turn_cnt ++;
+        if(turn_cnt==5000)
+        {
+            turn_cnt = 0;
+            rt_pin_write(TURN_ZP_R, OFF);
+            rt_pin_write(TURN_ZP_L, OFF);
+            char *turn_warn ="turn timrout!!!";
+            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            rt_free(turn_warn);
+            break;
+        }
+    }
+    turn_cnt = 0;
+    rt_pin_write(TURN_ZP_R, OFF);
+    rt_pin_write(TURN_ZP_L, OFF);
+    HMI_WRITE("cangWei.rotateFlag.val=0");
+}
+/*************************************************
+Function:       ctr_Motor_Driver
+Description:    步进电机驱动
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          50000000
+Output:         NULL
+Return:         shake_sec
+Others:         NULL
+*************************************************/
+void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_out)
+{
+    beep_init();
+    rt_pin_mode(Motor_Power, PIN_MODE_OUTPUT);
+    rt_pin_mode(LIMIT_UP, PIN_MODE_INPUT);
+    rt_pin_mode(LIMIT_DOWN, PIN_MODE_INPUT);
+    rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);
+    rt_pin_mode(Motor_DIR, PIN_MODE_OUTPUT);
+    if(EN==2)
+    {
+        rt_pin_write(Motor_EN, 0);
+        rt_pin_write(HK_TAKE, 0);  //使能步进电机2
+    }
+    else if(EN==0)
+    {
+        rt_pin_write(Motor_Power,0);
+    }
+    else{
+        rt_pin_write(Motor_EN, EN);
+        rt_pin_write(Motor_Power,1);
+    }
+    rt_pin_write(Motor_DIR, DIR);
+    beep_set(pwm, pwm/2);      //200kzh - 50%
+    while(DIR==1&&rt_pin_read(LIMIT_DOWN)==1)
+    {
+        if(time_out==0)
+        {
+            break;
+        }
+        rt_thread_delay(50);
+        time_out --;
+    }
+    while(DIR==0&&rt_pin_read(LIMIT_UP)==1)
+    {
+        if(time_out==0)
+        {
+            break;
+        }
+        rt_thread_delay(50);
+        time_out --;
+    }
+    rt_pin_write(Motor_EN, OFF);
+    rt_pin_write(HK_TAKE,OFF);  //双电机此处ON
+    beep_set(0, 0);      //200kzh - 50%
+}
+/*************************************************
+Function:       ctr_Petroleum_jelly
+Description:    涂凡士林
+Calls:
+Table Accessed: // 被访问的表(此项仅对于牵扯到数据库操作的程序)
+Table Updated: // 被修改的表(此项仅对于牵扯到数据库操作的程序)
+Input:          NULL
+Output:         NULL
+Return:         NULL
+Others:         NULL
+*************************************************/
+void ctr_Petroleum_jelly(rt_uint32_t delay)
+{
+    beep_init();
+    pwm_on(2,50000);
+    rt_thread_delay(delay*1000);
+    pwm_off(2,0);
+    rt_thread_delay(1000);
+    pwm_on(3, 50000);
+    rt_thread_delay(delay*1000);
+    pwm_off(3,0);
+    device_status.fsl_sw = 0;
+}
+//1.0转仓
 void turnzp(void)
 {
     static uint16_t turn_timeout = 0;
@@ -887,61 +1130,24 @@ void HardWare_Init(uint8_t boot)
     //关闭上仓门
     ctr_cangmen_up(OFF);
 
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"上仓门电机已停止!!!\"");
-        rt_thread_delay(1000);
-    }
     //关闭下仓门电机
     ctr_cangmen_down(OFF);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"下仓门电机已停止!!!\"");
-        rt_thread_delay(1000);
-    }
 
     //关闭镇流器
     ctr_lamp(OFF,1);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"镇流器已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
+
     //关闭震动电机
     ctr_shake(OFF,0);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"震动电机已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
-    //关闭清扫电机
 
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"清扫电机已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
     //关闭加热
     ctr_Heat(OFF);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"加热带已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
+
     //关闭补光灯
     ctr_led(OFF);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"补光灯已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
+
     //关闭12V供电(海康相机,RTU)
     ctr_photo(OFF);
-    if(boot==1)
-    {
-        HMI_WRITE("hardcheck.checktip.txt=\"12V供电已关闭!!!\"");
-        rt_thread_delay(1000);
-    }
+
 }
 //拍照
 void HK_TakePhoto(void)
@@ -1016,27 +1222,27 @@ void ResetInit(void)
            ctr_led(OFF);
            if(device_status.bat_status==1||atoi(device_status.fuse_voltage)<1)
            {
-               rt_kprintf("欠压!!!\n");
+               LOG_W("欠压!");
                return;
            }
            //7.关闭上仓门
            device_status.ctr_up_motor = 2;
            while(device_status.ctr_up_motor!=0)
            {
-               rt_kprintf("关闭上仓门...\n");
+               LOG_I("关闭上仓门...");
                rt_thread_delay(100);
            }
            //8.关闭下仓门
            device_status.ctr_down_motor = 2;
            while(device_status.ctr_down_motor!=0)
            {
-               rt_kprintf("关闭下仓门....\n");
+               LOG_I("关闭下仓门....");
                rt_thread_delay(100);
            }
            //9.清扫
            if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
            {
-               rt_kprintf("异常退出!!!\n");
+               LOG_W("异常退出!!!\n");
                return;
            }
             #if LAMP_EN == 0
@@ -1045,8 +1251,6 @@ void ResetInit(void)
             #endif
            if(device_status.version_type==4||device_status.version_type==41)
            {
-//               if(ctr_clear(650)==0)
-//               ctr_TG_Clear(400);
                device_status.clear_status=1;
            }
            else if (device_status.version_type==1) {
@@ -1097,11 +1301,11 @@ void WorkCheck(void)
         //工作模式检测(RTC时间正常,1-时控/0-光控)(RTC时间异常强行使用光控)
         if(device_status.timeSwitch==1)
         {
-            rt_kprintf("***************时控*****************\n");
+            LOG_I("***********时控*****************");
             //如果开始和结束是同一天
             if(device_status.startBar<device_status.stopBar)
             {
-                rt_kprintf("开始和结束是同一天");
+                LOG_I("开始和结束是同一天");
                 time_t now;
                 time(&now);
                 static struct tm nowtime;   //现在
@@ -1120,22 +1324,22 @@ void WorkCheck(void)
                 endtime.tm_hour = device_status.stopBar-8;
                 endtime.tm_min = 0;
                 endtime.tm_sec = 0;
-                rt_kprintf("***工作结束在当天:现在时间:%d-开始时间:%d-结束时间:%d***\n",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
+                LOG_I("***工作结束在当天:现在时间:%d-开始时间:%d-结束时间:%d***",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
                 //如果当前时间大于开始时间且小于结束时间,且没有开始工作
                 if((difftime(mktime(&nowtime), mktime(&starttime)) >=0) && (difftime(mktime(&nowtime),mktime(&endtime))<0))
                 {
-                    rt_kprintf("当前时间大于开始时间,小于结束时间,工作中!!!\n");
+                    LOG_I("当前时间大于开始时间,小于结束时间,工作中!!!");
                     device_status.work_status = 1;
                 }
                 //如果当前时间小于开始时间
                 else if(difftime(mktime(&nowtime),mktime(&starttime))<0)
                 {
-                    rt_kprintf("当前时间小于开始时间,不工作!!!-%d-%d\n",mktime(&nowtime),mktime(&starttime));
+                    LOG_I("当前时间小于开始时间,不工作!!!-%d-%d",mktime(&nowtime),mktime(&starttime));
                     device_status.work_status = 0;
                 }
                 //当前时间大于结束时间
                 else {
-                    rt_kprintf("当前时间大于结束时间,不工作!!!-%d-%d\n",mktime(&nowtime),mktime(&starttime));
+                    LOG_I("当前时间大于结束时间,不工作!!!-%d-%d",mktime(&nowtime),mktime(&starttime));
                     device_status.work_status = 0;
                 }
             }
@@ -1159,7 +1363,7 @@ void WorkCheck(void)
                 endtime.tm_hour = device_status.stopBar-8;
                 endtime.tm_min = 0;
                 endtime.tm_sec = 0;
-                rt_kprintf("工作结束在第二天:现在时间:%d-开始时间:%d-结束时间:%d!!!\n",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
+                LOG_I("工作结束在第二天:现在时间:%d-开始时间:%d-结束时间:%d!!!",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
                 //如果当前时间大于开始时间,且没有开始工作 ,注意时间戳日期加1
                 if((difftime(mktime(&nowtime), mktime(&starttime)) > 0 ))
                 {
@@ -1169,7 +1373,7 @@ void WorkCheck(void)
                     endtime.tm_min = 0;
                     endtime.tm_sec = 0;
                     device_status.work_status = 1;
-                    rt_kprintf("当前前时间大于开始时间,且没有开始工作\n");
+                    LOG_I("当前前时间大于开始时间,且没有开始工作");
                 }
                 //当前时间小于开始时间
                 else if ((difftime(mktime(&nowtime), mktime(&starttime)) < 0))
@@ -1182,12 +1386,12 @@ void WorkCheck(void)
                     //如果当前时间戳小于结束时间戳
                     if(difftime(mktime(&nowtime),mktime(&endtime)) < 0)
                     {
-                        rt_kprintf("当前时间大于开始时间,且没有开始工作,当前时间小于结束时间的情况:计算工作时间:从当前时间工作第二天的结束时间\n");
+                        LOG_I("当前时间大于开始时间,且没有开始工作,当前时间小于结束时间的情况:计算工作时间:从当前时间工作第二天的结束时间");
                         device_status.work_status = 1;
                     }
                     else
                     {
-                        rt_kprintf("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间!!!\n");
+                        LOG_I("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间");
                         device_status.work_status = 0; //不在工作时间,待机
                     }
 
@@ -1196,7 +1400,7 @@ void WorkCheck(void)
 
         }
         else {
-                rt_kprintf("光控定时模式!!!\n");
+                LOG_I("光控定时模式!");
                 /*
                 time_t now;
                 time(&now);
@@ -1219,25 +1423,25 @@ void WorkCheck(void)
                         device_status.lamp_status = 1;
                         device_status.lamp1_status = 0;
                         device_status.lamp2_status = 0;
-                        rt_kprintf("光控定时,计时中:光源1计数:%d\n",device_status.light_over_tim);
+                        LOG_I("光控定时,计时中:光源1计数:%d",device_status.light_over_tim);
                     }
                     else if (device_status.light_over_tim<device_status.light_over_tim-6*3600&&device_status.light_over_tim>3*3600) {
                         device_status.work_status = 1;
                         device_status.lamp_status = 0;
                         device_status.lamp1_status = 1;
                         device_status.lamp2_status = 0;
-                        rt_kprintf("光控定时,计时中:光源2计数:%d\n",device_status.light_over_tim);
+                        LOG_I("光控定时,计时中:光源2计数:%d",device_status.light_over_tim);
                     }
                     else if (device_status.light_over_tim<3*3600) {
                         device_status.work_status = 1;
                         device_status.lamp_status = 0;
                         device_status.lamp1_status = 0;
                         device_status.lamp2_status = 1;
-                        rt_kprintf("光控定时,计时中:光源3计数:%d\n",device_status.light_over_tim);
+                        LOG_I("光控定时,计时中:光源3计数:%d",device_status.light_over_tim);
                     }
                     #else
                     device_status.work_status = 1;;
-                    rt_kprintf("光控定时,计时中>>>>>>>>>:%d\n",device_status.light_over_tim);
+                    LOG_I("光控定时,计时中>>>>>>>>>:%d",device_status.light_over_tim);
                     #endif
                 }
                 else
@@ -1252,12 +1456,12 @@ void WorkCheck(void)
                     }
                     device_status.work_status = 0;
                     if(device_status.light_over_tim==0&&device_status.sun_status==1) device_status.light_over_tim = device_status.sunBar * 3600;
-                    rt_kprintf("光控中,白天:%d!!!\n",device_status.sun_status);
+                    LOG_I("光控中,白天:%d!!!",device_status.sun_status);
                 }
         }
         rt_thread_delay(1000);
     }
-    rt_kprintf("雨控状态,温控状态,电压状态:\n%d\n%d\n%d\n",device_status.rain_status,device_status.temp_status,device_status.bat_status);
+    LOG_I("雨控状态,温控状态,电压状态:%d-%d-%d",device_status.rain_status,device_status.temp_status,device_status.bat_status);
     device_status.work_status = 0;
     rt_thread_delay(1000);
 }
@@ -1269,8 +1473,8 @@ void WorkTask(void)
     static int clt_time = 0; //收集时间差秒数
     static int heat_time = 0;
     static uint16_t controltime = 6;
-    rt_kprintf("工作状态:%d\n",device_status.work_status);
-    rt_kprintf("开关机状态:%d\n",device_status.ds);
+    LOG_I("工作状态:%d",device_status.work_status);
+    LOG_I("开关机状态:%d",device_status.ds);
     while(device_status.work_status==1&&device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1)
     {
         device_status.work_done = 0;
@@ -1391,12 +1595,18 @@ void WorkTask(void)
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //        }
             //5.加热
-            heat_time = device_status.heattime * 60;
-            while(heat_time!=0)
+            if(device_status.heat_ws==1)
             {
-                heat_time--;
-                rt_kprintf("正在加热状态!!!\n");
-                rt_thread_delay(1000);
+                calorstat(device_status.heattime*60);
+            }
+            else {
+                heat_time = device_status.heattime * 60;
+                while(heat_time!=0)
+                {
+                    heat_time--;
+                    LOG_I("正在加热状态!!!");
+                    rt_thread_delay(1000);
+                }
             }
             //6.打开下仓门
             if(device_status.rain_status==0)
@@ -1485,17 +1695,6 @@ static void Work_status_thread_entry(void *parameter)
             rt_thread_delay(1000);
             rt_kprintf("开机光控检测:%d\n",sun_status_num);
         }
-
-        /*//2022-02-26-remove
-        time_t now;
-        time(&now);
-        static struct tm nowstamp;
-        nowstamp =*localtime(&now);
-        nowstamp.tm_hour = nowstamp.tm_hour - 8;
-        static rt_uint32_t nowstamp_num = 0;
-        nowstamp_num = mktime(&nowstamp);
-        ////2022-02-26-remove
-        */
         device_status.light_over_tim = device_status.sunBar * 3600;
         device_status.test_flag = 0;
      }
@@ -1525,19 +1724,9 @@ static void Work_Loop_thread_entry(void *parameter)
 /*入口函数清扫*/
 static void Control_Clear_thread_entry(void *parameter)
 {
-    #if ROBOT_EN == 1
-    //磁悬浮供电
-    //监测磁悬浮限位位置
-    //根据位置确定是否 按下按钮
-    rt_pin_mode(EMS_Dir, PIN_MODE_OUTPUT);
-    rt_pin_write(EMS_Dir, 0);
-    rt_thread_delay(50);
-    rt_pin_write(EMS_Dir, 1);
-    #endif
     while(1)
     {
         #if ROBOT_EN ==1
-        ctr_led(ON);
         ctr_Motor_Robot(ON);
         #else
         if(device_status.clear_status==1)
@@ -1552,15 +1741,62 @@ static void Control_Clear_thread_entry(void *parameter)
 /*入口函数加热*/
 static void Control_Heat_thread_entry(void *parameter)
 {
+
+    #if ROBOT_EN == 1
+    static uint8_t key_on = 0;
+    #else
+    while(device_status.work_status==0)
+    {
+        rt_thread_delay(1000);
+    }
+    #endif
     while(1)
     {
-        if(device_status.work_status==1)
+        #if ROBOT_EN == 1
+        //磁悬浮供电
+        //监测磁悬浮限位位置
+        //根据位置确定是否 按下按钮
+        LOG_D("Read 磁悬浮:%d",device_status.heattem);
+        //等待10S
+        if(device_status.heattem<35&&Read_Real_Voltage()/100>12)   //磁悬浮处于关闭状态
+        {
+            key_on = 0;
+            //发送触摸按钮信号
+            rt_pin_mode(EMS_Dir, PIN_MODE_OUTPUT);
+            rt_pin_write(EMS_Dir, 0);
+            rt_thread_delay(50);
+            rt_pin_write(EMS_Dir, 1);
+        }
+        if(device_status.heattem>50)
+        {
+            key_on = 1;
+            rt_thread_delay(1000);
+            LOG_D("Read 磁悬浮已打开:%d",device_status.heattem);
+        }
+
+        //磁悬浮供电
+        //监测磁悬浮限位位置
+        //根据位置确定是否 按下按钮+
+        if(Read_Real_Voltage()/100<12&&key_on==1)
         {
+            key_on = 0;
+            rt_pin_mode(EMS_Dir, PIN_MODE_OUTPUT);
+            rt_pin_write(EMS_Dir, 0);
+            rt_thread_delay(50);
+            rt_pin_write(EMS_Dir, 1);
+        }
+
+        #else
+        if(device_status.work_status==1&&device_status.heat_ws==0)
+        {
+            rt_thread_delay(10000);
             calorstat(device_status.heattime*60);
         }
-        else {
-            rt_kprintf("not calorstat!\n");
+        else
+        {
+            LOG_I("Not calorstat!");
         }
+        #endif
         rt_thread_delay(1000);
     }
 }
@@ -1585,7 +1821,7 @@ int Control_heat(void)
     /* 创建线程*/
     tid_heat  = rt_thread_create("Control_Heat_thread_entry",
             Control_Heat_thread_entry, RT_NULL,
-            512,       //2048
+            1024,       //2048
             25,         //23
             WORK_CHECK_THREAD_TIMESLICE);       //5
     if(tid_heat!=RT_NULL)

+ 45 - 12
Application_CBD/applications/control.h

@@ -39,15 +39,20 @@ typedef struct  _packed
     uint8_t iSave;           //存储标志位
     uint8_t dtype;           //设备类型?7-孢子仪,3-测报灯
     /*孢子仪*/
-    uint8_t auto_test_sw;           //一键测试   0-关   1-开
-    uint8_t cold_status;            //制冷状态   0-关   1-开
-    uint8_t cold_sw;                //制冷开关   0-关   1-开
-    uint8_t wind_sw;                //风机开关   0-关   1-开
-    uint8_t collect_fan_status;     //采集状态   0-关   1-开
-    uint8_t autotakepic;            //对焦拍照   0-关   1-开
-    uint8_t develop_flag;           //是否进入培养模式
-    uint8_t cool_fan_status;        //散热风机状态 0-停止 1-打开
-    uint8_t fsl_sw;                 //凡士林开关:0-关,1-开
+    uint8_t run_sta;              //运行状态
+    uint8_t cul_time;             //收集时间
+    uint8_t culture_time;         //培养时间
+    uint8_t stay_time;            //已培养时间
+    uint8_t pre_temp;             //培养仓温度
+    uint8_t auto_test_sw;         //一键测试   0-关   1-开
+    uint8_t cold_status;          //制冷状态   0-关   1-开
+    uint8_t cold_sw;              //制冷开关   0-关   1-开
+    uint8_t wind_sw;              //风机开关   0-关   1-开
+    uint8_t collect_fan_status;   //采集状态   0-关   1-开
+    uint8_t autotakepic;          //对焦拍照   0-关   1-开
+    uint8_t develop_flag;         //是否进入培养模式
+    uint8_t cool_fan_status;      //散热风机状态 0-停止 1-打开
+    uint8_t fsl_sw;               //凡士林开关:0-关,1-开
     uint8_t collecting_sh1;       //采集开启1
     uint8_t collecting_eh1;       //采集关闭1
     uint8_t collecting_sh2;       //采集开启2
@@ -55,6 +60,7 @@ typedef struct  _packed
     uint8_t collecting_sh3;       //采集开启3
     uint8_t collecting_eh3;       //采集关闭3
     /*测报灯*/
+    uint8_t heat_ws;         //加热开关
     uint8_t photo_ws;        //拍照
     uint8_t power_status;    //电源
     uint8_t sun_test;        //光控测测试标志位
@@ -66,7 +72,7 @@ typedef struct  _packed
     uint8_t down_status;     //下仓门状态 0-停止 1-打开 2-关闭
     uint8_t clear_status;    //清扫状态   0-停止 1-开始
     uint8_t shake_ws;        //震动       0-关   1-开
-    uint8_t heatvalue;       //
+    uint8_t heatvalue;       //加热设定温度
     uint8_t ctr_up_motor;    //上仓门,    1打开,0关闭
     uint8_t ctr_down_motor;  //下仓门,    1打开,0关闭
     uint8_t rain_status;     //雨控              0-正常 1-欠压
@@ -107,6 +113,7 @@ typedef struct  _packed
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t expiry_date;        //到期时间
     int passWord;              //初始密码
+    const char *coll_time[10];
     char mqttcfg1[64];         //
     char mqttcfg2[64];         //
     char csq[8];               //信号强度
@@ -129,8 +136,8 @@ typedef struct  _packed
     char json_w_clock[128];    //修改时间
     char json_w_reset[128];    //
     char json_w_platform[128]; //
-    char *power;               //功率
-    char *voltage;             //电池电压
+    char power[8];               //功率
+    char voltage[8];             //电池电压
 }Device_Status_typedef;
 
 /************************************************/
@@ -209,6 +216,32 @@ typedef struct  _packed
 void ctr_JD_Clear(void);
 uint8_t ctr_Motor_xichong(uint8_t status_ws);
 uint8_t ctr_Motor_xifu(uint8_t status_ws);
+/*****************************孢子仪**********************************/
+//制冷
+#define Cold_Pin GET_PIN(B,11)
+//采集
+#define Collect_Fan GET_PIN(B,10)
+//转盘
+#define  TURN_ZP_R GET_PIN(B,0)
+#define  TURN_ZP_L GET_PIN(B,1)
+//转盘限位
+#define LIMIT_0 GET_PIN(C,13)
+#define LIMIT_90 GET_PIN(B,9)
+//散热
+#define  Cool_Fan_R GET_PIN(C, 5)
+#define  Cool_Fan_L GET_PIN(C, 4)
+//步进电机限位
+#define LIMIT_UP GET_PIN(B,8)
+#define LIMIT_DOWN GET_PIN(B,5)
+//步进电机驱动
+#define Motor_EN    GET_PIN(B,14)
+#define Motor_DIR   GET_PIN(B,15)
+void ctr_turn(uint8_t v);
+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);    //采集风机
+void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_out); //步进电机
+void ctr_Petroleum_jelly(rt_uint32_t delay);        //凡士林
 /*****************************定制4.0-2000W***************************************/
 #define FAN_P   GET_PIN(B,10)
 #define FAN_I   GET_PIN(B,11)

+ 110 - 51
Application_CBD/applications/dtu_uart2.c

@@ -21,9 +21,14 @@
 #include <easyflash.h>
 #include "sound.h"
 #include <ymodem.h>
-#define DBG_TAG "dtu_uart2.c"
-#define DBG_LVL LOG_LVL_INFO
 #include "beep.h"
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "dtu"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
+
 #define DTU_THREAD_PRIORITY         6          //线程优先级
 #define DTU_THREAD_STACK_SIZE       1024        //线程栈空间大小
 #define DTU_THREAD_TIMESLICE        5           //时间片
@@ -204,15 +209,6 @@ static void dtu_thread_entry_send(void *parameter)
                     }
                     if(Read_Real_Voltage()/100<12&&device_status.power_status==1)
                     {
-                        #if ROBOT_EN == 1
-                        //磁悬浮供电
-                        //监测磁悬浮限位位置
-                        //根据位置确定是否 按下按钮
-                        rt_pin_mode(EMS_Dir, PIN_MODE_OUTPUT);
-                        rt_pin_write(EMS_Dir, 0);
-                        rt_thread_delay(50);
-                        rt_pin_write(EMS_Dir, 1);
-                        #endif
                         DTU_Write("%s",makeJson_Warn("power down","power"));
                         device_status.power_status = 0;
                         rt_thread_delay(1500);
@@ -409,7 +405,6 @@ char *makeJson_Warn(char * s,char *t)
 /*生成JSON数据*/
 char * makeJson()
 {
-
     char utos[4];
     if(device_status.gps==NULL)
     rt_sprintf(device_status.gps, "0");
@@ -427,6 +422,7 @@ char * makeJson()
     static struct tm tm;
     gmtime_r(&stamp, &tm);
     rt_sprintf(device_status.stamp,"%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);
+
     cJSON * pJsonRoot = NULL;
     pJsonRoot = cJSON_CreateObject();
     if(NULL==pJsonRoot)
@@ -470,6 +466,9 @@ char * makeJson()
     else if (device_status.version_type==6) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
     }
+    else if (device_status.version_type==7) {
+        rt_sprintf(device_status.driver,"%s-%s",VERSION_BZY,device_status.driver_4g);
+    }
     if(device_status.sensor_485_sta!=0)
     {
         if(strstr(device_status.driver,"485")==RT_NULL)
@@ -503,7 +502,7 @@ char * makeJson()
         rt_sprintf(utos,"6");
         cJSON_AddStringToObject(pSubJson,"vtype",utos);
     }
-    if(device_status.version_type!=6)
+    if(device_status.version_type!=6&&device_status.dtype!=7)
     {
         //光控定时
         rt_sprintf(utos, "%d",device_status.sunBar);
@@ -554,50 +553,109 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.tpl);
         cJSON_AddStringToObject(pSubJson,"tpl",utos);
     }
-        //震动开关
-        rt_sprintf(utos, "%d",device_status.shake_ws);
-        cJSON_AddStringToObject(pSubJson,"shake",utos);
-        //震动时间
-        rt_sprintf(utos, "%d",device_status.shake_sec);
-        cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
-        cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
-        //开关状态
-        rt_sprintf(utos, "%d",device_status.ds);
-        cJSON_AddStringToObject(pSubJson,"ds",utos);
-        //湿度
-        cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
-        //温度
-        cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
-        cJSON_AddStringToObject(pSubJson,"imei",device_status.imei);            //IMEI
-        cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid);          //ICCID
-        cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp);          //时间
-        //经度
-        cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
-        //纬度
-        cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
-        //是否为上电开机
-        cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
-        //电流(当前)
-        cJSON_AddStringToObject(pSubJson,"current",device_status.power);
-        //电压
-        cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
+    if(device_status.dtype==3)
+    {
+        //工作状态
+        rt_sprintf(utos, "%d",device_status.work_status);
+        cJSON_AddStringToObject(pSubJson,"ws",utos);
         //保险丝电压
         cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
-        //数据上传间隔
-        rt_sprintf(utos, "%d",device_status.dattim);
-        cJSON_AddStringToObject(pSubJson,"dat_f",utos);
         //开始时间
         rt_sprintf(utos, "%d",device_status.startBar);
         cJSON_AddStringToObject(pSubJson,"st",utos);
         //结束时间
         rt_sprintf(utos, "%d",device_status.stopBar);
         cJSON_AddStringToObject(pSubJson,"et",utos);
-        //信号强度
-        cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
+    }
+    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);
+        rt_kprintf("ct1-ct2:%s\n",ct1);
+        device_status.coll_time[0] = ct1;
+        device_status.coll_time[1] = ct2;
+        cJSON *data_clt = NULL;
+        data_clt = cJSON_CreateStringArray(device_status.coll_time,2);
         //工作状态
         rt_sprintf(utos, "%d",device_status.work_status);
-        cJSON_AddStringToObject(pSubJson,"ws",utos);
-
+        cJSON_AddStringToObject(pSubJson,"work_sta",utos);
+        //运行状态
+        rt_sprintf(utos, "%d",device_status.run_sta);
+        cJSON_AddStringToObject(pSubJson,"run_sta",utos);
+        //箱体温度-box_tem
+        rt_sprintf(utos, "%d",device_status.heattem);
+        cJSON_AddStringToObject(pSubJson,"box_tem",utos);
+        //收集时间-cul_time
+        rt_sprintf(utos, "%d",device_status.cul_time);
+        cJSON_AddStringToObject(pSubJson,"cul_time",utos);
+        //制冷状态
+        rt_sprintf(utos, "%d",device_status.cold_sw);
+        cJSON_AddStringToObject(pSubJson,"cold_sw",utos);
+        //电压状态-batStatus
+        rt_sprintf(utos, "%d",device_status.bat_status);
+        cJSON_AddStringToObject(pSubJson,"batStatus",utos);
+        //已培养时间-staytime
+        rt_sprintf(utos, "%d",device_status.stay_time);
+        cJSON_AddStringToObject(pSubJson,"stay_time",utos);
+        //风机开关
+        rt_sprintf(utos, "%d",device_status.wind_sw);
+        cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
+        //培养仓温度
+        rt_sprintf(utos, "%d",device_status.pre_temp);
+        cJSON_AddStringToObject(pSubJson,"pre_temp",utos);
+        //分辨率
+        cJSON_AddStringToObject(pSubJson,"imgres","0");
+        //usb
+        cJSON_AddStringToObject(pSubJson,"usb_sta","0");
+        //雨控状态-rps
+        rt_sprintf(utos, "%d",device_status.rain_status);
+        cJSON_AddStringToObject(pSubJson,"rps",utos);
+        //收集时间
+        cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
+        //设定温度
+        rt_sprintf(utos, "%d",device_status.heatvalue);
+        cJSON_AddStringToObject(pSubJson,"set_temp",utos);
+    }
+    if(device_status.dtype!=7)
+    {
+        //震动开关
+        rt_sprintf(utos, "%d",device_status.shake_ws);
+        cJSON_AddStringToObject(pSubJson,"shake",utos);
+    }
+    //震动时间
+    rt_sprintf(utos, "%d",device_status.shake_sec);
+    cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
+    cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
+    //开关状态
+    rt_sprintf(utos, "%d",device_status.ds);
+    cJSON_AddStringToObject(pSubJson,"ds",utos);
+    //湿度
+    cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
+    //温度
+    cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
+    cJSON_AddStringToObject(pSubJson,"imei",device_status.imei);            //IMEI
+    cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid);          //ICCID
+    cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp);          //时间
+    //经度
+    cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
+    //纬度
+    cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
+    //是否为上电开机
+    cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
+    //电流(当前)
+    cJSON_AddStringToObject(pSubJson,"current",device_status.power);
+    //电压
+    cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
+    //数据上传间隔
+    rt_sprintf(utos, "%d",device_status.dattim);
+    cJSON_AddStringToObject(pSubJson,"dat_f",utos);
+    //信号强度
+    cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
@@ -906,7 +964,7 @@ int parseDtu(char *json_string)
                       rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
                       rt_kprintf("ICCID not change:%s-%s",iccid->valuestring,device_status.iccid);
                   }
-                  rt_kprintf("DTU时间:%s",datetime->valuestring);
+                  LOG_I("DTU时间:%s",datetime->valuestring);
                       char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
                       strncpy(year_s, datetime->valuestring, 4);
                       strncpy(month_s,datetime->valuestring+4,2);
@@ -921,20 +979,21 @@ int parseDtu(char *json_string)
                           {
                               if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
                               {
-
+                                  LOG_I("set_date success!");
                               }
                               else {
+                                  LOG_E("set_date failed!");
                                   rt_hw_rtc_init();
                               }
                           }
                           else {
 
-                              rt_kprintf("网络连接失败,同步时间失败!!!\n");
+                              LOG_E("网络连接失败,同步时间失败!");
                         }
                       }
                       if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
                       {
-                          rt_kprintf("设置时间:%d时%d分%d秒\n",atoi(hour_s),atoi(min_s),atoi(sec_s));
+                          LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
                           if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
                           {
                               set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));

+ 234 - 26
Application_CBD/applications/hmi.c

@@ -25,11 +25,15 @@
 #include <shell.h>
 #include "dtu_uart2.h"
 #include <fal.h>
-#define LOG_TAG              "hmi.c"
-#define LOG_LVL              LOG_LVL_DBG
-#include <ulog.h>
+
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "hmi"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
 #define HMI_THREAD_PRIORITY         5          //线程优先级
-#define HMI_THREAD_STACK_SIZE       512        //线程栈空间大小
+#define HMI_THREAD_STACK_SIZE       2048        //线程栈空间大小
 #define HMI_THREAD_TIMESLICE        10           //时间片
 
 #define CONTROL_MOTOR_PRIORITY      18
@@ -286,6 +290,48 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("menu.net.val=1");
             HMI_WRITE("workSta.net.val=2");
         }
+        if(device_status.dtype==7)
+        {
+            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);
+            //更新电池状态
+            HMI_WRITE("workSta.bat_sta.val=%d",device_status.bat_status);
+            //更新散热风机状态
+            HMI_WRITE("workSta.cool_fan.val=%d",device_status.cool_fan_status);
+            //更新开关状态
+            HMI_WRITE("workSta.on_off.val=%d",device_status.ds);
+            //更新工作状态
+            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.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("workSta.set_temp.val=%d",device_status.heatvalue);
+            HMI_WRITE("sysSet.keep.val=%d",device_status.heatvalue);
+            //当前温度-培养仓
+            HMI_WRITE("workSta.pre_temp.val=%d",device_status.pre_temp);
+            //设定培养时间
+            HMI_WRITE("workSta.cul_time.val=%d",device_status.cul_time);
+            HMI_WRITE("clockSet.stay.val=%d",device_status.cul_time);
+            //已培养时间
+
+            //滴液时间
+            HMI_WRITE("clockSet.drop.val=%d",device_status.shake_sec);
+            //采集开始时间1
+            HMI_WRITE("clockSet.start1.val=%d",device_status.collecting_sh1);
+            //采集开始时间2
+            HMI_WRITE("clockSet.start2.val=%d",device_status.collecting_eh1);
+            //采集结束时间1
+            HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_sh2);
+            //采集结束时间2
+            HMI_WRITE("clockSet.end2.val=%d",device_status.collecting_eh2);
+        }
         /**********************************吸虫塔*********************************/
         if(device_status.version_type==6)
         {
@@ -336,13 +382,128 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
     }
     else if (strstr(rx_buffer,"button")!=NULL) {
-        rt_kprintf("按键!\n");
+        LOG_D("button!");
         DTU_Write("button");
     }
     //拍照
     else if(strstr(rx_buffer,"putTest.switchPhoto=1")!=NULL) {
         device_status.photo_ws = 1;
     }
+    else if (strstr(rx_buffer,"putTest.switchPic=1")!=NULL) {
+        device_status.photo_ws = 1;
+    }
+    //转盘复位
+    else if (strstr(rx_buffer,"turn_init")!=NULL) {
+        LOG_I("转仓复位!");
+        ctr_turn(0);
+    }
+    //转盘
+    else if (strstr(rx_buffer,"turn")!=NULL) {
+        LOG_I("转仓!");
+        ctr_turn(90);
+    }
+    //打开电磁阀
+    else if (strstr(rx_buffer,"putTest.switchDrop=1")!=NULL) {
+        LOG_I("开始滴液!");
+        ctr_shake(ON, device_status.shake_sec);
+    }
+    //关闭电磁阀
+    else if (strstr(rx_buffer,"putTest.switchDrop=0")!=NULL) {
+        LOG_I("停止滴液!");
+        ctr_shake(OFF, 0);
+    }
+    //打开补光
+    else if (strstr(rx_buffer,"putTest.switchLed=1")!=NULL) {
+        LOG_I("打开补光!!");
+        ctr_led(ON);
+    }
+    //关闭补光
+    else if (strstr(rx_buffer,"putTest.switchLed=0")!=NULL) {
+        LOG_I("关闭补光!!!");
+        ctr_led(OFF);
+    }
+    //关闭加热
+    else if(strstr(rx_buffer,"putTest.switchHeat=0")!=NULL) {
+        device_status.heat_status = 0;
+        ctr_Heat(OFF);
+        LOG_I("Close Heat!");
+    }
+    //打开加热
+    else if(strstr(rx_buffer,"putTest.switchHeat=1")!=NULL) {
+        device_status.heat_status = 1;
+        ctr_Heat(ON);
+        LOG_I("Open Heat!");
+    }
+    //打开制冷
+    else if(strstr(rx_buffer,"putTest.switchCold=1")!=NULL) {
+        ctr_Cold(ON);
+        LOG_I("Open Cold!");
+    }
+    //关闭制冷
+    else if(strstr(rx_buffer,"putTest.switchCold=0")!=NULL) {
+        ctr_Cold(OFF);
+        LOG_I("Close Cold!");
+    }
+    //打开采集
+    else if(strstr(rx_buffer,"putTest.switchCollect=1")!=NULL){
+        ctr_Collect_Fan(ON);
+        LOG_I("采集风机已打开!");
+    }
+    //关闭采集
+    else if(strstr(rx_buffer,"putTest.switchCollect=0")!=NULL){
+        ctr_Collect_Fan(OFF);
+        LOG_I("采集风机已关闭!");
+    }
+    //打开散热
+    else if(strstr(rx_buffer,"putTest.switchCool=1")!=NULL){
+        ctr_Cool_Fan(ON);
+        LOG_I("散热风机已打开!");
+    }
+    //关闭散热
+    else if(strstr(rx_buffer,"putTest.switchCool=0")!=NULL){
+        ctr_Cool_Fan(OFF);
+        LOG_I("散热风机已关闭!");
+    }
+    //步进上行开始
+    else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
+        ctr_Motor_Driver(1, 0,500000,200);
+        LOG_I("开始步进上行!");
+    }
+    //步进上行停止
+    else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
+        ctr_Motor_Driver(0, 0,0,0);
+        LOG_I("停止步进上行!");
+    }
+    //步进下行
+    else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
+        ctr_Motor_Driver(1, 1,500000,200);
+        rt_kprintf("开始步进下行!\n");
+    }
+    //步进下行停止
+    else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
+        ctr_Motor_Driver(0, 0,0,0);
+        rt_kprintf("停止步进下行!\n");
+    }
+    //开始对焦拍照
+    else if(strstr(rx_buffer,"putTest.switchAutopic=1")!=NULL){
+        device_status.autotakepic=1;
+        rt_kprintf("开始对焦拍照!\n");
+    }
+    //停止对焦拍照
+    else if(strstr(rx_buffer,"putTest.switchAutopic=0")!=NULL){
+        device_status.autotakepic=0;
+    }
+    //粘附测试-开
+    else if(strstr(rx_buffer,"putTest.switchFsl=1")!=NULL){
+        rt_kprintf("粘附测试开!\n");
+        device_status.fsl_sw = 1;
+    }
+    //粘附测试-关
+    else if(strstr(rx_buffer,"putTest.switchFsl=0")!=NULL){
+        rt_kprintf("粘附测试关!\n");
+        pwm_off(2, 0);
+        pwm_off(3,0);
+    }
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
@@ -367,7 +528,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         else{
             ctr_shake(ON,device_status.shake_sec);
         }
-
     }
     //打开补光
     else if (strstr(rx_buffer,"putTest.switchFill=1")!=NULL) {
@@ -440,9 +600,33 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
+        if(device_status.dtype==7)
+        {
+            var = strstr(rx_buffer,"=");
+            var ++;
+            device_status.collecting_sh1 = *((int *)var);  //采集1开始
+            ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+            var+=4;
+            device_status.collecting_eh1 = *((int *)var);  //采集1结束
+            ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+            var+=4;
+            device_status.collecting_sh2 = *((int *)var);  //采集2开始
+            ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+            var+=4;
+            device_status.collecting_eh2 = *((int *)var);  //采集2结束
+            ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+            var+=4;
+            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));
+            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);
+        }
         char value_str[10];
         memset(value_str,0,sizeof(value_str));
-        rt_kprintf("时间设置!\n");
+        LOG_I("时间设置!");
         var=strstr(rx_buffer,"=");
         var++;
         strncpy(value_str,var,2);
@@ -650,6 +834,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //切换大数据平台
     else if (strstr(rx_buffer,"8.136.98.49")!=NULL)
     {
+        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
         rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
         ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
         //给RTU发送切换指令
@@ -671,6 +856,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     else if (strstr(rx_buffer,"120.27.222.26")!=NULL)
     {
+        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
         rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
         ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
         //给RTU发送切换指令
@@ -735,9 +921,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     {
         if(device_status.version_type != 1)
         {
+            device_status.dtype = 3;
             device_status.version_type = 1;
             sprintf(device_status.driver, "%s",VERSION_ZP);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
         else {
@@ -747,11 +935,13 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //高空
     else if (strstr(rx_buffer,"SwversionV11")!=NULL)
     {
+        device_status.dtype = 3;
         if(device_status.version_type != 11)
         {
             device_status.version_type = 11;
             sprintf(device_status.driver, "%s",VERSION_ZP);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
         else {
@@ -760,11 +950,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //4.0
     else if (strstr(rx_buffer,"SwversionV41")!=NULL) {
+        device_status.dtype = 3;
         if(device_status.version_type != 41)
         {
+            device_status.dtype = 3;
             device_status.version_type = 41;
             sprintf(device_status.driver, "%s",VERSION_HK);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
         else {
@@ -773,11 +966,13 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //水稻
     else if (strstr(rx_buffer,"SwversionV4")!=NULL) {
+        device_status.dtype = 3;
         if(device_status.version_type != 4)
         {
             device_status.version_type = 4;
             sprintf(device_status.driver, "%s",VERSION_HK_2000W);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
         else {
@@ -786,21 +981,25 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //5.0测报灯
     else if (strstr(rx_buffer,"SwversionV5")!=NULL) {
+        device_status.dtype = 3;
         if(device_status.version_type!=5)
         {
             device_status.version_type = 5;
             sprintf(device_status.driver, "%s",VERSION_V5);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
     }
     //吸虫塔
     else if (strstr(rx_buffer,"SwversionV6")!=NULL) {
+        device_status.dtype = 3;
         if(device_status.version_type != 6)
         {
             device_status.version_type = 6;
             sprintf(device_status.driver, "%s",VERSION_XCT);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
             MA_save();
         }
     }
@@ -816,8 +1015,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     else if((strstr(rx_buffer,"SwversionV7")!=NULL)) {
         if(device_status.dtype!=7)
         {
+            LOG_D("设置版本类型:7");
             device_status.dtype = 7;
-            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
+            device_status.version_type = 7;
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //设备类型
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
             MA_save();
         }
     }
@@ -882,12 +1084,12 @@ static void Ctr_Mortor_entry(void* parameter)
 {
    //rt_uint32_t limit_current = 3000;     //推杆电击限制电流1A
    rt_uint32_t rtc_err_cnt = 0;
-   static rt_uint16_t power_current = 0;
-   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;  //
-   static rt_uint16_t num_down_close = 200;  //
-   static rt_uint16_t photo_led_sec = 450;  //45S
+   //rt_uint16_t power_current = 0;
+   rt_uint16_t num_up_open = 200;    //20s
+   rt_uint16_t num_up_close = 200;   //
+   rt_uint16_t num_down_open = 200;  //
+   rt_uint16_t num_down_close = 200;  //
+   rt_uint16_t photo_led_sec = 450;  //45S
 
     while(1)
     {
@@ -951,10 +1153,10 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         if (device_status.ctr_down_motor == 1)
         {
-            if(num_down_open==200)
-            {
-                power_current = atoi(device_status.power);
-            }
+//            if(num_down_open==200)
+//            {
+//                power_current = atoi(device_status.power);
+//            }
             ctr_cangmen_down(OPEN);
             num_down_open--;
 //            if(atoi(device_status.power)>limit_current)
@@ -976,10 +1178,10 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         else if (device_status.ctr_down_motor == 2)
         {
-            if(num_down_close==200)
-            {
-                power_current = atoi(device_status.power);
-            }
+//            if(num_down_close==200)
+//            {
+//                power_current = atoi(device_status.power);
+//            }
             ctr_cangmen_down(CLOSE);
             num_down_close--;
             //2022-03-14-add:&&atoi(device_status.power)<8000
@@ -1184,7 +1386,7 @@ void Check_ParamConfig(void)
         ef_get_env_blob("json_w_platform",&device_status.json_w_platform,sizeof(device_status.json_w_platform),NULL);//平台
         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);                    //BL版本号 进BL的时候存储到FLASH
+        ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL);                    //平台地址
         device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
         device_status.work_done = 0;
         //工作完成标志位
@@ -1231,6 +1433,9 @@ void Check_ParamConfig(void)
             rt_pin_write(HK_5000W_P,ON);
             rt_sprintf(device_status.driver, "%s",VERSION_XCT);
         }
+        else if (device_status.version_type==7) {
+            rt_sprintf(device_status.driver, "%s",VERSION_BZY);
+        }
         else if (device_status.version_type==30) {
             rt_sprintf(device_status.driver, "%s",VERSION_Robot);
         }
@@ -1279,8 +1484,11 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         ctr_router(ON);
         Hmi_Fresh();
-        Control_clear();
-        Control_heat();
+        if(device_status.dtype!=7)
+        {
+            Control_clear();
+            Control_heat();
+        }
         dtu_data_play();
         sht30_collect();
 #if SENSOR_EN==1
@@ -1301,7 +1509,7 @@ void Check_ParamConfig(void)
             if(connect_num==180)
             {
                 device_status.timeSwitch = 0;
-                LOG_I("Time not set:%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);
+                LOG_W("Time not set:%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);
                 set_date(2020, 1, 1);
                 set_time(0, 0, 0);
                 break;

+ 12 - 15
Application_CBD/applications/main.c

@@ -11,7 +11,6 @@
 #include <rtthread.h>
 #include <board.h>
 #include <rtdevice.h>
-#include <rtdbg.h>
 #include "beep.h"
 #include "hmi.h"
 #include <control.h>
@@ -19,9 +18,13 @@
 #include "sht30_collect.h"
 #include "sound.h"
 #include <ledblink.h>
-#define LOG_TAG              "main"
-#define LOG_LVL              LOG_LVL_DBG
-#include <ulog.h>
+
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "main"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
 
 #define WDT_DEVICE_NAME    "wdt"    /* 看门狗设备名称 */
 /********************************************************************/
@@ -40,21 +43,13 @@ static void idle_hook(void);
 int main(void)
 {
     CompileTime;      //读取固件的编译时间
-    //ulog初始化
-    if(ulog_init()==0)
-    {
-        LOG_I("ulog init Success!");
-    }
-    else {
-        LOG_E("ulog init Failed!");
-    }
     /* 初始化设备 */
     rt_device_init(wdg_dev);
     led_add_device(LED0_PIN);
     led_set_level(1,0);
-    LOG_I("System Clock information:");
-    LOG_W("SYSCLK_Frequency = %d", HAL_RCC_GetSysClockFreq());
-    LOG_E("HCLK_Frequency   = %d", HAL_RCC_GetHCLKFreq());
+    LOG_W("System Clock information:");
+    LOG_I("SYSCLK_Frequency = %d", HAL_RCC_GetSysClockFreq());
+    LOG_I("HCLK_Frequency   = %d", HAL_RCC_GetHCLKFreq());
     LOG_I("PCLK1_Frequency  = %d", HAL_RCC_GetPCLK1Freq());
     LOG_I("PCLK2_Frequency  = %d", HAL_RCC_GetPCLK2Freq());
     Beep_Tip(100);
@@ -118,7 +113,9 @@ static void idle_hook(void)
     alarm_new =*localtime(&now);
     if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
     {
+        #if ROBOT_EN == 0
         rt_hw_cpu_reset();
+        #endif
     }
     #endif
 //    else {

+ 31 - 21
Application_CBD/applications/sht30_collect.c

@@ -15,6 +15,12 @@
 #include <stdio.h>
 #include "control.h"
 #include "math.h"
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "control"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
 //温湿度
 #define THREAD_PRIORITY         21      //线程优先级
 #define THREAD_STACK_SIZE       512    //栈大小
@@ -34,9 +40,8 @@
 #define ADC_DEV_CHANNLE_6 16    /*内部温度传感器*/
 #define REFER_VOLTAGE       330         /* 参考电压 3.3V,数据精度乘以100保留2位小数*/
 #define CONVERT_BITS        (1<<12)     /* 转换位数为12位 */
-static char send_buf[64];
 
-//#define serial_printf(x,...) {sprintf(send_buf,x,##__VA_ARGS__);rt_kprintf(send_buf);}
+
 Device_Status_typedef device_status;
 
 
@@ -110,10 +115,6 @@ static void sht30_collect_thread_entry(void *parameter)
             sht3x_device = sht3x_init("i2c1", 0x44);
             rt_thread_mdelay(150);
         }
-        //rt_kprintf("the voltage is:%d.%02d\n",Read_Real_Voltage()/100,Read_Real_Voltage()%100);
-        //sprintf(send_buf,"%.2f",(Read_Real_Current()/100.0*2.5)-20.0);
-        //device_status.power = send_buf;
-        //rt_kprintf(send_buf);
         if(Read_Light_Voltage()>500)
         {
             checklightnum++;
@@ -146,36 +147,39 @@ static void sht30_collect_thread_entry(void *parameter)
 }
 static void Power_ReadCheck(void *parameter)
 {
-    static char voltage_tmp[10];
-    static int rain_cnt = 0;
-    static int RV;
+    int rain_cnt = 0;
+    int RV;
     while(1)
     {
-        sprintf(send_buf,"%.2f",Read_Real_Current()/100.0*2.5);
-        device_status.power = send_buf;
+        #if ROBOT_EN == 0
+        sprintf(device_status.power,"%.2f",Read_Real_Current()/100.0*2.5);
+        #endif
         if (Read_Real_Voltage()/100<12) {
                     //关闭外设
-                    ctr_cangmen_down(OFF);
-                    ctr_cangmen_up(OFF);
-                    ctr_Heat(OFF);
-                    ctr_lamp(OFF,1);
+                    ctr_photo(OFF); //关闭相机供电
+                    ctr_lamp(OFF,1);//关闭镇流器
+                    ctr_Heat(OFF);  //关闭加热
+                    ctr_led(OFF);   //关闭补光灯
                     ctr_lamp(OFF,2);
                     ctr_lamp(OFF,3);
-                    ctr_led(OFF);
-                    ctr_router(OFF);
+                    ctr_cangmen_down(OFF);  //关闭下仓门输出
+                    ctr_cangmen_up(OFF);    //关闭上仓门输出
                 }
         if(Read_Real_Voltage()/100<21)
         {
+            #if ROBOT_EN == 1
+            ctr_led(OFF);
+            #endif
             device_status.bat_status = 1; //欠压
         }
         else {
             device_status.bat_status = 0; //解除欠压
             ctr_router(ON);               //打开路由器供电
             ctr_photo(ON);                //打开相机供电
+        #if ROBOT_EN == 1
+            ctr_led(ON);
+        #endif
         }
-        sprintf(voltage_tmp,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
-        device_status.voltage = voltage_tmp;
-        sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
         RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
         if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
         {
@@ -188,6 +192,10 @@ static void Power_ReadCheck(void *parameter)
                 device_status.heattem = 25;
             }
         }
+        #if ROBOT_EN == 0
+        rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
+        //LOG_D("voltage is:%sV",device_status.voltage);
+        sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
         if(Read_Rain_Voltage()>100)
         {
             device_status.rain_status = 1;
@@ -206,7 +214,8 @@ static void Power_ReadCheck(void *parameter)
                 device_status.rain_status = 0;
             }
         }
-        rt_thread_mdelay(10);
+       #endif
+        rt_thread_mdelay(1);
     }
 }
 /*读取电流值*/
@@ -413,6 +422,7 @@ int Read_Ntc_Voltage(void)
     }
     rt_adc_enable(adc_dev, ADC_DEV_CHANNLE_4);
     adc12_ntc = filter_Mid(rt_adc_read(adc_dev,ADC_DEV_CHANNLE_4));
+    //LOG_D("Read_Ntc_Voltage:%d",adc12_ntc);
     rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_4);
     HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);
     return adc12_ntc;

+ 7 - 0
Application_CBD/rt-thread/include/rtdbg.h

@@ -31,6 +31,8 @@
 #define RT_DBG_H__
 
 #include <rtconfig.h>
+#include <time.h>
+
 
 /* the debug log will force enable when RT_DEBUG macro is defined */
 #if defined(RT_DEBUG) && !defined(DBG_ENABLE)
@@ -127,11 +129,16 @@
         rt_kprintf(DBG_SECTION_NAME " Here %s:%d\n",        \
             __FUNCTION__, __LINE__);                        \
     }
+time_t timep;
+struct tm *p;
 
 #define dbg_log_line(lvl, color_n, fmt, ...)                \
     do                                                      \
     {                                                       \
+        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(fmt, ##__VA_ARGS__);                     \
         _DBG_LOG_X_END;                                     \
     }                                                       \

+ 3 - 1
Application_CBD/rt-thread/src/kservice.c

@@ -22,6 +22,7 @@
 #include <rtthread.h>
 #include <rthw.h>
 #include "string.h"
+#include "time.h"
 #ifdef RT_USING_MODULE
 #include <dlmodule.h>
 #endif
@@ -1199,13 +1200,14 @@ void rt_kprintf(const char *fmt, ...)
 #ifdef RT_USING_DEVICE
     if (_console_device == RT_NULL)
     {
-        rt_hw_console_output(rt_log_buf);
 
+        rt_hw_console_output(rt_log_buf);
     }
     else
     {
         rt_uint16_t old_flag = _console_device->open_flag;
         _console_device->open_flag |= RT_DEVICE_FLAG_STREAM;
+
         rt_device_write(_console_device, 0, rt_log_buf, length);
         _console_device->open_flag = old_flag;
     }

+ 6 - 7
Application_CBD/rt-thread/src/mem.c

@@ -668,7 +668,6 @@ int memtrace(int argc, char **argv)
     struct heap_mem *mem;
 
     list_mem();
-
     rt_kprintf("\nmemory heap address:\n");
     rt_kprintf("heap_ptr: 0x%08x\n", heap_ptr);
     rt_kprintf("lfree   : 0x%08x\n", lfree);
@@ -680,17 +679,17 @@ int memtrace(int argc, char **argv)
         int position = (rt_ubase_t)mem - (rt_ubase_t)heap_ptr;
         int size;
 
-        rt_kprintf("[0x%08x - ", mem);
-
         size = mem->next - position - SIZEOF_STRUCT_MEM;
+        //rt_kprintf("[0x%08x - ", mem);
+
         if (size < 1024)
-            rt_kprintf("%5d", size);
+            rt_kprintf("[0x%08x - %5d] %c%c%c%c",mem,size,mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]);
         else if (size < 1024 * 1024)
-            rt_kprintf("%4dK", size / 1024);
+            rt_kprintf("[0x%08x - %4dK] %c%c%c%c",mem,size / 1024,mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]);
         else
-            rt_kprintf("%4dM", size / (1024 * 1024));
+            rt_kprintf("[0x%08x - %4dM] %c%c%c%c",mem,size / (1024 * 1024),mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]);
 
-        rt_kprintf("] %c%c%c%c", mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3]);
+        //rt_kprintf("] %c%c%c%c", mem->thread[0], mem->thread[1], mem->thread[2], mem->thread[3],);
         if (mem->magic != HEAP_MAGIC)
             rt_kprintf(": ***\n");
         else

BIN
Application_CBD/rt-thread/tools/building.pyc


BIN
Application_CBD/rt-thread/tools/eclipse.pyc


BIN
Application_CBD/rt-thread/tools/menuconfig.pyc


BIN
Application_CBD/rt-thread/tools/mkdist.pyc


BIN
Application_CBD/rt-thread/tools/utils.pyc


+ 1 - 24
Application_CBD/rtconfig.h

@@ -54,7 +54,7 @@
 
 #define RT_USING_COMPONENTS_INIT
 #define RT_USING_USER_MAIN
-#define RT_MAIN_THREAD_STACK_SIZE 1024
+#define RT_MAIN_THREAD_STACK_SIZE 1440
 #define RT_MAIN_THREAD_PRIORITY 10
 
 /* C++ features */
@@ -137,29 +137,6 @@
 /* Utilities */
 
 #define RT_USING_RYM
-#define RT_USING_ULOG
-#define ULOG_OUTPUT_LVL_DEBUG
-#define ULOG_OUTPUT_LVL 7
-#define ULOG_USING_ISR_LOG
-#define ULOG_ASSERT_ENABLE
-#define ULOG_LINE_BUF_SIZE 128
-#define ULOG_USING_ASYNC_OUTPUT
-#define ULOG_ASYNC_OUTPUT_BUF_SIZE 2048
-#define ULOG_ASYNC_OUTPUT_BY_THREAD
-#define ULOG_ASYNC_OUTPUT_THREAD_STACK 512
-#define ULOG_ASYNC_OUTPUT_THREAD_PRIORITY 29
-
-/* log format */
-
-#define ULOG_OUTPUT_FLOAT
-#define ULOG_OUTPUT_TIME
-#define ULOG_OUTPUT_LEVEL
-#define ULOG_OUTPUT_TAG
-#define ULOG_OUTPUT_THREAD_NAME
-/* end of log format */
-#define ULOG_BACKEND_USING_CONSOLE
-#define ULOG_USING_FILTER
-#define ULOG_USING_SYSLOG
 /* end of Utilities */
 /* end of RT-Thread Components */
 

BIN
Application_CBD/rtconfig.pyc


+ 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="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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>