|
@@ -200,13 +200,13 @@ int ConnectorType(char* connector){
|
|
|
if(strcmp(connector, "0") == 0){
|
|
|
result= 0;
|
|
|
}
|
|
|
- else if(strcmp(connector, "U") == 0 || strcmp(connector, "V") == 0 || strcmp(connector, "E") == 0 || strcmp(connector, "F") == 0 || strcmp(connector, "T") == 0 || strcmp(connector, "D") == 0 || strcmp(connector, "M") == 0 || strcmp(connector, "N") == 0 || strcmp(connector, "P") == 0 || strcmp(connector, "R") == 0){
|
|
|
+ else if(strcmp(connector, "U") == 0 || strcmp(connector, "V") == 0 || strcmp(connector, "E") == 0 || strcmp(connector, "F") == 0 || strcmp(connector, "T") == 0 || strcmp(connector, "D") == 0 || strcmp(connector, "M") == 0 || strcmp(connector, "N") == 0 || strcmp(connector, "P") == 0 || strcmp(connector, "R") == 0 || strcmp(connector, "Y") == 0 || strcmp(connector, "Z") == 0){
|
|
|
result= 1;//CCS
|
|
|
}
|
|
|
else if(strcmp(connector, "G") == 0 || strcmp(connector, "B") == 0){
|
|
|
result= 2;//GB
|
|
|
}
|
|
|
- else if(strcmp(connector, "J") == 0 || strcmp(connector, "K") == 0){
|
|
|
+ else if(strcmp(connector, "J") == 0 || strcmp(connector, "K") == 0 || strcmp(connector, "L") == 0 || strcmp(connector, "S") == 0){
|
|
|
result= 3;//CHAdeMO
|
|
|
}
|
|
|
else if(strcmp(connector, "1") == 0 || strcmp(connector, "2") == 0 || strcmp(connector, "3") == 0 || strcmp(connector, "4") == 0 || strcmp(connector, "5") == 0 || strcmp(connector, "6") == 0 || strcmp(connector, "7") == 0 || strcmp(connector, "8") == 0){
|
|
@@ -1646,8 +1646,13 @@ int main(int argc, char *argv[]) {
|
|
|
int p3=atoi((char *)RatedPower3);
|
|
|
if(strcmp(IsAcDc, "D") == 0){
|
|
|
RatedPower=(p1*10+p2)*pow(10,p3-1);
|
|
|
- if(RatedPower>=30){
|
|
|
- PsuQuantity = RatedPower/30;
|
|
|
+ if(RatedPower==50){
|
|
|
+ PsuQuantity = 3;
|
|
|
+ }
|
|
|
+ else{
|
|
|
+// if(RatedPower>=30){
|
|
|
+ PsuQuantity = RatedPower/30;
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0 || strcmp(IsDO, "DB") == 0){
|