Merge branch 'master' into AW-Regular

EVSE/Projects/define.h

@@ -300,10 +300,10 @@ enum CoreProfile {
      CustomIdleFeeAfterStop,
      TimeOffset,
      NextTimeOffsetTransitionDateTime,
-	 TimeOffsetNextTransition,
-	 SystemUptimeSec,
-	 FreeVend,
-	 ConfigurationVersion,
+     TimeOffsetNextTransition,
+     SystemUptimeSec,
+     FreeVend,
+     ConfigurationVersion,
 	 _CoreProfile_CNT
 };
 
@@ -538,11 +538,12 @@ struct SysConfigData
 	unsigned char           StopChargingByButton;       //0: Disable  1: Enable
     struct LCD_OVERRIDE     LcdOveride;                 // LCD override info
     struct TTIA             TTIA_Info;                  // TTIA configuration struct
-    unsigned char 			OcppReceiptrURL[512];		// Charging receipt display URL
-    unsigned char			isAuthrizeByEVCCID;			// is Authorize by EVCCID (CCS)
 
     /************PowerCabinet************/
     WiringInfoData          WiringInfo;
+
+    unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
+    unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
 };
 
 struct ChargingInfoData