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

BT icon always on fixed, NVstorage name length limit

Browse source
This commit is contained in:
Ray Jones 2019-05-08 05:38:14 +10:00
parent ead2c9b189
commit e900cb84a7
6 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino/BTCDieselHeater/src/OLED/ScreenHeader.cpp
View file

@ -156,7 +156,7 @@ CScreenHeader::animate()
void
CScreenHeader::showBTicon()
{
if(getBluetoothClient().isConnected() || true) {
if(getBluetoothClient().isConnected()) {
_display.drawBitmap(X_BT_ICON, Y_BT_ICON, BTicon, W_BT_ICON, H_BT_ICON, WHITE);
}
}

17
Arduino/BTCDieselHeater/src/Utility/NVStorage.cpp
View file

@ -415,6 +415,7 @@ CESP32HeaterStorage::save()
saveUI();
}
// **** MAX LENGTH is 15 for name and values ****
void
CESP32HeaterStorage::loadHeater()
{
@ -432,6 +433,7 @@ CESP32HeaterStorage::loadHeater()
preferences.end();
}
// **** MAX LENGTH is 15 for name and values ****
void
CESP32HeaterStorage::saveHeater()
{
@ -449,6 +451,7 @@ CESP32HeaterStorage::saveHeater()
preferences.end();
}
// **** MAX LENGTH is 15 for name and values ****
void
CESP32HeaterStorage::loadTimer(int idx)
{
@ -467,6 +470,7 @@ CESP32HeaterStorage::loadTimer(int idx)
preferences.end();
}
// **** MAX LENGTH is 15 for name and values ****
void
CESP32HeaterStorage::saveTimer(int idx)
{
@ -484,6 +488,7 @@ CESP32HeaterStorage::saveTimer(int idx)
preferences.end();
}
// **** MAX LENGTH is 15 for name and values ****
void
CESP32HeaterStorage::loadUI()
{
@ -499,9 +504,9 @@ CESP32HeaterStorage::loadUI()
validatedLoad("GPIOinMode", _calValues.Options.GPIOinMode, 0, u8inBounds, 0, 3);
validatedLoad("GPIOoutMode", _calValues.Options.GPIOoutMode, 0, u8inBounds, 0, 2);
validatedLoad("GPIOalgMode", _calValues.Options.GPIOalgMode, 0, u8inBounds, 0, 2);
validatedLoad("HomeMenuonTimeout", _calValues.Options.HomeMenu.onTimeout, 0, u8inBounds, 0, 3);
validatedLoad("HomeMenuonStart", _calValues.Options.HomeMenu.onStart, 0, u8inBounds, 0, 3);
validatedLoad("HomeMenuonStop", _calValues.Options.HomeMenu.onStop, 0, u8inBounds, 0, 3);
validatedLoad("MenuonTimeout", _calValues.Options.HomeMenu.onTimeout, 0, u8inBounds, 0, 3);
validatedLoad("MenuonStart", _calValues.Options.HomeMenu.onStart, 0, u8inBounds, 0, 3);
validatedLoad("MenuonStop", _calValues.Options.HomeMenu.onStop, 0, u8inBounds, 0, 3);
validatedLoad("FrameRate", _calValues.Options.FrameRate, 1000, u16inBounds, 300, 1500);
preferences.end();
}
@ -521,9 +526,9 @@ CESP32HeaterStorage::saveUI()
preferences.putUChar("GPIOinMode", _calValues.Options.GPIOinMode);
preferences.putUChar("GPIOoutMode", _calValues.Options.GPIOoutMode);
preferences.putUChar("GPIOalgMode", _calValues.Options.GPIOalgMode);
preferences.putUChar("HomeMenuonTimeout", _calValues.Options.HomeMenu.onTimeout);
preferences.putUChar("HomeMenuonStart", _calValues.Options.HomeMenu.onStart);
preferences.putUChar("HomeMenuonStop", _calValues.Options.HomeMenu.onStop);
preferences.putUChar("MenuOnTimeout", _calValues.Options.HomeMenu.onTimeout);
preferences.putUChar("MenuonStart", _calValues.Options.HomeMenu.onStart);
preferences.putUChar("MenuonStop", _calValues.Options.HomeMenu.onStop);
preferences.putUShort("FrameRate", _calValues.Options.FrameRate);
preferences.end();
}

2
Bootload/COM.bat
View file

@ -1 +1 @@
esptool.exe --chip esp32 --port COM11 --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 BTCDieselHeater.ino.bin 0x8000 BTCDieselHeater.ino.partitions.bin
esptool.exe --chip esp32 --port COM11 --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 Afterburner.bin 0x8000 Afterburner.partitions.bin

2
Bootload/OTA.bat
View file

@ -1 +1 @@
espota.exe -i 192.168.20.40 -p 3232 --auth= -f BTCDieselHeater.ino.bin
espota.exe -i 192.168.20.100 -p 3232 --auth= -f Afterburner.bin

BIN
Bootload/bootload.zip
View file

Binary file not shown.

9
README.md
View file

@ -39,17 +39,20 @@ Working so far:
Timers can also be set to be one-shot.
This is an extremely flexible system!
* Battery backed Real Time Clock - DS3231
* Prototype "Green PCB" in production, using naked ESP32 and HC-05 modules
* Mk1 "Green PCB" using naked ESP32 and HC-05 modules
* Temperature readout in Celcius or Farenheit
* Two new experimental thermostat modes (No practical testing - presently too hot in .au!):
Tighten or loosen the thermostat temperature range by specifying a hysteresis value. eg tell the heater it is 23 degrees when it really is only 22.25 degrees (only 0.25 above set point).
Request a linear change in Hz according to the deviation from the setpoint
* 2 external digital inputs, 2 digital outputs, analogue input
* New Mk2 "Red PCB" that properly fits into an off the shelf case (requires machining)
To be implemented
--------------------------
* Add 2 external digital inputs, 2 digital outputs, analogue input 433MHz Rx stream, 433MHz Tx stream connections. This would allow external timer units for example, or analogue temeprature demand (which is still only 1 degree resolution).
* Low voltage cut out
* 433MHz Rx stream, 433MHz Tx stream connections. This would allow external timer units for example, or analogue temperature demand (which is still only 1 degree resolution with standard heater thermostat).
* Low voltage cut out
* Temperature probe offset or mapping to correct adverse readings.
* MQTT pub/sub
* "fuel gauge" - Integrate pump frequency, assuming a repeatable dose of fuel per pump cycle...
* Expand hardware compatability with different MCU setups. IE Arduino Due/Mega/Pro ESP8266 & ESP32