rljonesau
4395b17ba5
Merge branch 'JC_JSON'
2018-12-11 21:24:35 +11:00
rljonesau
dee79ecebc
Converted to JSON commands back to EPS32
2018-12-11 21:19:02 +11:00
rljonesau
10c33c3515
broke outgoing arrow flag in BTWebServer - fixed
2018-12-10 22:10:49 +11:00
rljonesau
2c136eb34c
Ray fiddles to get temp slider to talk to heater, and show desired temp value.
2018-12-10 21:26:29 +11:00
James C (SkinnyBuddah)
ff3fcc89f4
Update Arduino/BTCDieselHeater/mainpage.cpp
2018-12-09 23:25:54 +00:00
James C (SkinnyBuddah)
e0a8f2ff9f
Update Arduino/BTCDieselHeater/mainpage.cpp
2018-12-09 23:03:52 +00:00
James C (SkinnyBuddah)
dfb04d97d8
Removed commented code
2018-12-09 22:55:13 +00:00
James C (SkinnyBuddah)
30a954f123
Update Arduino/BTCDieselHeater/mainpage.cpp
2018-12-09 22:53:39 +00:00
rljonesau
f0d7d669ff
fixed runstate JSON in javascript
2018-12-10 06:30:36 +11:00
rljonesau
43d35493c0
First play with ArduinoJson library and javascript JSON.parse() - too fucking easy!
2018-12-10 06:28:02 +11:00
James
f4a52afd42
fixed parsing data into the webpage - need to get data coming out in the same format.
...
TRY THIS ONE RAY
2018-12-10 00:38:59 +11:00
rljonesau
1c9727b675
Merge branch 'JCWebPretty' of gitlab.com:mrjones.id.au/bluetoothheater into JCWebPretty
...
Conflicts resolved:
Arduino/BTCDieselHeater/mainpage.cpp
2018-12-09 20:19:51 +11:00
rljonesau
40305d6224
Fixed Console vs console, commented out new event code
2018-12-09 20:06:04 +11:00
James
374d299cf1
Fixed evt to Event ... FML
2018-12-09 17:24:18 +11:00
James
e24caea95d
fixed again
2018-12-09 17:21:04 +11:00
James
528b2b1fd3
missed }
2018-12-09 17:18:04 +11:00
James
ba5bd51b14
Fixed small issue of not terminating init() function correctly
2018-12-09 17:15:27 +11:00
James
2bc415b2af
Fixed on off toggle switch so it works
2018-12-09 17:09:50 +11:00
James
1d98716dd4
next
2018-12-09 15:41:44 +11:00
James
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.
2018-12-09 15:07:18 +11:00
rljonesau
f40f750c49
Extended range of actual temperature bar graph in screen 1
2018-12-09 14:00:40 +11:00
rljonesau
85ff28d347
Support for DS3231, DS1307, PCF8523 or millis() based RTCs - Use BTCConfig.h to select
2018-12-09 12:10:56 +11:00
rljonesau
55c33af996
added missing files! Dumbkoppf
2018-12-09 09:55:55 +11:00
rljonesau
90569c319c
Encapsulated RTC and timer functionality inside CClock class.
2018-12-09 09:51:16 +11:00
rljonesau
2a7e3fce1b
Added large clock screen
2018-12-08 23:25:53 +11:00
rljonesau
069633c61f
Added isConnected() to ESP32 Bluetooth classes (enables polymorphism from CBluetoothAbstract)
...
key repeat added to time setting screen
2018-12-08 20:31:15 +11:00
rljonesau
0f397e93f8
Slowed DS3231 I2C accesses to 400kHz
2018-12-08 16:44:48 +11:00
rljonesau
fbe39980ce
Bug fixes: timer that spans midnight, stale info in timer setup screens
2018-12-08 15:18:37 +11:00
rljonesau
ec1631b84b
Now can define day timer operates on
2018-12-08 12:39:41 +11:00
rljonesau
283eff4288
Timers now start/stop as required, and self clear if non-repeating.
...
Adding notion of Day of Week timers.
2018-12-08 09:30:55 +11:00
rljonesau
e51b2be8d1
dual timers, header icons for timers
2018-12-07 22:16:04 +11:00
Ray Jones
31f825ba5b
vectorising CScreenManager Screens
2018-12-07 15:53:08 +11:00
Ray Jones
157bf4fa0f
Adding Screen 7 for setting timer
2018-12-07 15:18:24 +11:00
rljonesau
00e68f3cc3
Removed SPI OLED support
2018-12-07 06:53:45 +11:00
rljonesau
3c8f0cff25
Added DS3231 support, and new screen to set the time/date
2018-12-07 06:47:36 +11:00
rljonesau
e2a1a8cf6e
keypad pins adjusted to suit final PCB pinout
2018-12-05 21:48:31 +11:00
rljonesau
dafe2efecf
Added missing arial and tahoma fonts
2018-12-02 17:31:26 +11:00
rljonesau
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
2018-12-02 17:30:40 +11:00
rljonesau
bbede54cdc
Final neat and tidy WiFi traffic animation code
2018-12-02 06:14:34 +11:00
rljonesau
d947a4708c
simultaneous wifi traffic animation
2018-12-02 05:51:53 +11:00
rljonesau
e2b207625e
Improved WiFi traffic animation
2018-12-02 05:25:10 +11:00
rljonesau
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"
2018-12-01 11:36:25 +11:00
rljonesau
891fa9f5c3
all menu items now use _drawMenuText, fully functioning with border when required
2018-12-01 00:33:49 +11:00
rljonesau
a784943349
Immensely tidied Screen3's handling of fixed/thermo mode by adding _printInverted to CScreen
2018-11-30 07:09:46 +11:00
rljonesau
abc8f63590
Added drawMenuText methods to considerably tidy up screen update code
...
Created an automatically resetting, transient font usage class.
2018-11-29 22:11:50 +11:00
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
