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

Commit graph

  • 71abd19e52 Gave screens meaningful names. Set Clock and Timer screens now branch from Clock Screen. rljonesau 2019-01-18 18:09:40 +1100
  • 4d12334823 Improved Config Portal feedback on OLED rljonesau 2019-01-18 14:34:32 +1100
  • 26d001657c Merge branch 'WifiOLED' rljonesau 2019-01-16 20:24:11 +1100
  • 716827b399 All WifiManager reconfigs now conclude via wifiEnterConfigPortal which manages NV flag and OLED reboot alert rljonesau 2019-01-16 20:22:17 +1100
  • 75c5ba744b Update README.md Ray Jones 2019-01-15 05:50:57 +0000
  • af0980a72b Can now set/clear CFG mode with OLED. Can also clear credentials. rljonesau 2019-01-15 08:41:54 +1100
  • fa4c595efa Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2019-01-15 07:04:57 +1100
  • abbd0fa5ae tidied commenting in BTCWifi.cpp rljonesau 2019-01-15 07:03:35 +1100
  • 1b74359084 Refactored to use BOOT (GPIO0) switch for WiFi - so obvious! Shows CFG on WiFi icon if STA+AP and portal running rljonesau 2019-01-14 21:35:21 +1100
  • 95c054e19b Rehashed post wm.autoConnect. Can now have config portal active on STA connection! rljonesau 2019-01-14 20:54:31 +1100
  • c2e790a5dd STA+AP mode working - woo hoo! rljonesau 2019-01-14 17:55:54 +1100
  • 13c3b1b44a changed to single variable for AP mode tracking rljonesau 2019-01-14 16:48:33 +1100
  • d01e660f79 re-enabled OTA - works :-) rljonesau 2019-01-14 15:22:57 +1100
  • 551205d6bd Tidy up DS18B20 reporting. Tidied WiFiManager handling, new Bluetooth app rljonesau 2019-01-14 14:30:41 +1100
  • 320b7e8b6f Added CFG to OLED WiFi icon when portal running. 5 sec press to reset WiFi creds, start portal rljonesau 2019-01-14 11:47:13 +1100
  • de2cd12770 Once again works with 192.168.100.1 as the SoftAP IP address rljonesau 2019-01-14 09:00:43 +1100
  • c0e42e6dc6 Pin 25 now determines if we boot into Config Portal or Web Page Short press -> Config Portal Long press -> Web Page (> 1 second) rljonesau 2019-01-14 08:24:13 +1100
  • 0765882256 Can launch SoftAP with web server from boot with no WiFiManager credentials. Now to set some NV flags to control the boot to either web server or WifiManager with no creds. rljonesau 2019-01-14 07:16:45 +1100
  • 4d780ed3a1 Have portal working from boot, reboot after setting up WiFiManager to connect to new network rljonesau 2019-01-14 06:59:32 +1100
  • 6f10d1867f Update README.md Ray Jones 2019-01-13 02:32:05 +0000
  • bbb225e3b7 Can finally get WifiManager configportal up using the pushbutton, but only if no credentials rljonesau 2019-01-13 08:32:13 +1100
  • 59d24d96b9 Simplified timer NV store load/save rljonesau 2019-01-12 12:57:32 +1100
  • 713724eaab restored comment on line in BTCWifi.cpp rljonesau 2019-01-12 12:21:29 +1100
  • 74daefe644 Added validatedLoad for checking and correcting values read by Preferences at time of read. rljonesau 2019-01-12 12:19:55 +1100
  • 28cd89ad5e Changed NV storage to use Preferences with discreet entries - no more conflation across branches :-) rljonesau 2019-01-12 10:33:45 +1100
  • 86f1c2df4c Added /wmconfig and /resetwifi uri's James 2019-01-11 21:37:59 +1100
  • e8a110a308 Fixed wm access from BTCWebServer.cpp for James rljonesau 2019-01-11 19:50:27 +1100
  • 8005636f30 Added /reset and /wmconfig pages to reset wifi settings and start config portal on request James 2019-01-11 19:28:22 +1100
  • a8f654e991 Core panic in core 1 after merge. fixed by removing ISR blockade about dallas read temp code. rljonesau 2019-01-11 17:13:22 +1100
  • 6a3e57ca11 Merge remote-tracking branch 'remotes/origin/JCWebColorChangeBar' rljonesau 2019-01-11 16:58:32 +1100
  • b40f9d3538 Improved DS18B20 handling (not connected), Fan Sensor & Operating voltage added to JSON. Wireless AP no go on new green board.... rljonesau 2019-01-11 16:40:25 +1100
  • 8786263734 Moved tempsensor.begin to top - Added code to scan for DS18B20 sensor Corrected wifi ap mode gateway address - Now 192.168.100.1 Jimmy C 2019-01-11 00:10:05 +1100
  • 74107d93d0 Added support for (horrid) 0.96" OLED via BTCConfig.h - BEST USE 1.3" SH1106 DISPLAYS HC-05 bug fix for bare modules - not happy with empty AT lines being sent ERROR:(0) returns! Had UART pins for HC-05 reversed on green board. rljonesau 2019-01-10 16:01:52 +1100
  • 9007f0856b commented out NVstore.getDimTime() until can properly define in menus. Tends to head toward 0 when trying other branches - defeating the dim function! rljonesau 2018-12-23 22:15:36 +1100
  • d378d902ac Added date picker and time setup input boxes Added two start and stop timers - No code attached - Simply UI at this stage Jimmy C 2018-12-23 02:27:17 +1100
  • 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) rljonesau 2018-12-22 21:32:13 +1100
  • 54fa331d23 No longer insert smart errors into received data frames. With JSON we can just build an error. rljonesau 2018-12-22 17:34:10 +1100
  • 5d2f42acba Added input boxes Jimmy C 2018-12-22 16:48:43 +1100
  • 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 rljonesau 2018-12-22 08:48:39 +1100
  • 18ce10e202 BUG FIX: OLED was showing E-07 faults when there should not have been rljonesau 2018-12-21 21:58:39 +1100
  • e315a06747 merged to master from James's coloured title bar - BUG fix of OLED error reporting rljonesau 2018-12-21 17:27:25 +1100
  • b99623108b got colour changing title bar working rljonesau 2018-12-21 15:57:19 +1100
  • 03500a2919 Merge remote-tracking branch 'remotes/origin/master' into JCWebColorChangeBar rljonesau 2018-12-21 15:29:56 +1100
  • f395fc9d27 deleted commented out junk rljonesau 2018-12-21 14:27:03 +1100
  • 60392e733e Update Arduino/BTCDieselHeater/src/WiFi/mainpage.cpp James C (SkinnyBuddah) 2018-12-21 03:24:29 +0000
  • 7bb0ffd022 Tidied up E-07 reporting, new AI app rljonesau 2018-12-21 12:27:03 +1100
  • 887c19c50a Forces E-07 in JSON ErrorState and ErrorStateStr messages now when no heater data detected upon blue wire V9 protocol document - ALTITUDE decoded! rljonesau 2018-12-21 09:22:29 +1100
  • 9caf3cc097 Added dia file for state machine rljonesau 2018-12-20 21:09:33 +1100
  • 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 rljonesau 2018-12-20 20:59:53 +1100
  • 5db72af511 Added suppression of blue wire recycling warnings for when not connected to blue wire <W> toggles rljonesau 2018-12-20 18:33:44 +1100
  • 17f044b544 replaced protocol document with V8 rljonesau 2018-12-20 17:29:53 +1100
  • 27d55f7c90 OLED now reports and resists illegal changes when an OEM controller is active rljonesau 2018-12-20 17:29:00 +1100
  • 7eda32b9e7 Omitted new file: UtilClasses.cpp rljonesau 2018-12-20 15:49:33 +1100
  • 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 rljonesau 2018-12-20 15:19:59 +1100
  • f2732ba1ac BUG FIX: was not detecting OEM controller! Added Bluewire activity to JSON reporting rljonesau 2018-12-20 06:13:28 +1100
  • dbde3c9065 Refactor JSON moderation to a single moderator for all possible clients, BT or WiFi. rljonesau 2018-12-19 23:07:51 +1100
  • 221041d166 Added schematic for breakout PCB to assist development with DoIT(30pin) or Ai-Thinker(38pin) dev boards rljonesau 2018-12-19 20:28:54 +1100
  • a90571ae5b Merge branch 'SubDirectories' rljonesau 2018-12-19 19:40:04 +1100
  • 403c182724 Comprehensive stuff up - editing a test branch - incorporated changes back into proper repo rljonesau 2018-12-19 19:39:07 +1100
  • 4fc2e1898d Added dummy favicon to web page rljonesau 2018-12-19 18:45:50 +1100
  • 538ab58221 Menu driven Bluetooth AI app added rljonesau 2018-12-19 06:18:13 +1100
  • 4414cf3fef updated README.md rljonesau 2018-12-17 06:00:46 +1100
  • 876e06a43c New AI application .AIA saved rljonesau 2018-12-16 18:53:18 +1100
  • 620425e978 left out fonts! rljonesau 2018-12-16 18:39:23 +1100
  • 3b52e93482 WHOOPSY - left out .ino file! rljonesau 2018-12-16 18:38:34 +1100
  • 529ac5d8e0 Pushed and shoved and edited and finally there - structured file directories rljonesau 2018-12-16 18:34:39 +1100
  • b07b7db8db Starting to move files about, fonts first rljonesau 2018-12-16 14:55:12 +1100
  • e000927d88 added missing licence headers rljonesau 2018-12-16 14:27:08 +1100
  • 4019e42925 Error reporting and runstate annotations away from standby and run. JC's nasty throbber included. rljonesau 2018-12-16 13:45:13 +1100
  • 49bd71c569 Added JSON ErrorString - reports to web page OK rljonesau 2018-12-16 11:06:36 +1100
  • 3ed4335db0 BUG FIX: variable name JSON for slider controls. Supports Fixed Hz now rljonesau 2018-12-16 09:07:31 +1100
  • 4a3a28540b Fixed bug with slider sending wrong ID in web page. Honours fixed/thermostat mode from heater info. rljonesau 2018-12-16 01:09:10 +1100
  • ff6715e018 New moderator applied to BTCwebserver. Bug fixes in mainpage.cpp - wrong InnerHTML for desired temp! rljonesau 2018-12-15 23:21:55 +1100
  • db62e38274 Merge remote-tracking branch 'remotes/origin/TelnetSpyRevisited' rljonesau 2018-12-15 22:33:33 +1100
  • 6a307eeb81 changed timeout of state machine to fall thru temperature read state rljonesau 2018-12-15 22:15:30 +1100
  • 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 Jimmy C 2018-12-15 21:50:02 +1100
  • 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. rljonesau 2018-12-15 20:34:58 +1100
  • 89a52403ca Added current date and current time - Working on date picker for setting the current date Jimmy C 2018-12-15 15:57:00 +1100
  • f2fc37d7b7 added date picker to mainpage Jimmy C 2018-12-15 15:40:39 +1100
  • 44d3a40dd2 Added console.log lines for debug - commiting to share on all machines James 2018-12-15 13:19:31 +1100
  • fe36e3d884 Added more time testing javascript to get browser localtime and use that to update the RTC James Clark 2018-12-15 01:16:51 +1100
  • f4d8bc8cd8 Added initial settings layout idea James 2018-12-15 00:31:02 +1100
  • a168cea5d2 templated moderator. added JSON formatting module rljonesau 2018-12-13 23:19:10 +1100
  • 77dbb4de82 Improved telnetspy interaction with OTA. Does graceful telnet close after upload. rljonesau 2018-12-13 19:42:35 +1100
  • eb64b1a775 Reverted to standard Adafruit SH1106 library (for ESP32) rljonesau 2018-12-12 21:37:02 +1100
  • e576ec4849 TelnetSpy added for debug log via telnet (port 23) as well as Serial (USB) rljonesau 2018-12-12 20:47:20 +1100
  • ae51dd2271 Tidied BTCwebserver by moving CModerator class into a module rljonesau 2018-12-12 20:03:44 +1100
  • 838fb98151 implemented web server send moderator using std::map rljonesau 2018-12-12 06:42:52 +1100
  • 4fc80e6b9c FFS - screwed up animation of Wifi Tx - fixed rljonesau 2018-12-11 22:37:18 +1100
  • b7cbf50db3 proper check if we should even bother to send fresh web data from ESP32 rljonesau 2018-12-11 22:31:58 +1100
  • c5b5165ba5 Moderated delivery of web page JSON to only send changes. Need to develop better method of delta checking, but works for now. rljonesau 2018-12-11 22:25:32 +1100
  • 4259cbe22b stupid error - left a test variable usage behind in cleanup rljonesau 2018-12-11 22:02:20 +1100
  • 0393c38831 javascript JSON interpret now only acts upon actual proper name/value pairs received rljonesau 2018-12-11 21:59:29 +1100
  • 4395b17ba5 Merge branch 'JC_JSON' rljonesau 2018-12-11 21:24:35 +1100
  • dee79ecebc Converted to JSON commands back to EPS32 rljonesau 2018-12-11 21:19:02 +1100
  • 10c33c3515 broke outgoing arrow flag in BTWebServer - fixed rljonesau 2018-12-10 22:10:49 +1100
  • 2c136eb34c Ray fiddles to get temp slider to talk to heater, and show desired temp value. rljonesau 2018-12-10 21:26:29 +1100
  • ff3fcc89f4 Update Arduino/BTCDieselHeater/mainpage.cpp James C (SkinnyBuddah) 2018-12-09 23:25:54 +0000
  • e0a8f2ff9f Update Arduino/BTCDieselHeater/mainpage.cpp James C (SkinnyBuddah) 2018-12-09 23:03:52 +0000
  • dfb04d97d8 Removed commented code James C (SkinnyBuddah) 2018-12-09 22:55:13 +0000