Browse Source

2021-07-27 / Wendell

Actions
1. add grouping function
2. fix factory size, model name & sn issue
3. fix cabinet does not re-start after write model name & sn in some case
4. fix hard reboot issue(dispenser do not reboot)
5. fix misc command issue
6. fix cabinet will charging fail when received stop charging flag at idle mode
7. fix initial function logic
8. add cabinet output voltage & current packet (cabinet to dispenser)
9. add packet of temperature of connector and chiller (dispenser to cabinet)
10.add 4g/wifi reset logic (disconnect internet & backend)
11.add manual stop, start soc, force charging
12.modify charging voltage & current log logic
13.update u-boot.img

Files
1. As follow commit history

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

Merge branch 'DO360' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into DO360
Wendell 3 years ago
parent
commit
88083069b9
1 changed files with 8 additions and 0 deletions
  1. 8 0
      EVSE/Projects/DO360/Apps/main.c

+ 8 - 0
EVSE/Projects/DO360/Apps/main.c

@@ -1362,11 +1362,19 @@ void Check4gWifiReset(void)
 {
     if(ShmChargerInfo->Control.SysCtrl.bits.BackendEnable)
     {
+<<<<<<< HEAD
 //        PRINTF_FUNC("Internet: %d, Ocpp: %d, Wifi: %d, Telcom: %d",
 //                ShmSysConfigAndInfo->SysInfo.InternetConn,
 //                ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
 //                ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode,
 //                ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled);
+=======
+        PRINTF_FUNC("Internet: %d, Ocpp: %d, Wifi: %d, Telcom: %d",
+                ShmSysConfigAndInfo->SysInfo.InternetConn,
+                ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
+                ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode,
+                ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled);
+>>>>>>> db8b46994f9d394b7a00b31806c6f9c2326981a7
         if(!ShmSysConfigAndInfo->SysInfo.InternetConn && !ShmSysConfigAndInfo->SysInfo.OcppConnStatus &&
             (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode != _SYS_WIFI_MODE_DISABLE ||
             ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == YES))