yf_zjb 3 лет назад
Родитель
Сommit
f8c572602e

+ 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>

+ 13 - 8
Application_CBD/.config

@@ -16,7 +16,7 @@ CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_USING_IDLE_HOOK=y
 CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
-CONFIG_IDLE_THREAD_STACK_SIZE=512
+CONFIG_IDLE_THREAD_STACK_SIZE=1024
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=256
@@ -52,7 +52,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
-CONFIG_RT_CONSOLEBUF_SIZE=512
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # end of Kernel Device Object
 
@@ -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=1440
+CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
 CONFIG_RT_MAIN_THREAD_PRIORITY=10
 
 #
@@ -341,6 +341,7 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="latest"
 # CONFIG_PKG_USING_AGILE_FTP is not set
 # CONFIG_PKG_USING_EMBEDDEDPROTO is not set
 # CONFIG_PKG_USING_RT_LINK_HW is not set
+# CONFIG_PKG_USING_RYANMQTT is not set
 # CONFIG_PKG_USING_LORA_PKT_FWD is not set
 # CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
 # CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
@@ -633,7 +634,6 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # sensors drivers
 #
-# CONFIG_PKG_USING_FINGERPRINT is not set
 # CONFIG_PKG_USING_LSM6DSM is not set
 # CONFIG_PKG_USING_LSM6DSL is not set
 # CONFIG_PKG_USING_LPS22HB is not set
@@ -697,6 +697,10 @@ CONFIG_PKG_SHT3X_VER="latest"
 # CONFIG_PKG_USING_AD7746 is not set
 # CONFIG_PKG_USING_ADT74XX is not set
 # CONFIG_PKG_USING_MAX17048 is not set
+# CONFIG_PKG_USING_AS7341 is not set
+# CONFIG_PKG_USING_CW2015 is not set
+# CONFIG_PKG_USING_ICM20608 is not set
+# CONFIG_PKG_USING_PAJ7620 is not set
 # end of sensors drivers
 
 #
@@ -713,10 +717,8 @@ CONFIG_PKG_SHT3X_VER="latest"
 # end of touch drivers
 
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
-# CONFIG_PKG_USING_AS7341 is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
 # CONFIG_PKG_USING_ESP_IDF is not set
-# CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_BUTTON is not set
 # CONFIG_PKG_USING_PCF8574 is not set
 # CONFIG_PKG_USING_SX12XX is not set
@@ -762,7 +764,6 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_CAN_YMODEM is not set
 # CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set
 # CONFIG_PKG_USING_QLED is not set
-# CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_AGILE_CONSOLE is not set
 # CONFIG_PKG_USING_LD3320 is not set
 # CONFIG_PKG_USING_WK2124 is not set
@@ -793,11 +794,11 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BL_MCU_SDK is not set
 # CONFIG_PKG_USING_SOFT_SERIAL is not set
 # CONFIG_PKG_USING_MB85RS16 is not set
-# CONFIG_PKG_USING_CW2015 is not set
 # CONFIG_PKG_USING_RFM300 is not set
 # CONFIG_PKG_USING_IO_INPUT_FILTER is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_LRF_NV7LIDAR is not set
+# CONFIG_PKG_USING_FINGERPRINT is not set
 # end of peripheral libraries and drivers
 
 #
@@ -885,6 +886,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SLCAN2RTT is not set
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
+# CONFIG_PKG_USING_CorevMCU_CLI is not set
 # end of miscellaneous packages
 
 #
@@ -907,10 +909,13 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_ARDUINO_CAPACITIVESENSOR is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ADXL375 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_VL53L0X is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_VL53L1X is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SENSOR is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_VL6180X is not set
 # CONFIG_PKG_USING_ADAFRUIT_MAX31855 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MAX31865 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MAX31856 is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MAX6675 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MLX90614 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_LSM9DS1 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_AHTX0 is not set

+ 1 - 1
Application_CBD/.config.old

@@ -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
 
 #

Разница между файлами не показана из-за своего большого размера
+ 229 - 229
Application_CBD/.cproject


BIN
Application_CBD/.settings/.rtmenus


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

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1349501965847690381" 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="1349771054540304169" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
Application_CBD/applications/beep.c

@@ -136,7 +136,7 @@ void Motor_shake(uint8_t status_shake,uint16_t shake_sec)
     if(status_shake==ON&&device_status.shake_ws==1)
     {
         rt_pwm_enable(pwm_device, PB1_TIM3_CH);
-        rt_thread_delay(shake_sec*1000);
+        rt_thread_delay(shake_sec*50);
         rt_pwm_disable(pwm_device, PB1_TIM3_CH);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }

+ 93 - 39
Application_CBD/applications/control.c

@@ -183,18 +183,26 @@ uint8_t ctr_Motor_xifu(uint8_t status_ws)
     return 0;
 }
 //清扫-卷带电机
-void ctr_JD_Clear()
+void ctr_JD_Clear(uint8_t shake_sw)
 {
     rt_uint16_t turn_timeout = 0;
     rt_pin_mode(MOTOR_C_LIMIT,PIN_MODE_INPUT);
+
     while(rt_pin_read(MOTOR_C_LIMIT)==0)
        {
 
            rt_thread_delay(20);
            while(rt_pin_read(MOTOR_C_LIMIT)==0)
            {
+
                Motor_Juandai(ON);
-               rt_thread_delay(50);
+               if(shake_sw==ON)
+               {
+                   Motor_shake(ON, 1);
+               }
+               else {
+                   rt_thread_delay(50);
+               }
                turn_timeout++;
                if(turn_timeout==1000) break;
            }
@@ -205,7 +213,13 @@ void ctr_JD_Clear()
            rt_thread_delay(20);
            while(rt_pin_read(MOTOR_C_LIMIT)==1)
            {
-               rt_thread_delay(50);
+               if(shake_sw==ON)
+               {
+                   Motor_shake(ON, 1);
+               }
+               else {
+                   rt_thread_delay(50);
+               }
                Motor_Juandai(ON);
                turn_timeout++;
                if(turn_timeout==1000) break;
@@ -215,7 +229,13 @@ void ctr_JD_Clear()
        while(rt_pin_read(MOTOR_C_LIMIT)==0)
        {
 
-           rt_thread_delay(20);
+           if(shake_sw==ON)
+           {
+               Motor_shake(ON, 1);
+           }
+           else {
+               rt_thread_delay(20);
+           }
            if(rt_pin_read(MOTOR_C_LIMIT)==0)
            {
                Motor_Juandai(OFF);
@@ -225,6 +245,7 @@ void ctr_JD_Clear()
                break;
            }
        }
+    rt_pin_write(SHAKE_SW, OFF);
     Motor_Juandai(OFF);
 }
 //工作任务流程
@@ -245,18 +266,18 @@ void WorkTask_XCT(void)
             rt_kprintf("收集中,等待开始拍照:%d\n",photo_fre);
         }
         //卷带
-        ctr_JD_Clear();
+        ctr_JD_Clear(OFF);
         //拍照
         HK_TakePhoto();
         //关闭吸附风机
-        ctr_Motor_xichong(ON);
-        ctr_Motor_xifu(ON);
+        ctr_Motor_xichong(OFF);
+        ctr_Motor_xifu(OFF);
         //关闭相机供电
         ctr_Heat(OFF);
         //卷带
-        ctr_JD_Clear();
+        ctr_JD_Clear(ON);
         //震动
-        Motor_shake(ON, device_status.shake_sec);
+        Motor_shake(ON, device_status.shake_sec*20);
     }
     //关闭风机
     ctr_Motor_xichong(OFF);
@@ -371,8 +392,14 @@ void ctr_develop(void)
     //已经培养的时间-分钟
     device_status.stay_time = 0;
     rt_uint32_t ii = 0;
+
     while(device_status.develop_flag==1)
     {
+        float stayedtime = 0.01;
+        char stayed[5];
+        stayedtime = (float)device_status.stay_time / 60.0;
+        sprintf(stayed,"%0.02f",stayedtime);
+        HMI_WRITE("workSta.staytime.txt=\"%s\"",stayed);
         ii++;
         LOG_I("developing...................................%d\n",ii);
         LOG_I("============================设定的培养温度:%d\n",device_status.heatvalue);
@@ -409,11 +436,6 @@ void ctr_develop(void)
             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);
     }
@@ -1603,8 +1625,10 @@ void WorkTask_BZY(void)
         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)
         {
+            if(device_status.run_sta!=0) break;
             time_t now;
             time(&now);
             cul_sh1_stamp = *localtime(&now);
@@ -1616,8 +1640,10 @@ void WorkTask_BZY(void)
             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)
+        //当前时间戳小于第二段开始 时间戳
+        while(difftime(mktime(&now_stamp), mktime(&cul_sh2_stamp)) < 0)
         {
+            if(device_status.run_sta!=0) break;
             time_t now;
             time(&now);
             cul_sh2_stamp = *localtime(&now);
@@ -1629,18 +1655,22 @@ void WorkTask_BZY(void)
             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))
+        //如果当前 时间戳大于开始时间戳并且小于 结束时间戳
+        if(difftime(mktime(&now_stamp), mktime(&cul_sh1_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==0)
-            ctr_turn(90,4);
-            rt_thread_delay(2000);
-            //涂凡士林
-            ctr_Petroleum_jelly(10);
-            rt_thread_delay(5000);
+            {
+                LOG_I("start to collect!!!");
+                DTU_Write("collect.mp3");
+                ctr_turn(90,4);
+                rt_thread_delay(2000);
+                //涂凡士林
+                ctr_Petroleum_jelly(10);
+                rt_thread_delay(5000);
+            }
+
             /*转盘到采集位置*/
             if(device_status.run_sta==4)
             ctr_turn(90,1);
@@ -1648,57 +1678,81 @@ void WorkTask_BZY(void)
             //只有开始和结束时刻不同的时间段,才有效
             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))
+                rt_int32_t collect_cnt = 0;
+
+                if((difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp)) > 0)&& difftime(mktime(&now_stamp),mktime(&cul_sh1_stamp)) > 0)
                 {
+                    device_status.work_status = 1;
+                    ctr_Collect_Fan(ON);
                     collect_cnt = difftime(mktime(&cul_eh1_stamp), mktime(&now_stamp));
                     while(1)
                     {
-                        if(collect_cnt<=0) break;
+                        if(collect_cnt<0) break;
+                        if(device_status.run_sta!=1) break;
                         collect_cnt = collect_cnt - 10;
-                        LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
+                        LOG_I("1===========采集风机启动,正在收集.....%d",collect_cnt);
                         rt_thread_mdelay(10000);
                     }
+                    now_stamp = *localtime(&now);
                     collect_cnt = 2;
                 }
-                if(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0)
+                else {
+                    device_status.work_status=0;
+                    ctr_Collect_Fan(OFF);
+                    LOG_I("未到收集1时间!");
+                }
+                if(difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp)) > 0 && difftime(mktime(&now_stamp),mktime(&cul_sh2_stamp)) > 0)
                 {
+                    device_status.work_status = 1;
+                    ctr_Collect_Fan(ON);
                     collect_cnt = difftime(mktime(&cul_eh2_stamp), mktime(&now_stamp));
                     while(1)
                     {
-                        if(collect_cnt<=0) break;
+                        if(collect_cnt<0) break;
+                        if(device_status.run_sta!=1) break;
                         collect_cnt = collect_cnt - 10;
-                        LOG_I("===========采集风机启动,正在收集.....%d",collect_cnt);
+                        LOG_I("2===========采集风机启动,正在收集.....%d",collect_cnt);
                         rt_thread_mdelay(10000);
                     }
+                    now_stamp = *localtime(&now);
+                }
+                else {
+                    device_status.work_status=0;
+                    ctr_Collect_Fan(OFF);
+                    LOG_I("未到收集2时间!");
                 }
-                ctr_Collect_Fan(OFF);
             }
             else
             {
                 LOG_I("this collect time is 0s,The wait time cannot be negative!");
             }
         }
-        else
+        if(device_status.run_sta==2)
+        {
+            device_status.develop_flag = 1;
+            device_status.work_status = 2;
+            ctr_develop();                  //培养
+        }
+        if(device_status.run_sta==3)
         {
-            LOG_I("next collect time is not arrivd!!! >>> .. start now time:%d",mktime(&now_stamp));
+            device_status.work_status = 3;
+            device_status.autotakepic=1;    //对焦拍照
         }
-        if(device_status.work_status==1)
+        //当前时间戳大于收集结束时间戳并且run_sta==1
+        if(device_status.run_sta==1 && difftime(mktime(&now_stamp), mktime(&cul_eh2_stamp)) > 0)
         {
             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==1)
-            ctr_turn(90,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==2)
-            ctr_turn(90,3);   /*转盘到拍照位置*/
+            ctr_turn(90,3);                 /*转盘到拍照位置*/
             rt_thread_delay(1000);
             device_status.work_status=3;    //现在是拍照
             device_status.autotakepic=1;    //对焦拍照
@@ -1713,7 +1767,7 @@ void WorkTask_BZY(void)
          }
         rt_thread_delay(1000);
     }
-    device_status.work_status = 0;  //待机
+    device_status.work_status = 0;          //待机
     LOG_W("==================!!!设备已待机!!!===================");
 }
 //工作任务流程s

+ 2 - 1
Application_CBD/applications/control.h

@@ -212,7 +212,8 @@ typedef struct  _packed
 #define MOTOR_CL_PIN GET_PIN(C,8)
 
 #define MOTOR_C_LIMIT GET_PIN(C,13)       //卷带限位
-void ctr_JD_Clear(void);
+
+void ctr_JD_Clear(uint8_t shake_sw);
 uint8_t ctr_Motor_xichong(uint8_t status_ws);
 uint8_t ctr_Motor_xifu(uint8_t status_ws);
 /*****************************孢子仪**********************************/

+ 22 - 5
Application_CBD/applications/dtu_uart2.c

@@ -63,7 +63,7 @@ static int DTU_uart2_init(void)
         dtuconfig.baud_rate = BAUD_RATE_115200;  //修改波特率9600
         dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
         dtuconfig.stop_bits = STOP_BITS_1;     //停止位1
-        dtuconfig.bufsz = 512;                 //缓冲区1k
+        dtuconfig.bufsz = 1024;                 //缓冲区1k
         dtuconfig.parity = PARITY_NONE;        //奇校验
         /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
         rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
@@ -210,11 +210,28 @@ static void dtu_thread_entry_send(void *parameter)
                     {
                         HMI_WRITE("sleep=%d",1);
                     }
-                    if(Read_Real_Voltage()/100<12&&device_status.power_status==1)
+                    //检测到电源掉电
+                    if(Read_Real_Voltage()/100<2&&device_status.power_status==1)
                     {
-                        DTU_Write("%s",makeJson_Warn("power down","power"));
-                        device_status.power_status = 0;
-                        rt_thread_delay(1500);
+                        //确定网络状态
+                        if(device_status.net==0)
+                        {
+                            DTU_Write("%s",makeJson_Warn("power down","power"));
+                            device_status.power_status = 0;
+                            rt_thread_delay(1500);
+                        }
+                        if(0)
+                        {
+                            //关闭路由器供电
+                            ctr_router(OFF);
+                            //关闭RTU供电
+                            ctr_DTU_Power(OFF);
+                        }
+                    }
+                    else {
+                        //打开路由器和RTU供电
+                        ctr_router(ON);
+                        ctr_DTU_Power(ON);
                     }
                 }
                 else {

+ 106 - 49
Application_CBD/applications/hmi.c

@@ -37,7 +37,7 @@
 #define HMI_THREAD_TIMESLICE        10           //时间片
 
 #define CONTROL_MOTOR_PRIORITY      18
-#define CONTROL_MOTOR_STACK_SIZE    512
+#define CONTROL_MOTOR_STACK_SIZE    1024
 #define CONTROL_MOTOR_TIMESLICE     5
 
 
@@ -324,15 +324,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("workSta.cul_time.val=%d",device_status.cul_time);
             HMI_WRITE("clockSet.stay.val=%d",device_status.cul_time);
             //已培养时间
-
+            if(device_status.develop_flag==0)
+            HMI_WRITE("workSta.staytime.txt=\"0\"");
             //滴液时间
             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);
+            HMI_WRITE("clockSet.start2.val=%d",device_status.collecting_sh2);
             //采集结束时间1
-            HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_sh2);
+            HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_eh1);
             //采集结束时间2
             HMI_WRITE("clockSet.end2.val=%d",device_status.collecting_eh2);
             //数据上传间隔
@@ -512,7 +513,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             turnzp();
         }
         else if (device_status.version_type==6) {
-            ctr_JD_Clear();
+            ctr_JD_Clear(ON);
         }
     }
     //震动
@@ -636,33 +637,76 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
+        char value_str[10];
+        memset(value_str,0,sizeof(value_str));
         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.cul_time = *((int *)var); //培养时间
-            ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
+            strncpy(value_str,var,2);
+            if(atoi(value_str)>=0&&atoi(value_str)<=23)
+            {
+                device_status.collecting_sh1 = atoi(value_str);
+                ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
+            }
+            else {
+                LOG_E("Set collecting_sh1 Failed!");
+            }
+            memset(value_str,0,sizeof(value_str));
+            strncpy(value_str,var+2,2);
+            if(atoi(value_str)>=0&&atoi(value_str)<=23)
+            {
+                device_status.collecting_eh1 = atoi(value_str);
+                ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
+            }
+            else {
+                LOG_E("Set collecting_eh1 Failed!");
+            }
+            memset(value_str,0,sizeof(value_str));
+            strncpy(value_str,var+4,2);
+            if(atoi(value_str)>=0&&atoi(value_str)<=23)
+            {
+                device_status.collecting_sh2 = atoi(value_str);
+                ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
+            }
+            else {
+                LOG_E("Set collecting_sh2 Failed!");
+            }
+            memset(value_str,0,sizeof(value_str));
+            strncpy(value_str,var+6,2);
+            if(atoi(value_str)>=0&&atoi(value_str)<=23)
+            {
+                device_status.collecting_eh2 = atoi(value_str);
+                ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
+            }
+            else {
+                LOG_E("Set collecting_eh2 Failed!");
+            }
+            memset(value_str,0,sizeof(value_str));
+            strncpy(value_str,var+8,2);
+            if(atoi(value_str)>=0&&atoi(value_str)<=23)
+            {
+                device_status.shake_sec = atoi(value_str);
+                ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
+            }
+            else {
+                LOG_E("Set shake_sec Failed!");
+            }
+            memset(value_str,0,sizeof(value_str));
+            strncpy(value_str,var+10,2);
+            if(atoi(value_str)>0&&atoi(value_str)<=24)
+            {
+                device_status.cul_time = atoi(value_str);
+                ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
+            }
+            else {
+                LOG_E("Set cul_time Failed!");
+            }
+
             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.cul_time);
             return;
         }
-        char value_str[10];
-        memset(value_str,0,sizeof(value_str));
         LOG_I("时间设置!");
         var=strstr(rx_buffer,"=");
         var++;
@@ -1328,7 +1372,7 @@ static void Ctr_Mortor_entry(void* parameter)
                     break;
                 }
                 photo_setup++;
-                rt_thread_mdelay(100);
+                rt_thread_mdelay(10);
                 LOG_I("对焦拍照:%d",photo_setup);
             }
             DTU_Write("takephotodone");
@@ -1758,33 +1802,46 @@ void Check_ParamConfig(void)
 }
 void ResetParamDefault(void)
 {
-    device_status.clt_time = 10;    //收集时间
-    device_status.dattim = 20;      //数据上传间隔
-    device_status.startBar = 20;    //定时开始时间
-    device_status.stopBar = 5;      //定时结束时间
-    device_status.heattime = 10;    //加热时间
-    device_status.shake_ws = 1;     //针对开关
-    device_status.shake_sec = 1;    //震动时间1-100ms
-    device_status.sunBar = 9;       //光控定时时长
-    device_status.tph = 70;         //高温保护阈值
-    device_status.tpl = 5;          //低温保护阈值
-    device_status.timeSwitch = 0;   //定时模式:光控
-    device_status.heatvalue=100;    //加热温度
     device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
+    device_status.collecting_sh1 = 8;
+    device_status.collecting_eh1 = 9;
+    device_status.collecting_sh1 = 14;
+    device_status.collecting_eh2 = 16;
+
+    if(device_status.dtype==3)
+    {
+        device_status.clt_time = 10;    //收集时间
+        device_status.dattim = 20;      //数据上传间隔
+        device_status.startBar = 20;    //定时开始时间
+        device_status.stopBar = 5;      //定时结束时间
+        device_status.heattime = 10;    //加热时间
+        device_status.shake_ws = 1;     //针对开关
+        device_status.shake_sec = 1;    //震动时间1-100ms
+        device_status.sunBar = 9;       //光控定时时长
+        device_status.tph = 70;         //高温保护阈值
+        device_status.tpl = -5;          //低温保护阈值
+        device_status.timeSwitch = 0;   //定时模式:光控
+        device_status.heatvalue=100;    //加热温度
+        ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
+        ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
+        ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
+        ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
+        ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
+        ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
+        ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
+        ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
+        ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
+        ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));       //震动开关
+        ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));    //震动时间
+    }
+    else if(device_status.dtype==7)
+    {
+        device_status.run_sta = 0;
+        ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
+    }
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
-    ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
-    ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
-    ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
-    ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
-    ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
-    ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
-    ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
-    ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
-    ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
-    ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws));       //震动开关
-    ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));    //震动时间
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
     HMI_WRITE("play %d,%d,%d",1,5,0);
@@ -1802,7 +1859,7 @@ void ResetParamDefault_DC(void)
     device_status.shake_sec = 1;    //震动时间1-100ms
     device_status.sunBar = 4;       //光控定时时长
     device_status.tph = 70;         //高温保护阈值
-    device_status.tpl = 5;          //低温保护阈值
+    device_status.tpl = -5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=100;
     device_status.ds = 1;           //设备状态开机

+ 1 - 1
Application_CBD/applications/sht30_collect.c

@@ -23,7 +23,7 @@
 
 //温湿度
 #define THREAD_PRIORITY         21      //线程优先级
-#define THREAD_STACK_SIZE       512    //栈大小
+#define THREAD_STACK_SIZE       1024    //栈大小
 #define THREAD_TIMESLICE        5       //时间片
 //电压,电流
 #define P_THREAD_PRIORITY       13      //线程优先级

+ 1 - 1
Application_CBD/drivers/board.h

@@ -426,7 +426,7 @@ extern "C" {
 #define STM32_FLASH_SIZE               (512)
 #define STM32_FLASH_END_ADDRESS        ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE * 1024))
 
-#define STM32_SRAM1_SIZE               (64)
+#define STM32_SRAM1_SIZE               (128)
 #define STM32_SRAM1_START              (0x20000000)
 #define STM32_SRAM1_END                (STM32_SRAM1_START + STM32_SRAM1_SIZE * 1024)
 

+ 1 - 1
Application_CBD/link.lds

@@ -6,7 +6,7 @@
 MEMORY
 {
 ROM (rx) : ORIGIN =0x8032000,LENGTH =512k
-RAM (rw) : ORIGIN =0x20000000,LENGTH =64k
+RAM (rw) : ORIGIN =0x20000000,LENGTH =128k
 }
 ENTRY(Reset_Handler)
 _system_stack_size = 0x200;

+ 1 - 1
Application_CBD/packages/EasyFlash-latest/src/ef_fal_port.c

@@ -84,7 +84,7 @@ static const ef_env default_env_set[] = {
         {"collecting_sh1","0"},    //
         {"collecting_eh1","0"},    //
         {"collecting_sh2","0"},    //
-        {"collecting_eh2","0"},    //
+        {"collecting_eh2","0"}    //
 };
 static char log_buf[RT_CONSOLEBUF_SIZE];
 static struct rt_semaphore env_cache_lock;

+ 3 - 3
Application_CBD/rtconfig.h

@@ -14,7 +14,7 @@
 #define RT_USING_HOOK
 #define RT_USING_IDLE_HOOK
 #define RT_IDLE_HOOK_LIST_SIZE 4
-#define IDLE_THREAD_STACK_SIZE 512
+#define IDLE_THREAD_STACK_SIZE 1024
 #define RT_USING_TIMER_SOFT
 #define RT_TIMER_THREAD_PRIO 4
 #define RT_TIMER_THREAD_STACK_SIZE 256
@@ -40,7 +40,7 @@
 
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
-#define RT_CONSOLEBUF_SIZE 512
+#define RT_CONSOLEBUF_SIZE 1024
 #define RT_CONSOLE_DEVICE_NAME "uart1"
 /* end of Kernel Device Object */
 #define RT_VER_NUM 0x40002
@@ -54,7 +54,7 @@
 
 #define RT_USING_COMPONENTS_INIT
 #define RT_USING_USER_MAIN
-#define RT_MAIN_THREAD_STACK_SIZE 1440
+#define RT_MAIN_THREAD_STACK_SIZE 2048
 #define RT_MAIN_THREAD_PRIORITY 10
 
 /* C++ features */

+ 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>