zhunk hai 1 ano
pai
achega
ee0ec00220

+ 3 - 11
Application_cbd_apm32f1/applications/control.h

@@ -14,14 +14,10 @@
 #include "stdio.h"
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
-#define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
-#define ROBOT_EN         0              //机器人
-#define Color_EN         0              //定制色诱
-#define BZYV2_EN         0              //孢子仪2.0
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.3.0"                   //孢子仪
+#define VERSION_BZY         "2.3.1"                   //孢子仪
 
 
 /*********************************************************************/
@@ -103,10 +99,6 @@ typedef struct  _packed
     uint8_t led_sta;         //补光灯报警0-正常,1-异常
     uint8_t selfcheck_ws;    //自检开关1-北大荒,2-标配
     uint8_t step_focus;
-    #if BOOT_ERR == 1
-    uint8_t gps_inuse;
-    uint8_t gps_view;
-    #endif
     uint16_t dattim;         //数据上传间隔
     uint16_t shake_sec;      //震动时间
     uint16_t thsp;           //息屏时间
@@ -114,8 +106,8 @@ typedef struct  _packed
     rt_uint32_t num_updata;         //
     rt_uint32_t rebootcnt;          //启动次数
     rt_uint32_t light_over_tim;     //光控定时差秒数,镇流器的结束时间
-    rt_uint32_t x_init_dis;          //流量套餐
-    rt_uint32_t y_init_dis;        //到期时间
+    rt_uint32_t x_init_dis;         //
+    rt_uint32_t y_init_dis;         //
     double focus_value;
     int passWord;              //初始密码
     double process;

+ 9 - 1
Application_cbd_apm32f1/rt-thread/components/utilities/ymodem/ymodem.c

@@ -193,7 +193,7 @@ static rt_err_t _rym_do_handshake(
     rt_uint16_t recv_crc, cal_crc;
     rt_size_t data_sz;
     rt_tick_t tick;
-
+    rt_uint16_t update_timeout = 0;
     ctx->stage = RYM_STAGE_ESTABLISHING;
     /* send C every second, so the sender could know we are waiting for it. */
     for (i = 0; i < tm_sec; i++)
@@ -203,14 +203,22 @@ static rt_err_t _rym_do_handshake(
                               RYM_CHD_INTV_TICK);
         if (code == RYM_CODE_SOH)
         {
+            update_timeout = 0;
             data_sz = _RYM_SOH_PKG_SZ;
             break;
         }
         else if (code == RYM_CODE_STX)
         {
+            update_timeout = 0;
             data_sz = _RYM_STX_PKG_SZ;
             break;
         }
+        //超时重启
+        update_timeout++;
+        if(update_timeout==30)
+        {
+            rt_hw_cpu_reset();
+        }
     }
     if (i == tm_sec)
     {