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

Commit graph

  • 30a954f123 Update Arduino/BTCDieselHeater/mainpage.cpp James C (SkinnyBuddah) 2018-12-09 22:53:39 +0000
  • f0d7d669ff fixed runstate JSON in javascript rljonesau 2018-12-10 06:30:36 +1100
  • 43d35493c0 First play with ArduinoJson library and javascript JSON.parse() - too fucking easy! rljonesau 2018-12-10 06:28:02 +1100
  • f4a52afd42 fixed parsing data into the webpage - need to get data coming out in the same format. James 2018-12-10 00:38:59 +1100
  • 1c9727b675 Merge branch 'JCWebPretty' of gitlab.com:mrjones.id.au/bluetoothheater into JCWebPretty rljonesau 2018-12-09 20:19:51 +1100
  • 40305d6224 Fixed Console vs console, commented out new event code rljonesau 2018-12-09 20:06:04 +1100
  • 374d299cf1 Fixed evt to Event ... FML James 2018-12-09 17:24:18 +1100
  • e24caea95d fixed again James 2018-12-09 17:21:04 +1100
  • 528b2b1fd3 missed } James 2018-12-09 17:18:04 +1100
  • ba5bd51b14 Fixed small issue of not terminating init() function correctly James 2018-12-09 17:15:27 +1100
  • 2bc415b2af Fixed on off toggle switch so it works James 2018-12-09 17:09:50 +1100
  • 1d98716dd4 next James 2018-12-09 15:41:44 +1100
  • b2db3dddad Hell yes its pretty.... doesn't do anything more than when Ray last updated the code - But I think i've nailed the design for now. James 2018-12-09 15:07:18 +1100
  • f40f750c49 Extended range of actual temperature bar graph in screen 1 rljonesau 2018-12-09 14:00:40 +1100
  • 85ff28d347 Support for DS3231, DS1307, PCF8523 or millis() based RTCs - Use BTCConfig.h to select rljonesau 2018-12-09 12:10:56 +1100
  • 55c33af996 added missing files! Dumbkoppf rljonesau 2018-12-09 09:55:55 +1100
  • 90569c319c Encapsulated RTC and timer functionality inside CClock class. rljonesau 2018-12-09 09:51:16 +1100
  • 2a7e3fce1b Added large clock screen rljonesau 2018-12-08 23:25:53 +1100
  • 069633c61f Added isConnected() to ESP32 Bluetooth classes (enables polymorphism from CBluetoothAbstract) key repeat added to time setting screen rljonesau 2018-12-08 20:31:15 +1100
  • 0f397e93f8 Slowed DS3231 I2C accesses to 400kHz rljonesau 2018-12-08 16:44:48 +1100
  • fbe39980ce Bug fixes: timer that spans midnight, stale info in timer setup screens rljonesau 2018-12-08 15:18:37 +1100
  • ec1631b84b Now can define day timer operates on rljonesau 2018-12-08 12:39:41 +1100
  • 283eff4288 Timers now start/stop as required, and self clear if non-repeating. Adding notion of Day of Week timers. rljonesau 2018-12-08 09:30:55 +1100
  • e51b2be8d1 dual timers, header icons for timers rljonesau 2018-12-07 22:16:04 +1100
  • 31f825ba5b vectorising CScreenManager Screens Ray Jones 2018-12-07 15:53:08 +1100
  • 157bf4fa0f Adding Screen 7 for setting timer Ray Jones 2018-12-07 15:18:24 +1100
  • 00e68f3cc3 Removed SPI OLED support rljonesau 2018-12-07 06:53:45 +1100
  • 3c8f0cff25 Added DS3231 support, and new screen to set the time/date rljonesau 2018-12-07 06:47:36 +1100
  • e2a1a8cf6e keypad pins adjusted to suit final PCB pinout rljonesau 2018-12-05 21:48:31 +1100
  • dafe2efecf Added missing arial and tahoma fonts rljonesau 2018-12-02 17:31:26 +1100
  • 859419639d Bug fix in Dot factory bitmaps when > 255 bytes in array. Added Access Point determination for OLED reporting of mode/IP address, now auto shows AP on icon Fixed latency issue when switching thermo/fixed mode in Screen3 rljonesau 2018-12-02 17:30:40 +1100
  • bbede54cdc Final neat and tidy WiFi traffic animation code rljonesau 2018-12-02 06:14:34 +1100
  • d947a4708c simultaneous wifi traffic animation rljonesau 2018-12-02 05:51:53 +1100
  • e2b207625e Improved WiFi traffic animation rljonesau 2018-12-02 05:25:10 +1100
  • 27d7c70068 Split CScreen base class out for fundamental screen functions Added CScreenHeader for standard header items, then all other screens inherit from there. Removed "get" helpers, now use getHeaterInfo() "CProtocolPackage" rljonesau 2018-12-01 11:36:25 +1100
  • 891fa9f5c3 all menu items now use _drawMenuText, fully functioning with border when required rljonesau 2018-12-01 00:33:49 +1100
  • a784943349 Immensely tidied Screen3's handling of fixed/thermo mode by adding _printInverted to CScreen rljonesau 2018-11-30 07:09:46 +1100
  • abc8f63590 Added drawMenuText methods to considerably tidy up screen update code Created an automatically resetting, transient font usage class. rljonesau 2018-11-29 22:11:50 +1100
  • 0b4fe001fa Added _drawMenuText variants, tidied up Screen5 so far rljonesau 2018-11-29 06:32:26 +1100
  • 388aef2c48 Screen5 completed - can set and save fuel settings OK. Also enhanced pump setters/getters to use float. Added selection box methods to CScreen rljonesau 2018-11-28 22:15:23 +1100
  • fac5c8d1ae Further work on Screen5 - Fuel/Air settings menu rljonesau 2018-11-28 06:40:01 +1100
  • 36a0755005 Have presentation of Fuel settings screen settled, need to allow adjustments rljonesau 2018-11-27 21:44:47 +1100
  • 885573a4dc Rolled custom changes out of Adafruit_SH1106.cpp (other than 1 bug fix) Splash screen now a bitmap drawn from display.cpp before initial _pDisplay->display() Added BSDlicense.txt as we are including Adafruit library code in project rljonesau 2018-11-27 06:25:51 +1100
  • 66c8407382 Gone crazy with license text headers rljonesau 2018-11-26 22:58:15 +1100
  • adb2741fe0 Add LICENSE Ray Jones 2018-11-26 10:46:40 +0000
  • ab539f0569 Merged remote-tracking branch 'remotes/origin/RLJ_WebSockets_I2C_OLED' rljonesau 2018-11-26 21:45:28 +1100
  • 4730cbfb9e Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2018-11-26 21:27:12 +1100
  • 5bcddf1a24 Merged with code changes from RLJ_WebServer_I2C_OLED to obtain I2C OLED An javascript web server rljonesau 2018-11-26 21:26:38 +1100
  • b5e57de2f2 Modified web server javascript to use bluetooth commands. I2C OLED changes added rljonesau 2018-11-26 20:05:05 +1100
  • c01c99697d Update README.md Ray Jones 2018-11-25 21:43:01 +0000
  • b77bbb127e Revamped screens to now be based upon CScreen class, along with a CScreenManager class. rljonesau 2018-11-25 15:45:17 +1100
  • 269da353de Merge branch 'NewPinout' of gitlab.com:mrjones.id.au/bluetoothheater into ESP32WebSockets James 2018-11-25 13:39:30 +1100
  • f77c24e21b Merge branch 'ESP32WebSockets' of gitlab.com:mrjones.id.au/bluetoothheater into ESP32WebSockets James 2018-11-25 13:29:10 +1100
  • 35217d9924 WebSocket Just Needs Background Code James 2018-11-25 11:20:15 +1100
  • 603bb2eb14 Added WebScoket sessions Have added a place holder for temp data Slider now working Off Off slide switch should work. James 2018-11-25 04:04:37 +1100
  • 297757c4a7 Cleaned up code files James 2018-11-24 20:59:10 +1100
  • 8a7d29d2f6 * Added 2 additional libraries * Correct WifiManager Filename for auto unarchive James 2018-11-24 20:58:15 +1100
  • 6320e08566 Removed unused Libraries. James 2018-11-24 20:57:40 +1100
  • f7b1e745bf First Test James 2018-11-21 10:50:59 +1100
  • ec3bfeb254 Update GitIgnore James 2018-11-25 13:04:56 +1100
  • 337043f0af WebSocket Just Needs Background Code James 2018-11-25 11:20:15 +1100
  • e340ebb357 Added WebScoket sessions Have added a place holder for temp data Slider now working Off Off slide switch should work. James 2018-11-25 04:04:37 +1100
  • 346056f982 Now host 4 OLED screens, includes helper functions for fundamental inspection/operations rljonesau 2018-11-24 22:03:47 +1100
  • 5b5a57d1c7 Cleaned up code files James 2018-11-24 20:59:10 +1100
  • 99b8d12047 * Added 2 additional libraries * Correct WifiManager Filename for auto unarchive James 2018-11-24 20:58:15 +1100
  • aa736d69ef Removed unused Libraries. James 2018-11-24 20:57:40 +1100
  • 03e7d6b89f Screen2 (simple display) pretty much done rljonesau 2018-11-24 11:51:09 +1100
  • efe8afeff3 Added Screen2 - simple presentation with ability to toggle thermostat and change set point (keypad) rljonesau 2018-11-23 21:34:37 +1100
  • fc23538ceb Introducing concept of multiple screens, with individual key handling via callbacks rljonesau 2018-11-22 21:30:51 +1100
  • 9826399835 created CKeyPad class, added key event callback functionality rljonesau 2018-11-22 06:40:31 +1100
  • 100aa4e493 removed test code from keypad handling rljonesau 2018-11-22 05:46:02 +1100
  • 831f2ab516 Added 5 way keypad sensing rljonesau 2018-11-21 20:53:12 +1100
  • bdde5e26b1 First Test James 2018-11-21 10:50:59 +1100
  • 63800ec900 removed old pin definitions rljonesau 2018-11-21 06:43:47 +1100
  • 4f9a077bd7 Added large and mini fonts, using derived class to print The Dot Factory style font definitions rljonesau 2018-11-20 22:01:27 +1100
  • 4924eac137 New pin allocations, updated OLED presentation rljonesau 2018-11-20 06:31:20 +1100
  • 50abc1b890 Initialise filtered temperature upon initial pass. Added WiFi icon rljonesau 2018-11-18 10:45:15 +1100
  • a36af395ea OLED working with small fonts, update @100ms Now restart Serial1 if CRC errors or other issues with reception rljonesau 2018-11-17 22:58:24 +1100
  • 9d79c107c5 Fine tuning OLED presentation, adding mini font rljonesau 2018-11-17 13:08:22 +1100
  • 5158630996 Advancing with OLED display... rljonesau 2018-11-14 22:12:18 +1100
  • 1cdb019401 Added SPI OLED (SH1106) on HSPI port and DS18B20 on pin 5. *** NEED TO COMMENT OUT SPIClass SPI in ESP32 library!!!!!! *** Added new state for temperature reading and OLED updates rljonesau 2018-11-13 22:02:14 +1100
  • 7d187b3393 Added WiFi options to BTCConfig.h rljonesau 2018-11-08 05:23:40 +1100
  • a7b6399c30 On/Off requests now repeat. Using Minimal SPIFFS, can now fit internal Bluetooth code BUT internal Bluetooth and WiFi bang radio heads - refusing to co-operate :-( rljonesau 2018-11-07 21:31:00 +1100
  • dc8e1940f2 Merged remote-tracking branch 'remotes/origin/ESP32HTTP' rljonesau 2018-11-07 19:56:47 +1100
  • fbeb78bd0f Merged OtherCommandsTrial to master rljonesau 2018-11-07 17:59:45 +1100
  • b3de89595d Try again to upload BTCWebServer.cpp James 2018-11-07 15:07:11 +1100
  • 2e9dfba3fc added getTemperature_Actual. Include guard in debugport.h. rljonesau 2018-11-07 06:41:14 +1100
  • fc2182ee1d Add very simple webserver code - http://ipaddress/on to poweron http://ipaddress/off to power off James 2018-11-07 04:18:12 +1100
  • 668870580e Added code to allow injection of test commands into unknown protocol values to see if some sort of reaction could be found - none so far. Added Blue LED flash on ESP32 when Rx'ing serial blue wire data. Created a UtilClasses.h file for utility classes. rljonesau 2018-11-06 20:43:54 +1100
  • d57f74482f RENAMED TO BTCDieselHeater.ino from SenderTrial2.ino - Using DebugPort in BTCWifi.cpp rljonesau 2018-11-06 14:23:28 +1100
  • 4a841f530a Merged branch 'master' into ESP32OTA to acquire ClassyBluetooth changes rljonesau 2018-11-06 13:25:05 +1100
  • 129790badb *!!!!Removed Telnet - Not really required!!! James 2018-11-04 16:19:22 +1100
  • c415a1a2c7 Now using a switch statement for state machine rljonesau 2018-11-01 07:55:25 +1100
  • b128e51880 Converted to class based Bluetooth management. HC-05 tested on ESP32. Cannot test the inbuilt ESP32 bluetooth - we blow the FLASH size! rljonesau 2018-11-01 05:57:21 +1100
  • 756ebdd888 Initial cut at getting HC05 into classes for the ESP32 or Due environments Runs on ESP32 OK. rljonesau 2018-10-30 22:05:29 +1100
  • f8f70058f9 Merge branch 'master' of gitlab.com:mrjones.id.au/bluetoothheater rljonesau 2018-10-30 20:28:39 +1100
  • dea11622ba Merge branch 'ESP32WifiFINAL' rljonesau 2018-10-30 20:27:56 +1100
  • b818b8541e Fixed all refs James 2018-10-30 19:45:17 +1100
  • c2669dc0ce Merge branch 'patch-2' into 'master' Ray Jones 2018-10-30 08:21:51 +0000
  • 43e8144f1c Update README.md James C (SkinnyBuddah) 2018-10-30 08:08:49 +0000