2022-10-27 / Simon Xue [DD360UCar]

Action:
1. [Modify] Summary page amount and U-point value.
2. [Modify] pkill ntpd when FW update.
3. [Modify] Readcmdline set fan speed.

Files
As the following commit history files

Image Version: V2.11.XX.XXXX.XX

EVSE/Projects/DD360UCar/Apps/CSU/main.c

@@ -82,8 +82,8 @@ uint8_t bd0_2_status = 0;
 uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
-char *fwVersion = "V2.10.00.0000.00"; // Phihong version
-char* DebugVersion = "V2.10.00";      // Software debug version
+char *fwVersion = "V2.11.00.0000.00"; // Phihong version
+char* DebugVersion = "V2.11.00";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 

EVSE/Projects/DD360UCar/Apps/Config.h

@@ -461,6 +461,12 @@ typedef struct stRecordTransactionInfo
     unsigned char res;
 }RecordTransactionInfo;
 
+typedef struct stTestFlag
+{
+    uint8_t ledflag;
+    uint8_t fanflag;
+}TestFlag;
+
 typedef struct StDcCommonInfo {
     uint8_t RebootCount;
     uint8_t CcsVersion;
@@ -534,6 +540,7 @@ typedef struct StDcCommonInfo {
     uint8_t showCanPackage;
     int LcmFwVersion;
     char DebugVersion[32];
+    TestFlag ptest;
 } DcCommonInfo;
 
 #endif /* CONFIG_H_ */

EVSE/Projects/DD360UCar/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -336,7 +336,7 @@ void CANReceiver(int fd)
                     // 檢查是否有收到EV小板訊號
                     if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 5 &&
                         !ShmDcCommonData->EVDisconnectFlag[_index] &&
-                        pDcChargingInfo->SystemStatus != S_UPDATE && !ShmDcCommonData->DebugFlag) {
+                        !pSysInfo->FirmwareUpdate && !ShmDcCommonData->DebugFlag) {
                         ShmDcCommonData->EVDisconnectTime[_index] = time((time_t*)NULL);
                         ShmDcCommonData->EVDisconnectFlag[_index] = TRUE;
                         log_error("Lost ev board %d can bus data!!!!", _index);

EVSE/Projects/DD360UCar/Apps/ModuleInternalComm/RelayBoard.c

@@ -1418,9 +1418,11 @@ static void fanBoardPorcess(void)
         if (GetTimeoutValue(gFanBoardRunTimer) / 1000 >= 1000) {
             //GetPsuTempForFanSpeed();
             //GetFanSpeedByFunction();
-            GetFanSpeed();
-            pSysInfo->SystemFanRotaSpeed = _setFanSpeed;
-            GetClockTime(&gFanBoardRunTimer, NULL);
+            if (!ShmDcCommonData->ptest.fanflag) {
+                GetFanSpeed();
+                pSysInfo->SystemFanRotaSpeed = _setFanSpeed;
+                GetClockTime(&gFanBoardRunTimer, NULL);
+            }
             /*
             ShmFanModuleData->SetFan1Speed = ShmFanModuleData->TestFanSpeed;
             ShmFanModuleData->SetFan2Speed = ShmFanModuleData->TestFanSpeed;

EVSE/Projects/DD360UCar/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -1031,16 +1031,17 @@ void ShowSummaryPage()
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
 
     // Show Money
-    if (ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].finalcost_flag &&
-        ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount > 0) {
-        ShowSummaryMoney(_Summary_total_money, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount);
-        //ShowSummaryMoney(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
-        ShowSummaryMoney(_Summary_cal_discount, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount);
-    } else {
+    if (!ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].finalcost_flag &&
+        ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount == 0 &&
+        ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount == 0 ) {
         // 未收到Final cost
         ShowSummaryMoneyDash(_Summary_total_money);
         //ShowSummaryMoneyDash(_Summary_cal_Total_money);
         ShowSummaryMoneyDash(_Summary_cal_discount);
+    } else {
+        ShowSummaryMoney(_Summary_total_money, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount);
+        //ShowSummaryMoney(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
+        ShowSummaryMoney(_Summary_cal_discount, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount);
     }
     /*
     log_info("start time:%s",pDcChargingInfo->StartDateTime);
@@ -1111,7 +1112,7 @@ void ShowSummaryPage()
     }
 
     if (pDcChargingInfo->PowerConsumption >= 0.1 ) {
-        data = pDcChargingInfo->PowerConsumption / pDcChargingInfo->PresentChargedDuration;
+        data = pDcChargingInfo->PowerConsumption / duration;
     } else
         data = 0;
     //sprintf((char *)value,"%.1f",data);

EVSE/Projects/DD360UCar/Apps/ModuleUpdateFW/Module_UpdateFW.c

@@ -170,8 +170,11 @@ static int InitCanBus(void)
 
 unsigned long long getAvailableMemory()
 {
+    system("pkill ntpd");
+    sleep(1);
     long pages = sysconf(_SC_AVPHYS_PAGES);
     long page_size = sysconf(_SC_PAGE_SIZE);
+    log_info("Avaiable Memory size:%.1f MB",pages*page_size/(1024*1024));
     return pages * page_size;
 }
 
@@ -199,6 +202,7 @@ static int CheckUpdateProcess(void)
     {
         log_info("Available memory (%.2f Bytes) less than 200 MBytes, free cache first.\n", getAvailableMemory() / (1024 * 1024.0));
         system("echo 3 > /proc/sys/vm/drop_caches");
+        sleep(1);
     }
 
     pSysConfig = (struct SysConfigData *)GetShmSysConfigData();

EVSE/Projects/DD360UCar/Apps/ReadCmdline.c

@@ -485,8 +485,15 @@ void GetGunSelectedNum(char *v1)
 void SetFanSpeed(char *v1)
 {
     int speed = atoi(v1);
-
-    ShmFanModuleData->TestFanSpeed = speed;
+    ShmFanModuleData->SetFan1Speed = speed;
+    if (speed > 0) {
+        ShmDcCommonData->ptest.fanflag = TRUE;
+        ShmFanModuleData->SetFan1Speed = speed;
+        printf("Set Test Fan Speed = %d\n",speed);
+    } else {
+        ShmDcCommonData->ptest.fanflag = FALSE;
+        printf("Clear Test Fan Flag\n");
+    }
 }
 
 void GetFanSpeed()