瀏覽代碼

2022-12-01 / Tim
Actions
1. [add] MODEL_DL, REG_W, GUN_TYPE_Y, GUN_TYPE_Z, GUN_TYPE_I, GUN_TYPE_Q, GUN_TYPE_W

Files
1. Module_RatedCurrent.c
2. Module_RatedCurrent.h

Jerry Wang 2 年之前
父節點
當前提交
378c2ad98b
共有 2 個文件被更改,包括 20 次插入1 次删除
  1. 15 0
      EVSE/Modularization/Module_RatedCurrent.c
  2. 5 1
      EVSE/Modularization/Module_RatedCurrent.h

+ 15 - 0
EVSE/Modularization/Module_RatedCurrent.c

@@ -38,6 +38,7 @@ static SymStruct modelTable[] = {
 	{ "DX", MODEL_DX },
     { "DB", MODEL_DB },
     { "DH", MODEL_DH },
+	{ "DL", MODEL_DL }
 };
 
 static SymStruct regulationTable[] = {
@@ -55,6 +56,7 @@ static SymStruct regulationTable[] = {
     {"I", REG_I},
     {"F", REG_F},
     {"L", REG_L},
+	{"W", REG_W}
 };
 
 static SymStruct powerTable[] = {
@@ -110,6 +112,8 @@ static SymStruct gunTypeTable[] = {
     {"Y", GUN_TYPE_Y},
     {"Z", GUN_TYPE_Z},
     {"S", GUN_TYPE_S},
+	{"I", GUN_TYPE_I},
+	{"Q", GUN_TYPE_Q}
 };
 
 //------------------------------------------------------------------------------
@@ -240,6 +244,7 @@ static uint16_t defaultRatedCurrent(uint8_t modelType, uint32_t gunType, int pow
 		break;
 
     case GUN_TYPE_K:
+    case GUN_TYPE_W:
     	ret = RC_200A;
         break;
 
@@ -272,6 +277,11 @@ static uint16_t defaultRatedCurrent(uint8_t modelType, uint32_t gunType, int pow
         ret =  RC_150A;
         break;
 
+    case GUN_TYPE_I:
+    case GUN_TYPE_Q:
+    	ret = RC_300A;
+    	break;
+
     case GUN_TYPE_0:
     	ret = RC_0A;
 		break;
@@ -523,6 +533,7 @@ static void exchangeGunTypeAndVolValue(uint8_t key, GunTypeAndVolInfo *gunAndVol
     case GUN_TYPE_K:
     case GUN_TYPE_L:
     case GUN_TYPE_S:
+    case GUN_TYPE_W:// : CHAdeMO 200A boost 350A
         pGunAndVol->GunType = Gun_Type_Chademo;
         pGunAndVol->GunVoltage = VOL_CHADEMO;
         break;
@@ -537,6 +548,10 @@ static void exchangeGunTypeAndVolValue(uint8_t key, GunTypeAndVolInfo *gunAndVol
     case GUN_TYPE_N:// : CCS1 80A
     case GUN_TYPE_P:// : Phoenix CCS2 500A 水冷
     case GUN_TYPE_R:// : Phoenix CCS1 500A 水冷
+    case GUN_TYPE_Y:// : CCS1 150A
+    case GUN_TYPE_Z:// : CCS2 150A
+    case GUN_TYPE_I:// : CCS1 300A Boost mode
+    case GUN_TYPE_Q:// : CCS2 300A Boost mode
         pGunAndVol->GunType = Gun_Type_CCS_2;
         pGunAndVol->GunVoltage = VOL_CCS;
         break;

+ 5 - 1
EVSE/Modularization/Module_RatedCurrent.h

@@ -26,6 +26,7 @@
 #define MODEL_DX								(0x0E) //DC EVSE Output Communication Box (Dispenser)
 #define MODEL_DB                                (0x0F) //DC to DC EVSE Output power cabinet
 #define MODEL_DH                                (0x10) //CSU 3.0
+#define MODEL_DL                                (0x11) //DC EVSE liquid cooling power cabinet
 
 //------------------------------------------------------------------------------
 // regulation key
@@ -44,6 +45,7 @@
 #define REG_I                                   (0x0C) // Z + TIC Meter pcb
 #define REG_F                                   (0x0D) // Z + MID Meter
 #define REG_L                                   (0x0E) // U + UL meter
+#define REG_W                                   (0x0F) // CNS / Taiwan manufacture
 
 //------------------------------------------------------------------------------
 // rate power key
@@ -93,7 +95,7 @@
 #define GUN_TYPE_P                              (0x14) //Phoenix CCS2 500A Liquid cooling
 #define GUN_TYPE_R                              (0x15) //Phoenix CCS1 500A Liquid cooling
 #define GUN_TYPE_C                              (0x16) //Reserved for ChaoJi
-#define GUN_TYPE_W                              (0x17) //Reserved for Wireless
+#define GUN_TYPE_W                              (0x17) //CHAdeMO 200A boost 350A
 #define GUN_TYPE_B                              (0x18) //GBT YG PT1000
 #define GUN_TYPE_H                              (0x19) //WOER GBT 500A
 #define GUN_TYPE_A                              (0x1A) //WOER GBT 400A
@@ -101,6 +103,8 @@
 #define GUN_TYPE_Y                              (0x1C) //CCS1 150A
 #define GUN_TYPE_Z                              (0x1D) //CCS2 150A
 #define GUN_TYPE_S                              (0x1E) //CHAdeMO 125A, Boost Mode: 200A
+#define GUN_TYPE_I                              (0x1F) //CCS1 300A Boost mode
+#define GUN_TYPE_Q                              (0x20) //CCS2 300A Boost mode
 
 //------------------------------------------------------------------------------
 // rating current parameters