Commit graph

307 commits

Author SHA1 Message Date
rljonesau
7332d4e797 Added status LED via GPIO Output #1. 2019-04-09 09:12:42 +10:00
rljonesau
485ca0b8a5 Added: Hold input 1 for run mode; Alternate closures input 1 toggle run/stop 2019-04-06 22:06:50 +11:00
rljonesau
e281e1adf8 Initial mode IP1 ON, IP2 OFF - works! 2019-04-06 21:45:25 +11:00
rljonesau
708a8087b1 Consolidated new generated run states into protocol handler, new JSON for suspend mode 2019-04-05 06:39:58 +11:00
rljonesau
cce60328c0 Added over temp cycling, based upon Jess Baughan's idea 2019-04-04 21:48:05 +11:00
rljonesau
c440498bad updated AppInventor/BluetoothHeaterMenuNewTimer.aia 2019-03-25 06:15:24 +11:00
rljonesau
e6b285c00c Bug fix - incorrect wifi mode upon wifi screen entry.
Tidied alignment of OTA & CFG/AP against Wifi icon
2019-03-24 17:38:48 +11:00
rljonesau
a8744fdf22 Wifi enable & OTA enable in NVram. Bug fix thermostat mode in priming menu.
OTA now shows in screen header against Wifi icon.
2019-03-24 16:48:03 +11:00
rljonesau
f4d6c3dccc Added descriptions of key pad functions in setup menus. Made key pad presses more consistent. 2019-03-17 18:10:01 +11:00
rljonesau
1cfd82c32f Added menu to show standard Adafruit font 2019-03-16 14:57:37 +11:00
rljonesau
77265112ab Timer menu key strokes more logical now - cool arrows found in Adafruit fonts!! 2019-03-16 10:54:50 +11:00
rljonesau
82a4970823 readme update 2019-03-16 08:46:09 +11:00
rljonesau
bdb34d9401 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater 2019-03-16 08:44:09 +11:00
rljonesau
cb1e784b5b Screen manager can now select any menu, typically only for off shoot stand alone menus.
Quite a tidy interface now.
2019-03-16 08:43:44 +11:00
Ray Jones
49840b88fd Update README.md 2019-03-15 13:01:35 +00:00
Ray Jones
b783482803 Update README.md 2019-03-15 12:59:07 +00:00
rljonesau
d19c60da33 Screen manager now uses vector<vector<CScreen*>> for all screens.
Very tidy and easily extensible now.
2019-03-15 23:42:54 +11:00
rljonesau
c7609a984f consolidated screen manager menu loop selection 2019-03-15 22:34:25 +11:00
rljonesau
ead0411d7a Tidied management of branch menus by adding them to a vector 2019-03-15 21:48:22 +11:00
rljonesau
ae102021d5 Added JSON command handling for thermostat control method 2019-03-15 19:08:05 +11:00
rljonesau
d8c050b165 Added setting screen to select the thermostat mode and window size 2019-03-15 18:19:30 +11:00
rljonesau
2fc020ae6c Implemented mechanism for thermostat hysteresis. Need to build UI. 2019-03-14 21:52:59 +11:00
rljonesau
220657956f Omitted InheritSettingsScreen.cpp/.h 2019-03-12 18:09:50 +11:00
rljonesau
c10d8c4204 OLED timer chart now updates with JSON timer changes 2019-03-06 07:17:58 +11:00
rljonesau
459f15054d Bluetooth app updated for 14 timers, including conflict testing. 2019-03-05 20:40:00 +11:00
rljonesau
f00a179f34 Implemented JSON send and receive of new timer packaging 2019-03-03 19:48:52 +11:00
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
rljonesau
83f564cf95 tidied CScreenManager 2019-03-02 10:32:50 +11:00
rljonesau
807709adc8 refactored inheritance of OEM settings into a new screen - MUCH TIDIER! 2019-03-02 10:16:37 +11:00
rljonesau
222c66bbbd Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater 2019-02-28 21:01:44 +11:00
rljonesau
12ed7301dc Added initUI calls, along with onSelect when screens come into view - ensures fresh start every time 2019-02-28 19:56:13 +11:00
rljonesau
5875a30064 Added fallback to Basic Control menu when dimming timeout elapses, unless in Detailed Control or Clock 2019-02-28 18:14:02 +11:00
rljonesau
4bc1c79a6d 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
rljonesau
bf082210b8 timers a work in progress - updating JSON commands 2019-02-26 19:38:30 +11:00
rljonesau
a45d88fcf5 refactored timer checking to now be table based. JSON naming changed to remove embedded numeric. 2019-02-20 21:50:28 +11:00
Ray Jones
d27ce9b888 Update README.md 2019-02-16 07:56:37 +00:00
rljonesau
aade6fdc34 timer conflict test now directly uses the proposed sTimer info, not the NV staged values. 2019-02-15 06:36:13 +11:00
rljonesau
fefb84a87a Massive rework of the timer setup and a graphical presentation of the timer status 2019-02-14 21:20:15 +11:00
rljonesau
cc98073eac Merge branch 'RLJ_JCWiFiRevisit2' 2019-02-12 06:29:35 +11:00
rljonesau
ee38936df1 Split TempDesired controls to TempDesired (slider) + TempDesiredVal (readout) 2019-02-12 06:28:58 +11:00
rljonesau
76f24adfcc Consolidated incoming JSON handling for pump/fan max/min values 2019-02-11 21:01:24 +11:00
rljonesau
4a95d528f8 Ray's touch ups to the fuel setting sliders. 2019-02-11 20:47:00 +11:00
rljonesau
30220e3e58 Added unmounting of SPIFFS when using OTA. Added /formatspiffs URL 2019-02-11 19:34:11 +11:00
James
2ce6c52243 hopefully pushing upstream 2019-02-11 08:54:51 +11:00
James
712cc7e319 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater into JimsNewWorkingWeb 2019-02-11 08:51:29 +11:00
James
6df163fc1b Changed index.html sliders now linked to values
changing sliders changes values immediadtly - Need to find a way to unhook that.
2019-02-11 08:51:02 +11:00
rljonesau
25a238ddad Bad default Hz for Max pump, should be 45 (4.5Hz), NOT 14 (1.4Hz) :-( 2019-02-10 19:20:47 +11:00
James
b14f2b8b1c Added hooks for pump and fan settings - Pending RaReview should be good to merge 2019-02-10 18:25:37 +11:00
rljonesau
20d08691fd Bluetooth app updated to show degF when Farenheit mode selected via OLED menus.
new JSON TempMode for degC/degF mode indication
2019-02-07 21:36:54 +11:00
rljonesau
437cee1b60 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater 2019-02-07 07:24:51 +11:00