Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tidy up

Browse source
This commit is contained in:
Ray Jones 2019-09-25 17:27:43 +10:00
parent 573ebf3e3b
commit 112628f103
4 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bootload/COM.bat
View file

@ -1,5 +1,5 @@
REM Firmware
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.1.3.bin 0x8000 Afterburner.partitions.bin
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.1.4.bin 0x8000 Afterburner.partitions.bin
REM SPIFFS
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_size detect 0x3d0000 spiffs.bin

2
src/OLED/MQTTScreen.cpp
View file

@ -96,7 +96,7 @@ CMQTTScreen::show()
sprintf(msg, "%s/%s", NVstore.getMQTTinfo().username, NVstore.getMQTTinfo().password);
_printMenuText(border, yPos, msg);
yPos += _display.textHeight() + 2;
sprintf(msg, "%s", NVstore.getMQTTinfo().topic);
sprintf(msg, "%s", NVstore.getMQTTinfo().topicPrefix);
_printMenuText(border, yPos, msg);
return true;

44
src/Utility/NVStorage.cpp
View file

@ -273,17 +273,17 @@ sHeaterTuning::load()
preferences.getBytes("probeSerial2", tempProbe[2].romCode.bytes, 8);
preferences.end();
for(int i=0; i<3; i++) {
DebugPort.printf("Rd Probe[%d] %02X:%02X:%02X:%02X:%02X:%02X\r\n",
i,
tempProbe[i].romCode.fields.serial_number[5],
tempProbe[i].romCode.fields.serial_number[4],
tempProbe[i].romCode.fields.serial_number[3],
tempProbe[i].romCode.fields.serial_number[2],
tempProbe[i].romCode.fields.serial_number[1],
tempProbe[i].romCode.fields.serial_number[0]
);
}
// for(int i=0; i<3; i++) {
// DebugPort.printf("Rd Probe[%d] %02X:%02X:%02X:%02X:%02X:%02X\r\n",
// i,
// tempProbe[i].romCode.fields.serial_number[5],
// tempProbe[i].romCode.fields.serial_number[4],
// tempProbe[i].romCode.fields.serial_number[3],
// tempProbe[i].romCode.fields.serial_number[2],
// tempProbe[i].romCode.fields.serial_number[1],
// tempProbe[i].romCode.fields.serial_number[0]
// );
// }
}
void
@ -309,17 +309,17 @@ sHeaterTuning::save()
preferences.putBytes("probeSerial2", tempProbe[2].romCode.bytes, 8);
preferences.end();
for(int i=0; i<3; i++) {
DebugPort.printf("Wr Probe[%d] %02X:%02X:%02X:%02X:%02X:%02X\r\n",
i,
tempProbe[i].romCode.fields.serial_number[5],
tempProbe[i].romCode.fields.serial_number[4],
tempProbe[i].romCode.fields.serial_number[3],
tempProbe[i].romCode.fields.serial_number[2],
tempProbe[i].romCode.fields.serial_number[1],
tempProbe[i].romCode.fields.serial_number[0]
);
}
// for(int i=0; i<3; i++) {
// DebugPort.printf("Wr Probe[%d] %02X:%02X:%02X:%02X:%02X:%02X\r\n",
// i,
// tempProbe[i].romCode.fields.serial_number[5],
// tempProbe[i].romCode.fields.serial_number[4],
// tempProbe[i].romCode.fields.serial_number[3],
// tempProbe[i].romCode.fields.serial_number[2],
// tempProbe[i].romCode.fields.serial_number[1],
// tempProbe[i].romCode.fields.serial_number[0]
// );
// }
}
void

8
src/Utility/NVStorage.h
View file

@ -237,7 +237,7 @@ struct sMQTTparams : public CESP32_NVStorage {
char host[128];
char username[32];
char password[32];
char topic[32];
char topicPrefix[32];
void init() {
enabled = false;
port = 1883;
@ -245,7 +245,7 @@ struct sMQTTparams : public CESP32_NVStorage {
memset(host, 0, 128);
memset(username, 0, 32);
memset(password, 0, 32);
memset(topic, 0, 32);
memset(topicPrefix, 0, 32);
}
sMQTTparams& operator=(const sMQTTparams& rhs) {
enabled = rhs.enabled;
@ -254,11 +254,11 @@ struct sMQTTparams : public CESP32_NVStorage {
memcpy(host, rhs.host, 128);
memcpy(username, rhs.username, 32);
memcpy(password, rhs.password, 32);
memcpy(topic, rhs.topic, 32);
memcpy(topicPrefix, rhs.topicPrefix, 32);
host[127] = 0;
username[31] = 0;
password[31] = 0;
topic[31] = 0;
topicPrefix[31] = 0;
return *this;
}
void load();