ESP32_ChinaDieselHeater_Con.../Arduino/BTCDieselHeater/src
rljonesau df4a1837d9 Merge branch 'master' into 7dayTimers
Resolved  Conflicts:
	Arduino/BTCDieselHeater/src/OLED/ScreenManager.cpp
	Arduino/BTCDieselHeater/src/OLED/SetTimerScreen.cpp
	Arduino/BTCDieselHeater/src/OLED/SetTimerScreen.h
2019-03-02 10:59:19 +11:00
..
Bluetooth timers a work in progress - updating JSON commands 2019-02-26 19:38:30 +11:00
cfg timers a work in progress - updating JSON commands 2019-02-26 19:38:30 +11:00
OLED Merge branch 'master' into 7dayTimers 2019-03-02 10:59:19 +11:00
Protocol Added inheritance of LCD controller setting to OLED menus. Can show fan volts in detailed control menu. 2019-02-27 22:51:02 +11:00
RTC refactored timer checking to now be table based. JSON naming changed to remove embedded numeric. 2019-02-20 21:50:28 +11:00
Utility refactored timer checking to now be table based. JSON naming changed to remove embedded numeric. 2019-02-20 21:50:28 +11:00
WiFi timers a work in progress - updating JSON commands 2019-02-26 19:38:30 +11:00