|
@@ -73,10 +73,10 @@ void SETTINGS_SetWebParamsDef(void)
|
|
*/
|
|
*/
|
|
void SETTINGS_SetTempWebParamsDef(void)
|
|
void SETTINGS_SetTempWebParamsDef(void)
|
|
{
|
|
{
|
|
- strcpy(sSettings.sWebParams.ip, "192.168.1.2");
|
|
+ strcpy(sSettings.sWebTempParams.ip, "192.168.1.8");
|
|
- strcpy(sSettings.sWebParams.gate, "192.168.1.1");
|
|
+ strcpy(sSettings.sWebTempParams.gate, "192.168.1.1");
|
|
- strcpy(sSettings.sWebParams.mask, "255.255.255.0");
|
|
+ strcpy(sSettings.sWebTempParams.mask, "255.255.255.0");
|
|
- sSettings.sWebParams.dhcpEnable = 1;
|
|
+ sSettings.sWebTempParams.dhcpEnable = 1;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -110,6 +110,7 @@ void SETTINGS_SetInfoDef(void)
|
|
strcpy(sSettings.sInfo.mac, sSys->mac);
|
|
strcpy(sSettings.sInfo.mac, sSys->mac);
|
|
strcpy(sSettings.sInfo.serialNumber, sSys->serial);
|
|
strcpy(sSettings.sInfo.serialNumber, sSys->serial);
|
|
strcpy(sSettings.sInfo.productionData, sSys->proddate);
|
|
strcpy(sSettings.sInfo.productionData, sSys->proddate);
|
|
|
|
+ strcpy(sSettings.sFlags.testState, sSys->testState);
|
|
vPortFree(sSys);
|
|
vPortFree(sSys);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
@@ -452,8 +453,17 @@ void SETTINGS_GetMac(uint8_t *mac)
|
|
*/
|
|
*/
|
|
void SETTINGS_SetProDate(char *proDate, uint8_t len)
|
|
void SETTINGS_SetProDate(char *proDate, uint8_t len)
|
|
{
|
|
{
|
|
- memset(sSettings.sInfo.productionData, 0, 40);
|
|
+ SYS_t *sSys = NULL;
|
|
- memcpy(sSettings.sInfo.productionData, proDate, len);
|
|
+
|
|
|
|
+ sSys = pvPortMalloc(sizeof(*sSys));
|
|
|
|
+ if (sSys) {
|
|
|
|
+ strcpy(sSys->proddate, proDate);
|
|
|
|
+ SYS_Save(sSys);
|
|
|
|
+ memset(sSettings.sInfo.productionData, 0, 40);
|
|
|
|
+ memcpy(sSettings.sInfo.productionData, proDate, len);
|
|
|
|
+ vPortFree(sSys);
|
|
|
|
+ SETTINGS_Save();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -461,8 +471,17 @@ void SETTINGS_SetProDate(char *proDate, uint8_t len)
|
|
*/
|
|
*/
|
|
void SETTINGS_SetT2OK(void)
|
|
void SETTINGS_SetT2OK(void)
|
|
{
|
|
{
|
|
- memset(sSettings.sFlags.testState, 0, 16);
|
|
+ SYS_t *sSys = NULL;
|
|
- memcpy(sSettings.sFlags.testState, "T2OK", 4);
|
|
+
|
|
|
|
+ sSys = pvPortMalloc(sizeof(*sSys));
|
|
|
|
+ if (sSys) {
|
|
|
|
+ memset(sSettings.sFlags.testState, 0, 16);
|
|
|
|
+ memcpy(sSettings.sFlags.testState, "T2OK", 4);
|
|
|
|
+ strcpy(sSys->testState, sSettings.sFlags.testState);
|
|
|
|
+ SYS_Save(sSys);
|
|
|
|
+ vPortFree(sSys);
|
|
|
|
+ SETTINGS_Save();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|