Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 9f0a046f0a Adding missing placeholders James 2019-05-15 20:10:12 +1000
  • c1bcc83e8b Proper std::string moderator, using mapped value for JSON output. Secure web upload with user/pass Ray Jones 2019-05-14 21:29:35 +1000
  • 39aba4819f commented out missing ABMqtt header. Fixed Index.html foibles of MQTT send. 64 byte limit in BT fixed. Ray Jones 2019-05-12 22:14:32 +1000
  • 7bc681e848 Javascript fixups for James Ray Jones 2019-05-12 21:32:55 +1000
  • cfa5ac857d Merge branch 'JIM_mqttSettingsPage' into MQTTstore Ray Jones 2019-05-12 20:20:56 +1000
  • 04fab40742 Refactored string in JSON moderator - const char* are BAD AND EVIL in a std::map MQTT parameter exchange via JSON and NV storage Ray Jones 2019-05-12 20:15:18 +1000
  • 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 James 2019-05-12 19:14:03 +1000
  • 9072c6bb7a Added fields and javascript for MQTT settings (Web Page Only) James 2019-05-12 11:47:46 +1000
  • 38711533cd Updated .AIA file for BT Android app Ray Jones 2019-05-12 09:03:19 +1000
  • e8f6b88aeb Quick fix: -20C -ve threshold for cyclic mode Ray Jones 2019-05-12 09:01:22 +1000
  • 9861297744 Suite of minor bug fixes and annoyances - now Afterburner for AP and BT server names :-) OTA was not rebooting after AP only update V2.2.3 Ray Jones 2019-05-11 12:18:06 +1000
  • 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... V2.2.2 Ray Jones 2019-05-09 06:30:26 +1000
  • e900cb84a7 BT icon always on fixed, NVstorage name length limit Ray Jones 2019-05-08 05:38:14 +1000
  • ead2c9b189 Added firmware version info to splash screen Ray Jones 2019-04-28 20:23:11 +1000
  • 7e4fff9d61 AP name now Afterburner. Splash screen now Afterburner Controller. Ray Jones 2019-04-28 09:56:45 +1000
  • 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. Ray Jones 2019-04-27 20:41:47 +1000
  • 21be30a3f6 Set V2.2: 20 Apr 2019 V2.2 rljonesau 2019-04-20 19:18:32 +1000
  • 505015139c Implemented screen switching upon timeout, start and stop in ScreenManager rljonesau 2019-04-20 19:13:24 +1000
  • 480bd1b15c Adding OnStart, OnStop and OnTimeout home screen actions rljonesau 2019-04-20 09:49:22 +1000
  • c1b1036ece New features: Version information screen Adjustable frame rate User selectable default menu Extra large fonts for clock and basic menu rljonesau 2019-04-19 21:38:39 +1000
  • 9a36df14ec BUG FIXES: Repeating timers were being cancelled! Set time always advanced by one day upon entry. Desired temperature was incorrect when using enhanced thermostat modes in Detailed menu rljonesau 2019-04-18 21:02:39 +1000
  • 1819a244f9 Added generic Debounce class for use by keypad and GPIO inputs rljonesau 2019-04-13 19:05:53 +1000
  • 83784a77d2 Added board detection to solve setup of GPIO of modded vs unmodded V2.0 PCBs and inversion of inputs on V1 PCBS. rljonesau 2019-04-13 09:18:07 +1000
  • a2fe5e969d GPIO screen now uses icons for inputs and outputs rljonesau 2019-04-11 09:00:36 +1000
  • 45330be305 Added GPIO screen rljonesau 2019-04-10 09:30:27 +1000
  • aba5762c0c Added GPIO out user mode rljonesau 2019-04-10 09:28:46 +1000
  • 7332d4e797 Added status LED via GPIO Output #1. rljonesau 2019-04-09 09:12:42 +1000
  • 485ca0b8a5 Added: Hold input 1 for run mode; Alternate closures input 1 toggle run/stop rljonesau 2019-04-06 22:06:50 +1100
  • e281e1adf8 Initial mode IP1 ON, IP2 OFF - works! rljonesau 2019-04-06 21:45:25 +1100
  • 708a8087b1 Consolidated new generated run states into protocol handler, new JSON for suspend mode rljonesau 2019-04-05 06:39:58 +1100
  • cce60328c0 Added over temp cycling, based upon Jess Baughan's idea rljonesau 2019-04-04 21:48:05 +1100
  • c440498bad updated AppInventor/BluetoothHeaterMenuNewTimer.aia rljonesau 2019-03-25 06:15:24 +1100
  • e6b285c00c Bug fix - incorrect wifi mode upon wifi screen entry. Tidied alignment of OTA & CFG/AP against Wifi icon rljonesau 2019-03-24 17:38:48 +1100
  • a8744fdf22 Wifi enable & OTA enable in NVram. Bug fix thermostat mode in priming menu. OTA now shows in screen header against Wifi icon. rljonesau 2019-03-24 16:48:03 +1100
  • f4d6c3dccc Added descriptions of key pad functions in setup menus. Made key pad presses more consistent. rljonesau 2019-03-17 18:10:01 +1100
  • 1cfd82c32f Added menu to show standard Adafruit font rljonesau 2019-03-16 14:57:37 +1100
  • 77265112ab Timer menu key strokes more logical now - cool arrows found in Adafruit fonts!! rljonesau 2019-03-16 10:54:50 +1100
  • 82a4970823 readme update rljonesau 2019-03-16 08:46:09 +1100
  • bdb34d9401 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2019-03-16 08:44:09 +1100
  • cb1e784b5b Screen manager can now select any menu, typically only for off shoot stand alone menus. Quite a tidy interface now. rljonesau 2019-03-16 08:43:44 +1100
  • 49840b88fd Update README.md Ray Jones 2019-03-15 13:01:35 +0000
  • b783482803 Update README.md Ray Jones 2019-03-15 12:59:07 +0000
  • d19c60da33 Screen manager now uses vector<vector<CScreen*>> for all screens. Very tidy and easily extensible now. rljonesau 2019-03-15 23:42:54 +1100
  • c7609a984f consolidated screen manager menu loop selection rljonesau 2019-03-15 22:34:25 +1100
  • ead0411d7a Tidied management of branch menus by adding them to a vector rljonesau 2019-03-15 21:48:22 +1100
  • ae102021d5 Added JSON command handling for thermostat control method rljonesau 2019-03-15 19:08:05 +1100
  • d8c050b165 Added setting screen to select the thermostat mode and window size rljonesau 2019-03-15 18:19:30 +1100
  • 2fc020ae6c Implemented mechanism for thermostat hysteresis. Need to build UI. rljonesau 2019-03-14 21:52:59 +1100
  • 220657956f Omitted InheritSettingsScreen.cpp/.h rljonesau 2019-03-12 18:09:50 +1100
  • c10d8c4204 OLED timer chart now updates with JSON timer changes rljonesau 2019-03-06 07:17:58 +1100
  • 459f15054d Bluetooth app updated for 14 timers, including conflict testing. rljonesau 2019-03-05 20:40:00 +1100
  • f00a179f34 Implemented JSON send and receive of new timer packaging rljonesau 2019-03-03 19:48:52 +1100
  • df4a1837d9 Merge branch 'master' into 7dayTimers rljonesau 2019-03-02 10:59:19 +1100
  • 83f564cf95 tidied CScreenManager rljonesau 2019-03-02 10:32:50 +1100
  • 807709adc8 refactored inheritance of OEM settings into a new screen - MUCH TIDIER! rljonesau 2019-03-02 10:16:37 +1100
  • 222c66bbbd Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2019-02-28 21:01:44 +1100
  • 12ed7301dc Added initUI calls, along with onSelect when screens come into view - ensures fresh start every time rljonesau 2019-02-28 19:56:13 +1100
  • 5875a30064 Added fallback to Basic Control menu when dimming timeout elapses, unless in Detailed Control or Clock rljonesau 2019-02-28 18:14:02 +1100
  • 4bc1c79a6d Added inheritance of LCD controller setting to OLED menus. Can show fan volts in detailed control menu. rljonesau 2019-02-27 22:51:02 +1100
  • bf082210b8 timers a work in progress - updating JSON commands rljonesau 2019-02-26 19:38:30 +1100
  • a45d88fcf5 refactored timer checking to now be table based. JSON naming changed to remove embedded numeric. rljonesau 2019-02-20 21:50:28 +1100
  • d27ce9b888 Update README.md Ray Jones 2019-02-16 07:56:37 +0000
  • aade6fdc34 timer conflict test now directly uses the proposed sTimer info, not the NV staged values. rljonesau 2019-02-15 06:36:13 +1100
  • fefb84a87a Massive rework of the timer setup and a graphical presentation of the timer status rljonesau 2019-02-14 21:20:15 +1100
  • cc98073eac Merge branch 'RLJ_JCWiFiRevisit2' rljonesau 2019-02-12 06:29:35 +1100
  • ee38936df1 Split TempDesired controls to TempDesired (slider) + TempDesiredVal (readout) rljonesau 2019-02-12 06:28:58 +1100
  • 76f24adfcc Consolidated incoming JSON handling for pump/fan max/min values rljonesau 2019-02-11 21:01:24 +1100
  • 4a95d528f8 Ray's touch ups to the fuel setting sliders. rljonesau 2019-02-11 20:47:00 +1100
  • 30220e3e58 Added unmounting of SPIFFS when using OTA. Added /formatspiffs URL rljonesau 2019-02-11 19:34:11 +1100
  • 2ce6c52243 hopefully pushing upstream James 2019-02-11 08:54:51 +1100
  • 712cc7e319 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater into JimsNewWorkingWeb James 2019-02-11 08:51:29 +1100
  • 6df163fc1b Changed index.html sliders now linked to values James 2019-02-11 08:51:02 +1100
  • 25a238ddad Bad default Hz for Max pump, should be 45 (4.5Hz), NOT 14 (1.4Hz) :-( rljonesau 2019-02-10 19:20:47 +1100
  • b14f2b8b1c Added hooks for pump and fan settings - Pending RaReview should be good to merge James 2019-02-10 18:25:37 +1100
  • 20d08691fd Bluetooth app updated to show degF when Farenheit mode selected via OLED menus. new JSON TempMode for degC/degF mode indication rljonesau 2019-02-07 21:36:54 +1100
  • 437cee1b60 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2019-02-07 07:24:51 +1100
  • 0a666e1e2f Added option for temperature readout in Farenheit. rljonesau 2019-02-07 07:24:22 +1100
  • af5d6d9b83 Update README.md Ray Jones 2019-02-06 19:57:22 +0000
  • b1e957e25c Update README.md Ray Jones 2019-02-04 07:25:41 +0000
  • 2938eb0b53 Update README.md Ray Jones 2019-02-04 04:01:21 +0000
  • c96e2ff210 Update README.md Ray Jones 2019-02-03 05:45:31 +0000
  • 15ce4ff839 Update README.md Ray Jones 2019-02-03 05:36:11 +0000
  • ef500a9f76 Update README.md Ray Jones 2019-02-02 23:59:13 +0000
  • 3db089657b Update README.md Ray Jones 2019-02-02 23:56:20 +0000
  • f23a944264 Update README.md Ray Jones 2019-02-02 23:55:46 +0000
  • 0dfcab0c24 Update README.md Ray Jones 2019-02-02 23:55:27 +0000
  • e83539d5e5 Update README.md PublicRelease Ray Jones 2019-02-02 03:16:57 +0000
  • 260be36f50 Update README.md Ray Jones 2019-02-02 00:54:28 +0000
  • 9f91aa579f bloody fragile HTML! - back to original, ignoring the browser debug warnings and it works! FFS. rljonesau 2019-01-28 15:08:42 +1100
  • aafe381c66 prevent clock menu on OLED if no RTC fitted rljonesau 2019-01-27 12:17:49 +1100
  • b785450ad5 #ifdef touch up rljonesau 2019-01-27 10:00:32 +1100
  • 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! rljonesau 2019-01-26 11:58:50 +1100
  • e4773a081b Added thermo/fixed toggle to detailed menu. Fixed reversed direction in timer menu. HTML fixes. rljonesau 2019-01-24 06:03:29 +1100
  • 0a1226a03c Added SPIFFS directory dump in setup, using "not found" to deliver pages other than special ones. rljonesau 2019-01-21 06:56:42 +1100
  • 4b1d941b7f Web server now using SPIFFS - must use Partition: Minimal SPIFFS rljonesau 2019-01-20 21:14:45 +1100
  • f48ec8d314 Tidied "STORING" timeout in PasswordScreen.cpp. rljonesau 2019-01-20 15:25:58 +1100
  • a218218db0 Heater settings now explain PF-X and SN-X by toggling their actual effect. First press if display is dimmed now brightens display but does not perform an action. rljonesau 2019-01-20 14:19:38 +1100
  • a6ea647724 Heater tuning and settings now in OLED sub menu which is password protected. rljonesau 2019-01-19 22:05:14 +1100
  • 7ddc2c16ef Using CPasswordScreen for Fuel and heater settings rljonesau 2019-01-19 10:06:12 +1100
  • 033d2f4c27 Adding CPasswordScreen class rljonesau 2019-01-19 07:15:02 +1100