From d57f74482f12e4cd931817be3947699ba67c1760 Mon Sep 17 00:00:00 2001 From: rljonesau Date: Tue, 6 Nov 2018 14:23:28 +1100 Subject: [PATCH] RENAMED TO BTCDieselHeater.ino from SenderTrial2.ino - Using DebugPort in BTCWifi.cpp --- .../.vs/ProjectSettings.json | 0 .../.vs/SenderTrial2/v15/.suo | Bin .../.vs/VSWorkspaceState.json | 0 .../.vs/__vm/.vsarduino.h | 0 .../.vs/__vm/Compile.vmps.xml | 0 .../.vs/__vm/Configuration.Release.vmps.xml | 0 .../.vs/__vm/Upload.vmps.xml | 0 .../.vs/slnx.sqlite | Bin .../.vscode/arduino.json | 2 +- .../.vscode/c_cpp_properties.json | 0 .../.vscode/settings.json | 0 .../.vscode/tasks.json | 0 .../BTCConfig.h | 2 +- .../BTCDieselHeater.ino} | 11 +++++----- .../BTCWifi.cpp | 19 +++++++++--------- .../BTCWifi.h | 0 .../BTCota.cpp | 0 .../BTCota.h | 0 .../BluetoothAbstract.h | 0 .../BluetoothESP32.cpp | 0 .../BluetoothESP32.h | 0 .../BluetoothHC05.cpp | 0 .../BluetoothHC05.h | 0 .../CppProperties.json | 0 .../NVStorage.cpp | 0 .../NVStorage.h | 0 .../Protocol.cpp | 0 .../Protocol.h | 0 .../Serial2Telnet/Serial2Telnet.ino | 0 .../SmartError.cpp | 0 .../SmartError.h | 0 .../TxManage.cpp | 0 .../TxManage.h | 0 .../deadwood/BTCTelnetSpy.cpp | 0 .../deadwood/BTCTelnetSpy.h | 0 .../debugport.h | 0 .../{SenderTrial2 => BTCDieselHeater}/pins.h | 0 37 files changed, 18 insertions(+), 16 deletions(-) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/ProjectSettings.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/SenderTrial2/v15/.suo (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/VSWorkspaceState.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/__vm/.vsarduino.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/__vm/Compile.vmps.xml (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/__vm/Configuration.Release.vmps.xml (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/__vm/Upload.vmps.xml (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vs/slnx.sqlite (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vscode/arduino.json (86%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vscode/c_cpp_properties.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vscode/settings.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/.vscode/tasks.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BTCConfig.h (95%) rename Arduino/{SenderTrial2/SenderTrial2.ino => BTCDieselHeater/BTCDieselHeater.ino} (99%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BTCWifi.cpp (80%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BTCWifi.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BTCota.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BTCota.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BluetoothAbstract.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BluetoothESP32.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BluetoothESP32.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BluetoothHC05.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/BluetoothHC05.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/CppProperties.json (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/NVStorage.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/NVStorage.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/Protocol.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/Protocol.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/Serial2Telnet/Serial2Telnet.ino (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/SmartError.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/SmartError.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/TxManage.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/TxManage.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/deadwood/BTCTelnetSpy.cpp (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/deadwood/BTCTelnetSpy.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/debugport.h (100%) rename Arduino/{SenderTrial2 => BTCDieselHeater}/pins.h (100%) diff --git a/Arduino/SenderTrial2/.vs/ProjectSettings.json b/Arduino/BTCDieselHeater/.vs/ProjectSettings.json similarity index 100% rename from Arduino/SenderTrial2/.vs/ProjectSettings.json rename to Arduino/BTCDieselHeater/.vs/ProjectSettings.json diff --git a/Arduino/SenderTrial2/.vs/SenderTrial2/v15/.suo b/Arduino/BTCDieselHeater/.vs/SenderTrial2/v15/.suo similarity index 100% rename from Arduino/SenderTrial2/.vs/SenderTrial2/v15/.suo rename to Arduino/BTCDieselHeater/.vs/SenderTrial2/v15/.suo diff --git a/Arduino/SenderTrial2/.vs/VSWorkspaceState.json b/Arduino/BTCDieselHeater/.vs/VSWorkspaceState.json similarity index 100% rename from Arduino/SenderTrial2/.vs/VSWorkspaceState.json rename to Arduino/BTCDieselHeater/.vs/VSWorkspaceState.json diff --git a/Arduino/SenderTrial2/.vs/__vm/.vsarduino.h b/Arduino/BTCDieselHeater/.vs/__vm/.vsarduino.h similarity index 100% rename from Arduino/SenderTrial2/.vs/__vm/.vsarduino.h rename to Arduino/BTCDieselHeater/.vs/__vm/.vsarduino.h diff --git a/Arduino/SenderTrial2/.vs/__vm/Compile.vmps.xml b/Arduino/BTCDieselHeater/.vs/__vm/Compile.vmps.xml similarity index 100% rename from Arduino/SenderTrial2/.vs/__vm/Compile.vmps.xml rename to Arduino/BTCDieselHeater/.vs/__vm/Compile.vmps.xml diff --git a/Arduino/SenderTrial2/.vs/__vm/Configuration.Release.vmps.xml b/Arduino/BTCDieselHeater/.vs/__vm/Configuration.Release.vmps.xml similarity index 100% rename from Arduino/SenderTrial2/.vs/__vm/Configuration.Release.vmps.xml rename to Arduino/BTCDieselHeater/.vs/__vm/Configuration.Release.vmps.xml diff --git a/Arduino/SenderTrial2/.vs/__vm/Upload.vmps.xml b/Arduino/BTCDieselHeater/.vs/__vm/Upload.vmps.xml similarity index 100% rename from Arduino/SenderTrial2/.vs/__vm/Upload.vmps.xml rename to Arduino/BTCDieselHeater/.vs/__vm/Upload.vmps.xml diff --git a/Arduino/SenderTrial2/.vs/slnx.sqlite b/Arduino/BTCDieselHeater/.vs/slnx.sqlite similarity index 100% rename from Arduino/SenderTrial2/.vs/slnx.sqlite rename to Arduino/BTCDieselHeater/.vs/slnx.sqlite diff --git a/Arduino/SenderTrial2/.vscode/arduino.json b/Arduino/BTCDieselHeater/.vscode/arduino.json similarity index 86% rename from Arduino/SenderTrial2/.vscode/arduino.json rename to Arduino/BTCDieselHeater/.vscode/arduino.json index b135405..4726eef 100644 --- a/Arduino/SenderTrial2/.vscode/arduino.json +++ b/Arduino/BTCDieselHeater/.vscode/arduino.json @@ -1,7 +1,7 @@ { "board": "esp32:esp32:esp32", "port": "192.168.0.101", - "sketch": "SenderTrial2.ino", + "sketch": "BTCDieselHeater.ino", "output": "..\\build", "configuration": "PSRAM=disabled,PartitionScheme=default,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none" } \ No newline at end of file diff --git a/Arduino/SenderTrial2/.vscode/c_cpp_properties.json b/Arduino/BTCDieselHeater/.vscode/c_cpp_properties.json similarity index 100% rename from Arduino/SenderTrial2/.vscode/c_cpp_properties.json rename to Arduino/BTCDieselHeater/.vscode/c_cpp_properties.json diff --git a/Arduino/SenderTrial2/.vscode/settings.json b/Arduino/BTCDieselHeater/.vscode/settings.json similarity index 100% rename from Arduino/SenderTrial2/.vscode/settings.json rename to Arduino/BTCDieselHeater/.vscode/settings.json diff --git a/Arduino/SenderTrial2/.vscode/tasks.json b/Arduino/BTCDieselHeater/.vscode/tasks.json similarity index 100% rename from Arduino/SenderTrial2/.vscode/tasks.json rename to Arduino/BTCDieselHeater/.vscode/tasks.json diff --git a/Arduino/SenderTrial2/BTCConfig.h b/Arduino/BTCDieselHeater/BTCConfig.h similarity index 95% rename from Arduino/SenderTrial2/BTCConfig.h rename to Arduino/BTCDieselHeater/BTCConfig.h index 651934b..8e51252 100644 --- a/Arduino/SenderTrial2/BTCConfig.h +++ b/Arduino/BTCDieselHeater/BTCConfig.h @@ -16,7 +16,7 @@ // limit rate of Bluetooth delivery from enthusiastic OEM controllers // #define OEM_TO_BLUETOOTH_MODERATION_TIME 700 -// show when we did not echo data frames to bluetooth +// show when we did moderate data frames to bluetooth #define REPORT_SUPPRESSED_OEM_DATA_FRAMES 0 diff --git a/Arduino/SenderTrial2/SenderTrial2.ino b/Arduino/BTCDieselHeater/BTCDieselHeater.ino similarity index 99% rename from Arduino/SenderTrial2/SenderTrial2.ino rename to Arduino/BTCDieselHeater/BTCDieselHeater.ino index 98e6f73..40ae8e3 100644 --- a/Arduino/SenderTrial2/SenderTrial2.ino +++ b/Arduino/BTCDieselHeater/BTCDieselHeater.ino @@ -222,7 +222,12 @@ CHeaterStorage* pNVStorage = NULL; void setup() { -// initWifi(TRIGGER_PIN, FAILEDSSID, FAILEDPASSWORD); + + // initialise serial monitor on serial port 0 + // this is the usual USB connection to a PC + // DO THIS BEFORE WE TRY AND SEND DEBUG INFO! + DebugPort.begin(115200); + initWifi(WiFi_TriggerPin, FAILEDSSID, FAILEDPASSWORD); initOTA(); pinMode(Tx2Pin, OUTPUT); @@ -245,10 +250,6 @@ void setup() { pinMode(Rx1Pin, INPUT_PULLUP); // required for MUX to work properly #endif - // initialise serial monitor on serial port 0 - // this is the usual USB connection to a PC - DebugPort.begin(115200); - // prepare for first long delay detection lastRxTime = millis(); diff --git a/Arduino/SenderTrial2/BTCWifi.cpp b/Arduino/BTCDieselHeater/BTCWifi.cpp similarity index 80% rename from Arduino/SenderTrial2/BTCWifi.cpp rename to Arduino/BTCDieselHeater/BTCWifi.cpp index 6644a5f..64c3074 100644 --- a/Arduino/SenderTrial2/BTCWifi.cpp +++ b/Arduino/BTCDieselHeater/BTCWifi.cpp @@ -1,5 +1,6 @@ // Should be working - Jimmy C #include "BTCWifi.h" +#include "DebugPort.h" // select which pin will trigger the configuration portal when set to LOW WiFiManager wm; @@ -32,16 +33,16 @@ void initWifi(int initpin,const char *failedssid, const char *failedpassword) res = wm.autoConnect(); // auto generated AP name from chipid if(!res) { - Serial.println("Failed to connect"); - Serial.println("Setting up ESP as AP"); + DebugPort.println("Failed to connect"); + DebugPort.println("Setting up ESP as AP"); WiFi.softAP(failedssid, failedpassword); } else { //if you get here you have connected to the WiFi - Serial.println("connected...yeey :)"); - Serial.println("Ready"); - Serial.print("IP address: "); - Serial.println(WiFi.localIP()); + DebugPort.println("connected...yeey :)"); + DebugPort.println("Ready"); + DebugPort.print("IP address: "); + DebugPort.println(WiFi.localIP()); } } @@ -50,7 +51,7 @@ void doWiFiManager(){ if(portalRunning){ wm.process(); if((millis()-startTime) > (timeout*1000)){ - Serial.println("portaltimeout"); + DebugPort.println("portaltimeout"); portalRunning = false; if(startCP){ wm.stopConfigPortal(); @@ -64,13 +65,13 @@ void doWiFiManager(){ // is configuration portal requested? if(TRIG_PIN == 1 && (!portalRunning)) { if(startCP){ - Serial.println("Button Pressed, Starting Config Portal"); + DebugPort.println("Button Pressed, Starting Config Portal"); wm.setConfigPortalBlocking(false); wm.startConfigPortal(); TRIG_PIN = 0; // reset the flag } else{ - Serial.println("Button Pressed, Starting Web Portal"); + DebugPort.println("Button Pressed, Starting Web Portal"); wm.startWebPortal(); TRIG_PIN = 0; // reset the flag } diff --git a/Arduino/SenderTrial2/BTCWifi.h b/Arduino/BTCDieselHeater/BTCWifi.h similarity index 100% rename from Arduino/SenderTrial2/BTCWifi.h rename to Arduino/BTCDieselHeater/BTCWifi.h diff --git a/Arduino/SenderTrial2/BTCota.cpp b/Arduino/BTCDieselHeater/BTCota.cpp similarity index 100% rename from Arduino/SenderTrial2/BTCota.cpp rename to Arduino/BTCDieselHeater/BTCota.cpp diff --git a/Arduino/SenderTrial2/BTCota.h b/Arduino/BTCDieselHeater/BTCota.h similarity index 100% rename from Arduino/SenderTrial2/BTCota.h rename to Arduino/BTCDieselHeater/BTCota.h diff --git a/Arduino/SenderTrial2/BluetoothAbstract.h b/Arduino/BTCDieselHeater/BluetoothAbstract.h similarity index 100% rename from Arduino/SenderTrial2/BluetoothAbstract.h rename to Arduino/BTCDieselHeater/BluetoothAbstract.h diff --git a/Arduino/SenderTrial2/BluetoothESP32.cpp b/Arduino/BTCDieselHeater/BluetoothESP32.cpp similarity index 100% rename from Arduino/SenderTrial2/BluetoothESP32.cpp rename to Arduino/BTCDieselHeater/BluetoothESP32.cpp diff --git a/Arduino/SenderTrial2/BluetoothESP32.h b/Arduino/BTCDieselHeater/BluetoothESP32.h similarity index 100% rename from Arduino/SenderTrial2/BluetoothESP32.h rename to Arduino/BTCDieselHeater/BluetoothESP32.h diff --git a/Arduino/SenderTrial2/BluetoothHC05.cpp b/Arduino/BTCDieselHeater/BluetoothHC05.cpp similarity index 100% rename from Arduino/SenderTrial2/BluetoothHC05.cpp rename to Arduino/BTCDieselHeater/BluetoothHC05.cpp diff --git a/Arduino/SenderTrial2/BluetoothHC05.h b/Arduino/BTCDieselHeater/BluetoothHC05.h similarity index 100% rename from Arduino/SenderTrial2/BluetoothHC05.h rename to Arduino/BTCDieselHeater/BluetoothHC05.h diff --git a/Arduino/SenderTrial2/CppProperties.json b/Arduino/BTCDieselHeater/CppProperties.json similarity index 100% rename from Arduino/SenderTrial2/CppProperties.json rename to Arduino/BTCDieselHeater/CppProperties.json diff --git a/Arduino/SenderTrial2/NVStorage.cpp b/Arduino/BTCDieselHeater/NVStorage.cpp similarity index 100% rename from Arduino/SenderTrial2/NVStorage.cpp rename to Arduino/BTCDieselHeater/NVStorage.cpp diff --git a/Arduino/SenderTrial2/NVStorage.h b/Arduino/BTCDieselHeater/NVStorage.h similarity index 100% rename from Arduino/SenderTrial2/NVStorage.h rename to Arduino/BTCDieselHeater/NVStorage.h diff --git a/Arduino/SenderTrial2/Protocol.cpp b/Arduino/BTCDieselHeater/Protocol.cpp similarity index 100% rename from Arduino/SenderTrial2/Protocol.cpp rename to Arduino/BTCDieselHeater/Protocol.cpp diff --git a/Arduino/SenderTrial2/Protocol.h b/Arduino/BTCDieselHeater/Protocol.h similarity index 100% rename from Arduino/SenderTrial2/Protocol.h rename to Arduino/BTCDieselHeater/Protocol.h diff --git a/Arduino/SenderTrial2/Serial2Telnet/Serial2Telnet.ino b/Arduino/BTCDieselHeater/Serial2Telnet/Serial2Telnet.ino similarity index 100% rename from Arduino/SenderTrial2/Serial2Telnet/Serial2Telnet.ino rename to Arduino/BTCDieselHeater/Serial2Telnet/Serial2Telnet.ino diff --git a/Arduino/SenderTrial2/SmartError.cpp b/Arduino/BTCDieselHeater/SmartError.cpp similarity index 100% rename from Arduino/SenderTrial2/SmartError.cpp rename to Arduino/BTCDieselHeater/SmartError.cpp diff --git a/Arduino/SenderTrial2/SmartError.h b/Arduino/BTCDieselHeater/SmartError.h similarity index 100% rename from Arduino/SenderTrial2/SmartError.h rename to Arduino/BTCDieselHeater/SmartError.h diff --git a/Arduino/SenderTrial2/TxManage.cpp b/Arduino/BTCDieselHeater/TxManage.cpp similarity index 100% rename from Arduino/SenderTrial2/TxManage.cpp rename to Arduino/BTCDieselHeater/TxManage.cpp diff --git a/Arduino/SenderTrial2/TxManage.h b/Arduino/BTCDieselHeater/TxManage.h similarity index 100% rename from Arduino/SenderTrial2/TxManage.h rename to Arduino/BTCDieselHeater/TxManage.h diff --git a/Arduino/SenderTrial2/deadwood/BTCTelnetSpy.cpp b/Arduino/BTCDieselHeater/deadwood/BTCTelnetSpy.cpp similarity index 100% rename from Arduino/SenderTrial2/deadwood/BTCTelnetSpy.cpp rename to Arduino/BTCDieselHeater/deadwood/BTCTelnetSpy.cpp diff --git a/Arduino/SenderTrial2/deadwood/BTCTelnetSpy.h b/Arduino/BTCDieselHeater/deadwood/BTCTelnetSpy.h similarity index 100% rename from Arduino/SenderTrial2/deadwood/BTCTelnetSpy.h rename to Arduino/BTCDieselHeater/deadwood/BTCTelnetSpy.h diff --git a/Arduino/SenderTrial2/debugport.h b/Arduino/BTCDieselHeater/debugport.h similarity index 100% rename from Arduino/SenderTrial2/debugport.h rename to Arduino/BTCDieselHeater/debugport.h diff --git a/Arduino/SenderTrial2/pins.h b/Arduino/BTCDieselHeater/pins.h similarity index 100% rename from Arduino/SenderTrial2/pins.h rename to Arduino/BTCDieselHeater/pins.h