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

204 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jimmy C
d378d902ac Added date picker and time setup input boxes 
Added two start and stop timers - No code attached - Simply UI at this stage
 2018-12-23 02:27:17 +11:00
rljonesau
e5db792179 OLED Display dims after 1 minute of no keyboard action. Keypress restores brightness for another minute. 
Allows for user defined interval, if zero display will not dim (user adjustment to be implemented)
 2018-12-22 21:32:13 +11:00
rljonesau
54fa331d23 No longer insert smart errors into received data frames. With JSON we can just build an error. 2018-12-22 17:34:10 +11:00
Jimmy C
5d2f42acba Added input boxes 2018-12-22 16:48:43 +11:00
rljonesau
e6ea53496f Fixed raw blue wire data reporting, now shows true raw data received (and sent by us) 
Added state machine reporting toggle to debug menu
New state machine diagram
 2018-12-22 08:48:39 +11:00
rljonesau
18ce10e202 BUG FIX: OLED was showing E-07 faults when there should not have been 2018-12-21 21:58:39 +11:00
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