|
@@ -57,18 +57,22 @@ static SymStruct regulationTable[] = {
|
|
|
};
|
|
|
|
|
|
static SymStruct powerTable[] = {
|
|
|
- {"30", POWER_30W},
|
|
|
- {"60", POWER_60W},
|
|
|
- {"80", POWER_80W},
|
|
|
- {"90", POWER_90W},
|
|
|
- {"12", POWER_120W},
|
|
|
- {"15", POWER_150W},
|
|
|
- {"16", POWER_160W},
|
|
|
- {"18", POWER_180W},
|
|
|
- {"24", POWER_240W},
|
|
|
- {"36", POWER_360W},
|
|
|
- {"48", POWER_480W},
|
|
|
- {"72", POWER_720W},
|
|
|
+ {"301", POWER_30W},
|
|
|
+ {"601", POWER_60W},
|
|
|
+ {"801", POWER_80W},
|
|
|
+ {"901", POWER_90W},
|
|
|
+ {"122", POWER_120W},
|
|
|
+ {"152", POWER_150W},
|
|
|
+ {"162", POWER_160W},
|
|
|
+ {"182", POWER_180W},
|
|
|
+ {"212", POWER_210W},
|
|
|
+ {"242", POWER_240W},
|
|
|
+ {"272", POWER_270W},
|
|
|
+ {"302", POWER_300W},
|
|
|
+ {"332", POWER_330W},
|
|
|
+ {"362", POWER_360W},
|
|
|
+ {"482", POWER_480W},
|
|
|
+ {"722", POWER_720W},
|
|
|
};
|
|
|
|
|
|
static SymStruct gunTypeTable[] = {
|
|
@@ -527,9 +531,21 @@ static int exchangePowerValue(uint8_t key)
|
|
|
case POWER_180W:
|
|
|
return 1800;
|
|
|
|
|
|
+ case POWER_210W:
|
|
|
+ return 2100;
|
|
|
+
|
|
|
case POWER_240W:
|
|
|
return 2400;
|
|
|
|
|
|
+ case POWER_270W:
|
|
|
+ return 2700;
|
|
|
+
|
|
|
+ case POWER_300W:
|
|
|
+ return 3000;
|
|
|
+
|
|
|
+ case POWER_330W:
|
|
|
+ return 3300;
|
|
|
+
|
|
|
case POWER_360W:
|
|
|
return 3600;
|
|
|
|
|
@@ -566,7 +582,7 @@ int RatedCurrentParsing(char *pModuleName, void *pDestStruct)
|
|
|
uint32_t ret = 0;
|
|
|
char model[3] = {'\0'};
|
|
|
char regulation[2] = {'\0'};
|
|
|
- char power[3] = {'\0'};
|
|
|
+ char power[4] = {'\0'};
|
|
|
char gunType[2] = {'\0'};
|
|
|
ParsingRatedCur *pParsingInfo = NULL;
|
|
|
RateCurInfo *pGunRateCurInfo = NULL;
|
|
@@ -583,8 +599,8 @@ int RatedCurrentParsing(char *pModuleName, void *pDestStruct)
|
|
|
model[2] = '\0';
|
|
|
strncpy(regulation, &pModuleName[3], 1);
|
|
|
regulation[1] = '\0';
|
|
|
- strncpy(power, &pModuleName[4], 2);
|
|
|
- power[2] = '\0';
|
|
|
+ strncpy(power, &pModuleName[4], 3);
|
|
|
+ power[3] = '\0';
|
|
|
|
|
|
//get max power value
|
|
|
powerKey = keyfromstring(&power[0], &powerTable[0], sizeof(powerTable) / sizeof(SymStruct));
|