Default modbus serial param to N81

Optimized DUE flash saving routine
This commit is contained in:
2019-06-11 15:17:45 +03:00
parent 02fc784002
commit b5c6c3a618
2 changed files with 28 additions and 1 deletions

View File

@@ -1033,15 +1033,42 @@ int mqttConfigResp(char *as) {
return 1; return 1;
} }
#if defined(__SAM3X8E__)
#define saveBufLen 16000
void cmdFunctionSave(int arg_cnt, char **args)
{
char* outBuf = (char*) malloc(saveBufLen); /* XXX: Dynamic size. */
if (outBuf == NULL)
{
return;
}
debugSerial<<F("Saving config to EEPROM..");
aJsonStringStream stringStream(NULL, outBuf, saveBufLen);
aJson.print(root, &stringStream);
int len = strlen(outBuf);
outBuf[len++]= EOF;
EEPROM.write(EEPROM_offset,(byte*) outBuf,len);
free (outBuf);
debugSerial<<F("Saved to EEPROM");
}
#else
void cmdFunctionSave(int arg_cnt, char **args) void cmdFunctionSave(int arg_cnt, char **args)
{ {
aJsonEEPROMStream jsonEEPROMStream = aJsonEEPROMStream(EEPROM_offset); aJsonEEPROMStream jsonEEPROMStream = aJsonEEPROMStream(EEPROM_offset);
debugSerial<<F("Saving config to EEPROM.."); debugSerial<<F("Saving config to EEPROM..");
aJson.print(root, &jsonEEPROMStream); aJson.print(root, &jsonEEPROMStream);
jsonEEPROMStream.putEOF(); jsonEEPROMStream.putEOF();
debugSerial<<F("Saved to EEPROM"); debugSerial<<F("Saved to EEPROM");
} }
#endif
void cmdFunctionIp(int arg_cnt, char **args) void cmdFunctionIp(int arg_cnt, char **args)
{ {
IPAddress ip0(0, 0, 0, 0); IPAddress ip0(0, 0, 0, 0);

View File

@@ -51,7 +51,7 @@
#endif #endif
#ifndef MODBUS_DIMMER_PARAM #ifndef MODBUS_DIMMER_PARAM
#define MODBUS_DIMMER_PARAM SERIAL_8E1 #define MODBUS_DIMMER_PARAM SERIAL_8N1
#endif #endif
#define dimPar MODBUS_DIMMER_PARAM #define dimPar MODBUS_DIMMER_PARAM