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

111 commits

Author SHA1 Message Date
Ray Jones
7081b957f1 Bug Fix - E-07 due to a delayed heater response would stop heater if cyclic mode was enabled 2019-06-16 18:13:16 +10:00
Ray Jones
ce8299609b Split PumpDemand and Temperature demands so Fixed Hz mode works cleanly, especially with Linear Hz thermostat and Cyclic mode. 
Cyclic mode, if enabled, is now shown on detailed screen, bracketing its range
Shifted helpers.h into src/Utility - made far more logical sense!

Fancy pants slash screen :-D
 2019-06-16 09:09:29 +10:00
Ray Jones
a53d6eabd0 removed most helper functions from NVstore, now pass in/out cal structures. Fixed some bad NV stores 2019-06-06 11:32:43 +10:00
Ray Jones
dafd7ba856 Fixed NV storage issue. 
Adding GPIO JSON
 2019-06-05 06:15:12 +10:00
Ray Jones
811c15093c Moved FOTA to local library to deal with 2 bugs, OTA reported on OLED according to source. 2019-06-03 06:34:45 +10:00
Ray Jones
f4a3ce45bb Condensed NV GPIO params into a struct. Improved GPIO info screen, showing disabled modes 2019-06-02 22:47:35 +10:00
Ray Jones
200b928af6 Tidied animation for wifi activity and mode indications when no traffic 2019-06-02 19:19:08 +10:00
Ray Jones
18927d758a Implemented TQuery to greatly reduce JSON traffic upon new client connections. 2019-05-30 20:31:34 +10:00
Ray Jones
21cf587798 Can push SPIFFS files now via the firmware upload browser form. 
However only works as a flat file system for now...
 2019-05-21 22:01:42 +10:00
Ray Jones
2ccd948001 Web update via OTA now under user control. Icon shows on header when an update is available. 
Update can be commanded via the Version Information menu by pressing UP, CENTRE, UP. Prompt driven of course!
Removed Wifi Trigger pin - does not play nice with automatic COM port uploads!
Reverted to DS18B20 read from index 0 - allows plugging sensor in and re-discovery!
 2019-05-20 22:09:59 +10:00
Ray Jones
fc8eef73a6 Using websocket to get proper firmware upload byte count 2019-05-18 18:49:22 +10:00
Ray Jones
da33a02844 Added SW watchdog 2019-05-17 16:08:35 +10:00
Ray Jones
a6540eb997 Added factory default via version menu. 
WiFi credentials for SoftAP and web update now stored in NV storage.
NV Storage structures now handle load and save for their members
 2019-05-16 21:12:29 +10:00
Ray Jones
58f4631f72 Web update progress on OLED bug fix of runstate in index.html 2019-05-15 20:24:43 +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
cfa5ac857d Merge branch 'JIM_mqttSettingsPage' into MQTTstore 2019-05-12 20:20:56 +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
James
a36ef97af2 Settings for MQTT will now dissapear if not enabled in the web interface. 
retrieve/save details should work once Ray creates nvRam hooks for the code:D
 2019-05-12 19:14:03 +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
ead2c9b189 Added firmware version info to splash screen 2019-04-28 20:23:11 +10:00
Ray Jones
7e4fff9d61 AP name now Afterburner. Splash screen now Afterburner Controller. 2019-04-28 09:56:45 +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
21be30a3f6 Set V2.2: 20 Apr 2019 2019-04-20 19:18:32 +10:00
rljonesau
505015139c Implemented screen switching upon timeout, start and stop in ScreenManager 2019-04-20 19:13:24 +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
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
e281e1adf8 Initial mode IP1 ON, IP2 OFF - works! 2019-04-06 21:45:25 +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
2fc020ae6c Implemented mechanism for thermostat hysteresis. Need to build UI. 2019-03-14 21:52:59 +11:00
rljonesau
f00a179f34 Implemented JSON send and receive of new timer packaging 2019-03-03 19:48:52 +11:00
rljonesau
4bc1c79a6d Added inheritance of LCD controller setting to OLED menus. Can show fan volts in detailed control menu. 2019-02-27 22:51:02 +11:00
rljonesau
aafe381c66 prevent clock menu on OLED if no RTC fitted 2019-01-27 12:17:49 +11:00
rljonesau
b785450ad5 #ifdef touch up 2019-01-27 10:00:32 +11:00
rljonesau
0a1226a03c Added SPIFFS directory dump in setup, using "not found" to deliver pages other than special ones. 2019-01-21 06:56:42 +11:00
rljonesau
4b1d941b7f Web server now using SPIFFS - must use Partition: Minimal SPIFFS 2019-01-20 21:14:45 +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
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