[Improve][DD360Audi][Apps]

2020.12.10 / Jerry Wang

Actions:
1. Debug on wait plug it user prices error issus.

Image version: V1.00.XX.XXXX.XX
Image checksum: XXXXXXXX

EVSE/Projects/DD360Audi/Apps/Module_LcmControl.c

@@ -1347,6 +1347,8 @@ void ProcessPageInfo()
 
 void ChangeDisplayMoneyInfo()
 {
+    uint8_t curGun = ShmSysConfigAndInfo->SysInfo.CurGunSelected;
+
     if (ShmSysConfigAndInfo->SysConfig.BillingData.isBilling) {
         struct timeb csuTime;
         struct tm *tmCSU;
@@ -1355,14 +1357,17 @@ void ChangeDisplayMoneyInfo()
         tmCSU = localtime(&csuTime.time);
 
         ChangeDisplay2Value(__money_rate_map, _charging_money);
+        if (gAudiCustInfo->PricesInfo[curGun].UserPrices != 0.0) { //Jerry add
+            DisplayMoneyRate(gAudiCustInfo->PricesInfo[curGun].UserPrices);
+        } else {
+            if (tmCSU->tm_hour <= 23) {
+                ShmSysConfigAndInfo->SysConfig.BillingData.Cur_fee = ShmSysConfigAndInfo->SysConfig.BillingData.Fee[tmCSU->tm_hour];
+                DisplayMoneyRate(ShmSysConfigAndInfo->SysConfig.BillingData.Cur_fee);
+            }
 
-        if (tmCSU->tm_hour <= 23) {
-            ShmSysConfigAndInfo->SysConfig.BillingData.Cur_fee = ShmSysConfigAndInfo->SysConfig.BillingData.Fee[tmCSU->tm_hour];
-            DisplayMoneyRate(ShmSysConfigAndInfo->SysConfig.BillingData.Cur_fee);
-        }
-
-        if (ShmSysConfigAndInfo->SysConfig.BillingData.Currency <= 53) {
-            DisplayMoneyCur((byte *)Currency[ShmSysConfigAndInfo->SysConfig.BillingData.Currency]);
+            if (ShmSysConfigAndInfo->SysConfig.BillingData.Currency <= 53) {
+                DisplayMoneyCur((byte *)Currency[ShmSysConfigAndInfo->SysConfig.BillingData.Currency]);
+            }
         }
     } else {
         ChangeDisplay2Value(__money_rate_map, _disappear);

EVSE/Projects/DD360Audi/Apps/ReDoComm.c

@@ -1576,6 +1576,12 @@ static void systemStatusProcess(int fd, uint8_t plugNum, uint8_t gunID)
                 writeWaitPlugItState(fd, gunID);
                 ftime(&gRegTimeUp[plugNum][REG_WAIT_PLUG_IT_STATE]);
             }
+
+            ftime(&AuthNowTime);
+            if (DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_CAP], AuthNowTime) > LOOP_RETRY_TIME) {
+                readChargingCapability(fd, gunID);
+                ftime(&gRegTimeUp[plugNum][REG_CHARGING_CAP]);
+            }
         }
 
         //check update firmware