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

79 commits

Author SHA1 Message Date
rljonesau 0b4fe001fa Added _drawMenuText variants, tidied up Screen5 so far 2018-11-29 06:32:26 +11:00
rljonesau 388aef2c48 Screen5 completed - can set and save fuel settings OK. 
Also enhanced pump setters/getters to use float.
Added selection box methods to CScreen
 2018-11-28 22:15:23 +11:00
rljonesau fac5c8d1ae Further work on Screen5 - Fuel/Air settings menu 2018-11-28 06:40:01 +11:00
rljonesau 36a0755005 Have presentation of Fuel settings screen settled, need to allow adjustments 2018-11-27 21:44:47 +11:00
rljonesau 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
 2018-11-27 06:25:51 +11:00
rljonesau 66c8407382 Gone crazy with license text headers 2018-11-26 22:58:15 +11:00
rljonesau ab539f0569 Merged remote-tracking branch 'remotes/origin/RLJ_WebSockets_I2C_OLED' 2018-11-26 21:45:28 +11:00
rljonesau 5bcddf1a24 Merged with code changes from RLJ_WebServer_I2C_OLED to obtain I2C OLED An javascript web server 2018-11-26 21:26:38 +11:00
rljonesau b5e57de2f2 Modified web server javascript to use bluetooth commands. 
I2C OLED changes added
 2018-11-26 20:05:05 +11:00
rljonesau b77bbb127e Revamped screens to now be based upon CScreen class, along with a CScreenManager class. 2018-11-25 15:45:17 +11:00
James 269da353de Merge branch 'NewPinout' of gitlab.com:mrjones.id.au/bluetoothheater into ESP32WebSockets 
# Conflicts:
#	Arduino/BTCDieselHeater/.vscode/arduino.json
 2018-11-25 13:39:30 +11:00
James f77c24e21b Merge branch 'ESP32WebSockets' of gitlab.com:mrjones.id.au/bluetoothheater into ESP32WebSockets 2018-11-25 13:29:10 +11:00
James 35217d9924 WebSocket Just Needs Background Code 2018-11-25 13:27:29 +11:00
James 603bb2eb14 Added WebScoket sessions 
Have added a place holder for temp data
Slider now working
Off Off slide switch should work.

Not a full test code rollout
 2018-11-25 13:26:47 +11:00
James 297757c4a7 Cleaned up code files 2018-11-25 13:26:46 +11:00
James 8a7d29d2f6 * Added 2 additional libraries 
* Correct WifiManager Filename for auto unarchive
 2018-11-25 13:24:58 +11:00
James 6320e08566 Removed unused Libraries. 2018-11-25 13:24:57 +11:00
James f7b1e745bf First Test 2018-11-25 13:24:57 +11:00
James 337043f0af WebSocket Just Needs Background Code 2018-11-25 11:20:15 +11:00
James e340ebb357 Added WebScoket sessions 
Have added a place holder for temp data
Slider now working
Off Off slide switch should work.

Not a full test code rollout
 2018-11-25 04:04:37 +11:00
rljonesau 346056f982 Now host 4 OLED screens, includes helper functions for fundamental inspection/operations 2018-11-24 22:03:47 +11:00
James 5b5a57d1c7 Cleaned up code files 2018-11-24 21:00:15 +11:00
James 99b8d12047 * Added 2 additional libraries 
* Correct WifiManager Filename for auto unarchive
 2018-11-24 20:58:15 +11:00
James aa736d69ef Removed unused Libraries. 2018-11-24 20:57:40 +11:00
rljonesau 03e7d6b89f Screen2 (simple display) pretty much done 2018-11-24 11:51:09 +11:00
rljonesau efe8afeff3 Added Screen2 - simple presentation with ability to toggle thermostat and change set point (keypad) 2018-11-23 21:34:37 +11:00
rljonesau fc23538ceb Introducing concept of multiple screens, with individual key handling via callbacks 2018-11-22 21:30:51 +11:00
rljonesau 9826399835 created CKeyPad class, added key event callback functionality 2018-11-22 06:40:31 +11:00
rljonesau 100aa4e493 removed test code from keypad handling 2018-11-22 05:46:02 +11:00
rljonesau 831f2ab516 Added 5 way keypad sensing 2018-11-21 20:53:12 +11:00
James bdde5e26b1 First Test 2018-11-21 10:50:59 +11:00
rljonesau 63800ec900 removed old pin definitions 2018-11-21 06:43:47 +11:00
rljonesau 4f9a077bd7 Added large and mini fonts, using derived class to print The Dot Factory style font definitions 2018-11-20 22:01:27 +11:00
rljonesau 4924eac137 New pin allocations, updated OLED presentation 2018-11-20 06:31:20 +11:00
rljonesau 50abc1b890 Initialise filtered temperature upon initial pass. 
Added WiFi icon
 2018-11-18 10:45:15 +11:00
rljonesau a36af395ea OLED working with small fonts, update @100ms 
Now restart Serial1 if CRC errors or other issues with reception
 2018-11-17 22:59:16 +11:00
rljonesau 9d79c107c5 Fine tuning OLED presentation, adding mini font 2018-11-17 13:08:22 +11:00
rljonesau 5158630996 Advancing with OLED display... 2018-11-14 22:12:18 +11:00
rljonesau 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
 2018-11-13 22:02:14 +11:00
rljonesau 7d187b3393 Added WiFi options to BTCConfig.h 2018-11-08 05:23:40 +11:00
rljonesau 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 :-(
 2018-11-07 21:31:00 +11:00
rljonesau dc8e1940f2 Merged remote-tracking branch 'remotes/origin/ESP32HTTP' 
Conflict resolved in
	Arduino/BTCDieselHeater/BTCDieselHeater.ino
 2018-11-07 19:56:47 +11:00
James b3de89595d Try again to upload BTCWebServer.cpp 2018-11-07 15:07:11 +11:00
rljonesau 2e9dfba3fc added getTemperature_Actual. Include guard in debugport.h. 2018-11-07 06:41:14 +11:00
James fc2182ee1d Add very simple webserver code - 
http://ipaddress/on to poweron
http://ipaddress/off to power off
 2018-11-07 04:18:12 +11:00
rljonesau 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.
 2018-11-06 20:43:54 +11:00
rljonesau d57f74482f RENAMED TO BTCDieselHeater.ino from SenderTrial2.ino - Using DebugPort in BTCWifi.cpp 2018-11-06 14:23:28 +11:00
rljonesau 4a841f530a Merged branch 'master' into ESP32OTA to acquire ClassyBluetooth changes 
Resolved Conflict:
	Arduino/SenderTrial2/SenderTrial2.ino

Defined pin 23 for triggering wifiManager
 2018-11-06 13:25:05 +11:00
James 129790badb *!!!!Removed Telnet - Not really required!!! 
*Setup wifi connectivity as a blocking process.  As Wifi is required for OTA to function no point moving forward until this is done on startup.  This will mean either we connect to an Access Point or we become one.

*Added BTC OTA option
 2018-11-04 16:19:22 +11:00
rljonesau c415a1a2c7 Now using a switch statement for state machine 2018-11-01 07:55:25 +11:00