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

146 commits

Author SHA1 Message Date
Ray Jones
f330d812e6 Added JTAG use defines for ESP PROG debug 2019-10-27 11:02:49 +11:00
Ray Jones
8893abb575 tidy up 2019-10-20 20:19:27 +11:00
Ray Jones
2e25ad3da4 Fixed role ordering in NV for DS18B20 probe offsets 
Replaced ` with clean degree symbol in standard font & arial 8
Removed temp offset from fuel cal screen
GUI alignment tweaks to avoid cutoffs
Better handling of single DS18B20 with BME280
Added bounds limits to Exponential Mean
Sorted inheritance from CSensor properly
 2019-10-19 09:58:19 +11:00
Ray Jones
aabe6a54b3 Stabilised BME280 with DS18B20 coexistence 2019-10-18 12:55:16 +11:00
Ray Jones
ab246244c9 Merge branch 'Branch_V3BoardDetect' 2019-09-25 19:39:02 +10:00
Ray Jones
af34331401 Dig Only V3 PCB, Fixed Hz setting reporting bug fix 2019-09-25 19:38:19 +10:00
Ray Jones
112628f103 Tidy up 2019-09-25 17:27:43 +10:00
Ray Jones
573ebf3e3b Added auto save of single DS18B20 serial number 2019-09-22 14:46:39 +10:00
Ray Jones
8fb1981552 Added Temp Probe selection screen, mapping sensors to user preferences 2019-09-22 09:03:42 +10:00
Ray Jones
de9417ff73 Tidied JSON/MQTT topic command decode into UtilClasses.cpp 2019-09-21 09:58:51 +10:00
Ray Jones
6e86571a19 Merged branch 'VerboseMQTTout' 
Resolved Conflicts:
	src/Afterburner.cpp
	src/Utility/BTC_JSON.cpp
 2019-09-21 08:11:36 +10:00
Ray Jones
bf537d1ac5 MQTT can now accept any cmd topic that matches the JSON names 2019-09-20 23:00:27 +10:00
Ray Jones
095797f8b0 . 2019-09-19 19:23:59 +10:00
Ray Jones
b2cc6ff36d V3.1.4 2019-09-19 19:04:09 +10:00
Ray Jones
c51b18dd36 Added password hold option 2019-09-17 20:07:57 +10:00
Ray Jones
3a70970356 Added menu mode selection menu 2019-09-17 08:30:49 +10:00
Ray Jones
f93e5d7628 Add basic menu Modes 2019-09-15 12:51:51 +10:00
Ray Jones
d30536e939 V3.1.3 - Bug fix not disabling WiFi correctly 2019-09-12 06:32:21 +10:00
Ray Jones
3a810d6eea Tidied Repeating timer icon 2019-09-08 11:56:22 +10:00
Ray Jones
ac5fdc5dfd V3.1.2 - 
AM/PM selection in clock setup menu.
Extra MQTT JSON IDs added.

Filtered No Heater JSON.
 2019-09-08 10:14:36 +10:00
Ray Jones
583a4881cd Added AM/PM annunciators to clock for 12hr mode 
Added last will to MQTT connection
Condensed no heater timeouts with default screen
 2019-09-07 23:48:46 +10:00
Ray Jones
9fbb6e8dfc Shifted MQTT telnet setup into a separate module. 
Fixed addCRC script for > V3 python
 2019-09-07 18:28:21 +10:00
Ray Jones
77dada9d6b BUG FIX: Fuel gauge reset via web page 
NEW FEATURE: MQTT status screen
 2019-09-04 20:59:01 +10:00
Ray Jones
13fb3f715a Un commented the code that restores an STA connection 2019-09-02 08:22:33 +10:00
Ray Jones
8a237059fd Added JSON driven watchdog 2019-09-01 17:35:12 +10:00
Ray Jones
3e4ce429c7 BUG FIX: bad clientID due to bad MQTT library - causes disconnects with multiple AB's on one broker! 
IMPROVEMENT: MQTT reconnect implemented.
 2019-09-01 14:43:00 +10:00
Ray Jones
fdf4e9af99 Set version to V3.1.0 - MQTT!!! 2019-08-31 17:41:01 +10:00
Ray Jones
61e246f6f1 telnet menu to setup MQTT. JSON now pushed over MQTT - typ. topic name: Afterburner/JSONout 2019-08-31 17:34:56 +10:00
Ray Jones
253bc3f728 Added MQTT topic for controller to NV store. 
Found PubSubClient is blocking, causing WD reboots
 2019-08-30 20:08:54 +10:00
Ray Jones
f6f721bd8a Got basic MQTT session working to test.mosquito.org :-) 2019-08-27 23:09:07 +10:00
Ray Jones
c79522233c Added Stop function to GPIO input #1 (eg CO sensor with Ext Thermostat 2019-08-27 20:35:21 +10:00
Ray Jones
08a39a26f7 Added countdown to detailed GUI for external thermostat shutdown feature 2019-08-27 06:13:01 +10:00
Ray Jones
7853102a4d Added external thermostat time function to GPIO setup screen 2019-08-26 08:41:44 +10:00
Ray Jones
e7bac339b5 Implemented functionality to start & stop heater according to external thermostat input 2019-08-26 06:37:41 +10:00
Ray Jones
f5a8c3c11e BUG FIX: GPIO2 set for external thermostat sent dT as the Greek 'd' in the JSON - BAD - broke websocket 2019-08-19 05:33:07 +10:00
Ray Jones
79b6c06a2a Added AP SSID/password configuration via debug port 2019-08-10 21:45:28 +10:00
Ray Jones
d7e083b837 Board detect bug fix. New icons for GPIO setup/status 2019-08-10 15:57:46 +10:00
Ray Jones
4873fa8c71 Split GPIO so each pin's function is defined individually. 
Adjusted DS18B20 timing to match Maxim's recommended values.
 2019-08-09 06:13:02 +10:00
Ray Jones
48a0254f13 Can now define the operation mode for each GPIO line individually. 
Need to test actual functionality, GUI OK.
 2019-08-07 22:04:20 +10:00
Ray Jones
10db95733f Added external thermostat via GPIO in 2. Want to change how GPIO pins are defined. 
Modded code to only allow single DS18B20 - getting funny ROM SEARCH lock ups...
Set mini temp sample interval to 750ms, as per data sheet for 12bit DS18B20
 2019-08-07 18:59:30 +10:00
Ray Jones
e205119b24 Added trap for skipping directly to suspend if already over temperature with cyclic mode enabled. 
Otherwise heater starts then runs stop cycle immediately!
 2019-08-04 11:15:41 +10:00
Ray Jones
1c314e14f2 removed debug prints of TempCurrent - grrrrr 2019-08-04 08:23:54 +10:00
Ray Jones
2a788cb2d0 Fixed rounding issue of TempCurrent in JSON data, always 0.1 low 2019-08-04 08:19:59 +10:00
Ray Jones
27b988c895 Fixed referral to test FOTA page 2019-08-03 20:47:19 +10:00
Ray Jones
e5e0f87e0b Tidy of animation counts in screen header - was delaying appearance of battery icon 2019-08-03 19:52:37 +10:00
Ray Jones
08d0307fc8 BUG FIX: Web update was broken due to watchdog timeout - added onProgress to FOTA - all good now 
Returned to compact timer icon, press centre button to see start/stop times in base menus
Version info screen refactored to show available version number
New splash screen now presented upon display for a short time after upload or rename to /splash.bmp
 2019-08-03 12:42:49 +10:00
Ray Jones
ac091fa6d8 Added ability to upload custom splash ScreenFlowV3.dia. 
Added 4th board type - GPIO disabled on V2.0 PCB - install 0R in C6, leave other bits out.
 2019-08-01 22:57:18 +10:00
Ray Jones
945d9c88b7 Revised CRCengine to include all bytes uploaded - CRC of everything should be 0! 2019-07-31 06:27:04 +10:00
Ray Jones
1b3b478a49 Reset to original Arduino min_spiffs partition layout. 
Fixed a residual screen refresh issue with cyclic enabled and max temp dialed up - marker stuck.
SPIFFS upload added to bootload.zip COM.bat
 2019-07-30 19:21:55 +10:00
Ray Jones
a52143479f Fix of residual screen content following browser updates of SPIFFS files. 2019-07-28 20:59:26 +10:00
Ray Jones
c1207e66ef Extreme makeover to timer manager, now properly shows one shot next day timers in timer chart. 
Added cursor showing time of day on Timer chart.
 2019-07-28 17:40:12 +10:00
Ray Jones
f154580eb2 Tidied up timer setup screen 
OTA uploads now have a bar graph!
 2019-07-28 11:37:39 +10:00
Ray Jones
6c21a9c6a6 Titled Timer screen - lost std header 
Added missing source files
 2019-07-28 09:07:29 +10:00
Ray Jones
d563cb0c8a MASSIVE rework of the menu structure 2019-07-28 00:28:39 +10:00
Ray Jones
a7348fdbf5 Decoding HC-05 MAC address 2019-07-27 12:47:16 +10:00
Ray Jones
dfa60eb491 added cable compensation to LVC warning threshold 2019-07-27 08:50:09 +10:00
Ray Jones
ca0e763da6 Added Hour Meters screen 2019-07-26 23:12:00 +10:00
Ray Jones
d2116fc18c Cleaner hourmeter handling using a new class for each counter. 
Added a warning animation to LVC, ether <12V, or 0.5V > LVC if that result is over 12V
 2019-07-26 22:13:46 +10:00
Ray Jones
f86ae7cffb tidied Hourmeter class, staged NV changes to write in correct time slot 2019-07-26 06:39:56 +10:00
Ray Jones
1dbfa67163 Storing actual runtimes to NV store at heater off, resetting intermediates at same time. 
Improved restart behaviour of persistent variable handling
 2019-07-25 22:31:31 +10:00
Ray Jones
2084c7d60c added BootInit flag to RTC store - used for persistent vars init after OTA updates 2019-07-25 21:27:57 +10:00
Ray Jones
c621f7078c Moved src/libraries to /lib - '.a' files now get generated by PIO for each library. 2019-07-25 17:40:23 +10:00
Ray Jones
9c338fa74c Main skeleton of Hourmeter in place 2019-07-25 06:06:47 +10:00
Ray Jones
92283a3e0d Added module files for fuelgauge, RTCStore, HourMeter 2019-07-24 19:25:07 +10:00
Ray Jones
204007401b tweaked reboot message timeouts for /update & /reboot 2019-07-23 22:56:04 +10:00
Ray Jones
8ebf6dbf3e Refactored directory hierarchy to regain some linker command line space in PIO 2019-07-23 22:32:36 +10:00
Ray Jones
cb79fd5dd0 BUG FIX - E-01 fired upon reboots with premature low volt detection 
Improvement - /update and /reboot now have a post event status sequence during reboot.
 2019-07-23 21:11:29 +10:00
Ray Jones
db3343d362 Bug Fix: bounds checks for LVC did not allow 0 2019-07-23 06:15:18 +10:00
Ray Jones
dca26680b4 cancel cyclic mode upon error fail 2019-07-22 20:58:36 +10:00
Ray Jones
d6bba90c84 LVC JSON now proper floating point. 
Tidied screen dribbles in priming menu
 2019-07-22 06:30:08 +10:00
Ray Jones
06e69acc77 Added Low Volt Cutout, Temperature probe offset 
Tarted up fuel mixture adjust screen
 2019-07-21 21:17:54 +10:00
Ray Jones
dd5e62c8cb Rework priming menu, can now reset fuel gauge. JSON added for fuel usage & cal. 2019-07-20 16:08:43 +10:00
Ray Jones
04ae988d2d . 2019-07-20 06:53:12 +10:00
Ray Jones
a543ba0748 Tidied browser update by adding new browserupload class. 
Adding RTC register storage for frequent NV updates (fuel gauge, desired temp etc)
 2019-07-18 22:28:40 +10:00
Ray Jones
e50d93bb8c Using RTC registers to store fuel gauge. 
Added BrowserUpload class
 2019-07-18 22:25:28 +10:00
Ray Jones
77ac324d64 Added SPIFFS upload error detection and feedback to browser 
Added Time/Date responses
 2019-07-17 19:35:34 +10:00
Ray Jones
4d6ab5b280 Single shot SQuery (stops JSON Time & UpTime constantly being sent). 
Working on SPIFFS upload abort if out of space....
 2019-07-16 06:29:23 +10:00
Ray Jones
16ee16f97f Added support for .gz compressed SPIFFS files. 
Using wrapper for millis() via library --wrap option, returns xTaskGetTicksCount() instead of the very dubious int64_t/1000 of default millis(), especially when it gets BIG.
 2019-07-15 19:56:36 +10:00
Ray Jones
1f28bb7d5d Added JSON IP query parameters 2019-07-11 22:03:27 +10:00
Ray Jones
b6b0c7afbd stylish /update & /formatspiffs 2019-07-11 18:55:31 +10:00
Ray Jones
8dd5dc662e Added extra CRC checking to OTA 2019-07-09 22:19:21 +10:00
Ray Jones
278d40af33 big dependency tidy up 2019-07-07 17:18:38 +10:00
Ray Jones
2f38a33984 Omitted DataFilter.cpp &DataFilter.h 2019-07-06 23:48:38 +10:00
Ray Jones
1b4b6699c5 Added exponential mean to heater data. 
Replaced char with int8_t - damn thing was unsigned!
Likewise uint8_t for unsigned char
Rework of webserver inbuilt management functions cross linked, work well
 2019-07-06 23:46:20 +10:00
Ray Jones
c20b309184 Added CyclicOn, CyclicOff, CyclicTemp JSON Removed UserSettings subset setters/getters 
BOUNDS checking on JSON inputs
 2019-07-03 23:01:36 +10:00
Ray Jones
6d7af0e010 Bug fix of feedback over JSON of TempDesired when in Fixed Hz mode. 
Introduced when demandDegC/demandPump split was added to fix Cyclic shutdown on low Hz demands.
 2019-07-03 20:28:00 +10:00
Ray Jones
6b814e70d9 NVstorage.h fix up 2019-07-02 20:22:14 +10:00
Ray Jones
657bec98e7 Merged owa and ds18b20 libraries - weird include issues under Linux? 2019-07-02 20:18:44 +10:00
Ray Jones
0378e733ef font rename 2019-07-02 19:17:24 +10:00
Ray Jones
592ace0f0a and more freertos 2019-07-02 19:02:28 +10:00
Ray Jones
4491da1f2f more freertos vs FreeRTOS 2019-07-02 19:00:07 +10:00
Ray Jones
d247d14945 fixups of FreeRTOS dir to freertos 2019-07-02 18:49:40 +10:00
Ray Jones
471a423a19 An intensive include directory clean up (case / system paths) hopefully 99% there for Linux... 2019-07-02 18:27:20 +10:00
Ray Jones
e6b8365f09 Moved all libraries inside repository - this ensures all builds use the same libraries. 2019-07-01 20:46:08 +10:00
Ray Jones
8d143c03a5 Added Windows symbolic links so an Arduino project can parasite off the superior PlatformIO paths :-) 
Adjusted JSON ThermostatOvertemp to be 0,2,3,4 etc.
 2019-06-30 22:39:40 +10:00
Ray Jones
129631c82a Converted to Platform IO friendly project, still works with Arduino provided you rename Afterburner.cpp to Afterburner.ino 2019-06-30 16:44:50 +10:00