zhunk пре 1 година
родитељ
комит
900fbd168f

+ 1 - 5
Application_cbd_apm32f1/applications/control.h

@@ -21,7 +21,7 @@
 #define BZYV2_EN         0              //孢子仪2.0
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.1.0"                   //孢子仪
+#define VERSION_BZY         "2.1.1"                   //孢子仪
 
 
 /*********************************************************************/
@@ -103,10 +103,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;           //息屏时间

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