Commit Graph

527 Commits

Author SHA1 Message Date
rljonesau baf1def165 Left out SmartError.cpp & SmartError.h :-( 2018-10-29 06:01:26 +11:00
James Clark 33bb526a54 Added nonblocking wifi manager - Also added STA mode on timeout of 20 seconds 2018-10-28 19:59:34 +11:00
rljonesau ca853a1ac5 Added a "carbon rod" to moderate enthusiastic OEM controllers to Bluetooth.
Updated Android app to better deal with blue wire comms situations, also added warning of limited
control when an OEM controller is in the mix, disabling the temperature and fixed/thermo modes.
2018-10-28 18:34:16 +11:00
rljonesau ea8af6db09 Added debug messages if state machine gets thrown back to idle due to no bluewire rx data
Added protocol document!
2018-10-28 15:05:23 +11:00
James 15a3b6d3ef Added RemoteDebug and a define to change debugging from serial to telnet depening on telnet define at top of .ino 2018-10-28 14:03:44 +11:00
James f3d6d8d6d2 Initial WifiManager addition. 2018-10-28 10:14:34 +11:00
rljonesau 151543b84c Smart error checking now performed in Arduino code.
App Inventor app re-configured to not check these itself any more.
The heater frames sent over blue tooth have the new error codes.
2018-10-28 08:21:35 +11:00
Ray Jones 169b53aaa5 Merge branch 'SmartErrors' into 'master'
Massive tidy up of heater data state machine, SOO much nicer now :-)

See merge request mrjones.id.au/bluetoothheater!4
2018-10-27 10:51:25 +00:00
rljonesau a01bcea53d Massive tidy up of heater data state machine, SOO much nicer now :-) 2018-10-27 21:30:01 +11:00
Ray Jones 383dd466b8 Merge branch 'ESP32Bluetooth' into 'master'
Esp32 bluetooth

See merge request mrjones.id.au/bluetoothheater!3
2018-10-27 09:09:13 +00:00
rljonesau 2799ec3352 Tidied up HC-05 handling (on an ESP32 at least)
Now using SENSE line from HC-05 to detect a client is connected.
Runs with either sort of HC-05 module, provided the 5 pin regulator style is set to 9600 data mode.
Removed #ifdef BLUETOOTH from .ino file, Bluetooth functions report now anyway with/without client.
2018-10-27 20:03:10 +11:00
rljonesau 7be3424359 Switched to HC-05.
quick push for James
2018-10-27 17:35:17 +11:00
rljonesau a156062a94 Removed String vars - rumours of heap fragmentation causing long term issues
Report data frames within BT functions.
Improved command decode reporting
2018-10-20 22:28:32 +11:00
Ray Jones 8fd8a314dd Merge branch 'ESP32Bluetooth' into 'master'
Esp32 bluetooth

See merge request mrjones.id.au/bluetoothheater!2
2018-10-20 07:12:57 +00:00
rljonesau 1325ae6038 Added NV Storage for ESP32
Changed "USB" to "DebugPort"
Tidy up of blue wire data frames and passing about by reference instead of just the data buffer.
Added AppInventor application
2018-10-20 18:11:23 +11:00
rljonesau 5d112d7e64 Added #ifdef BLUETOOTH to knobble Bluetooth functions if required 2018-10-18 21:09:18 +11:00
rljonesau 399ca22c5a Functionality works with ESP32 BLE or classic (not simultaneously)
Use #ifdef ESP32_USE_BLE_RLJ to toggle modes.

Also broken out bluetooth functions into a few files for better separation of code.
2018-10-18 20:49:14 +11:00
James C (SkinnyBuddah) ee707716b7 Update README.md just to flesh out a little 2018-10-16 14:30:18 +00:00
rljonesau baed4b3079 Beefed up Bluetooth handling to include tuning parameters.
Changed Tx headers to [OEM] and [BTC] for the OEM controller and this Bluetooth controller.
Added #ifdefs to accomodate Mega and ESP32.
Built and tested on ESP32, Serial1 talks to heater OK using standard pin numbering :-)
2018-10-15 18:14:12 +11:00
rljonesau 18571ae857 Added BT transmission of heater and controller frames.
Prefixed with [CTL], [HTR] or [SLF] to ID who sourced the data frame.
2018-10-13 10:12:38 +11:00
rljonesau 6ed419991c Serial2 now connects to HC-05 module and sets module to 115200 2018-09-25 20:56:32 +10:00
rljonesau d63988be64 Slight mod to allow simple sniffing mode by grounding pin 21 of the Due. 2018-09-24 20:56:37 +10:00
rljonesau 5c1f68369a CProtocol now, not CFrame 2018-09-23 19:15:49 +10:00
rljonesau 961c5b8b29 changed to protocol.h/.cpp 2018-09-23 18:59:19 +10:00
rljonesau 9818b33e47 Automatically detects if another controller exists on the blue wire.
If found, it parrots the settings, but allows on/off commands to be inserted by a user.
If no other controller detected, it falls back and delivers our settings each second.

Currently reports all packets to USB, but will move onto Bluetooth delivery of heater data soon.
2018-09-23 16:31:09 +10:00
rljonesau 99e1b9d6bc Initial attempt at injecting messages within a working system 2018-09-23 09:31:47 +10:00
Ray Jones 4fbf3f0d41 Initial commit 2018-09-22 23:29:14 +00:00