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

68 commits

Author SHA1 Message Date
rljonesau
551205d6bd Tidy up DS18B20 reporting. Tidied WiFiManager handling, new Bluetooth app 2019-01-14 14:30:41 +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
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
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
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
f395fc9d27 deleted commented out junk 2018-12-21 14: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
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
27d55f7c90 OLED now reports and resists illegal changes when an OEM controller is active 2018-12-20 17:29:00 +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
403c182724 Comprehensive stuff up - editing a test branch - incorporated changes back into proper repo 2018-12-19 19:39:07 +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
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
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
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
85ff28d347 Support for DS3231, DS1307, PCF8523 or millis() based RTCs - Use BTCConfig.h to select 2018-12-09 12:10:56 +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
rljonesau
0f397e93f8 Slowed DS3231 I2C accesses to 400kHz 2018-12-08 16:44:48 +11:00
rljonesau
fbe39980ce Bug fixes: timer that spans midnight, stale info in timer setup screens 2018-12-08 15:18:37 +11:00
rljonesau
283eff4288 Timers now start/stop as required, and self clear if non-repeating. 
Adding notion of Day of Week timers.
 2018-12-08 09:30:55 +11:00
rljonesau
e51b2be8d1 dual timers, header icons for timers 2018-12-07 22:16:04 +11:00
rljonesau
3c8f0cff25 Added DS3231 support, and new screen to set the time/date 2018-12-07 06:47:36 +11:00
rljonesau
e2b207625e Improved WiFi traffic animation 2018-12-02 05:25:10 +11:00
rljonesau
27d7c70068 Split CScreen base class out for fundamental screen functions 
Added CScreenHeader for standard header items, then all other screens inherit from there.
Removed "get" helpers, now use getHeaterInfo() "CProtocolPackage"
 2018-12-01 11:36:25 +11:00
rljonesau
abc8f63590 Added drawMenuText methods to considerably tidy up screen update code 
Created an automatically resetting, transient font usage class.
 2018-11-29 22:11:50 +11:00
rljonesau
388aef2c48 Screen5 completed - can set and save fuel settings OK. 
Also enhanced pump setters/getters to use float.
Added selection box methods to CScreen
 2018-11-28 22:15:23 +11:00
rljonesau
fac5c8d1ae Further work on Screen5 - Fuel/Air settings menu 2018-11-28 06:40:01 +11:00
rljonesau
36a0755005 Have presentation of Fuel settings screen settled, need to allow adjustments 2018-11-27 21:44:47 +11:00
rljonesau
66c8407382 Gone crazy with license text headers 2018-11-26 22:58:15 +11:00
rljonesau
5bcddf1a24 Merged with code changes from RLJ_WebServer_I2C_OLED to obtain I2C OLED An javascript web server 2018-11-26 21:26:38 +11:00
rljonesau
b77bbb127e Revamped screens to now be based upon CScreen class, along with a CScreenManager class. 2018-11-25 15:45:17 +11:00
rljonesau
346056f982 Now host 4 OLED screens, includes helper functions for fundamental inspection/operations 2018-11-24 22:03:47 +11:00