Browse Source

2020.02.24 / Folus Wen

Actions:
1. Module_ProduceUtils.c serial number query/config protocol bug fix.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 5 years ago
parent
commit
d63a5341b7

BIN
EVSE/Modularization/Module_4g


BIN
EVSE/Modularization/Module_ProduceUtils


+ 18 - 7
EVSE/Modularization/Module_ProduceUtils.c

@@ -403,17 +403,28 @@ int main(void)
 					case CMD_QUERY_ALARM_LOG:
 						break;
 					case CMD_QUERY_SN:
+						ftime(&csuTime);
+						tmCSU = localtime(&csuTime.time);
 						DEBUG_INFO("Query serial number: %s\r\n", (char*)ShmSysConfigAndInfo->SysConfig.SerialNumber);
-						tx_size = 7 + strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber);
+						tx_size = 15 + strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber);
 						outBuffer[0] = 0xaa;
 						outBuffer[1] = PROTOCOL_ADDR;
 						outBuffer[2] = inputBuffer[1];
 						outBuffer[3] = CMD_QUERY_SN;
-						outBuffer[4] = strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber)&0xff;
-						outBuffer[5] = (strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber)>>0x08) & 0xff;
+						outBuffer[4] = (strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber)+8)&0xff;
+						outBuffer[5] = ((strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber)+8)>>0x08) & 0xff;
+						outBuffer[6] = ((tmCSU->tm_year+1900)/1000)+'0';
+						outBuffer[7] = (((tmCSU->tm_year+1900)%1000)/100)+'0';
+						outBuffer[8] = (((tmCSU->tm_year+1900)%100)/10)+'0';
+						outBuffer[9] = ((tmCSU->tm_year+1900)%10) +'0';
+						outBuffer[10] = ((tmCSU->tm_mon+1)/10) +'0';
+						outBuffer[11] = ((tmCSU->tm_mon+1)%10) +'0';
+						outBuffer[12] = (tmCSU->tm_mday/10) +'0';
+						outBuffer[13] = (tmCSU->tm_mday%10) +'0';
+
 						for(uint8_t idx=0;idx<strlen((char*)ShmSysConfigAndInfo->SysConfig.SerialNumber);idx++)
 						{
-							outBuffer[6+idx] = (char)ShmSysConfigAndInfo->SysConfig.SerialNumber[idx];
+							outBuffer[14+idx] = (char)ShmSysConfigAndInfo->SysConfig.SerialNumber[idx];
 						}
 
 						for(uint16_t idx=0;idx<(outBuffer[4] | (outBuffer[5]<<8));idx++)
@@ -496,11 +507,11 @@ int main(void)
 						memset(ShmSysConfigAndInfo->SysConfig.SerialNumber, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
 						memset(ShmSysConfigAndInfo->SysConfig.SystemId, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SystemId));
 
-						for(uint16_t idx=0;idx<(inputBuffer[4] | (inputBuffer[5]<<8));idx++)
+						for(uint16_t idx=0;idx<((inputBuffer[4] | (inputBuffer[5]<<8))-8);idx++)
 						{
-							ShmSysConfigAndInfo->SysConfig.SerialNumber[idx] = inputBuffer[6+idx];
+							ShmSysConfigAndInfo->SysConfig.SerialNumber[idx] = inputBuffer[14+idx];
 						}
-						ShmSysConfigAndInfo->SysConfig.SerialNumber[(inputBuffer[4] | (inputBuffer[5]<<8))] = '\0';
+						ShmSysConfigAndInfo->SysConfig.SerialNumber[(inputBuffer[4] | (inputBuffer[5]<<8))-8] = '\0';
 						memcpy(ShmSysConfigAndInfo->SysConfig.SystemId, ShmSysConfigAndInfo->SysConfig.ModelName, strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName));
 						memcpy(&ShmSysConfigAndInfo->SysConfig.SystemId[strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName)], ShmSysConfigAndInfo->SysConfig.SerialNumber, (inputBuffer[4] | (inputBuffer[5]<<8)));
 

BIN
EVSE/Modularization/Module_Wifi


BIN
EVSE/Modularization/OcppBackend


BIN
EVSE/Modularization/WebService


BIN
EVSE/Modularization/libInfypwr_PsuCommObj.a


BIN
EVSE/Modularization/libModule_RFID.a


BIN
EVSE/Modularization/libModule_Upgrade.a


BIN
EVSE/Modularization/libPhihong_PsuCommObj.a


BIN
EVSE/Modularization/logPackTools


BIN
EVSE/Projects/AW-Regular/Images/FactoryDefaultConfig.bin


BIN
EVSE/Projects/AW-Regular/Images/ramdisk.gz


BIN
EVSE/rootfs/root/Module_4g


BIN
EVSE/rootfs/root/Module_ProduceUtils


BIN
EVSE/rootfs/root/Module_Wifi


BIN
EVSE/rootfs/root/OcppBackend


BIN
EVSE/rootfs/root/WebService


BIN
EVSE/rootfs/root/logPackTools