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

49 commits

Author SHA1 Message Date
Ray Jones
c1bcc83e8b Proper std::string moderator, using mapped value for JSON output. Secure web upload with user/pass 2019-05-14 21:29:35 +10:00
Ray Jones
39aba4819f commented out missing ABMqtt header. 
Fixed Index.html foibles of MQTT send.
64 byte limit in BT fixed.
 2019-05-12 22:14:32 +10:00
Ray Jones
04fab40742 Refactored string in JSON moderator - const char* are BAD AND EVIL in a std::map 
MQTT parameter exchange via JSON and NV storage
 2019-05-12 20:15:18 +10:00
Ray Jones
e8f6b88aeb Quick fix: -20C -ve threshold for cyclic mode 2019-05-12 09:01:22 +10:00
Ray Jones
9861297744 Suite of minor bug fixes and annoyances - now Afterburner for AP and BT server names :-) 
OTA was not rebooting after AP only update
 2019-05-11 12:18:06 +10:00
Ray Jones
b47a4606dd Changed DS18B20 read to a use device address - faster 
Seeing 10 second WiFi timeout if BT & WiFI client active, reversed order so Websocket now sends before BT
  - very much more stable now
  - smacks of a UART ISR causing issues with socket kernel code...
 2019-05-09 06:30:26 +10:00
Ray Jones
e900cb84a7 BT icon always on fixed, NVstorage name length limit 2019-05-08 05:38:14 +10:00
Ray Jones
de6226ad12 User settings loop now uses graphic symbology. 
Added adjustable -ve threshold for Jess mode (cyclic shutdown if over temp).
Added user selectable display blank, dim or do nothing option on keypad inactivity.
Added user selectable menu timeout on keypad inactivity.
 2019-04-27 20:41:47 +10:00
rljonesau
480bd1b15c Adding OnStart, OnStop and OnTimeout home screen actions 2019-04-20 09:49:22 +10:00
rljonesau
c1b1036ece New features: 
Version information screen
Adjustable frame rate
User selectable default menu
Extra large fonts for clock and basic menu
 2019-04-19 21:38:39 +10:00
rljonesau
1819a244f9 Added generic Debounce class for use by keypad and GPIO inputs 2019-04-13 19:05:53 +10:00
rljonesau
83784a77d2 Added board detection to solve setup of GPIO of modded vs unmodded V2.0 PCBs and inversion of inputs on V1 PCBS. 2019-04-13 09:18:07 +10:00
rljonesau
a2fe5e969d GPIO screen now uses icons for inputs and outputs 2019-04-11 09:00:36 +10:00
rljonesau
aba5762c0c Added GPIO out user mode 2019-04-10 09:28:46 +10:00
rljonesau
7332d4e797 Added status LED via GPIO Output #1. 2019-04-09 09:12:42 +10:00
rljonesau
485ca0b8a5 Added: Hold input 1 for run mode; Alternate closures input 1 toggle run/stop 2019-04-06 22:06:50 +11:00
rljonesau
708a8087b1 Consolidated new generated run states into protocol handler, new JSON for suspend mode 2019-04-05 06:39:58 +11:00
rljonesau
cce60328c0 Added over temp cycling, based upon Jess Baughan's idea 2019-04-04 21:48:05 +11:00
rljonesau
a8744fdf22 Wifi enable & OTA enable in NVram. Bug fix thermostat mode in priming menu. 
OTA now shows in screen header against Wifi icon.
 2019-03-24 16:48:03 +11:00
rljonesau
ae102021d5 Added JSON command handling for thermostat control method 2019-03-15 19:08:05 +11:00
rljonesau
d8c050b165 Added setting screen to select the thermostat mode and window size 2019-03-15 18:19:30 +11:00
rljonesau
2fc020ae6c Implemented mechanism for thermostat hysteresis. Need to build UI. 2019-03-14 21:52:59 +11:00
rljonesau
459f15054d Bluetooth app updated for 14 timers, including conflict testing. 2019-03-05 20:40:00 +11:00
rljonesau
f00a179f34 Implemented JSON send and receive of new timer packaging 2019-03-03 19:48:52 +11:00
rljonesau
a45d88fcf5 refactored timer checking to now be table based. JSON naming changed to remove embedded numeric. 2019-02-20 21:50:28 +11:00
rljonesau
aade6fdc34 timer conflict test now directly uses the proposed sTimer info, not the NV staged values. 2019-02-15 06:36:13 +11:00
rljonesau
fefb84a87a Massive rework of the timer setup and a graphical presentation of the timer status 2019-02-14 21:20:15 +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
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
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
a6ea647724 Heater tuning and settings now in OLED sub menu which is password protected. 2019-01-19 22:05:14 +11:00
rljonesau
033d2f4c27 Adding CPasswordScreen class 2019-01-19 07:15:02 +11:00
rljonesau
551205d6bd Tidy up DS18B20 reporting. Tidied WiFiManager handling, new Bluetooth app 2019-01-14 14:30:41 +11:00
rljonesau
59d24d96b9 Simplified timer NV store load/save 2019-01-12 12:57:32 +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
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
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
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
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
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
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
403c182724 Comprehensive stuff up - editing a test branch - incorporated changes back into proper repo 2018-12-19 19:39:07 +11:00
rljonesau
529ac5d8e0 Pushed and shoved and edited and finally there - structured file directories 2018-12-16 18:34:39 +11:00