Browse Source

2020-03-19 / Alston Lin

Actions
1. Add error code for GB error
2. Add share memory key for GB Data
3. Add GB structure

Files
1. As follow commit history
Alston 5 years ago
parent
commit
6e327f1942
2 changed files with 64 additions and 1 deletions
  1. 1 0
      EVSE/Modularization/Infypwr_PsuCommObj.c
  2. 63 1
      EVSE/Projects/define.h

+ 1 - 0
EVSE/Modularization/Infypwr_PsuCommObj.c

@@ -243,6 +243,7 @@ void ReceiveDataFromCanBus()
 					break;
 
 				case INFYPWR_GROUP_SHIFT | MODULE_IAVAILABLE:
+				case MODULE_IAVAILABLE:
 				{
 					// Ś^śÇ­°¸üŤáŞşšqŹy
 					address = frame.can_id & 0x000000FF;

+ 63 - 1
EVSE/Projects/define.h

@@ -118,6 +118,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 #define ShmFanBdKey				1007
 #define ShmRelayBdKey			1008
 #define ShmOcppModuleKey		1009
+#define ShmGBTCommKey			1010
 
 /**************************************************************************************/
 /****************** Share memory configuration value constant define ******************/
@@ -687,6 +688,8 @@ char AlarmStatusCode[128][6]=
 	"012287", 	// Self test Failed due to Model name is none match
 	"012288",	// CCS output UVP
 	"012289",	// Chademo output UVP
+	"012290",	// GBT output UVP
+	"012291",	// Self test Failed due to communication of GBTboard failure
 };
 struct AlarmCodeData
 {
@@ -798,7 +801,9 @@ struct AlarmCodeData
 			//AlarmVal[11]
 			unsigned char CcsOutputUVPFail :1;					//bit 0
 			unsigned char ChademoOutputUVPFail :1;					//bit 1
-			unsigned char :6;									//bit 2 ~ 7
+			unsigned char GbtOutputUVPFail :1;					//bit 2
+			unsigned char GbtboardStestFail :1;					//bit 3
+			unsigned char :4;									//bit 4 ~ 7
 		}bits;
 	}AlarmEvents;
 };
@@ -1351,6 +1356,7 @@ struct PsuModuleData
 	char 				OutletTemp;			//0x00: -60¢XC  ~  0xFE: 194¢XC, resolution: 1¢XC, offset: -60¢XC, 0xFF: invalid
 	unsigned int 		AlarmCode;
 	unsigned int 		FaultCode;			//
+	unsigned int 		IAvailableCurrent;		//abcd=abc.d amp
 };
 
 /*Following are the information for each PSU Group*/
@@ -1484,6 +1490,62 @@ struct CHAdeMOData
 	struct CHAdeMOEvseData 	evse[CHAdeMO_QUANTITY];
 };
 
+/************************************************************************************/
+/**************************GBT protocol Share memory*********************/
+/**************************************************************************************/
+struct GBTEvData
+{
+	unsigned short MaxiBatteryVoltage;		// 0~600(V) (unit:1V)
+	unsigned short MaxiChargingTime;		// 10(sec.)~255(min.)	(Unit:sec)
+
+	unsigned char  EstimatChargingTime;		// 0~254(min.)	(Unit:sec)
+
+	unsigned short TotalBatteryCapacity;	// 0.1~6553.5(kWh)	(unit:0.1 kWh)
+	unsigned char  ProtocolVersion;			// 0~255
+
+	unsigned short TargetBatteryVoltage;	// 0~600(V) (unit:1V)
+	unsigned short ChargingCurrentRequest;	// 0~200(A) (unit:1A)
+											// 0~1023(A) (unit:1A)
+
+	unsigned char  EvDetection;				//102.5
+										//					bit0=0:Vehicle charging disabled,	(stop charging)
+										//					bit0=1:Vehicle charging enabled,
+										//					bit1=0:¡§Parking¡¨ position
+										//					bit1=1:other position				(stop charging)
+										//					bit2=0:Charging system normal
+										//					bit2=1:Charging system error		(stop charging)
+										//					bit3=0:EV contactor close or during welding detection
+										//					bit3=1:EV contactor open or termination of welding detection (stop charging)
+										//					bit4=0:No stop request before charging
+										//					bit4=1:Normal stop request before charging	(stop charging)
+	unsigned char  SOC;					//102.6				0~100(%) (unit:%)
+										//					Display Only
+	unsigned char  PresentMsgFlowStatus;	//
+};
+
+struct GBTEvseData
+{
+	unsigned char 	SelfTest_Comp;
+	unsigned char	version[16];				// GBT firmware version
+
+	unsigned short  AvailableOutputVoltage;		// 0~600(V) (unit:1V)
+	unsigned short  AvailableOutputCurrent;		// 0~255(A) (unit:1A)
+
+	unsigned char   ConnectorTemperatureP;	// -40~215(degC) (unit:degC) //value 0=-40	[NISSAN customized]
+	unsigned char   ConnectorTemperatureN;	// -40~215(degC) (unit:degC) //value 0=-40	[NISSAN customized]
+
+	unsigned short  PresentOutputVoltage;		// 0~600(V) (unit:1V)
+	unsigned short  PresentOutputCurrent;		// 0~255(A) (unit:1A)
+
+	unsigned short RemainChargingTime;		//109.7,109.6			10(sec.)~255(min.)	(Unit:sec)
+	unsigned char	EvboardStatus;			// 	0 : init
+};
+
+struct GBTData
+{
+	struct GBTEvData 		ev[GB_QUANTITY];
+	struct GBTEvseData 		evse[GB_QUANTITY];
+};
 
 /************************************************************************************/
 /**************************CCS protocol Share memory***************************/