[Improve][DM30][DW30][General]: For good reading and debug use, correct some indent and space in source code files.

2020.07.03 / TC Hsu

Actions: Check indent and space number in source code, correct it if the indent is not march the code section.

Image version    : N/A
Image checksum   : N/A

Hardware PWB P/N : N/A
Hardware Version : N/A

Files:

	modified:   EVSE/Projects/DM30/Apps/Module_EvComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_EvComm.h
	modified:   EVSE/Projects/DM30/Apps/Module_EventLogging.c
	modified:   EVSE/Projects/DM30/Apps/Module_InternalComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_LcmControl.c
	modified:   EVSE/Projects/DM30/Apps/Module_PrimaryComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_PsuComm.c
	modified:   EVSE/Projects/DM30/Apps/PrimaryComm.c
	modified:   EVSE/Projects/DM30/Apps/PrimaryComm.h
	modified:   EVSE/Projects/DM30/Apps/ReadCmdline.c
	modified:   EVSE/Projects/DM30/Apps/internalComm.c
	modified:   EVSE/Projects/DM30/Apps/main.c
	modified:   EVSE/Projects/DW30/Apps/Module_EvComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_EvComm.h
	modified:   EVSE/Projects/DW30/Apps/Module_EventLogging.c
	modified:   EVSE/Projects/DW30/Apps/Module_InternalComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_LcmControl.c
	modified:   EVSE/Projects/DW30/Apps/Module_PrimaryComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_PsuComm.c
	modified:   EVSE/Projects/DW30/Apps/PrimaryComm.c
	modified:   EVSE/Projects/DW30/Apps/PrimaryComm.h
	modified:   EVSE/Projects/DW30/Apps/ReadCmdline.c
	modified:   EVSE/Projects/DW30/Apps/internalComm.c
	modified:   EVSE/Projects/DW30/Apps/main.c

EVSE/Projects/DM30/Apps/Module_EvComm.c

@@ -103,9 +103,9 @@ void GetMaxVolAndCurMethod(byte index, float *vol, float *cur);
 void GetMaxPowerMethod(byte index, float *pow);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 unsigned long GetTimeoutValue(struct timeval _sour_time)
 {
@@ -231,12 +231,12 @@ int InitShareMemory()
         DEBUG_ERROR("shmat ShmSysConfigAndInfo NG\n");
         #endif
         result = FAIL;
-     }
+    }
     else
     {}
 
-     //initial ShmStatusCodeData
-     if ((MeterSMId = shmget(ShmStatusCodeKey, sizeof(struct StatusCodeData),  0777)) < 0)
+    //initial ShmStatusCodeData
+    if ((MeterSMId = shmget(ShmStatusCodeKey, sizeof(struct StatusCodeData),  0777)) < 0)
     {
         #ifdef SystemLogMessage
         DEBUG_ERROR("shmget ShmStatusCodeData NG\n");
@@ -272,6 +272,7 @@ int InitShareMemory()
         else
         {}
     }
+
     if(GB_QUANTITY > 0)
     {
         if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData),  IPC_CREAT | 0777)) < 0)
@@ -1940,7 +1941,7 @@ void ClearAbnormalStatus_CCS(byte gun_index)
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023850", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutV2GPreChargePerformaceTime == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutV2GPreChargePerformaceTime == YES)
     {
         memcpy(code, "023850", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
@@ -2199,14 +2200,14 @@ void ClearAbnormalStatus_CCS(byte gun_index)
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023891", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccNotReadyForCharging == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccNotReadyForCharging == YES)
     {
         memcpy(code, "023891", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023892", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES)
     {
         memcpy(code, "023892", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
@@ -2930,7 +2931,7 @@ void SetPresentChargingOutputPower(struct ChargingInfoData *chargingData_1, stru
         _outCur_2 != cur2)
     {
         PRINTF_FUNC("G1 -> Output Vol = %f, Output Cur = %f -- G2 -> Output Vol = %f, Output Cur = %f \n",
-            vol1, cur1, vol2, cur2);
+                    vol1, cur1, vol2, cur2);
 
         _outVol_1 = vol1; _outCur_1 = cur1; _outVol_2 = vol2; _outCur_2 = cur2;
     }
@@ -2964,7 +2965,7 @@ void SetPresentChargingOutputCap(struct ChargingInfoData *chargingData_1, struct
         _cur_2 != cur2)
     {
         PRINTF_FUNC("To EV (Real) Power_1 = %f, Cur_1 = %f, Power_2 = %f, Cur_2 = %f \n",
-                pow1, cur1, pow2, cur2);
+                    pow1, cur1, pow2, cur2);
         _pow_1 = pow1; _cur_1 = cur1; _pow_2 = pow2; _cur_2 = cur2;
         chargingData_1->RealMaxCurrent = _cur_1;
         chargingData_1->RealMaxPower = pow1;
@@ -3219,10 +3220,10 @@ int main(int argc, char *argv[])
                 // 固定要取得的資訊 : 1.槍鎖狀態, 2."Connector 1" 溫度, 3."Connector 2" 溫度, 4.Pilot Voltage
                 //PRINTF_FUNC("GetMiscellaneousInfo. index = %d, Eid = %d \n", _index, _chargingData[_index]->Evboard_id);
                 GetMiscellaneousInfo(_index,
-                        _chargingData[_index]->RelayK1K2Status,
-                        _chargingData[_index]->PresentChargedEnergy,
-                        (_chargingData[_index]->PresentChargingVoltage * 10),
-                        _chargingData[_index]->Evboard_id);
+                                     _chargingData[_index]->RelayK1K2Status,
+                                     _chargingData[_index]->PresentChargedEnergy,
+                                     (_chargingData[_index]->PresentChargingVoltage * 10),
+                                     _chargingData[_index]->Evboard_id);
             }
 
             switch (_chargingData[_index]->SystemStatus)
@@ -3296,14 +3297,14 @@ int main(int argc, char *argv[])
                         GetMaxVolAndCurMethod(_index, &maxVol, &maxCur);
 
                         PRINTF_FUNC("To EV_%d Max_Vol = %f, Cap_Cur = %f, Cap_Pow = %f \n",
-                                _index, maxVol, maxCur, _chargingData[_index]->AvailableChargingPower);
+                                    _index, maxVol, maxCur, _chargingData[_index]->AvailableChargingPower);
                         _chargingData[_index]->RealMaxVoltage = maxVol;
 
                         SetChargingPermission(_index, START,
-                        _chargingData[_index]->AvailableChargingPower,
-                                maxCur,
-                                maxVol,
-                                _chargingData[_index]->Evboard_id);
+                                              _chargingData[_index]->AvailableChargingPower,
+                                              maxCur,
+                                              maxVol,
+                                              _chargingData[_index]->Evboard_id);
 
                         // 取得車端電池資訊 : 1.AC or DC ? 2.Total battery cap, 3.Max battery vol, 4.Max battery cur
                         GetEvBatteryInfo(_index, _chargingData[_index]->Evboard_id);
@@ -3363,7 +3364,7 @@ int main(int argc, char *argv[])
                         SetIsolationStatus(_index, _result, _chargingData[_index]->Evboard_id);
 
                         if(_chargingData[_index]->SystemStatus == S_CCS_PRECHARGE_ST0 &&
-                            _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
+                           _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
                         {
                             SetEvsePrechargeInfo(_index, PRECHARGE_PRERELAY_PASS, _chargingData[_index]->Evboard_id);
                         }
@@ -3436,7 +3437,7 @@ int main(int argc, char *argv[])
                         }
 
                         if(_chargingData[_index]->Type == _Type_CCS_2 &&
-                            _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
+                           _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
                         {
                             SetEvsePrechargeInfo(_index, PRECHARGE_CHARELAY_PASS, _chargingData[_index]->Evboard_id);
                         }
@@ -3480,10 +3481,10 @@ int main(int argc, char *argv[])
 
                         GetMaxVolAndCurMethod(_index, &maxVol, &maxCur);
                         SetChargingPermission(_index, STOP,
-                                    _chargingData[_index]->AvailableChargingPower,
-                                    maxCur,
-                                    maxVol,
-                                    _chargingData[_index]->Evboard_id);
+                                              _chargingData[_index]->AvailableChargingPower,
+                                              maxCur,
+                                              maxVol,
+                                              _chargingData[_index]->Evboard_id);
                     }
                 }
                     break;

EVSE/Projects/DM30/Apps/Module_EvComm.h

@@ -61,18 +61,18 @@ void EvseStopChargingEvent(byte stopResult, byte *stopReason, byte toId);
 enum Receieve_PSU_msgf
 {
     // 車端主動
-    ADDRESS_REQ =                       0x080001FF,
-    NOTIFICATION_EV_STATUS =            0x08000300,
-    NOTIFICATION_EV_STOP =              0x08000B00,
+    ADDRESS_REQ                         = 0x080001FF,
+    NOTIFICATION_EV_STATUS              = 0x08000300,
+    NOTIFICATION_EV_STOP                = 0x08000B00,
 
     // 車端回應
-    ACK_EV_FW_VERSION =                 0x08000400,
-    ACK_EV_HW_VERSION =                 0x08000500,
-    ACK_GET_OUTPUT_REQ =                0x08000900,
-    ACK_GET_EV_BATTERY_INFO =           0x08000A00,
-    ACK_GET_MISCELLANEOUS_INFO =        0x08000D00,
-    ACK_EVSE_ISOLATION_STATUS =         0x08001200,
-    ACK_EVSE_PRECHAGE_INFO =            0x08001500,
+    ACK_EV_FW_VERSION                   = 0x08000400,
+    ACK_EV_HW_VERSION                   = 0x08000500,
+    ACK_GET_OUTPUT_REQ                  = 0x08000900,
+    ACK_GET_EV_BATTERY_INFO             = 0x08000A00,
+    ACK_GET_MISCELLANEOUS_INFO          = 0x08000D00,
+    ACK_EVSE_ISOLATION_STATUS           = 0x08001200,
+    ACK_EVSE_PRECHAGE_INFO              = 0x08001500,
 };
 
 #endif /* MODULE_EVCOMM_H_ */

EVSE/Projects/DM30/Apps/Module_EventLogging.c

@@ -39,9 +39,9 @@ struct StatusCodeData           *ShmStatusCodeData;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 int StoreLogMsg(const char *fmt, ...)
 {

EVSE/Projects/DM30/Apps/Module_InternalComm.c

@@ -160,17 +160,17 @@ Ac_Charging_current acChargingCurrent;
 #define AC_RELAY_DRIVE_FAULT        262144
 
 int _alarm_code[] = {AC_OVP, AC_UVP, AC_OCP, AC_OTP, AC_GMI_FAULT, AC_CP_ERROR, AC_AC_LEAKAGE
-        , AC_DC_LEAKAGE, AC_SYSTEM_SELFTEST_FAULT, AC_HANDSHAKE_TIMEOUT, AC_EMC_STOP, AC_RELAY_WELDING
-        , AC_GF_MODULE_FAULT, AC_SHUTTER_FAULT, AC_LOCKER_FAULT, AC_POWER_DROP, AC_CIRCUIT_SHORT
-        , AC_ROTARY_SWITCH_FAULT, AC_RELAY_DRIVE_FAULT};
+                     , AC_DC_LEAKAGE, AC_SYSTEM_SELFTEST_FAULT, AC_HANDSHAKE_TIMEOUT, AC_EMC_STOP, AC_RELAY_WELDING
+                     , AC_GF_MODULE_FAULT, AC_SHUTTER_FAULT, AC_LOCKER_FAULT, AC_POWER_DROP, AC_CIRCUIT_SHORT
+                     , AC_ROTARY_SWITCH_FAULT, AC_RELAY_DRIVE_FAULT};
 
 void PRINTF_FUNC(char *string, ...);
 
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 unsigned long GetTimeoutValue(struct timeval _sour_time)
 {
@@ -620,11 +620,11 @@ void CheckK1K2RelayOutput(byte index)
             {
                 if (gunCount == 1)
                 {
-                if (regRelay.relay_event.bits.Gun1_N == YES && regRelay.relay_event.bits.CCS_Precharge == YES)
-                    _chargingData[index]->RelayKPK2Status = YES;
-                else
-                    _chargingData[index]->RelayKPK2Status = NO;
-            }
+                    if (regRelay.relay_event.bits.Gun1_N == YES && regRelay.relay_event.bits.CCS_Precharge == YES)
+                        _chargingData[index]->RelayKPK2Status = YES;
+                    else
+                        _chargingData[index]->RelayKPK2Status = NO;
+                }
                 else
                 {
                     if (_chargingData[index]->SystemStatus == S_CCS_PRECHARGE_ST0)
@@ -697,12 +697,12 @@ void GetGfdAdc()
                 if (_chargingData[i]->GroundFaultStatus == GFD_FAIL)
                 {
                     PRINTF_FUNC("GFD Fail. index = %d, Step = %d, R = %d, Vol = %d \n",
-                            i, gfd_adc.rb_step_1, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
+                                i, gfd_adc.rb_step_1, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
                 }
                 else if (_chargingData[i]->GroundFaultStatus == GFD_WARNING)
                 {
-                  PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
-                      i, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
+                    PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
+                                i, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
                 }
             }
             else if (i == 1)
@@ -711,12 +711,12 @@ void GetGfdAdc()
                 if (_chargingData[i]->GroundFaultStatus == GFD_FAIL)
                 {
                     PRINTF_FUNC("GFD Fail. index = %d, Step = %d, R = %d, Vol = %d \n",
-                            i, gfd_adc.rb_step_2, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
+                                i, gfd_adc.rb_step_2, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
                 }
                 else if (_chargingData[i]->GroundFaultStatus == GFD_WARNING)
                 {
-                  PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
-                      i, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
+                    PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
+                                i, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
                 }
             }
         }
@@ -877,7 +877,7 @@ void SetK1K2RelayStatus(byte index)
         }
     }
     else if ((_chargingData[index]->SystemStatus >= S_PREPARING_FOR_EVSE &&
-            _chargingData[index]->SystemStatus <= S_CHARGING))
+             _chargingData[index]->SystemStatus <= S_CHARGING))
     {
         if (_chargingData[index]->RelayWeldingCheck == YES)
         {
@@ -898,7 +898,7 @@ void SetK1K2RelayStatus(byte index)
         }
     }
     else if ((_chargingData[index]->SystemStatus >= S_TERMINATING &&
-            _chargingData[index]->SystemStatus <= S_COMPLETE))
+             _chargingData[index]->SystemStatus <= S_COMPLETE))
     {
         if ((_chargingData[index]->PresentChargingCurrent * 10) <= SEFETY_SWITCH_RELAY_CUR)
         {
@@ -1169,7 +1169,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
             led_color.Connect_1_Red     = COLOR_MIN_LV;
         }
         else if ((chargingData_1->SystemStatus >= S_AUTHORIZING && chargingData_1->SystemStatus <= S_COMPLETE) ||
-                (chargingData_1->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_1->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                 (chargingData_1->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_1->SystemStatus <= S_CCS_PRECHARGE_ST1))
         {
             led_color.Connect_1_Green   = COLOR_MIN_LV;
             led_color.Connect_1_Blue    = COLOR_MAX_LV;
@@ -1184,7 +1184,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
             led_color.Connect_2_Red     = COLOR_MIN_LV;
         }
         else if ((chargingData_2->SystemStatus >= S_AUTHORIZING && chargingData_2->SystemStatus <= S_COMPLETE) ||
-                (chargingData_2->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_2->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                 (chargingData_2->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_2->SystemStatus <= S_CCS_PRECHARGE_ST1))
         {
             led_color.Connect_2_Green   = COLOR_MIN_LV;
             led_color.Connect_2_Blue    = COLOR_MAX_LV;
@@ -1205,7 +1205,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
     if (_checkLedChanged > 0)
     {
         if (Config_Led_Color(Uart5Fd, Addr.Led, &led_color) == PASS)
-    {
+        {
             _checkLedChanged--;
 
             cur_led_color.Connect_1_Red = led_color.Connect_1_Red;
@@ -1365,29 +1365,29 @@ int InitComPort()
 //================================================
 bool FindChargingInfoData(byte target, struct ChargingInfoData **chargingData)
 {
-    for (byte index = 0; index < CHAdeMO_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index];
+    for (byte index = 0; index < CHAdeMO_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index];
             return true;
         }
     }
 
-    for (byte index = 0; index < CCS_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.CcsChargingData[index];
+    for (byte index = 0; index < CCS_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.CcsChargingData[index];
             return true;
         }
     }
 
-    for (byte index = 0; index < GB_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.GbChargingData[index];
+    for (byte index = 0; index < GB_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.GbChargingData[index];
             return true;
         }
     }
@@ -1555,7 +1555,7 @@ void CableCheckDetected(byte index)
                 SetGfdConfig(index, GFD_CABLECHK);
             }
             else if (_chargingData[index]->SystemStatus >= S_CCS_PRECHARGE_ST0 &&
-                    _chargingData[index]->SystemStatus <= S_CCS_PRECHARGE_ST1)
+                     _chargingData[index]->SystemStatus <= S_CCS_PRECHARGE_ST1)
             {
                 SetGfdConfig(index, GFD_PRECHARGE);
             }
@@ -1592,9 +1592,9 @@ void CheckOutputPowerOverCarReq(byte index)
         if (fireV >= (carV + (carV * 0.1)))
         {
             PRINTF_FUNC("[Module_InternalComm]CheckOutputPowerOverCarReq NG : fire = %f, battery = %f \n",
-                    _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
+                        _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
             DEBUG_ERROR("[Module_InternalComm]CheckOutputPowerOverCarReq NG : fire = %f, battery = %f \n",
-                    _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
+                        _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
             _chargingData[index]->StopChargeFlag = YES;
         }
     }
@@ -1620,9 +1620,9 @@ void CheckOutputVolNoneMatchFire(byte index)
                 if ((GetTimeoutValue(_checkOutputNoneMatchTimer[index]) / 1000) >= 5000)
                 {
                     PRINTF_FUNC("[Module_InternalComm]CheckOutputVolNoneMatchFire NG (%d) : pre = %f, fire = %f \n",
-                            index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
+                                index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
                     DEBUG_ERROR("[Module_InternalComm]CheckOutputVolNoneMatchFire NG (%d): pre = %f, fire = %f \n",
-                            index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
+                                index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
                     _chargingData[index]->StopChargeFlag = YES;
                 }
             }
@@ -1679,19 +1679,19 @@ void GetPsuTempForFanSpeed()
 
     if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == NO)
     {
-    if (ShmFanModuleData->TestFanSpeed == NORMAL_FAN_SPEED)
-    {
-        if (temp >= ENV_TEMP_MAX)
-            ShmFanModuleData->TestFanSpeed = MAX_FAN_SPEED;
-    }
-    else if (ShmFanModuleData->TestFanSpeed == MAX_FAN_SPEED)
-    {
-        if (temp <= ENV_TEMP_MIN)
+        if (ShmFanModuleData->TestFanSpeed == NORMAL_FAN_SPEED)
+        {
+            if (temp >= ENV_TEMP_MAX)
+                ShmFanModuleData->TestFanSpeed = MAX_FAN_SPEED;
+        }
+        else if (ShmFanModuleData->TestFanSpeed == MAX_FAN_SPEED)
+        {
+            if (temp <= ENV_TEMP_MIN)
+                ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
+        }
+        else
             ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
     }
-    else
-        ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
-    }
 }
 
 void GetAcStatus()
@@ -1825,7 +1825,7 @@ void AcChargeTypeProcess()
                     _status = S_IDLE;
             }
             else if (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING &&
-                    ac_chargingInfo[0]->SystemStatus < S_CHARGING)
+                     ac_chargingInfo[0]->SystemStatus < S_CHARGING)
             {
                 if (acStatus.CpStatus == AC_SYS_C && acStatus.RelayStatus == YES)
                     _status = S_CHARGING;
@@ -1839,7 +1839,7 @@ void AcChargeTypeProcess()
                       ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE))
             {
                 if (ShmSysConfigAndInfo->SysInfo.OrderCharging != FAIL &&
-                        ShmSysConfigAndInfo->SysInfo.OrderCharging == DEFAULT_AC_INDEX)
+                    ShmSysConfigAndInfo->SysInfo.OrderCharging == DEFAULT_AC_INDEX)
                 {
                     PRINTF_FUNC("** AC Remote \n");
                     strcpy((char *)ac_chargingInfo[0]->StartUserId, "");
@@ -1848,13 +1848,13 @@ void AcChargeTypeProcess()
                 }
                 else
                 {
-                PRINTF_FUNC("** UserId = %s \n", ShmSysConfigAndInfo->SysConfig.UserId);
-                strcpy((char *)ac_chargingInfo[0]->StartUserId, (char *)ShmSysConfigAndInfo->SysConfig.UserId);
-                PRINTF_FUNC("** CardNumber = %s \n", ac_chargingInfo[0]->StartUserId);
-                strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
-                ShmSysConfigAndInfo->SysInfo.WaitForPlugit = NO;
-                _status = S_PREPARNING;
-            }
+                    PRINTF_FUNC("** UserId = %s \n", ShmSysConfigAndInfo->SysConfig.UserId);
+                    strcpy((char *)ac_chargingInfo[0]->StartUserId, (char *)ShmSysConfigAndInfo->SysConfig.UserId);
+                    PRINTF_FUNC("** CardNumber = %s \n", ac_chargingInfo[0]->StartUserId);
+                    strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
+                    ShmSysConfigAndInfo->SysInfo.WaitForPlugit = NO;
+                    _status = S_PREPARNING;
+                }
             }
 
             //printf("_status = %d \n", _status);
@@ -2039,10 +2039,10 @@ int main(void)
             // 自檢階段
             if (ShmSysConfigAndInfo->SysInfo.SelfTestSeq <= _STEST_PSU_CAP)
             {
-            GetFwAndHwVersion_Led();
-            sleep(1);
-            gettimeofday(&_led_priority_time, NULL);
-        }
+                GetFwAndHwVersion_Led();
+                sleep(1);
+                gettimeofday(&_led_priority_time, NULL);
+            }
             else
             {
                 // 自檢階段沒有問到版號
@@ -2100,9 +2100,9 @@ int main(void)
                     // 限定只有在槍類別為 GBT 的時候才做 relay welding 的判斷
                     if (_chargingData[i]->Type == _Type_GB)
                     {
-                    if (_chargingData[i]->SystemStatus >= S_PREPARING_FOR_EVSE &&
+                        if (_chargingData[i]->SystemStatus >= S_PREPARING_FOR_EVSE &&
                             _chargingData[i]->RelayWeldingCheck == NO)
-                        CheckRelayWeldingStatus(i);
+                            CheckRelayWeldingStatus(i);
                     }
                     else
                         _chargingData[i]->RelayWeldingCheck = YES;
@@ -2157,14 +2157,14 @@ int main(void)
                     regRelay.relay_event.bits.Gun1_Parallel_N = outputRelay.relay_event.bits.Gun1_Parallel_N;
 
                     PRINTF_FUNC("Match Relay, AC = %x, g1_p = %x, g1_n = %x, g2_p = %x, g2_n = %x, pre = %x, bri_p = %x, bri_n = %x \n",
-                            regRelay.relay_event.bits.AC_Contactor,
-                            regRelay.relay_event.bits.Gun1_P,
-                            regRelay.relay_event.bits.Gun1_N,
-                            regRelay.relay_event.bits.Gun2_P,
-                            regRelay.relay_event.bits.Gun2_N,
-                            regRelay.relay_event.bits.CCS_Precharge,
-                            regRelay.relay_event.bits.Gun1_Parallel_P,
-                            regRelay.relay_event.bits.Gun1_Parallel_N);
+                                regRelay.relay_event.bits.AC_Contactor,
+                                regRelay.relay_event.bits.Gun1_P,
+                                regRelay.relay_event.bits.Gun1_N,
+                                regRelay.relay_event.bits.Gun2_P,
+                                regRelay.relay_event.bits.Gun2_N,
+                                regRelay.relay_event.bits.CCS_Precharge,
+                                regRelay.relay_event.bits.Gun1_Parallel_P,
+                                regRelay.relay_event.bits.Gun1_Parallel_N);
                 }
             }
         }
@@ -2229,13 +2229,13 @@ int main(void)
         {
             if (GetTimeoutValue(_led_priority_time) / 1000 >= 1000)
             {
-            if(gunCount == 1)
-            {
-                SetLedColor(_chargingData[0], _chargingData[0]);
-            }
-            else if (gunCount == 2)
-            {
-                SetLedColor(_chargingData[0], _chargingData[1]);
+                if(gunCount == 1)
+                {
+                    SetLedColor(_chargingData[0], _chargingData[0]);
+                }
+                else if (gunCount == 2)
+                {
+                    SetLedColor(_chargingData[0], _chargingData[1]);
                 }
 
                 gettimeofday(&_led_priority_time, NULL);

EVSE/Projects/DM30/Apps/Module_LcmControl.c

@@ -4,9 +4,9 @@ bool needReloadQr = true;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 char* getTimeString(void);
 
@@ -424,17 +424,28 @@ void DemoFunction()
     }
     else
     {
-        if (demoCount == 20) {
+        if (demoCount == 20)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_IDLE;
-        } else if (demoCount == 80) {
+        }
+        else if (demoCount == 80)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZING;
-        } else if (demoCount == 100) {
+        }
+        else if (demoCount == 100)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZ_COMP;
-        } else if (demoCount == 120) {
+        }
+        else if (demoCount == 120)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZ_FAIL;
-        } else if (demoCount == 140) {
+        }
+        else if (demoCount == 140)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_PRE_CHARGE;
-        } else if (demoCount == 180) {
+        }
+        else if (demoCount == 180)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_CHARGING;
         }
     }
@@ -567,35 +578,35 @@ void ChangeBattMapAndValue(short page, int soc)
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_empty);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_20);
+                ChangeDisplay2Value(__batt_map, _battery_cap_20);
         }
         else if (soc >= 20 && soc < 40)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_20);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_40);
+                ChangeDisplay2Value(__batt_map, _battery_cap_40);
         }
         else if (soc >= 40 && soc < 60)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_40);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_60);
+                ChangeDisplay2Value(__batt_map, _battery_cap_60);
         }
         else if (soc >= 60 && soc < 80)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_60);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_80);
+                ChangeDisplay2Value(__batt_map, _battery_cap_80);
         }
         else if (soc >= 80 && soc <= 100)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_80);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_100);
+                ChangeDisplay2Value(__batt_map, _battery_cap_100);
         }
     }
     else if (page == _LCM_COMPLETE)
@@ -979,7 +990,7 @@ void ProcessPageInfo()
                             ChangeChargingEnergyValue(ac_chargingInfo[0]->PresentChargedEnergy);
 
                             if (ShmSysConfigAndInfo->SysConfig.BillingData.isBilling &&
-                                    ac_chargingInfo[0]->ChargingFee >= 0)
+                                ac_chargingInfo[0]->ChargingFee >= 0)
                             {
                                 ChangeChargingFeeValue(ac_chargingInfo[0]->ChargingFee);
                             }
@@ -1134,8 +1145,8 @@ void ProcessPageInfo()
                 }
 
                 if (_chargingInfoData[index]->SystemStatus == S_IDLE ||
-                        _chargingInfoData[index]->SystemStatus == S_RESERVATION ||
-                        _chargingInfoData[index]->SystemStatus == S_BOOTING)
+                    _chargingInfoData[index]->SystemStatus == S_RESERVATION ||
+                    _chargingInfoData[index]->SystemStatus == S_BOOTING)
                 {
                     if (FirstPageChanged() == YES || needReloadQr || _page_reload)
                     {

EVSE/Projects/DM30/Apps/Module_PrimaryComm.c

@@ -59,9 +59,9 @@ byte flash = NO;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 int StoreLogMsg(const char *fmt, ...)
 {
@@ -145,11 +145,14 @@ void trim(char *s)
     while((s[j]==' ')||(s[j]=='\t')||(s[j]=='\n'))
         j--;
 
-    if(i==0 && j==strlen(s)-1) { }
-    else if(i==0) s[j+1] = '\0';
-    else {
+    if(i==0 && j==strlen(s)-1)
+    { }
+    else if(i==0)
+        s[j+1] = '\0';
+    else
+    {
         for(k=i; k<=j; k++) s[l++] = s[k];
-        s[l] = '\0';
+            s[l] = '\0';
     }
 }
 

EVSE/Projects/DM30/Apps/PrimaryComm.c

@@ -167,13 +167,14 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
         tx[6] |= (Set_Buf->Button_LED[idx] ? 0x01:0x00) << (0+idx);
 
     for (int idx = 0; idx < 4; idx++)
-            tx[6] |= (Set_Buf->System_LED[idx] ? 0x01:0x00) << (2+idx);
+        tx[6] |= (Set_Buf->System_LED[idx] ? 0x01:0x00) << (2+idx);
 
     tx[6] |= (Set_Buf->AC_Connector ? 0x01:0x00) << 6;
     tx[6] |= (Set_Buf->AC_Breaker ? 0x01:0x00) << 7;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
+
     tx[7] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
@@ -200,14 +201,15 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
 unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *Set_Buf)
 {
     unsigned char result = FAIL;
-    unsigned char tx[21] = { 0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
-            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
-            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
+    unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
+                            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
+                            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[20] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
@@ -219,10 +221,10 @@ unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *S
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                (rx[6] == tx[6]))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           (rx[6] == tx[6]))
         {
             result = PASS;
         }
@@ -240,8 +242,8 @@ unsigned char Update_Start(unsigned char fd, unsigned char targetAddr, unsigned
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
-    tx[10] = chksum;
 
+    tx[10] = chksum;
 
     if(tranceive(fd, tx, sizeof(tx), rx) > 0)
     {
@@ -312,6 +314,7 @@ unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsign
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
+
     tx[sizeof(tx)-1] = chksum;
 
     if(tranceive(fd, tx, sizeof(tx), rx) >0)

EVSE/Projects/DM30/Apps/PrimaryComm.h

@@ -23,7 +23,6 @@ extern struct Command
     unsigned char update_Abort;         //0xe1
     unsigned char update_Transfer;      //0xe2
     unsigned char update_Finish;        //0xe3
-
 }Cmd;
 
 typedef struct Verion
@@ -75,5 +74,4 @@ extern unsigned char Update_Abord(unsigned char fd, unsigned char targetAddr);
 extern unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsigned int startAddr, unsigned char *data, unsigned short int length);
 extern unsigned char Update_Finish(unsigned char fd, unsigned char targetAddr);
 
-
 #endif /* PRIMARYCOMM_H_ */

EVSE/Projects/DM30/Apps/ReadCmdline.c

@@ -5,7 +5,6 @@
  *      Author: 7564
  */
 
-
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/types.h>
@@ -63,13 +62,13 @@ struct PsuData                  *ShmPsuData;
 struct ChargingInfoData         *_chargingData[CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY];
 struct ChargingInfoData         *ac_chargingInfo[AC_QUANTITY];
 
-char *msg = "state : get gun state (index) \n"
-        "card : scanning card (x) : \n"
-        "gun : get gun plugit state (index) \n"
-        "lock : get gun locked state (index) \n"
-        "self : self test state (x) \n"
-        "ver : ver of board (407 or index or rb or fan) \n"
-        "ac : get ac relay state (x) \n";
+char *msg = "state  : get gun state (index) \n"
+            "card   : scanning card (x) : \n"
+            "gun    : get gun plugit state (index) \n"
+            "lock   : get gun locked state (index) \n"
+            "self   : self test state (x) \n"
+            "ver    : ver of board (407 or index or rb or fan) \n"
+            "ac     : get ac relay state (x) \n";
 
 bool FindChargingInfoData(byte target, struct ChargingInfoData **chargingData)
 {
@@ -144,31 +143,42 @@ int InitShareMemory()
     {}
 
     if (CHAdeMO_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmCHAdeMOCommKey, sizeof(struct CHAdeMOData),
-        IPC_CREAT | 0777)) < 0) {
+        if ((MeterSMId = shmget(ShmCHAdeMOCommKey, sizeof(struct CHAdeMOData), IPC_CREAT | 0777)) < 0)
+        {
             result = FAIL;
-        } else if ((ShmCHAdeMOData = shmat(MeterSMId, NULL, 0))
-                == (void *) -1) {
+        }
+        else if ((ShmCHAdeMOData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
             result = FAIL;
-        } else {
+        }
+        else
+        {
+            //NULL
         }
     }
 
-    if (CCS_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmCcsCommKey, sizeof(struct CcsData),
-        IPC_CREAT | 0777)) < 0) {
+    if (CCS_QUANTITY > 0)
+    {
+        if ((MeterSMId = shmget(ShmCcsCommKey, sizeof(struct CcsData), IPC_CREAT | 0777)) < 0)
+        {
             result = FAIL;
-        } else if ((ShmCcsData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
+        }
+        else if ((ShmCcsData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
+        {
             result = FAIL;
-        } else {
+        } else
+        {
+            //NULL
         }
     }
 
-    if (GB_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData),
-        IPC_CREAT | 0777)) < 0) {
+    if (GB_QUANTITY > 0)
+    {
+        if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData), IPC_CREAT | 0777)) < 0)
+        {
             return 0;
-        } else if ((ShmGBTData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
+        }
+        else if ((ShmGBTData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
+        {
             return 0;
         }
         memset(ShmGBTData, 0, sizeof(struct GBTData));
@@ -486,7 +496,7 @@ void ChangeGunNum()
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc = NO_DEFINE;
     }
     else if (ShmSysConfigAndInfo->SysConfig.AcConnectorCount > 0 &&
-            ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)
+             ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc = DEFAULT_AC_INDEX;
     else
     {
@@ -567,9 +577,9 @@ void GetPsuTemp()
 void GetAcInputVol()
 {
     printf("L1N_L12 = %f, L2N_L23 = %f, L3N_L31 = %f \n",
-            ShmSysConfigAndInfo->SysInfo.InputVoltageR,
-            ShmSysConfigAndInfo->SysInfo.InputVoltageS,
-            ShmSysConfigAndInfo->SysInfo.InputVoltageT);
+           ShmSysConfigAndInfo->SysInfo.InputVoltageR,
+           ShmSysConfigAndInfo->SysInfo.InputVoltageS,
+           ShmSysConfigAndInfo->SysInfo.InputVoltageT);
 }
 
 void GetPsuInformation(char *v1)
@@ -587,7 +597,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->SystemPresentPsuQuantity; i++)
         {
             printf("Psu Index = %d, PriVersion = %s, SecVersion = %s \n",
-                    i, ShmPsuData->PsuVersion[i].FwPrimaryVersion, ShmPsuData->PsuVersion[i].FwSecondVersion);
+                   i, ShmPsuData->PsuVersion[i].FwPrimaryVersion, ShmPsuData->PsuVersion[i].FwSecondVersion);
         }
 
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
@@ -595,7 +605,7 @@ void GetPsuInformation(char *v1)
             for (int j = 0; j < ShmPsuData->PsuGroup[i].GroupPresentPsuQuantity; j++)
             {
                 printf("Group Index = %d, Psu Index = %d, Version = %s \n",
-                    i, j, ShmPsuData->PsuGroup[i].PsuModule[j].FwVersion);
+                       i, j, ShmPsuData->PsuGroup[i].PsuModule[j].FwVersion);
             }
         }
     }
@@ -604,7 +614,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
         {
             printf("Group Index = %d, MaxCur = %d, Power = %d \n",
-                    i, ShmPsuData->PsuGroup[i].GroupAvailableCurrent, ShmPsuData->PsuGroup[i].GroupAvailablePower);
+                   i, ShmPsuData->PsuGroup[i].GroupAvailableCurrent, ShmPsuData->PsuGroup[i].GroupAvailablePower);
         }
     }
     else if (strcmp(v1, "output") == 0)
@@ -612,7 +622,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
         {
             printf("Group Index = %d, OutputV = %d, OutputC = %d \n",
-                    i, ShmPsuData->PsuGroup[i].GroupPresentOutputVoltage, ShmPsuData->PsuGroup[i].GroupPresentOutputCurrent);
+                   i, ShmPsuData->PsuGroup[i].GroupPresentOutputVoltage, ShmPsuData->PsuGroup[i].GroupPresentOutputCurrent);
         }
     }
     printf("*************************************************\n");
@@ -716,7 +726,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
             }
             break;
 
-
             case S_PREPARNING:
             {
                 if(PreviousSystemStatus != _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus)
@@ -727,7 +736,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
 
                     //等待 AC Relay 搭上且找到模組 (main 在此 statue 其它 task 會去做完)
                     printf ("wait find module\n");
-
                 }
                 //main 會在此階段判斷以下資料跳到下一個 state
                 //用來得知 AC 是否有搭上 (搭上模組的資訊才會出來) 因為每次  AC_Contactor
@@ -745,7 +753,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->TimeoutFlag = 0;
                 //不論是什麼 type 的槍都固意設成 Chademo 不跑 Prechage step
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->Type = 9;
-
             }
             break;
 
@@ -783,7 +790,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
             }
             break;
 
-
             case S_PREPARING_FOR_EVSE:
             {
                 if(PreviousSystemStatus != _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus)
@@ -791,7 +797,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                     PreviousSystemStatus = _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus;
 
                     printf ("[UnconditionalCharge - S_PREPARING_FOR_EVSE]\n");
-
                 }
                 //printf ("tar vol = %d \n", _Voltage);
                 //printf ("tar cur = %d \n", _Current);
@@ -849,8 +854,9 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingPower =
                         ((float)((_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingVoltage) * (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingCurrent)) / 1000);
 
-                if (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus == 0x02){
-                     printf ("Charging Ground Fault check Fail (%d)\n",_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus);
+                if (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus == 0x02)
+                {
+                    printf ("Charging Ground Fault check Fail (%d)\n",_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus);
                     _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus = S_TERMINATING;
                 }
             }
@@ -919,15 +925,15 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
         if(strcmp(newString[0], "chg") == 0)
         {
             if (strcmp(newString[1], "-1") == 0 || strcmp(newString[1], "") == 0)
-               continue;
+                continue;
             if (strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
-               continue;
+                continue;
 
             float _vol = atof(newString[1]);
             float _cur = atof(newString[2]);
 
             if (_cur <= 0 || _cur <= 0)
-               continue;
+                continue;
 
             printf("vol = %f, cur = %f \n", _vol, _cur);
             _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->EvBatterytargetVoltage = _vol;
@@ -1129,7 +1135,7 @@ int main(void)
         {
             //如果連一個參數都沒有 (此命令不理會) 加上判斷第二參數
             if (strcmp(newString[1], "-1") == 0 || strcmp(newString[1], "") == 0 ||
-                    strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
+                strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
             {
                 printf ("Input cmd fail ------  strchg [vol 150-1000] [cru 2-100]\n");
                 continue;

EVSE/Projects/DM30/Apps/internalComm.c

@@ -165,6 +165,7 @@ unsigned char Query_Present_InputVoltage(unsigned char fd, unsigned char targetA
         {
             chksum ^= rx[6+idx];
         }
+
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
            (rx[2] == tx[1]) &&
            (rx[1] == tx[2]) &&
@@ -215,14 +216,15 @@ unsigned char Query_Present_OutputVoltage(unsigned char fd, unsigned char target
            (rx[1] == tx[2]) &&
            (rx[3] == tx[3]))
         {
-
             Ret_Buf->behindFuse_Voltage_C1 =(rx[6] | (rx[7]<<8));
             Ret_Buf->behindRelay_Voltage_C1 =(rx[8] | (rx[9]<<8));
+
             if((rx[4] | rx[5]<<8) > 4)
             {
                 Ret_Buf->behindFuse_Voltage_C2 =(rx[10] | (rx[11]<<8));
                 Ret_Buf->behindRelay_Voltage_C2 =(rx[12] | (rx[13]<<8));
             }
+
             result = PASS;
         }
     }
@@ -293,7 +295,6 @@ unsigned char Query_Temperature(unsigned char fd, unsigned char targetAddr, Temp
         }
     }
 
-
     return result;
 }
 
@@ -359,15 +360,18 @@ unsigned char Query_Relay_Output(unsigned char fd, unsigned char targetAddr, Rel
            (rx[3] == tx[3]))
         {
             Ret_Buf->relay_event.bits.AC_Contactor = (rx[6] >> 0) & 0x01;
+
             Ret_Buf->relay_event.bits.CCS_Precharge = (rx[6] >> 1) & 0x01;
 
             Ret_Buf->relay_event.bits.Gun1_N = (rx[7] >> 0) & 0x01;
             Ret_Buf->relay_event.bits.Gun1_P = (rx[7] >> 1) & 0x01;
+
             Ret_Buf->relay_event.bits.Gun1_Parallel_N = (rx[7] >> 2) & 0x01;
             Ret_Buf->relay_event.bits.Gun1_Parallel_P = (rx[7] >> 3) & 0x01;
 
             Ret_Buf->relay_event.bits.Gun2_N = (rx[8] >> 0) & 0x01;
             Ret_Buf->relay_event.bits.Gun2_P = (rx[8] >> 1) & 0x01;
+
             result = PASS;
         }
     }
@@ -446,23 +450,23 @@ unsigned char Query_Gpio_Input(unsigned char fd, unsigned char targetAddr, Gpio_
            (rx[1] == tx[2]) &&
            (rx[3] == tx[3]))
         {
-            Ret_Buf->AC_Connector       = (rx[6] >> 0) & 0x01;
-            Ret_Buf->AC_MainBreaker     = (rx[6] >> 1) & 0x01;
-            Ret_Buf->SPD                = (rx[6] >> 2) & 0x01;
-            Ret_Buf->Door_Open          = (rx[6] >> 3) & 0x01;
-            Ret_Buf->GFD[0]             = (rx[6] >> 4) & 0x01;
-            Ret_Buf->GFD[1]             = (rx[6] >> 5) & 0x01;
-            Ret_Buf->AC_Drop            = (rx[6] >> 6) & 0x01;
+            Ret_Buf->AC_Connector           = (rx[6] >> 0) & 0x01;
+            Ret_Buf->AC_MainBreaker         = (rx[6] >> 1) & 0x01;
+            Ret_Buf->SPD                    = (rx[6] >> 2) & 0x01;
+            Ret_Buf->Door_Open              = (rx[6] >> 3) & 0x01;
+            Ret_Buf->GFD[0]                 = (rx[6] >> 4) & 0x01;
+            Ret_Buf->GFD[1]                 = (rx[6] >> 5) & 0x01;
+            Ret_Buf->AC_Drop                = (rx[6] >> 6) & 0x01;
 
-            Ret_Buf->Emergency_IO       = (rx[7] >> 0) & 0x01;
+            Ret_Buf->Emergency_IO           = (rx[7] >> 0) & 0x01;
 
             Ret_Buf->Button_Emergency_Press = (rx[8] >> 0) & 0x01;
-            Ret_Buf->Button_On_Press    = (rx[8] >> 1) & 0x01;
-            Ret_Buf->Button_Off_Press   = (rx[8] >> 2) & 0x01;
-            Ret_Buf->Key_1_Press        = (rx[8] >> 3) & 0x01;
-            Ret_Buf->Key_2_Press        = (rx[8] >> 4) & 0x01;
-            Ret_Buf->Key_3_Press        = (rx[8] >> 5) & 0x01;
-            Ret_Buf->Key_4_Press        = (rx[8] >> 6) & 0x01;
+            Ret_Buf->Button_On_Press        = (rx[8] >> 1) & 0x01;
+            Ret_Buf->Button_Off_Press       = (rx[8] >> 2) & 0x01;
+            Ret_Buf->Key_1_Press            = (rx[8] >> 3) & 0x01;
+            Ret_Buf->Key_2_Press            = (rx[8] >> 4) & 0x01;
+            Ret_Buf->Key_3_Press            = (rx[8] >> 5) & 0x01;
+            Ret_Buf->Key_4_Press            = (rx[8] >> 6) & 0x01;
 
             result = PASS;
         }
@@ -511,15 +515,18 @@ unsigned char Config_Fan_Speed(unsigned char fd, unsigned char targetAddr, FanSp
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[14] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
+
     if(len > 6)
     {
         if (len < 6+(rx[4] | rx[5]<<8))
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -547,6 +554,7 @@ unsigned char Config_Relay_Output(unsigned char fd, unsigned char targetAddr, Re
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6 + idx];
+
     tx[9] = chksum;
 
 //  for (int i = 0; i < 10; i++)
@@ -563,6 +571,7 @@ unsigned char Config_Relay_Output(unsigned char fd, unsigned char targetAddr, Re
 //          printf("set relay cmd : rx = %x \n", rx[i]);
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -594,10 +603,11 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
         tx[6] |= (Set_Buf->Button_LED[idx]?0x01:0x00)<<(1+idx);
 
     for(int idx = 0;idx<4;idx++)
-            tx[6] |= (Set_Buf->System_LED[idx]?0x01:0x00)<<(3+idx);
+        tx[6] |= (Set_Buf->System_LED[idx]?0x01:0x00)<<(3+idx);
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[14] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -608,6 +618,7 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -637,6 +648,7 @@ unsigned char Config_Gfd_Value(unsigned char fd, unsigned char targetAddr, Gfd_c
 
     for(int idx = 0; idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[8] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -647,6 +659,7 @@ unsigned char Config_Gfd_Value(unsigned char fd, unsigned char targetAddr, Gfd_c
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -668,7 +681,7 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 {
     unsigned char result = FAIL;
     unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Model_Name, 0x0E, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
@@ -676,6 +689,7 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 
     for(int idx = 0; idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[20] = chksum;
 
 //  for(int i = 0; i < 21; i++)
@@ -689,16 +703,17 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-              (rx[2] == tx[1]) &&
-              (rx[1] == tx[2]) &&
-              (rx[3] == tx[3]) &&
-              rx[6] == PASS)
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           rx[6] == PASS)
         {
             result = PASS;
         }
@@ -710,29 +725,31 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *Set_Buf)
 {
     unsigned char result = FAIL;
-    unsigned char tx[21] = { 0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
-            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
-            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
+    unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
+                            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
+                            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[20] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                rx[6] == PASS)
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           rx[6] == PASS)
         {
             result = PASS;
         }
@@ -750,15 +767,18 @@ unsigned char Update_Start(unsigned char fd, unsigned char targetAddr, unsigned
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[10] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
+
     if(len > 6)
     {
         if (len < 6+(rx[4] | rx[5]<<8))
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -825,10 +845,12 @@ unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsign
     tx[7] = (startAddr>>8) & 0xff;
     tx[8] = (startAddr>>16) & 0xff;
     tx[9] = (startAddr>>24) & 0xff;
+
     memcpy(tx+10, data, length);
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[sizeof(tx)-1] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -906,9 +928,9 @@ unsigned char Query_AC_Status(unsigned char fd, unsigned char targetAddr, Ac_Sta
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]))
         {
             Ret_Buf->CpStatus = rx[6];
             Ret_Buf->CurLimit = (rx[7] | (rx[8] << 8));
@@ -1046,12 +1068,13 @@ unsigned char Config_LED_Status(unsigned char fd, unsigned char targetAddr, Ac_L
 {
     unsigned char result = FAIL;
     unsigned char tx[12] = {0xaa, 0x00, targetAddr, Cmd.config_ac_led_status, 0x05, 0x00, Ret_Buf->ActionMode, (Ret_Buf->AcAlarmCode >> 0) & 0xFF,
-            (Ret_Buf->AcAlarmCode >> 8) & 0xFF, (Ret_Buf->AcAlarmCode >> 16) & 0xFF, (Ret_Buf->AcAlarmCode >> 24) & 0xFF};
+                            (Ret_Buf->AcAlarmCode >> 8) & 0xFF, (Ret_Buf->AcAlarmCode >> 16) & 0xFF, (Ret_Buf->AcAlarmCode >> 24) & 0xFF};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[11] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
@@ -1084,11 +1107,13 @@ unsigned char Config_Legacy_Req(unsigned char fd, unsigned char targetAddr, unsi
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[8] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1116,11 +1141,13 @@ unsigned char Config_Ac_Duty(unsigned char fd, unsigned char targetAddr, unsigne
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1148,11 +1175,13 @@ unsigned char Config_CSU_Mode(unsigned char fd, unsigned char targetAddr)
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1180,11 +1209,13 @@ unsigned char Config_Reset_MCU(unsigned char fd, unsigned char targetAddr)
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1207,13 +1238,14 @@ unsigned char Config_Led_Color(unsigned char fd, unsigned char targetAddr, Led_C
 {
     unsigned char result = FAIL;
     unsigned char tx[13] = {0xaa, 0x00, targetAddr, Cmd.config_led_color, 0x06, 0x00,
-            Ret_Buf->Connect_1_Red, Ret_Buf->Connect_1_Green, Ret_Buf->Connect_1_Blue,
-            Ret_Buf->Connect_2_Red, Ret_Buf->Connect_2_Green, Ret_Buf->Connect_2_Blue};
+                            Ret_Buf->Connect_1_Red, Ret_Buf->Connect_1_Green, Ret_Buf->Connect_1_Blue,
+                            Ret_Buf->Connect_2_Red, Ret_Buf->Connect_2_Green, Ret_Buf->Connect_2_Blue};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[13] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -1229,10 +1261,10 @@ unsigned char Config_Led_Color(unsigned char fd, unsigned char targetAddr, Led_C
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                (rx[6] == PASS))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           (rx[6] == PASS))
         {
             result = PASS;
         }

EVSE/Projects/DM30/Apps/main.c

@@ -1589,7 +1589,6 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
                 DEBUG_ERROR_MSG("write /dev/mtdblock10 NG\r\n");
                 result = FAIL;
             }
-
         }
         else
         {
@@ -1747,11 +1746,11 @@ void DisplayChargingInfo()
     {
         if (chargingInfo[i]->SystemStatus != S_IDLE &&
             chargingInfo[i]->SystemStatus != S_RESERVATION)
-            {
-                ChangeGunSelectByIndex(i);
+        {
+            ChangeGunSelectByIndex(i);
             return;
-            }
         }
+    }
 
     if (ShmSysConfigAndInfo->SysConfig.AcConnectorCount > 0 &&
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE &&
@@ -1956,7 +1955,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012289", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.ChademoOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.ChademoOutputUVPFail == YES)
         {
             memcpy(code, "012289", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -1977,7 +1976,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012290", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.GbtOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.GbtOutputUVPFail == YES)
         {
             memcpy(code, "012290", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -1998,7 +1997,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012288", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CcsOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CcsOutputUVPFail == YES)
         {
             memcpy(code, "012288", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -2237,39 +2236,39 @@ void ChkPrimaryStatus()
             {
                 switch(ac_chargingInfo[0]->SystemStatus)
                 {
-                case S_IDLE:
-                {
-                    if(isDetectPlugin())
+                    case S_IDLE:
                     {
-                        _DetectPlugInTimeout();
-                        StopSystemTimeoutDet();
+                        if(isDetectPlugin())
+                        {
+                            _DetectPlugInTimeout();
+                            StopSystemTimeoutDet();
+                        }
                     }
-                }
-                    break;
-                case S_REASSIGN_CHECK:
-                case S_REASSIGN:
-                case S_PREPARNING:
-                case S_PREPARING_FOR_EV:
-                case S_PREPARING_FOR_EVSE:
-                case S_CCS_PRECHARGE_ST0:
-                case S_CCS_PRECHARGE_ST1:
-                {
-                    // 取消充電
-                    AcChargingTerminalProcess();
-                }
-                    break;
-                case S_CHARGING:
-                {
-                    if (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE)
+                        break;
+                    case S_REASSIGN_CHECK:
+                    case S_REASSIGN:
+                    case S_PREPARNING:
+                    case S_PREPARING_FOR_EV:
+                    case S_PREPARING_FOR_EVSE:
+                    case S_CCS_PRECHARGE_ST0:
+                    case S_CCS_PRECHARGE_ST1:
                     {
-                        // 停止充電
+                        // 取消充電
                         AcChargingTerminalProcess();
                     }
-                }
-                    break;
-                case S_COMPLETE:
-                {}
-                    break;
+                        break;
+                    case S_CHARGING:
+                    {
+                        if (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE)
+                        {
+                            // 停止充電
+                            AcChargingTerminalProcess();
+                        }
+                    }
+                        break;
+                    case S_COMPLETE:
+                    {}
+                        break;
                 }
             }
 
@@ -2296,7 +2295,7 @@ void ChkPrimaryStatus()
                     if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc != NO_DEFINE)
                         AcChargingTerminalProcess();
                     else
-                    ChargingTerminalProcess(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
+                        ChargingTerminalProcess(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
                 }
                     break;
                 case S_CHARGING:
@@ -2347,8 +2346,8 @@ void ChkPrimaryStatus()
                 for (byte _index = 0; _index < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; _index++)
                 {
                     if (chargingInfo[_index]->SystemStatus != S_BOOTING &&
-                            chargingInfo[_index]->SystemStatus != S_IDLE &&
-                            chargingInfo[_index]->SystemStatus != S_RESERVATION)
+                        chargingInfo[_index]->SystemStatus != S_IDLE &&
+                        chargingInfo[_index]->SystemStatus != S_RESERVATION)
                     {
                         ShmSysConfigAndInfo->SysInfo.CurGunSelected = _index;
                         ChangeGunSelectByIndex(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
@@ -2523,7 +2522,7 @@ void CheckGunTypeFromHw()
                 bd1_2_status = gpioValue;
                 break;
             case 44:
-            bd0_1_status = gpioValue;
+                bd0_1_status = gpioValue;
                 break;
             case 45:
                 bd0_2_status = gpioValue;
@@ -2684,9 +2683,9 @@ void UserScanFunction()
 
                 PRINTF_FUNC("ac stop charging \n");
                 PRINTF_FUNC("index = %d, card number = %s, UserId = %s \n", ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc,
-                        ac_chargingInfo[0]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
+                            ac_chargingInfo[0]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
                 memcpy(value, (unsigned char *)ac_chargingInfo[0]->StartUserId,
-                    ARRAY_SIZE(ac_chargingInfo[0]->StartUserId));
+                       ARRAY_SIZE(ac_chargingInfo[0]->StartUserId));
                 if (strcmp((char *)ShmSysConfigAndInfo->SysConfig.UserId, value) == EQUAL)
                 {
                     AcChargingTerminalProcess();
@@ -2694,16 +2693,16 @@ void UserScanFunction()
                 strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
             }
             else if (stopReq < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount &&
-                    chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_CHARGING &&
-                    (_acgunIndex <= 0 || (_acgunIndex > 0 && ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)))
+                     chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_CHARGING &&
+                     (_acgunIndex <= 0 || (_acgunIndex > 0 && ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)))
             {
                 char value[32];
 
                 PRINTF_FUNC("stop charging \n");
                 PRINTF_FUNC("index = %d, card number = %s, UserId = %s \n", ShmSysConfigAndInfo->SysInfo.CurGunSelected,
-                        chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
+                            chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
                 memcpy(value, (unsigned char *)chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId,
-                        ARRAY_SIZE(chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId));
+                       ARRAY_SIZE(chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId));
 
                 // 同一張卡直接停掉
                 if (strcmp((char *)ShmSysConfigAndInfo->SysConfig.UserId, value) == EQUAL)
@@ -2831,7 +2830,7 @@ unsigned char isModeChange(unsigned char gun_index)
 void ScannerCardProcess()
 {
     if (!isDetectPlugin() && !isCardScan && ShmSysConfigAndInfo->SysWarningInfo.Level != 2 &&
-            ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE)
+        ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE)
     {
         isCardScan = true;
         // 處理刷卡及驗證卡號的動作
@@ -3002,7 +3001,7 @@ bool CheckConnectorTypeStatus()
     bool result = true;
 
     PRINTF_FUNC("bd0_1_status = %d, bd0_2_status = %d, bd1_1_status = %d, bd1_2_status = %d \n",
-            bd0_1_status, bd0_2_status, bd1_1_status, bd1_2_status);
+                bd0_1_status, bd0_2_status, bd1_1_status, bd1_2_status);
     if (strlen((char *) ShmSysConfigAndInfo->SysConfig.ModelName) >= 9)
     {
         byte slots = 1;
@@ -3028,8 +3027,8 @@ bool CheckConnectorTypeStatus()
         ShmSysConfigAndInfo->SysConfig.TotalConnectorCount = _gunIndex;
         ShmSysConfigAndInfo->SysConfig.AcConnectorCount = _acgunIndex;
         PRINTF_FUNC("DC _gunCount = %d, AC _gunCount = %d \n",
-                ShmSysConfigAndInfo->SysConfig.TotalConnectorCount,
-                ShmSysConfigAndInfo->SysConfig.AcConnectorCount);
+                    ShmSysConfigAndInfo->SysConfig.TotalConnectorCount,
+                    ShmSysConfigAndInfo->SysConfig.AcConnectorCount);
 
         if (ShmSysConfigAndInfo->SysConfig.TotalConnectorCount == 0)
         {
@@ -3650,8 +3649,8 @@ void GetSystemTime()
     ftime(&csuTime);
     tmCSU = localtime(&csuTime.time);
     PRINTF_FUNC("Time : %04d-%02d-%02d %02d:%02d:%02d \n", tmCSU->tm_year + 1900,
-            tmCSU->tm_mon + 1, tmCSU->tm_mday, tmCSU->tm_hour, tmCSU->tm_min,
-            tmCSU->tm_sec);
+                tmCSU->tm_mon + 1, tmCSU->tm_mday, tmCSU->tm_hour, tmCSU->tm_min,
+                tmCSU->tm_sec);
 
 //  byte date[14];
 //
@@ -3811,26 +3810,26 @@ void CheckOcppStatus()
 
         if (canReset)
         {
-        ShmOCPP16Data->MsMsg.bits.ResetReq = NO;
+            ShmOCPP16Data->MsMsg.bits.ResetReq = NO;
             sprintf((char*)ShmOCPP16Data->Reset.ResponseStatus, "Accepted");
-        if(strcmp((char *)ShmOCPP16Data->Reset.Type, "Hard") == EQUAL)
-        {
-            DEBUG_ERROR_MSG("****** Hard Reboot ****** \n");
+            if(strcmp((char *)ShmOCPP16Data->Reset.Type, "Hard") == EQUAL)
+            {
+                DEBUG_ERROR_MSG("****** Hard Reboot ****** \n");
                 ShmOCPP16Data->MsMsg.bits.ResetConf = YES;
-            sleep(3);
-            system("reboot -f");
-        }
-        else if (strcmp((char *)ShmOCPP16Data->Reset.Type, "Soft") == EQUAL)
-        {
-            DEBUG_ERROR_MSG("****** Soft Reboot ****** \n");
+                sleep(3);
+                system("reboot -f");
+            }
+            else if (strcmp((char *)ShmOCPP16Data->Reset.Type, "Soft") == EQUAL)
+            {
+                DEBUG_ERROR_MSG("****** Soft Reboot ****** \n");
                 ShmOCPP16Data->MsMsg.bits.ResetConf = YES;
-            sleep(3);
+                sleep(3);
                 system("killall OcppBackend &");
-            KillTask();
-            system("/usr/bin/run_evse_restart.sh");
+                KillTask();
+                system("/usr/bin/run_evse_restart.sh");
+            }
         }
     }
-    }
 }
 
 void OcppStartTransation(byte gunIndex)
@@ -3882,7 +3881,7 @@ void OcppRemoteStartChk()
         for (byte ac_index = 0; ac_index < ShmSysConfigAndInfo->SysConfig.AcConnectorCount; ac_index++)
         {
             if ((ac_chargingInfo[ac_index]->SystemStatus == S_IDLE || ac_chargingInfo[ac_index]->SystemStatus == S_RESERVATION)&&
-                    ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq == YES)
+                ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq == YES)
             {
                 ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq = NO;
                 ShmSysConfigAndInfo->SysInfo.OrderCharging = DEFAULT_AC_INDEX;
@@ -4424,7 +4423,7 @@ void CheckTask()
     }
 
     if(strcmp((char *)ShmSysConfigAndInfo->SysConfig.OcppServerURL, "") != EQUAL &&
-            strcmp((char *)ShmSysConfigAndInfo->SysConfig.ChargeBoxId, "") != EQUAL)
+       strcmp((char *)ShmSysConfigAndInfo->SysConfig.ChargeBoxId, "") != EQUAL)
     {
         if(system("pidof -s OcppBackend > /dev/null") != 0)
         {
@@ -4483,7 +4482,7 @@ void CheckSmartChargeProfile(byte _index)
             {
                 // 預設最小輸出電流 (MIN_OUTPUT_CUR) A
                 if (_time >= ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].StartPeriod &&
-                        ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].Limit > MIN_OUTPUT_CUR)
+                    ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].Limit > MIN_OUTPUT_CUR)
                 {
                     _startCount = _count;
                 }
@@ -4534,7 +4533,7 @@ void CheckReturnToChargingConn()
             if (count != ShmSysConfigAndInfo->SysInfo.CurGunSelected)
             {
                 if ((chargingInfo[count]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[count]->SystemStatus <= S_COMPLETE) ||
-                        (chargingInfo[count]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[count]->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                    (chargingInfo[count]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[count]->SystemStatus <= S_CCS_PRECHARGE_ST1))
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
@@ -4547,23 +4546,23 @@ void CheckReturnToChargingConn()
         {
             // 沒有選中 AC，且 AC 在充電中
             if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE &&
-                    (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING && ac_chargingInfo[0]->SystemStatus <= S_COMPLETE))
+                (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING && ac_chargingInfo[0]->SystemStatus <= S_COMPLETE))
             {
                 // 當前 DC 充電槍在 idle 狀態
                 if (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_IDLE ||
-                        chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_RESERVATION)
+                    chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_RESERVATION)
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
                 }
             }
             else if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == DEFAULT_AC_INDEX &&
-                        ((chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_COMPLETE) ||
-                        (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_CCS_PRECHARGE_ST1)))
+                     ((chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_COMPLETE) ||
+                      (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_CCS_PRECHARGE_ST1)))
             {
                 // 當前 DC 充電槍在 idle 狀態
                 if (ac_chargingInfo[0]->SystemStatus == S_IDLE ||
-                        ac_chargingInfo[0]->SystemStatus == S_RESERVATION)
+                    ac_chargingInfo[0]->SystemStatus == S_RESERVATION)
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
@@ -4581,14 +4580,14 @@ bool GetStartChargingByAlterMode(byte _gun)
     bool result = true;
 
     if (ShmSysConfigAndInfo->SysConfig.TotalConnectorCount == 2 &&
-            ShmSysConfigAndInfo->SysInfo.IsAlternatvieConf == YES)
+        ShmSysConfigAndInfo->SysInfo.IsAlternatvieConf == YES)
     {
         for (byte _select = 0; _select < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; _select++)
         {
             if (_select != _gun)
             {
                 if (chargingInfo[_select]->SystemStatus != S_IDLE &&
-                        chargingInfo[_select]->SystemStatus != S_RESERVATION)
+                    chargingInfo[_select]->SystemStatus != S_RESERVATION)
                 {
                     result = false;
                     break;
@@ -4619,7 +4618,7 @@ int main(void)
     }
 
     PRINTF_FUNC("Chademo = %d, CCS = %d, GB = %d, AC = %d \n",
-            CHAdeMO_QUANTITY, CCS_QUANTITY, GB_QUANTITY, AC_QUANTITY);
+                CHAdeMO_QUANTITY, CCS_QUANTITY, GB_QUANTITY, AC_QUANTITY);
     PRINTF_FUNC("\n"); PRINTF_FUNC("Initial SystemConfig and Info.......\n");
     if (!InitialSystemDefaultConfig())
     {
@@ -4663,7 +4662,7 @@ int main(void)
         ShmPsuData->Work_Step == _NO_WORKING)
     {
         if (ShmSysConfigAndInfo->SysWarningInfo.Level != 2)
-        DisplaySelfTestFailReason();
+            DisplaySelfTestFailReason();
 
         for (byte gun_index = 0; gun_index < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; gun_index++)
         {
@@ -4903,7 +4902,7 @@ int main(void)
                             {
                                 if (ShmSysConfigAndInfo->SysInfo.CurGunSelected == gun_index)
                                     ShmSysConfigAndInfo->SysInfo.ConnectorPage = _LCM_IDLE;
-                                    }
+                            }
                         } // Idle 正常程序終點
                     }
 
@@ -4986,12 +4985,12 @@ int main(void)
                         ShmSysConfigAndInfo->SysInfo.MainChargingMode == _MAIN_CHARGING_MODE_AVER)
                     {
                         if (ShmSysConfigAndInfo->SysInfo.CanAverageCharging)
-                        setChargerMode(gun_index, MODE_PRECHARGE);
+                            setChargerMode(gun_index, MODE_PRECHARGE);
                         else
                             setChargerMode(gun_index, MODE_IDLE);
                     }
                     else if (ShmSysConfigAndInfo->SysInfo.ReAssignedFlag == _REASSIGNED_RELAY_M_TO_A &&
-                        ShmSysConfigAndInfo->SysInfo.BridgeRelayStatus == NO)
+                             ShmSysConfigAndInfo->SysInfo.BridgeRelayStatus == NO)
                     {
                         PRINTF_FUNC("=============Smart Charging : _REASSIGNED_COMP============= Step 6 \n");
                         ShmSysConfigAndInfo->SysInfo.MainChargingMode = _MAIN_CHARGING_MODE_AVER;
@@ -5178,7 +5177,7 @@ int main(void)
                             RecordAlarmCode(gun_index, "012234");
                         }
                         else if (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
-                            (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL))
+                                 (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL))
                         {
                             // UVP
                             RecordAlarmCode(gun_index, "012289");
@@ -5200,8 +5199,8 @@ int main(void)
                             RecordAlarmCode(gun_index, "012236");
                         }
                         else if (isPrechargeStatus_gb(gun_index) == 10 &&
-                                (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
-                                 (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL)))
+                                 (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
+                                  (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL)))
                         {
                             // UVP
                             RecordAlarmCode(gun_index, "012290");
@@ -5303,7 +5302,6 @@ int main(void)
                             strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "Local");
                     }
 
-
                     if (ShmSysConfigAndInfo->SysInfo.CurGunSelected == gun_index)
                         ShmSysConfigAndInfo->SysInfo.ConnectorPage = _LCM_COMPLETE;
                 }
@@ -5421,7 +5419,7 @@ int main(void)
                 else if (ac_chargingInfo[0]->SystemStatus == S_CHARGING)
                     ChangeLcmByIndex(_LCM_CHARGING);
                 else if (ac_chargingInfo[0]->SystemStatus == S_TERMINATING ||
-                        ac_chargingInfo[0]->SystemStatus == S_COMPLETE)
+                         ac_chargingInfo[0]->SystemStatus == S_COMPLETE)
                     ChangeLcmByIndex(_LCM_COMPLETE);
                 else
                     dcPageRun = true;

EVSE/Projects/DW30/Apps/Module_EvComm.c

@@ -103,9 +103,9 @@ void GetMaxVolAndCurMethod(byte index, float *vol, float *cur);
 void GetMaxPowerMethod(byte index, float *pow);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 unsigned long GetTimeoutValue(struct timeval _sour_time)
 {
@@ -231,12 +231,12 @@ int InitShareMemory()
         DEBUG_ERROR("shmat ShmSysConfigAndInfo NG\n");
         #endif
         result = FAIL;
-     }
+    }
     else
     {}
 
-     //initial ShmStatusCodeData
-     if ((MeterSMId = shmget(ShmStatusCodeKey, sizeof(struct StatusCodeData),  0777)) < 0)
+    //initial ShmStatusCodeData
+    if ((MeterSMId = shmget(ShmStatusCodeKey, sizeof(struct StatusCodeData),  0777)) < 0)
     {
         #ifdef SystemLogMessage
         DEBUG_ERROR("shmget ShmStatusCodeData NG\n");
@@ -272,6 +272,7 @@ int InitShareMemory()
         else
         {}
     }
+
     if(GB_QUANTITY > 0)
     {
         if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData),  IPC_CREAT | 0777)) < 0)
@@ -1940,7 +1941,7 @@ void ClearAbnormalStatus_CCS(byte gun_index)
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023850", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutV2GPreChargePerformaceTime == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutV2GPreChargePerformaceTime == YES)
     {
         memcpy(code, "023850", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
@@ -2199,14 +2200,14 @@ void ClearAbnormalStatus_CCS(byte gun_index)
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023891", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccNotReadyForCharging == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccNotReadyForCharging == YES)
     {
         memcpy(code, "023891", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
         isCleanCheck = true;
     }
     else if (strncmp((char *)_chargingData[gun_index]->EvConnAlarmCode, "023892", 6) == EQUAL &&
-            ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES)
+             ShmStatusCodeData->InfoCode.InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES)
     {
         memcpy(code, "023892", 6);
         memcpy(_chargingData[gun_index]->EvConnAlarmCode, "", 6);
@@ -2930,7 +2931,7 @@ void SetPresentChargingOutputPower(struct ChargingInfoData *chargingData_1, stru
         _outCur_2 != cur2)
     {
         PRINTF_FUNC("G1 -> Output Vol = %f, Output Cur = %f -- G2 -> Output Vol = %f, Output Cur = %f \n",
-            vol1, cur1, vol2, cur2);
+                    vol1, cur1, vol2, cur2);
 
         _outVol_1 = vol1; _outCur_1 = cur1; _outVol_2 = vol2; _outCur_2 = cur2;
     }
@@ -2964,7 +2965,7 @@ void SetPresentChargingOutputCap(struct ChargingInfoData *chargingData_1, struct
         _cur_2 != cur2)
     {
         PRINTF_FUNC("To EV (Real) Power_1 = %f, Cur_1 = %f, Power_2 = %f, Cur_2 = %f \n",
-                pow1, cur1, pow2, cur2);
+                    pow1, cur1, pow2, cur2);
         _pow_1 = pow1; _cur_1 = cur1; _pow_2 = pow2; _cur_2 = cur2;
         chargingData_1->RealMaxCurrent = _cur_1;
         chargingData_1->RealMaxPower = pow1;
@@ -3219,10 +3220,10 @@ int main(int argc, char *argv[])
                 // 固定要取得的資訊 : 1.槍鎖狀態, 2."Connector 1" 溫度, 3."Connector 2" 溫度, 4.Pilot Voltage
                 //PRINTF_FUNC("GetMiscellaneousInfo. index = %d, Eid = %d \n", _index, _chargingData[_index]->Evboard_id);
                 GetMiscellaneousInfo(_index,
-                        _chargingData[_index]->RelayK1K2Status,
-                        _chargingData[_index]->PresentChargedEnergy,
-                        (_chargingData[_index]->PresentChargingVoltage * 10),
-                        _chargingData[_index]->Evboard_id);
+                                     _chargingData[_index]->RelayK1K2Status,
+                                     _chargingData[_index]->PresentChargedEnergy,
+                                     (_chargingData[_index]->PresentChargingVoltage * 10),
+                                     _chargingData[_index]->Evboard_id);
             }
 
             switch (_chargingData[_index]->SystemStatus)
@@ -3296,14 +3297,14 @@ int main(int argc, char *argv[])
                         GetMaxVolAndCurMethod(_index, &maxVol, &maxCur);
 
                         PRINTF_FUNC("To EV_%d Max_Vol = %f, Cap_Cur = %f, Cap_Pow = %f \n",
-                                _index, maxVol, maxCur, _chargingData[_index]->AvailableChargingPower);
+                                    _index, maxVol, maxCur, _chargingData[_index]->AvailableChargingPower);
                         _chargingData[_index]->RealMaxVoltage = maxVol;
 
                         SetChargingPermission(_index, START,
-                        _chargingData[_index]->AvailableChargingPower,
-                                maxCur,
-                                maxVol,
-                                _chargingData[_index]->Evboard_id);
+                                              _chargingData[_index]->AvailableChargingPower,
+                                              maxCur,
+                                              maxVol,
+                                              _chargingData[_index]->Evboard_id);
 
                         // 取得車端電池資訊 : 1.AC or DC ? 2.Total battery cap, 3.Max battery vol, 4.Max battery cur
                         GetEvBatteryInfo(_index, _chargingData[_index]->Evboard_id);
@@ -3363,7 +3364,7 @@ int main(int argc, char *argv[])
                         SetIsolationStatus(_index, _result, _chargingData[_index]->Evboard_id);
 
                         if(_chargingData[_index]->SystemStatus == S_CCS_PRECHARGE_ST0 &&
-                            _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
+                           _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
                         {
                             SetEvsePrechargeInfo(_index, PRECHARGE_PRERELAY_PASS, _chargingData[_index]->Evboard_id);
                         }
@@ -3436,7 +3437,7 @@ int main(int argc, char *argv[])
                         }
 
                         if(_chargingData[_index]->Type == _Type_CCS_2 &&
-                            _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
+                           _chargingData[_index]->PrechargeStatus == PRECHARGE_READY)
                         {
                             SetEvsePrechargeInfo(_index, PRECHARGE_CHARELAY_PASS, _chargingData[_index]->Evboard_id);
                         }
@@ -3480,10 +3481,10 @@ int main(int argc, char *argv[])
 
                         GetMaxVolAndCurMethod(_index, &maxVol, &maxCur);
                         SetChargingPermission(_index, STOP,
-                                    _chargingData[_index]->AvailableChargingPower,
-                                    maxCur,
-                                    maxVol,
-                                    _chargingData[_index]->Evboard_id);
+                                              _chargingData[_index]->AvailableChargingPower,
+                                              maxCur,
+                                              maxVol,
+                                              _chargingData[_index]->Evboard_id);
                     }
                 }
                     break;

EVSE/Projects/DW30/Apps/Module_EvComm.h

@@ -61,18 +61,18 @@ void EvseStopChargingEvent(byte stopResult, byte *stopReason, byte toId);
 enum Receieve_PSU_msgf
 {
     // 車端主動
-    ADDRESS_REQ =                       0x080001FF,
-    NOTIFICATION_EV_STATUS =            0x08000300,
-    NOTIFICATION_EV_STOP =              0x08000B00,
+    ADDRESS_REQ                         = 0x080001FF,
+    NOTIFICATION_EV_STATUS              = 0x08000300,
+    NOTIFICATION_EV_STOP                = 0x08000B00,
 
     // 車端回應
-    ACK_EV_FW_VERSION =                 0x08000400,
-    ACK_EV_HW_VERSION =                 0x08000500,
-    ACK_GET_OUTPUT_REQ =                0x08000900,
-    ACK_GET_EV_BATTERY_INFO =           0x08000A00,
-    ACK_GET_MISCELLANEOUS_INFO =        0x08000D00,
-    ACK_EVSE_ISOLATION_STATUS =         0x08001200,
-    ACK_EVSE_PRECHAGE_INFO =            0x08001500,
+    ACK_EV_FW_VERSION                   = 0x08000400,
+    ACK_EV_HW_VERSION                   = 0x08000500,
+    ACK_GET_OUTPUT_REQ                  = 0x08000900,
+    ACK_GET_EV_BATTERY_INFO             = 0x08000A00,
+    ACK_GET_MISCELLANEOUS_INFO          = 0x08000D00,
+    ACK_EVSE_ISOLATION_STATUS           = 0x08001200,
+    ACK_EVSE_PRECHAGE_INFO              = 0x08001500,
 };
 
 #endif /* MODULE_EVCOMM_H_ */

EVSE/Projects/DW30/Apps/Module_EventLogging.c

@@ -39,9 +39,9 @@ struct StatusCodeData           *ShmStatusCodeData;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 int StoreLogMsg(const char *fmt, ...)
 {

EVSE/Projects/DW30/Apps/Module_InternalComm.c

@@ -160,17 +160,17 @@ Ac_Charging_current acChargingCurrent;
 #define AC_RELAY_DRIVE_FAULT        262144
 
 int _alarm_code[] = {AC_OVP, AC_UVP, AC_OCP, AC_OTP, AC_GMI_FAULT, AC_CP_ERROR, AC_AC_LEAKAGE
-        , AC_DC_LEAKAGE, AC_SYSTEM_SELFTEST_FAULT, AC_HANDSHAKE_TIMEOUT, AC_EMC_STOP, AC_RELAY_WELDING
-        , AC_GF_MODULE_FAULT, AC_SHUTTER_FAULT, AC_LOCKER_FAULT, AC_POWER_DROP, AC_CIRCUIT_SHORT
-        , AC_ROTARY_SWITCH_FAULT, AC_RELAY_DRIVE_FAULT};
+                     , AC_DC_LEAKAGE, AC_SYSTEM_SELFTEST_FAULT, AC_HANDSHAKE_TIMEOUT, AC_EMC_STOP, AC_RELAY_WELDING
+                     , AC_GF_MODULE_FAULT, AC_SHUTTER_FAULT, AC_LOCKER_FAULT, AC_POWER_DROP, AC_CIRCUIT_SHORT
+                     , AC_ROTARY_SWITCH_FAULT, AC_RELAY_DRIVE_FAULT};
 
 void PRINTF_FUNC(char *string, ...);
 
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 unsigned long GetTimeoutValue(struct timeval _sour_time)
 {
@@ -620,11 +620,11 @@ void CheckK1K2RelayOutput(byte index)
             {
                 if (gunCount == 1)
                 {
-                if (regRelay.relay_event.bits.Gun1_N == YES && regRelay.relay_event.bits.CCS_Precharge == YES)
-                    _chargingData[index]->RelayKPK2Status = YES;
-                else
-                    _chargingData[index]->RelayKPK2Status = NO;
-            }
+                    if (regRelay.relay_event.bits.Gun1_N == YES && regRelay.relay_event.bits.CCS_Precharge == YES)
+                        _chargingData[index]->RelayKPK2Status = YES;
+                    else
+                        _chargingData[index]->RelayKPK2Status = NO;
+                }
                 else
                 {
                     if (_chargingData[index]->SystemStatus == S_CCS_PRECHARGE_ST0)
@@ -697,12 +697,12 @@ void GetGfdAdc()
                 if (_chargingData[i]->GroundFaultStatus == GFD_FAIL)
                 {
                     PRINTF_FUNC("GFD Fail. index = %d, Step = %d, R = %d, Vol = %d \n",
-                            i, gfd_adc.rb_step_1, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
+                                i, gfd_adc.rb_step_1, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
                 }
                 else if (_chargingData[i]->GroundFaultStatus == GFD_WARNING)
                 {
-                  PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
-                      i, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
+                    PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
+                                i, gfd_adc.Resister_conn1, gfd_adc.voltage_conn1);
                 }
             }
             else if (i == 1)
@@ -711,12 +711,12 @@ void GetGfdAdc()
                 if (_chargingData[i]->GroundFaultStatus == GFD_FAIL)
                 {
                     PRINTF_FUNC("GFD Fail. index = %d, Step = %d, R = %d, Vol = %d \n",
-                            i, gfd_adc.rb_step_2, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
+                                i, gfd_adc.rb_step_2, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
                 }
                 else if (_chargingData[i]->GroundFaultStatus == GFD_WARNING)
                 {
-                  PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
-                      i, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
+                    PRINTF_FUNC("GFD Warning. index = %d, R = %d, Vol = %d \n",
+                                i, gfd_adc.Resister_conn2, gfd_adc.voltage_conn2);
                 }
             }
         }
@@ -877,7 +877,7 @@ void SetK1K2RelayStatus(byte index)
         }
     }
     else if ((_chargingData[index]->SystemStatus >= S_PREPARING_FOR_EVSE &&
-            _chargingData[index]->SystemStatus <= S_CHARGING))
+             _chargingData[index]->SystemStatus <= S_CHARGING))
     {
         if (_chargingData[index]->RelayWeldingCheck == YES)
         {
@@ -898,7 +898,7 @@ void SetK1K2RelayStatus(byte index)
         }
     }
     else if ((_chargingData[index]->SystemStatus >= S_TERMINATING &&
-            _chargingData[index]->SystemStatus <= S_COMPLETE))
+             _chargingData[index]->SystemStatus <= S_COMPLETE))
     {
         if ((_chargingData[index]->PresentChargingCurrent * 10) <= SEFETY_SWITCH_RELAY_CUR)
         {
@@ -1169,7 +1169,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
             led_color.Connect_1_Red     = COLOR_MIN_LV;
         }
         else if ((chargingData_1->SystemStatus >= S_AUTHORIZING && chargingData_1->SystemStatus <= S_COMPLETE) ||
-                (chargingData_1->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_1->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                 (chargingData_1->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_1->SystemStatus <= S_CCS_PRECHARGE_ST1))
         {
             led_color.Connect_1_Green   = COLOR_MIN_LV;
             led_color.Connect_1_Blue    = COLOR_MAX_LV;
@@ -1184,7 +1184,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
             led_color.Connect_2_Red     = COLOR_MIN_LV;
         }
         else if ((chargingData_2->SystemStatus >= S_AUTHORIZING && chargingData_2->SystemStatus <= S_COMPLETE) ||
-                (chargingData_2->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_2->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                 (chargingData_2->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingData_2->SystemStatus <= S_CCS_PRECHARGE_ST1))
         {
             led_color.Connect_2_Green   = COLOR_MIN_LV;
             led_color.Connect_2_Blue    = COLOR_MAX_LV;
@@ -1205,7 +1205,7 @@ void SetLedColor(struct ChargingInfoData *chargingData_1, struct ChargingInfoDat
     if (_checkLedChanged > 0)
     {
         if (Config_Led_Color(Uart5Fd, Addr.Led, &led_color) == PASS)
-    {
+        {
             _checkLedChanged--;
 
             cur_led_color.Connect_1_Red = led_color.Connect_1_Red;
@@ -1365,29 +1365,29 @@ int InitComPort()
 //================================================
 bool FindChargingInfoData(byte target, struct ChargingInfoData **chargingData)
 {
-    for (byte index = 0; index < CHAdeMO_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index];
+    for (byte index = 0; index < CHAdeMO_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index];
             return true;
         }
     }
 
-    for (byte index = 0; index < CCS_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.CcsChargingData[index];
+    for (byte index = 0; index < CCS_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.CcsChargingData[index];
             return true;
         }
     }
 
-    for (byte index = 0; index < GB_QUANTITY; index++) {
-        if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index
-                == target) {
-            chargingData[target] =
-                    &ShmSysConfigAndInfo->SysInfo.GbChargingData[index];
+    for (byte index = 0; index < GB_QUANTITY; index++)
+    {
+        if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == target)
+        {
+            chargingData[target] = &ShmSysConfigAndInfo->SysInfo.GbChargingData[index];
             return true;
         }
     }
@@ -1555,7 +1555,7 @@ void CableCheckDetected(byte index)
                 SetGfdConfig(index, GFD_CABLECHK);
             }
             else if (_chargingData[index]->SystemStatus >= S_CCS_PRECHARGE_ST0 &&
-                    _chargingData[index]->SystemStatus <= S_CCS_PRECHARGE_ST1)
+                     _chargingData[index]->SystemStatus <= S_CCS_PRECHARGE_ST1)
             {
                 SetGfdConfig(index, GFD_PRECHARGE);
             }
@@ -1592,9 +1592,9 @@ void CheckOutputPowerOverCarReq(byte index)
         if (fireV >= (carV + (carV * 0.1)))
         {
             PRINTF_FUNC("[Module_InternalComm]CheckOutputPowerOverCarReq NG : fire = %f, battery = %f \n",
-                    _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
+                        _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
             DEBUG_ERROR("[Module_InternalComm]CheckOutputPowerOverCarReq NG : fire = %f, battery = %f \n",
-                    _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
+                        _chargingData[index]->FireChargingVoltage, (_chargingData[index]->EvBatterytargetVoltage * 10));
             _chargingData[index]->StopChargeFlag = YES;
         }
     }
@@ -1620,9 +1620,9 @@ void CheckOutputVolNoneMatchFire(byte index)
                 if ((GetTimeoutValue(_checkOutputNoneMatchTimer[index]) / 1000) >= 5000)
                 {
                     PRINTF_FUNC("[Module_InternalComm]CheckOutputVolNoneMatchFire NG (%d) : pre = %f, fire = %f \n",
-                            index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
+                                index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
                     DEBUG_ERROR("[Module_InternalComm]CheckOutputVolNoneMatchFire NG (%d): pre = %f, fire = %f \n",
-                            index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
+                                index, (_chargingData[index]->PresentChargingVoltage * 10), _chargingData[index]->FireChargingVoltage);
                     _chargingData[index]->StopChargeFlag = YES;
                 }
             }
@@ -1679,19 +1679,19 @@ void GetPsuTempForFanSpeed()
 
     if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == NO)
     {
-    if (ShmFanModuleData->TestFanSpeed == NORMAL_FAN_SPEED)
-    {
-        if (temp >= ENV_TEMP_MAX)
-            ShmFanModuleData->TestFanSpeed = MAX_FAN_SPEED;
-    }
-    else if (ShmFanModuleData->TestFanSpeed == MAX_FAN_SPEED)
-    {
-        if (temp <= ENV_TEMP_MIN)
+        if (ShmFanModuleData->TestFanSpeed == NORMAL_FAN_SPEED)
+        {
+            if (temp >= ENV_TEMP_MAX)
+                ShmFanModuleData->TestFanSpeed = MAX_FAN_SPEED;
+        }
+        else if (ShmFanModuleData->TestFanSpeed == MAX_FAN_SPEED)
+        {
+            if (temp <= ENV_TEMP_MIN)
+                ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
+        }
+        else
             ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
     }
-    else
-        ShmFanModuleData->TestFanSpeed = NORMAL_FAN_SPEED;
-    }
 }
 
 void GetAcStatus()
@@ -1825,7 +1825,7 @@ void AcChargeTypeProcess()
                     _status = S_IDLE;
             }
             else if (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING &&
-                    ac_chargingInfo[0]->SystemStatus < S_CHARGING)
+                     ac_chargingInfo[0]->SystemStatus < S_CHARGING)
             {
                 if (acStatus.CpStatus == AC_SYS_C && acStatus.RelayStatus == YES)
                     _status = S_CHARGING;
@@ -1839,7 +1839,7 @@ void AcChargeTypeProcess()
                       ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE))
             {
                 if (ShmSysConfigAndInfo->SysInfo.OrderCharging != FAIL &&
-                        ShmSysConfigAndInfo->SysInfo.OrderCharging == DEFAULT_AC_INDEX)
+                    ShmSysConfigAndInfo->SysInfo.OrderCharging == DEFAULT_AC_INDEX)
                 {
                     PRINTF_FUNC("** AC Remote \n");
                     strcpy((char *)ac_chargingInfo[0]->StartUserId, "");
@@ -1848,13 +1848,13 @@ void AcChargeTypeProcess()
                 }
                 else
                 {
-                PRINTF_FUNC("** UserId = %s \n", ShmSysConfigAndInfo->SysConfig.UserId);
-                strcpy((char *)ac_chargingInfo[0]->StartUserId, (char *)ShmSysConfigAndInfo->SysConfig.UserId);
-                PRINTF_FUNC("** CardNumber = %s \n", ac_chargingInfo[0]->StartUserId);
-                strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
-                ShmSysConfigAndInfo->SysInfo.WaitForPlugit = NO;
-                _status = S_PREPARNING;
-            }
+                    PRINTF_FUNC("** UserId = %s \n", ShmSysConfigAndInfo->SysConfig.UserId);
+                    strcpy((char *)ac_chargingInfo[0]->StartUserId, (char *)ShmSysConfigAndInfo->SysConfig.UserId);
+                    PRINTF_FUNC("** CardNumber = %s \n", ac_chargingInfo[0]->StartUserId);
+                    strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
+                    ShmSysConfigAndInfo->SysInfo.WaitForPlugit = NO;
+                    _status = S_PREPARNING;
+                }
             }
 
             //printf("_status = %d \n", _status);
@@ -2039,10 +2039,10 @@ int main(void)
             // 自檢階段
             if (ShmSysConfigAndInfo->SysInfo.SelfTestSeq <= _STEST_PSU_CAP)
             {
-            GetFwAndHwVersion_Led();
-            sleep(1);
-            gettimeofday(&_led_priority_time, NULL);
-        }
+                GetFwAndHwVersion_Led();
+                sleep(1);
+                gettimeofday(&_led_priority_time, NULL);
+            }
             else
             {
                 // 自檢階段沒有問到版號
@@ -2100,9 +2100,9 @@ int main(void)
                     // 限定只有在槍類別為 GBT 的時候才做 relay welding 的判斷
                     if (_chargingData[i]->Type == _Type_GB)
                     {
-                    if (_chargingData[i]->SystemStatus >= S_PREPARING_FOR_EVSE &&
+                        if (_chargingData[i]->SystemStatus >= S_PREPARING_FOR_EVSE &&
                             _chargingData[i]->RelayWeldingCheck == NO)
-                        CheckRelayWeldingStatus(i);
+                            CheckRelayWeldingStatus(i);
                     }
                     else
                         _chargingData[i]->RelayWeldingCheck = YES;
@@ -2157,14 +2157,14 @@ int main(void)
                     regRelay.relay_event.bits.Gun1_Parallel_N = outputRelay.relay_event.bits.Gun1_Parallel_N;
 
                     PRINTF_FUNC("Match Relay, AC = %x, g1_p = %x, g1_n = %x, g2_p = %x, g2_n = %x, pre = %x, bri_p = %x, bri_n = %x \n",
-                            regRelay.relay_event.bits.AC_Contactor,
-                            regRelay.relay_event.bits.Gun1_P,
-                            regRelay.relay_event.bits.Gun1_N,
-                            regRelay.relay_event.bits.Gun2_P,
-                            regRelay.relay_event.bits.Gun2_N,
-                            regRelay.relay_event.bits.CCS_Precharge,
-                            regRelay.relay_event.bits.Gun1_Parallel_P,
-                            regRelay.relay_event.bits.Gun1_Parallel_N);
+                                regRelay.relay_event.bits.AC_Contactor,
+                                regRelay.relay_event.bits.Gun1_P,
+                                regRelay.relay_event.bits.Gun1_N,
+                                regRelay.relay_event.bits.Gun2_P,
+                                regRelay.relay_event.bits.Gun2_N,
+                                regRelay.relay_event.bits.CCS_Precharge,
+                                regRelay.relay_event.bits.Gun1_Parallel_P,
+                                regRelay.relay_event.bits.Gun1_Parallel_N);
                 }
             }
         }
@@ -2229,13 +2229,13 @@ int main(void)
         {
             if (GetTimeoutValue(_led_priority_time) / 1000 >= 1000)
             {
-            if(gunCount == 1)
-            {
-                SetLedColor(_chargingData[0], _chargingData[0]);
-            }
-            else if (gunCount == 2)
-            {
-                SetLedColor(_chargingData[0], _chargingData[1]);
+                if(gunCount == 1)
+                {
+                    SetLedColor(_chargingData[0], _chargingData[0]);
+                }
+                else if (gunCount == 2)
+                {
+                    SetLedColor(_chargingData[0], _chargingData[1]);
                 }
 
                 gettimeofday(&_led_priority_time, NULL);

EVSE/Projects/DW30/Apps/Module_LcmControl.c

@@ -4,9 +4,9 @@ bool needReloadQr = true;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 char* getTimeString(void);
 
@@ -424,17 +424,28 @@ void DemoFunction()
     }
     else
     {
-        if (demoCount == 20) {
+        if (demoCount == 20)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_IDLE;
-        } else if (demoCount == 80) {
+        }
+        else if (demoCount == 80)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZING;
-        } else if (demoCount == 100) {
+        }
+        else if (demoCount == 100)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZ_COMP;
-        } else if (demoCount == 120) {
+        }
+        else if (demoCount == 120)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_AUTHORIZ_FAIL;
-        } else if (demoCount == 140) {
+        }
+        else if (demoCount == 140)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_PRE_CHARGE;
-        } else if (demoCount == 180) {
+        }
+        else if (demoCount == 180)
+        {
             ShmSysConfigAndInfo->SysInfo.PageIndex = _LCM_CHARGING;
         }
     }
@@ -567,35 +578,35 @@ void ChangeBattMapAndValue(short page, int soc)
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_empty);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_20);
+                ChangeDisplay2Value(__batt_map, _battery_cap_20);
         }
         else if (soc >= 20 && soc < 40)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_20);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_40);
+                ChangeDisplay2Value(__batt_map, _battery_cap_40);
         }
         else if (soc >= 40 && soc < 60)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_40);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_60);
+                ChangeDisplay2Value(__batt_map, _battery_cap_60);
         }
         else if (soc >= 60 && soc < 80)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_60);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_80);
+                ChangeDisplay2Value(__batt_map, _battery_cap_80);
         }
         else if (soc >= 80 && soc <= 100)
         {
             if (_battery_display_ani)
                 ChangeDisplay2Value(__batt_map, _battery_cap_80);
             else
-            ChangeDisplay2Value(__batt_map, _battery_cap_100);
+                ChangeDisplay2Value(__batt_map, _battery_cap_100);
         }
     }
     else if (page == _LCM_COMPLETE)
@@ -979,7 +990,7 @@ void ProcessPageInfo()
                             ChangeChargingEnergyValue(ac_chargingInfo[0]->PresentChargedEnergy);
 
                             if (ShmSysConfigAndInfo->SysConfig.BillingData.isBilling &&
-                                    ac_chargingInfo[0]->ChargingFee >= 0)
+                                ac_chargingInfo[0]->ChargingFee >= 0)
                             {
                                 ChangeChargingFeeValue(ac_chargingInfo[0]->ChargingFee);
                             }
@@ -1134,8 +1145,8 @@ void ProcessPageInfo()
                 }
 
                 if (_chargingInfoData[index]->SystemStatus == S_IDLE ||
-                        _chargingInfoData[index]->SystemStatus == S_RESERVATION ||
-                        _chargingInfoData[index]->SystemStatus == S_BOOTING)
+                    _chargingInfoData[index]->SystemStatus == S_RESERVATION ||
+                    _chargingInfoData[index]->SystemStatus == S_BOOTING)
                 {
                     if (FirstPageChanged() == YES || needReloadQr || _page_reload)
                     {

EVSE/Projects/DW30/Apps/Module_PrimaryComm.c

@@ -59,9 +59,9 @@ byte flash = NO;
 
 void PRINTF_FUNC(char *string, ...);
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 int StoreLogMsg(const char *fmt, ...)
 {
@@ -145,11 +145,14 @@ void trim(char *s)
     while((s[j]==' ')||(s[j]=='\t')||(s[j]=='\n'))
         j--;
 
-    if(i==0 && j==strlen(s)-1) { }
-    else if(i==0) s[j+1] = '\0';
-    else {
+    if(i==0 && j==strlen(s)-1)
+    { }
+    else if(i==0)
+        s[j+1] = '\0';
+    else
+    {
         for(k=i; k<=j; k++) s[l++] = s[k];
-        s[l] = '\0';
+            s[l] = '\0';
     }
 }
 

EVSE/Projects/DW30/Apps/PrimaryComm.c

@@ -167,13 +167,14 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
         tx[6] |= (Set_Buf->Button_LED[idx] ? 0x01:0x00) << (0+idx);
 
     for (int idx = 0; idx < 4; idx++)
-            tx[6] |= (Set_Buf->System_LED[idx] ? 0x01:0x00) << (2+idx);
+        tx[6] |= (Set_Buf->System_LED[idx] ? 0x01:0x00) << (2+idx);
 
     tx[6] |= (Set_Buf->AC_Connector ? 0x01:0x00) << 6;
     tx[6] |= (Set_Buf->AC_Breaker ? 0x01:0x00) << 7;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
+
     tx[7] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
@@ -200,14 +201,15 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
 unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *Set_Buf)
 {
     unsigned char result = FAIL;
-    unsigned char tx[21] = { 0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
-            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
-            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
+    unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
+                            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
+                            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[20] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
@@ -219,10 +221,10 @@ unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *S
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                (rx[6] == tx[6]))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           (rx[6] == tx[6]))
         {
             result = PASS;
         }
@@ -240,8 +242,8 @@ unsigned char Update_Start(unsigned char fd, unsigned char targetAddr, unsigned
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
-    tx[10] = chksum;
 
+    tx[10] = chksum;
 
     if(tranceive(fd, tx, sizeof(tx), rx) > 0)
     {
@@ -312,6 +314,7 @@ unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsign
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6+idx];
+
     tx[sizeof(tx)-1] = chksum;
 
     if(tranceive(fd, tx, sizeof(tx), rx) >0)

EVSE/Projects/DW30/Apps/PrimaryComm.h

@@ -23,7 +23,6 @@ extern struct Command
     unsigned char update_Abort;         //0xe1
     unsigned char update_Transfer;      //0xe2
     unsigned char update_Finish;        //0xe3
-
 }Cmd;
 
 typedef struct Verion
@@ -75,5 +74,4 @@ extern unsigned char Update_Abord(unsigned char fd, unsigned char targetAddr);
 extern unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsigned int startAddr, unsigned char *data, unsigned short int length);
 extern unsigned char Update_Finish(unsigned char fd, unsigned char targetAddr);
 
-
 #endif /* PRIMARYCOMM_H_ */

EVSE/Projects/DW30/Apps/ReadCmdline.c

@@ -5,7 +5,6 @@
  *      Author: 7564
  */
 
-
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <sys/types.h>
@@ -63,13 +62,13 @@ struct PsuData                  *ShmPsuData;
 struct ChargingInfoData         *_chargingData[CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY];
 struct ChargingInfoData         *ac_chargingInfo[AC_QUANTITY];
 
-char *msg = "state : get gun state (index) \n"
-        "card : scanning card (x) : \n"
-        "gun : get gun plugit state (index) \n"
-        "lock : get gun locked state (index) \n"
-        "self : self test state (x) \n"
-        "ver : ver of board (407 or index or rb or fan) \n"
-        "ac : get ac relay state (x) \n";
+char *msg = "state  : get gun state (index) \n"
+            "card   : scanning card (x) : \n"
+            "gun    : get gun plugit state (index) \n"
+            "lock   : get gun locked state (index) \n"
+            "self   : self test state (x) \n"
+            "ver    : ver of board (407 or index or rb or fan) \n"
+            "ac     : get ac relay state (x) \n";
 
 bool FindChargingInfoData(byte target, struct ChargingInfoData **chargingData)
 {
@@ -144,31 +143,42 @@ int InitShareMemory()
     {}
 
     if (CHAdeMO_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmCHAdeMOCommKey, sizeof(struct CHAdeMOData),
-        IPC_CREAT | 0777)) < 0) {
+        if ((MeterSMId = shmget(ShmCHAdeMOCommKey, sizeof(struct CHAdeMOData), IPC_CREAT | 0777)) < 0)
+        {
             result = FAIL;
-        } else if ((ShmCHAdeMOData = shmat(MeterSMId, NULL, 0))
-                == (void *) -1) {
+        }
+        else if ((ShmCHAdeMOData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
             result = FAIL;
-        } else {
+        }
+        else
+        {
+            //NULL
         }
     }
 
-    if (CCS_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmCcsCommKey, sizeof(struct CcsData),
-        IPC_CREAT | 0777)) < 0) {
+    if (CCS_QUANTITY > 0)
+    {
+        if ((MeterSMId = shmget(ShmCcsCommKey, sizeof(struct CcsData), IPC_CREAT | 0777)) < 0)
+        {
             result = FAIL;
-        } else if ((ShmCcsData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
+        }
+        else if ((ShmCcsData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
+        {
             result = FAIL;
-        } else {
+        } else
+        {
+            //NULL
         }
     }
 
-    if (GB_QUANTITY > 0) {
-        if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData),
-        IPC_CREAT | 0777)) < 0) {
+    if (GB_QUANTITY > 0)
+    {
+        if ((MeterSMId = shmget(ShmGBTCommKey, sizeof(struct GBTData), IPC_CREAT | 0777)) < 0)
+        {
             return 0;
-        } else if ((ShmGBTData = shmat(MeterSMId, NULL, 0)) == (void *) -1) {
+        }
+        else if ((ShmGBTData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
+        {
             return 0;
         }
         memset(ShmGBTData, 0, sizeof(struct GBTData));
@@ -486,7 +496,7 @@ void ChangeGunNum()
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc = NO_DEFINE;
     }
     else if (ShmSysConfigAndInfo->SysConfig.AcConnectorCount > 0 &&
-            ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)
+             ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc = DEFAULT_AC_INDEX;
     else
     {
@@ -567,9 +577,9 @@ void GetPsuTemp()
 void GetAcInputVol()
 {
     printf("L1N_L12 = %f, L2N_L23 = %f, L3N_L31 = %f \n",
-            ShmSysConfigAndInfo->SysInfo.InputVoltageR,
-            ShmSysConfigAndInfo->SysInfo.InputVoltageS,
-            ShmSysConfigAndInfo->SysInfo.InputVoltageT);
+           ShmSysConfigAndInfo->SysInfo.InputVoltageR,
+           ShmSysConfigAndInfo->SysInfo.InputVoltageS,
+           ShmSysConfigAndInfo->SysInfo.InputVoltageT);
 }
 
 void GetPsuInformation(char *v1)
@@ -587,7 +597,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->SystemPresentPsuQuantity; i++)
         {
             printf("Psu Index = %d, PriVersion = %s, SecVersion = %s \n",
-                    i, ShmPsuData->PsuVersion[i].FwPrimaryVersion, ShmPsuData->PsuVersion[i].FwSecondVersion);
+                   i, ShmPsuData->PsuVersion[i].FwPrimaryVersion, ShmPsuData->PsuVersion[i].FwSecondVersion);
         }
 
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
@@ -595,7 +605,7 @@ void GetPsuInformation(char *v1)
             for (int j = 0; j < ShmPsuData->PsuGroup[i].GroupPresentPsuQuantity; j++)
             {
                 printf("Group Index = %d, Psu Index = %d, Version = %s \n",
-                    i, j, ShmPsuData->PsuGroup[i].PsuModule[j].FwVersion);
+                       i, j, ShmPsuData->PsuGroup[i].PsuModule[j].FwVersion);
             }
         }
     }
@@ -604,7 +614,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
         {
             printf("Group Index = %d, MaxCur = %d, Power = %d \n",
-                    i, ShmPsuData->PsuGroup[i].GroupAvailableCurrent, ShmPsuData->PsuGroup[i].GroupAvailablePower);
+                   i, ShmPsuData->PsuGroup[i].GroupAvailableCurrent, ShmPsuData->PsuGroup[i].GroupAvailablePower);
         }
     }
     else if (strcmp(v1, "output") == 0)
@@ -612,7 +622,7 @@ void GetPsuInformation(char *v1)
         for (int i = 0; i < ShmPsuData->GroupCount; i++)
         {
             printf("Group Index = %d, OutputV = %d, OutputC = %d \n",
-                    i, ShmPsuData->PsuGroup[i].GroupPresentOutputVoltage, ShmPsuData->PsuGroup[i].GroupPresentOutputCurrent);
+                   i, ShmPsuData->PsuGroup[i].GroupPresentOutputVoltage, ShmPsuData->PsuGroup[i].GroupPresentOutputCurrent);
         }
     }
     printf("*************************************************\n");
@@ -716,7 +726,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
             }
             break;
 
-
             case S_PREPARNING:
             {
                 if(PreviousSystemStatus != _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus)
@@ -727,7 +736,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
 
                     //等待 AC Relay 搭上且找到模組 (main 在此 statue 其它 task 會去做完)
                     printf ("wait find module\n");
-
                 }
                 //main 會在此階段判斷以下資料跳到下一個 state
                 //用來得知 AC 是否有搭上 (搭上模組的資訊才會出來) 因為每次  AC_Contactor
@@ -745,7 +753,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->TimeoutFlag = 0;
                 //不論是什麼 type 的槍都固意設成 Chademo 不跑 Prechage step
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->Type = 9;
-
             }
             break;
 
@@ -783,7 +790,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
             }
             break;
 
-
             case S_PREPARING_FOR_EVSE:
             {
                 if(PreviousSystemStatus != _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus)
@@ -791,7 +797,6 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                     PreviousSystemStatus = _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus;
 
                     printf ("[UnconditionalCharge - S_PREPARING_FOR_EVSE]\n");
-
                 }
                 //printf ("tar vol = %d \n", _Voltage);
                 //printf ("tar cur = %d \n", _Current);
@@ -849,8 +854,9 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
                 _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingPower =
                         ((float)((_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingVoltage) * (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->PresentChargingCurrent)) / 1000);
 
-                if (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus == 0x02){
-                     printf ("Charging Ground Fault check Fail (%d)\n",_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus);
+                if (_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus == 0x02)
+                {
+                    printf ("Charging Ground Fault check Fail (%d)\n",_chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->GroundFaultStatus);
                     _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus = S_TERMINATING;
                 }
             }
@@ -919,15 +925,15 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
         if(strcmp(newString[0], "chg") == 0)
         {
             if (strcmp(newString[1], "-1") == 0 || strcmp(newString[1], "") == 0)
-               continue;
+                continue;
             if (strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
-               continue;
+                continue;
 
             float _vol = atof(newString[1]);
             float _cur = atof(newString[2]);
 
             if (_cur <= 0 || _cur <= 0)
-               continue;
+                continue;
 
             printf("vol = %f, cur = %f \n", _vol, _cur);
             _chargingData[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->EvBatterytargetVoltage = _vol;
@@ -1129,7 +1135,7 @@ int main(void)
         {
             //如果連一個參數都沒有 (此命令不理會) 加上判斷第二參數
             if (strcmp(newString[1], "-1") == 0 || strcmp(newString[1], "") == 0 ||
-                    strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
+                strcmp(newString[2], "-1") == 0 || strcmp(newString[2], "") == 0)
             {
                 printf ("Input cmd fail ------  strchg [vol 150-1000] [cru 2-100]\n");
                 continue;

EVSE/Projects/DW30/Apps/internalComm.c

@@ -165,6 +165,7 @@ unsigned char Query_Present_InputVoltage(unsigned char fd, unsigned char targetA
         {
             chksum ^= rx[6+idx];
         }
+
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
            (rx[2] == tx[1]) &&
            (rx[1] == tx[2]) &&
@@ -215,14 +216,15 @@ unsigned char Query_Present_OutputVoltage(unsigned char fd, unsigned char target
            (rx[1] == tx[2]) &&
            (rx[3] == tx[3]))
         {
-
             Ret_Buf->behindFuse_Voltage_C1 =(rx[6] | (rx[7]<<8));
             Ret_Buf->behindRelay_Voltage_C1 =(rx[8] | (rx[9]<<8));
+
             if((rx[4] | rx[5]<<8) > 4)
             {
                 Ret_Buf->behindFuse_Voltage_C2 =(rx[10] | (rx[11]<<8));
                 Ret_Buf->behindRelay_Voltage_C2 =(rx[12] | (rx[13]<<8));
             }
+
             result = PASS;
         }
     }
@@ -293,7 +295,6 @@ unsigned char Query_Temperature(unsigned char fd, unsigned char targetAddr, Temp
         }
     }
 
-
     return result;
 }
 
@@ -359,15 +360,18 @@ unsigned char Query_Relay_Output(unsigned char fd, unsigned char targetAddr, Rel
            (rx[3] == tx[3]))
         {
             Ret_Buf->relay_event.bits.AC_Contactor = (rx[6] >> 0) & 0x01;
+
             Ret_Buf->relay_event.bits.CCS_Precharge = (rx[6] >> 1) & 0x01;
 
             Ret_Buf->relay_event.bits.Gun1_N = (rx[7] >> 0) & 0x01;
             Ret_Buf->relay_event.bits.Gun1_P = (rx[7] >> 1) & 0x01;
+
             Ret_Buf->relay_event.bits.Gun1_Parallel_N = (rx[7] >> 2) & 0x01;
             Ret_Buf->relay_event.bits.Gun1_Parallel_P = (rx[7] >> 3) & 0x01;
 
             Ret_Buf->relay_event.bits.Gun2_N = (rx[8] >> 0) & 0x01;
             Ret_Buf->relay_event.bits.Gun2_P = (rx[8] >> 1) & 0x01;
+
             result = PASS;
         }
     }
@@ -446,23 +450,23 @@ unsigned char Query_Gpio_Input(unsigned char fd, unsigned char targetAddr, Gpio_
            (rx[1] == tx[2]) &&
            (rx[3] == tx[3]))
         {
-            Ret_Buf->AC_Connector       = (rx[6] >> 0) & 0x01;
-            Ret_Buf->AC_MainBreaker     = (rx[6] >> 1) & 0x01;
-            Ret_Buf->SPD                = (rx[6] >> 2) & 0x01;
-            Ret_Buf->Door_Open          = (rx[6] >> 3) & 0x01;
-            Ret_Buf->GFD[0]             = (rx[6] >> 4) & 0x01;
-            Ret_Buf->GFD[1]             = (rx[6] >> 5) & 0x01;
-            Ret_Buf->AC_Drop            = (rx[6] >> 6) & 0x01;
+            Ret_Buf->AC_Connector           = (rx[6] >> 0) & 0x01;
+            Ret_Buf->AC_MainBreaker         = (rx[6] >> 1) & 0x01;
+            Ret_Buf->SPD                    = (rx[6] >> 2) & 0x01;
+            Ret_Buf->Door_Open              = (rx[6] >> 3) & 0x01;
+            Ret_Buf->GFD[0]                 = (rx[6] >> 4) & 0x01;
+            Ret_Buf->GFD[1]                 = (rx[6] >> 5) & 0x01;
+            Ret_Buf->AC_Drop                = (rx[6] >> 6) & 0x01;
 
-            Ret_Buf->Emergency_IO       = (rx[7] >> 0) & 0x01;
+            Ret_Buf->Emergency_IO           = (rx[7] >> 0) & 0x01;
 
             Ret_Buf->Button_Emergency_Press = (rx[8] >> 0) & 0x01;
-            Ret_Buf->Button_On_Press    = (rx[8] >> 1) & 0x01;
-            Ret_Buf->Button_Off_Press   = (rx[8] >> 2) & 0x01;
-            Ret_Buf->Key_1_Press        = (rx[8] >> 3) & 0x01;
-            Ret_Buf->Key_2_Press        = (rx[8] >> 4) & 0x01;
-            Ret_Buf->Key_3_Press        = (rx[8] >> 5) & 0x01;
-            Ret_Buf->Key_4_Press        = (rx[8] >> 6) & 0x01;
+            Ret_Buf->Button_On_Press        = (rx[8] >> 1) & 0x01;
+            Ret_Buf->Button_Off_Press       = (rx[8] >> 2) & 0x01;
+            Ret_Buf->Key_1_Press            = (rx[8] >> 3) & 0x01;
+            Ret_Buf->Key_2_Press            = (rx[8] >> 4) & 0x01;
+            Ret_Buf->Key_3_Press            = (rx[8] >> 5) & 0x01;
+            Ret_Buf->Key_4_Press            = (rx[8] >> 6) & 0x01;
 
             result = PASS;
         }
@@ -511,15 +515,18 @@ unsigned char Config_Fan_Speed(unsigned char fd, unsigned char targetAddr, FanSp
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[14] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
+
     if(len > 6)
     {
         if (len < 6+(rx[4] | rx[5]<<8))
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -547,6 +554,7 @@ unsigned char Config_Relay_Output(unsigned char fd, unsigned char targetAddr, Re
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6 + idx];
+
     tx[9] = chksum;
 
 //  for (int i = 0; i < 10; i++)
@@ -563,6 +571,7 @@ unsigned char Config_Relay_Output(unsigned char fd, unsigned char targetAddr, Re
 //          printf("set relay cmd : rx = %x \n", rx[i]);
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -594,10 +603,11 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
         tx[6] |= (Set_Buf->Button_LED[idx]?0x01:0x00)<<(1+idx);
 
     for(int idx = 0;idx<4;idx++)
-            tx[6] |= (Set_Buf->System_LED[idx]?0x01:0x00)<<(3+idx);
+        tx[6] |= (Set_Buf->System_LED[idx]?0x01:0x00)<<(3+idx);
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[14] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -608,6 +618,7 @@ unsigned char Config_Gpio_Output(unsigned char fd, unsigned char targetAddr, Gpi
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -637,6 +648,7 @@ unsigned char Config_Gfd_Value(unsigned char fd, unsigned char targetAddr, Gfd_c
 
     for(int idx = 0; idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[8] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -647,6 +659,7 @@ unsigned char Config_Gfd_Value(unsigned char fd, unsigned char targetAddr, Gfd_c
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -668,7 +681,7 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 {
     unsigned char result = FAIL;
     unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Model_Name, 0x0E, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
@@ -676,6 +689,7 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 
     for(int idx = 0; idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[20] = chksum;
 
 //  for(int i = 0; i < 21; i++)
@@ -689,16 +703,17 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-              (rx[2] == tx[1]) &&
-              (rx[1] == tx[2]) &&
-              (rx[3] == tx[3]) &&
-              rx[6] == PASS)
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           rx[6] == PASS)
         {
             result = PASS;
         }
@@ -710,29 +725,31 @@ unsigned char Config_Model_Name(unsigned char fd, unsigned char targetAddr, unsi
 unsigned char Config_Rtc_Data(unsigned char fd, unsigned char targetAddr, Rtc *Set_Buf)
 {
     unsigned char result = FAIL;
-    unsigned char tx[21] = { 0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
-            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
-            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
+    unsigned char tx[21] = {0xaa, 0x00, targetAddr, Cmd.config_Rtc_Data, 0x0E, 0x00, Set_Buf->RtcData[0], Set_Buf->RtcData[1],
+                            Set_Buf->RtcData[2], Set_Buf->RtcData[3], Set_Buf->RtcData[4], Set_Buf->RtcData[5], Set_Buf->RtcData[6], Set_Buf->RtcData[7],
+                            Set_Buf->RtcData[8], Set_Buf->RtcData[9], Set_Buf->RtcData[10], Set_Buf->RtcData[11], Set_Buf->RtcData[12], Set_Buf->RtcData[13]};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[20] = chksum;
 
     if (tranceive(fd, tx, sizeof(tx), rx) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                rx[6] == PASS)
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           rx[6] == PASS)
         {
             result = PASS;
         }
@@ -750,15 +767,18 @@ unsigned char Update_Start(unsigned char fd, unsigned char targetAddr, unsigned
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[10] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
+
     if(len > 6)
     {
         if (len < 6+(rx[4] | rx[5]<<8))
             return result;
 
         chksum = 0x00;
+
         for(int idx = 0;idx<(rx[4] | rx[5]<<8);idx++)
         {
             chksum ^= rx[6+idx];
@@ -825,10 +845,12 @@ unsigned char Update_Transfer(unsigned char fd, unsigned char targetAddr, unsign
     tx[7] = (startAddr>>8) & 0xff;
     tx[8] = (startAddr>>16) & 0xff;
     tx[9] = (startAddr>>24) & 0xff;
+
     memcpy(tx+10, data, length);
 
     for(int idx = 0;idx<(tx[4] | tx[5]<<8);idx++)
         chksum ^= tx[6+idx];
+
     tx[sizeof(tx)-1] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -906,9 +928,9 @@ unsigned char Query_AC_Status(unsigned char fd, unsigned char targetAddr, Ac_Sta
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]))
         {
             Ret_Buf->CpStatus = rx[6];
             Ret_Buf->CurLimit = (rx[7] | (rx[8] << 8));
@@ -1046,12 +1068,13 @@ unsigned char Config_LED_Status(unsigned char fd, unsigned char targetAddr, Ac_L
 {
     unsigned char result = FAIL;
     unsigned char tx[12] = {0xaa, 0x00, targetAddr, Cmd.config_ac_led_status, 0x05, 0x00, Ret_Buf->ActionMode, (Ret_Buf->AcAlarmCode >> 0) & 0xFF,
-            (Ret_Buf->AcAlarmCode >> 8) & 0xFF, (Ret_Buf->AcAlarmCode >> 16) & 0xFF, (Ret_Buf->AcAlarmCode >> 24) & 0xFF};
+                            (Ret_Buf->AcAlarmCode >> 8) & 0xFF, (Ret_Buf->AcAlarmCode >> 16) & 0xFF, (Ret_Buf->AcAlarmCode >> 24) & 0xFF};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[11] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
@@ -1084,11 +1107,13 @@ unsigned char Config_Legacy_Req(unsigned char fd, unsigned char targetAddr, unsi
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[8] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1116,11 +1141,13 @@ unsigned char Config_Ac_Duty(unsigned char fd, unsigned char targetAddr, unsigne
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1148,11 +1175,13 @@ unsigned char Config_CSU_Mode(unsigned char fd, unsigned char targetAddr)
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1180,11 +1209,13 @@ unsigned char Config_Reset_MCU(unsigned char fd, unsigned char targetAddr)
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[7] = chksum;
 
     if (tranceiveRelDelayTime(fd, tx, sizeof(tx), rx, 100) > 0)
     {
         chksum = 0x00;
+
         for (int idx = 0; idx < (rx[4] | rx[5] << 8); idx++)
         {
             chksum ^= rx[6 + idx];
@@ -1207,13 +1238,14 @@ unsigned char Config_Led_Color(unsigned char fd, unsigned char targetAddr, Led_C
 {
     unsigned char result = FAIL;
     unsigned char tx[13] = {0xaa, 0x00, targetAddr, Cmd.config_led_color, 0x06, 0x00,
-            Ret_Buf->Connect_1_Red, Ret_Buf->Connect_1_Green, Ret_Buf->Connect_1_Blue,
-            Ret_Buf->Connect_2_Red, Ret_Buf->Connect_2_Green, Ret_Buf->Connect_2_Blue};
+                            Ret_Buf->Connect_1_Red, Ret_Buf->Connect_1_Green, Ret_Buf->Connect_1_Blue,
+                            Ret_Buf->Connect_2_Red, Ret_Buf->Connect_2_Green, Ret_Buf->Connect_2_Blue};
     unsigned char rx[512];
     unsigned char chksum = 0x00;
 
     for (int idx = 0; idx < (tx[4] | tx[5] << 8); idx++)
         chksum ^= tx[6 + idx];
+
     tx[13] = chksum;
 
     unsigned char len = tranceive(fd, tx, sizeof(tx), rx);
@@ -1229,10 +1261,10 @@ unsigned char Config_Led_Color(unsigned char fd, unsigned char targetAddr, Led_C
         }
 
         if((chksum == rx[6+(rx[4] | rx[5]<<8)]) &&
-                (rx[2] == tx[1]) &&
-                (rx[1] == tx[2]) &&
-                (rx[3] == tx[3]) &&
-                (rx[6] == PASS))
+           (rx[2] == tx[1]) &&
+           (rx[1] == tx[2]) &&
+           (rx[3] == tx[3]) &&
+           (rx[6] == PASS))
         {
             result = PASS;
         }

EVSE/Projects/DW30/Apps/main.c

@@ -1589,7 +1589,6 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
                 DEBUG_ERROR_MSG("write /dev/mtdblock10 NG\r\n");
                 result = FAIL;
             }
-
         }
         else
         {
@@ -1747,11 +1746,11 @@ void DisplayChargingInfo()
     {
         if (chargingInfo[i]->SystemStatus != S_IDLE &&
             chargingInfo[i]->SystemStatus != S_RESERVATION)
-            {
-                ChangeGunSelectByIndex(i);
+        {
+            ChangeGunSelectByIndex(i);
             return;
-            }
         }
+    }
 
     if (ShmSysConfigAndInfo->SysConfig.AcConnectorCount > 0 &&
         ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE &&
@@ -1956,7 +1955,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012289", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.ChademoOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.ChademoOutputUVPFail == YES)
         {
             memcpy(code, "012289", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -1977,7 +1976,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012290", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.GbtOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.GbtOutputUVPFail == YES)
         {
             memcpy(code, "012290", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -1998,7 +1997,7 @@ void ReleaseAlarmCode(byte gunIndex)
             isCleanCheck = true;
         }
         else if (strncmp((char *)chargingInfo[gunIndex]->ConnectorAlarmCode, "012288", 6) == EQUAL &&
-                ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CcsOutputUVPFail == YES)
+                 ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CcsOutputUVPFail == YES)
         {
             memcpy(code, "012288", 6);
             memcpy(chargingInfo[gunIndex]->ConnectorAlarmCode, "", 6);
@@ -2237,39 +2236,39 @@ void ChkPrimaryStatus()
             {
                 switch(ac_chargingInfo[0]->SystemStatus)
                 {
-                case S_IDLE:
-                {
-                    if(isDetectPlugin())
+                    case S_IDLE:
                     {
-                        _DetectPlugInTimeout();
-                        StopSystemTimeoutDet();
+                        if(isDetectPlugin())
+                        {
+                            _DetectPlugInTimeout();
+                            StopSystemTimeoutDet();
+                        }
                     }
-                }
-                    break;
-                case S_REASSIGN_CHECK:
-                case S_REASSIGN:
-                case S_PREPARNING:
-                case S_PREPARING_FOR_EV:
-                case S_PREPARING_FOR_EVSE:
-                case S_CCS_PRECHARGE_ST0:
-                case S_CCS_PRECHARGE_ST1:
-                {
-                    // 取消充電
-                    AcChargingTerminalProcess();
-                }
-                    break;
-                case S_CHARGING:
-                {
-                    if (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE)
+                        break;
+                    case S_REASSIGN_CHECK:
+                    case S_REASSIGN:
+                    case S_PREPARNING:
+                    case S_PREPARING_FOR_EV:
+                    case S_PREPARING_FOR_EVSE:
+                    case S_CCS_PRECHARGE_ST0:
+                    case S_CCS_PRECHARGE_ST1:
                     {
-                        // 停止充電
+                        // 取消充電
                         AcChargingTerminalProcess();
                     }
-                }
-                    break;
-                case S_COMPLETE:
-                {}
-                    break;
+                        break;
+                    case S_CHARGING:
+                    {
+                        if (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE)
+                        {
+                            // 停止充電
+                            AcChargingTerminalProcess();
+                        }
+                    }
+                        break;
+                    case S_COMPLETE:
+                    {}
+                        break;
                 }
             }
 
@@ -2296,7 +2295,7 @@ void ChkPrimaryStatus()
                     if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc != NO_DEFINE)
                         AcChargingTerminalProcess();
                     else
-                    ChargingTerminalProcess(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
+                        ChargingTerminalProcess(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
                 }
                     break;
                 case S_CHARGING:
@@ -2347,8 +2346,8 @@ void ChkPrimaryStatus()
                 for (byte _index = 0; _index < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; _index++)
                 {
                     if (chargingInfo[_index]->SystemStatus != S_BOOTING &&
-                            chargingInfo[_index]->SystemStatus != S_IDLE &&
-                            chargingInfo[_index]->SystemStatus != S_RESERVATION)
+                        chargingInfo[_index]->SystemStatus != S_IDLE &&
+                        chargingInfo[_index]->SystemStatus != S_RESERVATION)
                     {
                         ShmSysConfigAndInfo->SysInfo.CurGunSelected = _index;
                         ChangeGunSelectByIndex(ShmSysConfigAndInfo->SysInfo.CurGunSelected);
@@ -2523,7 +2522,7 @@ void CheckGunTypeFromHw()
                 bd1_2_status = gpioValue;
                 break;
             case 44:
-            bd0_1_status = gpioValue;
+                bd0_1_status = gpioValue;
                 break;
             case 45:
                 bd0_2_status = gpioValue;
@@ -2684,9 +2683,9 @@ void UserScanFunction()
 
                 PRINTF_FUNC("ac stop charging \n");
                 PRINTF_FUNC("index = %d, card number = %s, UserId = %s \n", ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc,
-                        ac_chargingInfo[0]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
+                            ac_chargingInfo[0]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
                 memcpy(value, (unsigned char *)ac_chargingInfo[0]->StartUserId,
-                    ARRAY_SIZE(ac_chargingInfo[0]->StartUserId));
+                       ARRAY_SIZE(ac_chargingInfo[0]->StartUserId));
                 if (strcmp((char *)ShmSysConfigAndInfo->SysConfig.UserId, value) == EQUAL)
                 {
                     AcChargingTerminalProcess();
@@ -2694,16 +2693,16 @@ void UserScanFunction()
                 strcpy((char *)ShmSysConfigAndInfo->SysConfig.UserId, "");
             }
             else if (stopReq < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount &&
-                    chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_CHARGING &&
-                    (_acgunIndex <= 0 || (_acgunIndex > 0 && ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)))
+                     chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_CHARGING &&
+                     (_acgunIndex <= 0 || (_acgunIndex > 0 && ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE)))
             {
                 char value[32];
 
                 PRINTF_FUNC("stop charging \n");
                 PRINTF_FUNC("index = %d, card number = %s, UserId = %s \n", ShmSysConfigAndInfo->SysInfo.CurGunSelected,
-                        chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
+                            chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId, ShmSysConfigAndInfo->SysConfig.UserId);
                 memcpy(value, (unsigned char *)chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId,
-                        ARRAY_SIZE(chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId));
+                       ARRAY_SIZE(chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->StartUserId));
 
                 // 同一張卡直接停掉
                 if (strcmp((char *)ShmSysConfigAndInfo->SysConfig.UserId, value) == EQUAL)
@@ -2831,7 +2830,7 @@ unsigned char isModeChange(unsigned char gun_index)
 void ScannerCardProcess()
 {
     if (!isDetectPlugin() && !isCardScan && ShmSysConfigAndInfo->SysWarningInfo.Level != 2 &&
-            ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE)
+        ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE)
     {
         isCardScan = true;
         // 處理刷卡及驗證卡號的動作
@@ -3002,7 +3001,7 @@ bool CheckConnectorTypeStatus()
     bool result = true;
 
     PRINTF_FUNC("bd0_1_status = %d, bd0_2_status = %d, bd1_1_status = %d, bd1_2_status = %d \n",
-            bd0_1_status, bd0_2_status, bd1_1_status, bd1_2_status);
+                bd0_1_status, bd0_2_status, bd1_1_status, bd1_2_status);
     if (strlen((char *) ShmSysConfigAndInfo->SysConfig.ModelName) >= 9)
     {
         byte slots = 1;
@@ -3028,8 +3027,8 @@ bool CheckConnectorTypeStatus()
         ShmSysConfigAndInfo->SysConfig.TotalConnectorCount = _gunIndex;
         ShmSysConfigAndInfo->SysConfig.AcConnectorCount = _acgunIndex;
         PRINTF_FUNC("DC _gunCount = %d, AC _gunCount = %d \n",
-                ShmSysConfigAndInfo->SysConfig.TotalConnectorCount,
-                ShmSysConfigAndInfo->SysConfig.AcConnectorCount);
+                    ShmSysConfigAndInfo->SysConfig.TotalConnectorCount,
+                    ShmSysConfigAndInfo->SysConfig.AcConnectorCount);
 
         if (ShmSysConfigAndInfo->SysConfig.TotalConnectorCount == 0)
         {
@@ -3650,8 +3649,8 @@ void GetSystemTime()
     ftime(&csuTime);
     tmCSU = localtime(&csuTime.time);
     PRINTF_FUNC("Time : %04d-%02d-%02d %02d:%02d:%02d \n", tmCSU->tm_year + 1900,
-            tmCSU->tm_mon + 1, tmCSU->tm_mday, tmCSU->tm_hour, tmCSU->tm_min,
-            tmCSU->tm_sec);
+                tmCSU->tm_mon + 1, tmCSU->tm_mday, tmCSU->tm_hour, tmCSU->tm_min,
+                tmCSU->tm_sec);
 
 //  byte date[14];
 //
@@ -3811,26 +3810,26 @@ void CheckOcppStatus()
 
         if (canReset)
         {
-        ShmOCPP16Data->MsMsg.bits.ResetReq = NO;
+            ShmOCPP16Data->MsMsg.bits.ResetReq = NO;
             sprintf((char*)ShmOCPP16Data->Reset.ResponseStatus, "Accepted");
-        if(strcmp((char *)ShmOCPP16Data->Reset.Type, "Hard") == EQUAL)
-        {
-            DEBUG_ERROR_MSG("****** Hard Reboot ****** \n");
+            if(strcmp((char *)ShmOCPP16Data->Reset.Type, "Hard") == EQUAL)
+            {
+                DEBUG_ERROR_MSG("****** Hard Reboot ****** \n");
                 ShmOCPP16Data->MsMsg.bits.ResetConf = YES;
-            sleep(3);
-            system("reboot -f");
-        }
-        else if (strcmp((char *)ShmOCPP16Data->Reset.Type, "Soft") == EQUAL)
-        {
-            DEBUG_ERROR_MSG("****** Soft Reboot ****** \n");
+                sleep(3);
+                system("reboot -f");
+            }
+            else if (strcmp((char *)ShmOCPP16Data->Reset.Type, "Soft") == EQUAL)
+            {
+                DEBUG_ERROR_MSG("****** Soft Reboot ****** \n");
                 ShmOCPP16Data->MsMsg.bits.ResetConf = YES;
-            sleep(3);
+                sleep(3);
                 system("killall OcppBackend &");
-            KillTask();
-            system("/usr/bin/run_evse_restart.sh");
+                KillTask();
+                system("/usr/bin/run_evse_restart.sh");
+            }
         }
     }
-    }
 }
 
 void OcppStartTransation(byte gunIndex)
@@ -3882,7 +3881,7 @@ void OcppRemoteStartChk()
         for (byte ac_index = 0; ac_index < ShmSysConfigAndInfo->SysConfig.AcConnectorCount; ac_index++)
         {
             if ((ac_chargingInfo[ac_index]->SystemStatus == S_IDLE || ac_chargingInfo[ac_index]->SystemStatus == S_RESERVATION)&&
-                    ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq == YES)
+                ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq == YES)
             {
                 ShmOCPP16Data->CsMsg.bits[acDirIndex].RemoteStartTransactionReq = NO;
                 ShmSysConfigAndInfo->SysInfo.OrderCharging = DEFAULT_AC_INDEX;
@@ -4424,7 +4423,7 @@ void CheckTask()
     }
 
     if(strcmp((char *)ShmSysConfigAndInfo->SysConfig.OcppServerURL, "") != EQUAL &&
-            strcmp((char *)ShmSysConfigAndInfo->SysConfig.ChargeBoxId, "") != EQUAL)
+       strcmp((char *)ShmSysConfigAndInfo->SysConfig.ChargeBoxId, "") != EQUAL)
     {
         if(system("pidof -s OcppBackend > /dev/null") != 0)
         {
@@ -4483,7 +4482,7 @@ void CheckSmartChargeProfile(byte _index)
             {
                 // 預設最小輸出電流 (MIN_OUTPUT_CUR) A
                 if (_time >= ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].StartPeriod &&
-                        ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].Limit > MIN_OUTPUT_CUR)
+                    ShmOCPP16Data->SmartChargingProfile[_index].ChargingSchedule.ChargingSchedulePeriod[_count].Limit > MIN_OUTPUT_CUR)
                 {
                     _startCount = _count;
                 }
@@ -4534,7 +4533,7 @@ void CheckReturnToChargingConn()
             if (count != ShmSysConfigAndInfo->SysInfo.CurGunSelected)
             {
                 if ((chargingInfo[count]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[count]->SystemStatus <= S_COMPLETE) ||
-                        (chargingInfo[count]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[count]->SystemStatus <= S_CCS_PRECHARGE_ST1))
+                    (chargingInfo[count]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[count]->SystemStatus <= S_CCS_PRECHARGE_ST1))
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
@@ -4547,23 +4546,23 @@ void CheckReturnToChargingConn()
         {
             // 沒有選中 AC，且 AC 在充電中
             if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == NO_DEFINE &&
-                    (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING && ac_chargingInfo[0]->SystemStatus <= S_COMPLETE))
+                (ac_chargingInfo[0]->SystemStatus >= S_PREPARNING && ac_chargingInfo[0]->SystemStatus <= S_COMPLETE))
             {
                 // 當前 DC 充電槍在 idle 狀態
                 if (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_IDLE ||
-                        chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_RESERVATION)
+                    chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus == S_RESERVATION)
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
                 }
             }
             else if (ShmSysConfigAndInfo->SysInfo.CurGunSelectedByAc == DEFAULT_AC_INDEX &&
-                        ((chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_COMPLETE) ||
-                        (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_CCS_PRECHARGE_ST1)))
+                     ((chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_REASSIGN_CHECK && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_COMPLETE) ||
+                      (chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[ShmSysConfigAndInfo->SysInfo.CurGunSelected]->SystemStatus <= S_CCS_PRECHARGE_ST1)))
             {
                 // 當前 DC 充電槍在 idle 狀態
                 if (ac_chargingInfo[0]->SystemStatus == S_IDLE ||
-                        ac_chargingInfo[0]->SystemStatus == S_RESERVATION)
+                    ac_chargingInfo[0]->SystemStatus == S_RESERVATION)
                 {
                     isReturnTimeout = true;
                     StartSystemTimeoutDet(Timeout_ReturnToChargingGunDet);
@@ -4581,14 +4580,14 @@ bool GetStartChargingByAlterMode(byte _gun)
     bool result = true;
 
     if (ShmSysConfigAndInfo->SysConfig.TotalConnectorCount == 2 &&
-            ShmSysConfigAndInfo->SysInfo.IsAlternatvieConf == YES)
+        ShmSysConfigAndInfo->SysInfo.IsAlternatvieConf == YES)
     {
         for (byte _select = 0; _select < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; _select++)
         {
             if (_select != _gun)
             {
                 if (chargingInfo[_select]->SystemStatus != S_IDLE &&
-                        chargingInfo[_select]->SystemStatus != S_RESERVATION)
+                    chargingInfo[_select]->SystemStatus != S_RESERVATION)
                 {
                     result = false;
                     break;
@@ -4619,7 +4618,7 @@ int main(void)
     }
 
     PRINTF_FUNC("Chademo = %d, CCS = %d, GB = %d, AC = %d \n",
-            CHAdeMO_QUANTITY, CCS_QUANTITY, GB_QUANTITY, AC_QUANTITY);
+                CHAdeMO_QUANTITY, CCS_QUANTITY, GB_QUANTITY, AC_QUANTITY);
     PRINTF_FUNC("\n"); PRINTF_FUNC("Initial SystemConfig and Info.......\n");
     if (!InitialSystemDefaultConfig())
     {
@@ -4663,7 +4662,7 @@ int main(void)
         ShmPsuData->Work_Step == _NO_WORKING)
     {
         if (ShmSysConfigAndInfo->SysWarningInfo.Level != 2)
-        DisplaySelfTestFailReason();
+            DisplaySelfTestFailReason();
 
         for (byte gun_index = 0; gun_index < ShmSysConfigAndInfo->SysConfig.TotalConnectorCount; gun_index++)
         {
@@ -4903,7 +4902,7 @@ int main(void)
                             {
                                 if (ShmSysConfigAndInfo->SysInfo.CurGunSelected == gun_index)
                                     ShmSysConfigAndInfo->SysInfo.ConnectorPage = _LCM_IDLE;
-                                    }
+                            }
                         } // Idle 正常程序終點
                     }
 
@@ -4986,12 +4985,12 @@ int main(void)
                         ShmSysConfigAndInfo->SysInfo.MainChargingMode == _MAIN_CHARGING_MODE_AVER)
                     {
                         if (ShmSysConfigAndInfo->SysInfo.CanAverageCharging)
-                        setChargerMode(gun_index, MODE_PRECHARGE);
+                            setChargerMode(gun_index, MODE_PRECHARGE);
                         else
                             setChargerMode(gun_index, MODE_IDLE);
                     }
                     else if (ShmSysConfigAndInfo->SysInfo.ReAssignedFlag == _REASSIGNED_RELAY_M_TO_A &&
-                        ShmSysConfigAndInfo->SysInfo.BridgeRelayStatus == NO)
+                             ShmSysConfigAndInfo->SysInfo.BridgeRelayStatus == NO)
                     {
                         PRINTF_FUNC("=============Smart Charging : _REASSIGNED_COMP============= Step 6 \n");
                         ShmSysConfigAndInfo->SysInfo.MainChargingMode = _MAIN_CHARGING_MODE_AVER;
@@ -5178,7 +5177,7 @@ int main(void)
                             RecordAlarmCode(gun_index, "012234");
                         }
                         else if (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
-                            (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL))
+                                 (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL))
                         {
                             // UVP
                             RecordAlarmCode(gun_index, "012289");
@@ -5200,8 +5199,8 @@ int main(void)
                             RecordAlarmCode(gun_index, "012236");
                         }
                         else if (isPrechargeStatus_gb(gun_index) == 10 &&
-                                (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
-                                 (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL)))
+                                 (((chargingInfo[gun_index]->EvBatterytargetVoltage * 10) > 0 && chargingInfo[gun_index]->EvBatterytargetVoltage < SYSTEM_MIN_VOL) ||
+                                  (chargingInfo[gun_index]->PresentChargedDuration >= 10 && chargingInfo[gun_index]->PresentChargingVoltage < SYSTEM_MIN_VOL)))
                         {
                             // UVP
                             RecordAlarmCode(gun_index, "012290");
@@ -5303,7 +5302,6 @@ int main(void)
                             strcpy((char *)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "Local");
                     }
 
-
                     if (ShmSysConfigAndInfo->SysInfo.CurGunSelected == gun_index)
                         ShmSysConfigAndInfo->SysInfo.ConnectorPage = _LCM_COMPLETE;
                 }
@@ -5421,7 +5419,7 @@ int main(void)
                 else if (ac_chargingInfo[0]->SystemStatus == S_CHARGING)
                     ChangeLcmByIndex(_LCM_CHARGING);
                 else if (ac_chargingInfo[0]->SystemStatus == S_TERMINATING ||
-                        ac_chargingInfo[0]->SystemStatus == S_COMPLETE)
+                         ac_chargingInfo[0]->SystemStatus == S_COMPLETE)
                     ChangeLcmByIndex(_LCM_COMPLETE);
                 else
                     dcPageRun = true;