App/public.h

@@ -7,7 +7,7 @@
 extern uint8_t g_bhavePrice;
 
 #define DEV_TYPE 0x0904
-#define APP_VERSION 0x0904312D
+#define APP_VERSION 0x0904302F
 
 
 #define BROADCAST_SN   0xFFFFFFFF // ¹ã²¥µØÖ·

App/xspDataOpt.c

@@ -680,7 +680,7 @@ void check_gun_status_to_save_record(void)
             else if((g_xspCollDa.gunDnTime >= g_xspCollDa.gunUpTime)){
                 if(g_xspCollDa.gunDnTime-g_xspCollDa.gunUpTime<1000) {
                     printf("干扰产生的抬枪信号\n");
-                    g_gunStatus[0].bsave = 0;
+                    //g_gunStatus[0].bsave = 0;
                     gunstatus = g_gunStatus[0].curst;
                     return;
                 }
@@ -821,7 +821,7 @@ void analysis_7seg_code(uint8_t _7egDa[])
                 eAmount = abs((int)temp.amount - (int)g_xspCollDa.curDisp.amount);
                 eOil = abs((int)temp.oil - (int)g_xspCollDa.curDisp.oil);
                 //printf("aaaaaa = %d, eamout = %d, eoil = %d\n",Get_SysTick()-g_xspCollDa.lastTick,eAmount,eOil);
-                if((eAmount < 100) && (eOil<50) && ((Get_SysTick()-g_xspCollDa.lastTick) < 500)){ //判断是额增长且时间差小于500ms
+                if((eAmount < AMOUNT_ERR) && (eOil<50) && ((Get_SysTick()-g_xspCollDa.lastTick) < 500)){ //判断是额增长且时间差小于500ms
                     g_xspCollDa.startToprog++;
                     g_xspCollDa.lastTick = Get_SysTick();
                 }
@@ -907,7 +907,7 @@ void analysis_7seg_code(uint8_t _7egDa[])
         else if (g_xspCollDa.curstatus == STATUS_STOP) { // 停止后，又开始变化的，要判断一下当前的数据是继续加油还是数据的查询
             eAmount = abs((int)temp.amount - (int)g_xspCollDa.lastDisp.amount);
             eOil = abs((int)temp.oil - (int)g_xspCollDa.lastDisp.oil);
-            if ((eAmount < 100) && (eOil < 50)) {
+            if ((eAmount < AMOUNT_ERR) && (eOil < 50)) {
                 printf("加油继续........(%010u) ", Get_SysTick());
                 printf("%d,%d,%d\n", temp.amount, temp.oil, temp.price);
 
@@ -931,7 +931,7 @@ void analysis_7seg_code(uint8_t _7egDa[])
                     eAmount = abs((int)temp.amount - (int)nostart.amount);
                     eOil = abs((int)temp.oil - (int)nostart.oil);
                     //printf("aaaaaa = %d, eamout = %d, eoil = %d\n",Get_SysTick()-g_xspCollDa.lastTick,eAmount,eOil);
-                    if((eAmount < 100) && (eOil<50) ){ //判断是额增长且时间差小于500ms
+                    if((eAmount < AMOUNT_ERR) && (eOil<50) ){ //判断是额增长且时间差小于500ms
                         g_xspCollDa.startToprog++;
                         g_xspCollDa.lastTick = Get_SysTick();
                     }

App/xspDataOpt.h

@@ -7,6 +7,9 @@
 
 #define XSP_SAVE_TIME  (1000*60*30)// 30·ÖÖÓ
 
+#define AMOUNT_ERR 300
+#define OILL_ERR   50
+
 enum {
     U1_ID = 0x00,
     U4_ID = 0x01,

Project/XspBoardPro.uvprojx

@@ -83,7 +83,7 @@
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>1</RunUserProg2>
             <UserProg1Name>fromelf --bin !L --output app.bin</UserProg1Name>
-            <UserProg2Name>wbjw_bin.exe -a 08018000 -d 0904 -f 3 -v 12D -r .\app.bin</UserProg2Name>
+            <UserProg2Name>wbjw_bin.exe -a 08018000 -d 0904 -f 3 -v 02F -r .\app.bin</UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopA1X>0</nStopA1X>