Commit graph

191 commits

Author SHA1 Message Date
rljonesau
4a95d528f8 Ray's touch ups to the fuel setting sliders. 2019-02-11 20:47:00 +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
0a666e1e2f Added option for temperature readout in Farenheit. 2019-02-07 07:24:22 +11:00
rljonesau
9f91aa579f bloody fragile HTML! - back to original, ignoring the browser debug warnings and it works! FFS. 2019-01-28 15:08:42 +11:00
rljonesau
aafe381c66 prevent clock menu on OLED if no RTC fitted 2019-01-27 12:17:49 +11:00
rljonesau
b785450ad5 #ifdef touch up 2019-01-27 10:00:32 +11:00
rljonesau
67bc2b8261 FUBAR'd the default system voltage in NV storage - was 12, should be 120!
adding last two bytes of MAC to default AP's SSID - useful if you have a couple of ESP's on the desk!
2019-01-26 11:58:50 +11:00
rljonesau
e4773a081b Added thermo/fixed toggle to detailed menu. Fixed reversed direction in timer menu. HTML fixes. 2019-01-24 06:03:29 +11:00
rljonesau
0a1226a03c Added SPIFFS directory dump in setup, using "not found" to deliver pages other than special ones. 2019-01-21 06:56:42 +11:00
rljonesau
4b1d941b7f Web server now using SPIFFS - must use Partition: Minimal SPIFFS 2019-01-20 21:14:45 +11:00
rljonesau
f48ec8d314 Tidied "STORING" timeout in PasswordScreen.cpp. 2019-01-20 15:25:58 +11:00
rljonesau
a218218db0 Heater settings now explain PF-X and SN-X by toggling their actual effect.
First press if display is dimmed now brightens display but does not perform an action.
2019-01-20 14:19:38 +11:00
rljonesau
a6ea647724 Heater tuning and settings now in OLED sub menu which is password protected. 2019-01-19 22:05:14 +11:00
rljonesau
7ddc2c16ef Using CPasswordScreen for Fuel and heater settings 2019-01-19 10:06:12 +11:00
rljonesau
033d2f4c27 Adding CPasswordScreen class 2019-01-19 07:15:02 +11:00
rljonesau
71abd19e52 Gave screens meaningful names. Set Clock and Timer screens now branch from Clock Screen. 2019-01-18 18:09:40 +11:00
rljonesau
4d12334823 Improved Config Portal feedback on OLED 2019-01-18 14:34:32 +11:00
rljonesau
716827b399 All WifiManager reconfigs now conclude via wifiEnterConfigPortal which manages NV flag and OLED reboot alert 2019-01-16 20:22:17 +11:00
rljonesau
af0980a72b Can now set/clear CFG mode with OLED. Can also clear credentials. 2019-01-15 08:41:54 +11:00
rljonesau
abbd0fa5ae tidied commenting in BTCWifi.cpp 2019-01-15 07:03:35 +11:00
rljonesau
1b74359084 Refactored to use BOOT (GPIO0) switch for WiFi - so obvious! Shows CFG on WiFi icon if STA+AP and portal running 2019-01-14 21:35:21 +11:00
rljonesau
95c054e19b Rehashed post wm.autoConnect. Can now have config portal active on STA connection! 2019-01-14 20:54:31 +11:00
rljonesau
c2e790a5dd STA+AP mode working - woo hoo! 2019-01-14 17:55:54 +11:00
rljonesau
13c3b1b44a changed to single variable for AP mode tracking 2019-01-14 16:48:33 +11:00
rljonesau
d01e660f79 re-enabled OTA - works :-) 2019-01-14 15:22:57 +11:00
rljonesau
551205d6bd Tidy up DS18B20 reporting. Tidied WiFiManager handling, new Bluetooth app 2019-01-14 14:30:41 +11:00
rljonesau
320b7e8b6f Added CFG to OLED WiFi icon when portal running. 5 sec press to reset WiFi creds, start portal 2019-01-14 11:47:13 +11:00
rljonesau
de2cd12770 Once again works with 192.168.100.1 as the SoftAP IP address 2019-01-14 09:00:43 +11:00
rljonesau
c0e42e6dc6 Pin 25 now determines if we boot into Config Portal or Web Page
Short press -> Config Portal
Long press -> Web Page (> 1 second)
2019-01-14 08:24:13 +11:00
rljonesau
0765882256 Can launch SoftAP with web server from boot with no WiFiManager credentials.
Now to set some NV flags to control the boot to either web server or WifiManager with no creds.
2019-01-14 07:16:45 +11:00
rljonesau
4d780ed3a1 Have portal working from boot, reboot after setting up WiFiManager to connect to new network 2019-01-14 06:59:32 +11:00
rljonesau
bbb225e3b7 Can finally get WifiManager configportal up using the pushbutton, but only if no credentials 2019-01-13 08:32:13 +11:00
rljonesau
59d24d96b9 Simplified timer NV store load/save 2019-01-12 12:57:32 +11:00
rljonesau
713724eaab restored comment on line in BTCWifi.cpp 2019-01-12 12:21:29 +11:00
rljonesau
74daefe644 Added validatedLoad for checking and correcting values read by Preferences at time of read. 2019-01-12 12:19:55 +11:00
rljonesau
28cd89ad5e Changed NV storage to use Preferences with discreet entries - no more conflation across branches :-) 2019-01-12 10:33:45 +11:00
James
86f1c2df4c Added /wmconfig and /resetwifi uri's 2019-01-11 21:37:59 +11:00
rljonesau
e8a110a308 Fixed wm access from BTCWebServer.cpp for James 2019-01-11 19:50:27 +11:00
James
8005636f30 Added /reset and /wmconfig pages to reset wifi settings and start config portal on request 2019-01-11 19:28:22 +11:00
rljonesau
a8f654e991 Core panic in core 1 after merge. fixed by removing ISR blockade about dallas read temp code. 2019-01-11 17:13:22 +11:00
rljonesau
6a3e57ca11 Merge remote-tracking branch 'remotes/origin/JCWebColorChangeBar'
Resolved Conflicts in :
	Arduino/BTCDieselHeater/BTCDieselHeater.ino
	Arduino/BTCDieselHeater/src/WiFi/mainpage.cpp
2019-01-11 16:58:32 +11:00
rljonesau
b40f9d3538 Improved DS18B20 handling (not connected), Fan Sensor & Operating voltage added to JSON.
Wireless AP no go on new green board....
2019-01-11 16:40:25 +11:00
Jimmy C
8786263734 Moved tempsensor.begin to top - Added code to scan for DS18B20 sensor
Corrected wifi ap mode gateway address - Now 192.168.100.1
2019-01-11 00:10:05 +11:00
rljonesau
74107d93d0 Added support for (horrid) 0.96" OLED via BTCConfig.h - BEST USE 1.3" SH1106 DISPLAYS
HC-05 bug fix for bare modules - not happy with empty AT lines being sent ERROR:(0) returns!
Had UART pins for HC-05 reversed on green board.
2019-01-10 16:01:52 +11:00
rljonesau
9007f0856b commented out NVstore.getDimTime() until can properly define in menus. Tends to head toward 0 when trying other branches - defeating the dim function! 2018-12-23 22:15:36 +11:00