Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
365 commits 2 branches 34 tags 137 MiB
Commit graph

365 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rljonesau c5b5165ba5 Moderated delivery of web page JSON to only send changes. 
Need to develop better method of delta checking, but works for now.
 2018-12-11 22:25:32 +11:00
rljonesau 4259cbe22b stupid error - left a test variable usage behind in cleanup 2018-12-11 22:02:20 +11:00
rljonesau 0393c38831 javascript JSON interpret now only acts upon actual proper name/value pairs received 2018-12-11 21:59:29 +11:00
rljonesau 4395b17ba5 Merge branch 'JC_JSON' 2018-12-11 21:24:35 +11:00
rljonesau dee79ecebc Converted to JSON commands back to EPS32 2018-12-11 21:19:02 +11:00
rljonesau 10c33c3515 broke outgoing arrow flag in BTWebServer - fixed 2018-12-10 22:10:49 +11:00
rljonesau 2c136eb34c Ray fiddles to get temp slider to talk to heater, and show desired temp value. 2018-12-10 21:26:29 +11:00
James C (SkinnyBuddah) ff3fcc89f4 Update Arduino/BTCDieselHeater/mainpage.cpp 2018-12-09 23:25:54 +00:00
James C (SkinnyBuddah) e0a8f2ff9f Update Arduino/BTCDieselHeater/mainpage.cpp 2018-12-09 23:03:52 +00:00
James C (SkinnyBuddah) dfb04d97d8 Removed commented code 2018-12-09 22:55:13 +00:00
James C (SkinnyBuddah) 30a954f123 Update Arduino/BTCDieselHeater/mainpage.cpp 2018-12-09 22:53:39 +00:00
rljonesau f0d7d669ff fixed runstate JSON in javascript 2018-12-10 06:30:36 +11:00
rljonesau 43d35493c0 First play with ArduinoJson library and javascript JSON.parse() - too fucking easy! 2018-12-10 06:28:02 +11:00
James f4a52afd42 fixed parsing data into the webpage - need to get data coming out in the same format. 
TRY THIS ONE RAY
 2018-12-10 00:38:59 +11:00
rljonesau 1c9727b675 Merge branch 'JCWebPretty' of gitlab.com:mrjones.id.au/bluetoothheater into JCWebPretty 
Conflicts resolved:
Arduino/BTCDieselHeater/mainpage.cpp
 2018-12-09 20:19:51 +11:00
rljonesau 40305d6224 Fixed Console vs console, commented out new event code 2018-12-09 20:06:04 +11:00
James 374d299cf1 Fixed evt to Event ... FML 2018-12-09 17:24:18 +11:00
James e24caea95d fixed again 2018-12-09 17:21:04 +11:00
James 528b2b1fd3 missed } 2018-12-09 17:18:04 +11:00
James ba5bd51b14 Fixed small issue of not terminating init() function correctly 2018-12-09 17:15:27 +11:00
James 2bc415b2af Fixed on off toggle switch so it works 2018-12-09 17:09:50 +11:00
James 1d98716dd4 next 2018-12-09 15:41:44 +11:00
James b2db3dddad Hell yes its pretty.... doesn't do anything more than when Ray last updated the code - But I think i've nailed the design for now. 2018-12-09 15:07:18 +11:00
rljonesau f40f750c49 Extended range of actual temperature bar graph in screen 1 2018-12-09 14:00:40 +11:00
rljonesau 85ff28d347 Support for DS3231, DS1307, PCF8523 or millis() based RTCs - Use BTCConfig.h to select 2018-12-09 12:10:56 +11:00
rljonesau 55c33af996 added missing files! Dumbkoppf 2018-12-09 09:55:55 +11:00
rljonesau 90569c319c Encapsulated RTC and timer functionality inside CClock class. 2018-12-09 09:51:16 +11:00
rljonesau 2a7e3fce1b Added large clock screen 2018-12-08 23:25:53 +11:00