Commit graph

343 commits

Author SHA1 Message Date
rljonesau
e315a06747 merged to master from James's coloured title bar - BUG fix of OLED error reporting 2018-12-21 17:27:25 +11:00
rljonesau
b99623108b got colour changing title bar working 2018-12-21 15:57:19 +11:00
rljonesau
03500a2919 Merge remote-tracking branch 'remotes/origin/master' into JCWebColorChangeBar 2018-12-21 15:29:56 +11:00
rljonesau
f395fc9d27 deleted commented out junk 2018-12-21 14:27:03 +11:00
James C (SkinnyBuddah)
60392e733e Update Arduino/BTCDieselHeater/src/WiFi/mainpage.cpp 2018-12-21 03:24:29 +00:00
rljonesau
7bb0ffd022 Tidied up E-07 reporting, new AI app 2018-12-21 12:27:03 +11:00
rljonesau
887c19c50a Forces E-07 in JSON ErrorState and ErrorStateStr messages now when no heater data detected upon blue wire
V9 protocol document - ALTITUDE decoded!
2018-12-21 09:22:29 +11:00
rljonesau
9caf3cc097 Added dia file for state machine 2018-12-20 21:09:33 +11:00
rljonesau
4d0ae22961 Rename state machine "report" states to "validate" - better match in JSON world
State machine diagram updated to suit latest design with extra temperature read state
2018-12-20 20:59:53 +11:00
rljonesau
5db72af511 Added suppression of blue wire recycling warnings for when not connected to blue wire <W> toggles 2018-12-20 18:33:44 +11:00
rljonesau
17f044b544 replaced protocol document with V8 2018-12-20 17:29:53 +11:00
rljonesau
27d55f7c90 OLED now reports and resists illegal changes when an OEM controller is active 2018-12-20 17:29:00 +11:00
rljonesau
7eda32b9e7 Omitted new file: UtilClasses.cpp 2018-12-20 15:49:33 +11:00
rljonesau
5268d0704c Tidy up of state machine in JSON world
Hit <SPC> to get debug console menu
Toggle reporting of CHeaterPackage to debug console - using <B> on debug console
Toggle reporting of JSON to debug console - using <J> on debug console
Only allow temperature and heating mode changes when not using an OEM controller
2018-12-20 15:19:59 +11:00
rljonesau
f2732ba1ac BUG FIX: was not detecting OEM controller! Added Bluewire activity to JSON reporting 2018-12-20 06:13:28 +11:00
rljonesau
dbde3c9065 Refactor JSON moderation to a single moderator for all possible clients, BT or WiFi.
Any change in client connection status will force a refresh to all possible clients.
2018-12-19 23:07:51 +11:00
rljonesau
221041d166 Added schematic for breakout PCB to assist development with DoIT(30pin) or Ai-Thinker(38pin) dev boards 2018-12-19 20:28:54 +11:00
rljonesau
a90571ae5b Merge branch 'SubDirectories' 2018-12-19 19:40:04 +11:00
rljonesau
403c182724 Comprehensive stuff up - editing a test branch - incorporated changes back into proper repo 2018-12-19 19:39:07 +11:00
rljonesau
4fc2e1898d Added dummy favicon to web page 2018-12-19 18:45:50 +11:00
rljonesau
538ab58221 Menu driven Bluetooth AI app added 2018-12-19 06:18:13 +11:00
rljonesau
4414cf3fef updated README.md 2018-12-17 06:00:46 +11:00
rljonesau
876e06a43c New AI application .AIA saved 2018-12-16 18:53:18 +11:00
rljonesau
620425e978 left out fonts! 2018-12-16 18:39:23 +11:00
rljonesau
3b52e93482 WHOOPSY - left out .ino file! 2018-12-16 18:38:34 +11:00
rljonesau
529ac5d8e0 Pushed and shoved and edited and finally there - structured file directories 2018-12-16 18:34:39 +11:00
rljonesau
b07b7db8db Starting to move files about, fonts first 2018-12-16 14:55:12 +11:00
rljonesau
e000927d88 added missing licence headers 2018-12-16 14:27:08 +11:00
rljonesau
4019e42925 Error reporting and runstate annotations away from standby and run. JC's nasty throbber included. 2018-12-16 13:45:13 +11:00
rljonesau
49bd71c569 Added JSON ErrorString - reports to web page OK 2018-12-16 11:06:36 +11:00
rljonesau
3ed4335db0 BUG FIX: variable name JSON for slider controls. Supports Fixed Hz now 2018-12-16 09:07:31 +11:00
rljonesau
4a3a28540b Fixed bug with slider sending wrong ID in web page. Honours fixed/thermostat mode from heater info. 2018-12-16 01:09:10 +11:00
rljonesau
ff6715e018 New moderator applied to BTCwebserver. Bug fixes in mainpage.cpp - wrong InnerHTML for desired temp! 2018-12-15 23:21:55 +11:00
rljonesau
db62e38274 Merge remote-tracking branch 'remotes/origin/TelnetSpyRevisited'
Resolved Conflicts:
	Arduino/BTCDieselHeater/BTCWebServer.cpp
	Arduino/BTCDieselHeater/BTCota.cpp
2018-12-15 22:33:33 +11:00
rljonesau
6a307eeb81 changed timeout of state machine to fall thru temperature read state 2018-12-15 22:15:30 +11:00
Jimmy C
b7b15e8532 Added reusable slider function - Now send the JSON keyname to update
Added AdvSettings finally
Added 'r' to telnetspy to allow for restarting of esp via telnet
2018-12-15 21:50:02 +11:00
rljonesau
97b2c849e2 Fully migrated to JSON comms over Bluetooth. New .aia file for App Inventor included.
All JSON commands now accepted by ESP.
Output JSON from ESP is moderated.
2018-12-15 20:34:58 +11:00
Jimmy C
89a52403ca Added current date and current time - Working on date picker for setting the current date 2018-12-15 15:57:00 +11:00
Jimmy C
f2fc37d7b7 added date picker to mainpage 2018-12-15 15:40:39 +11:00
James
44d3a40dd2 Added console.log lines for debug - commiting to share on all machines 2018-12-15 13:19:31 +11:00
James Clark
fe36e3d884 Added more time testing javascript to get browser localtime and use that to update the RTC 2018-12-15 01:16:51 +11:00
James
f4d8bc8cd8 Added initial settings layout idea 2018-12-15 00:31:02 +11:00
rljonesau
a168cea5d2 templated moderator. added JSON formatting module 2018-12-13 23:19:10 +11:00
rljonesau
77dbb4de82 Improved telnetspy interaction with OTA. Does graceful telnet close after upload. 2018-12-13 19:42:35 +11:00
rljonesau
eb64b1a775 Reverted to standard Adafruit SH1106 library (for ESP32) 2018-12-12 21:37:02 +11:00
rljonesau
e576ec4849 TelnetSpy added for debug log via telnet (port 23) as well as Serial (USB) 2018-12-12 20:47:20 +11:00
rljonesau
ae51dd2271 Tidied BTCwebserver by moving CModerator class into a module 2018-12-12 20:03:44 +11:00
rljonesau
838fb98151 implemented web server send moderator using std::map 2018-12-12 06:42:52 +11:00
rljonesau
4fc80e6b9c FFS - screwed up animation of Wifi Tx - fixed 2018-12-11 22:37:18 +11:00
rljonesau
b7cbf50db3 proper check if we should even bother to send fresh web data from ESP32 2018-12-11 22:31:58 +11:00