Merge branch 'master' into Noodoe

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -147,7 +147,7 @@ typedef union
 		unsigned char StatusNotificationConf:1;		//bit 1,
 		unsigned char TriggerMeterValue:1;			//bit 2,
 		unsigned char :5;	//bit 5~7
-	}bits[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY + AC_QUANTITY];
+	}bits[CONNECTOR_QUANTITY];
 }CpinitiateMsg;
 
 CpinitiateMsg cpinitateMsg;
@@ -16600,7 +16600,7 @@ void InitialSystemValue(void)
 
  	if(ShmSysConfigAndInfo->SysConfig.ModelName[0]=='D') // 'D' means DC
 	{
- 		if(ShmSysConfigAndInfo->SysConfig.ModelName[0]=='O')
+ 		if(ShmSysConfigAndInfo->SysConfig.ModelName[1]=='O')
  		{
  			// DO series
  			for(int index=0; index<GENERAL_GUN_QUANTITY ; index++)