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

Added WiFi options to BTCConfig.h

Browse source
This commit is contained in:
rljonesau 2018-11-08 05:23:40 +11:00
parent a7b6399c30
commit 7d187b3393
4 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino/BTCDieselHeater/.vscode/arduino.json vendored
View file

@ -1,6 +1,6 @@
{ {
"board": "esp32:esp32:esp32", "board": "esp32:esp32:esp32",
"port": "192.168.0.108", "port": "192.168.0.103",
"sketch": "BTCDieselHeater.ino", "sketch": "BTCDieselHeater.ino",
"output": "..\\build", "output": "..\\build",
"configuration": "PSRAM=disabled,PartitionScheme=min_spiffs,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none" "configuration": "PSRAM=disabled,PartitionScheme=min_spiffs,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none"

10
Arduino/BTCDieselHeater/BTCConfig.h
View file

@ -11,7 +11,15 @@
#define USE_BLE_BLUETOOTH 0 #define USE_BLE_BLUETOOTH 0
#define USE_CLASSIC_BLUETOOTH 0 #define USE_CLASSIC_BLUETOOTH 0
#define USE_WIFI 1 //////////////////////////////////////////////////////////////////////////////
// Configure WiFi options
//
// *** Presently ESP32 Bluetooth and WiFi do not co-exist well (ala don't work!) ***
// HC-05 works OK with WiFi
//
#define USE_WIFI 1
#define USE_OTA 1
#define USE_WEBSERVER 1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

16
Arduino/BTCDieselHeater/BTCDieselHeater.ino
View file

@ -172,10 +172,16 @@ void setup() {
DebugPort.begin(115200); DebugPort.begin(115200);
#if USE_WIFI == 1 #if USE_WIFI == 1
initWifi(WiFi_TriggerPin, FAILEDSSID, FAILEDPASSWORD); initWifi(WiFi_TriggerPin, FAILEDSSID, FAILEDPASSWORD);
#if USE_OTA == 1
initOTA(); initOTA();
#endif // USE_OTA
#if USE_WEBSERVER == 1
initWebServer(); initWebServer();
#endif #endif // USE_WEBSERVER
#endif // USE_WIFI
pinMode(ListenOnlyPin, INPUT_PULLUP); // pin to enable passive mode pinMode(ListenOnlyPin, INPUT_PULLUP); // pin to enable passive mode
pinMode(LED_Pin, OUTPUT); // On board LED indicator pinMode(LED_Pin, OUTPUT); // On board LED indicator
@ -229,10 +235,16 @@ void loop()
unsigned long timenow = millis(); unsigned long timenow = millis();
#if USE_WIFI == 1 #if USE_WIFI == 1
doWiFiManager(); doWiFiManager();
#if USE_OTA == 1
DoOTA(); DoOTA();
#endif // USE_OTA
#if USE_WEBSERVER == 1
doWebServer(); doWebServer();
#endif #endif //USE_WEBSERVER
#endif // USE_WIFI
// check for test commands received from PC Over USB // check for test commands received from PC Over USB
if(DebugPort.available()) { if(DebugPort.available()) {

1
Arduino/BTCDieselHeater/BluetoothESP32.cpp
View file

@ -192,6 +192,7 @@ CBluetoothESP32BLE::~CBluetoothESP32BLE()
void void
CBluetoothESP32BLE::init() CBluetoothESP32BLE::init()
{ {
DebugPort.println("Initialising ESP32 BLE");
// create the BLE device // create the BLE device
BLEDevice::init("DieselHeater"); BLEDevice::init("DieselHeater");