Merge pull request #106 from bdring/Devt

Devt
bdring · Nov 10, 2021 · 99bdb11 · 99bdb11
2 parents 682a5b1 + 439234a
commit 99bdb11
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/FluidNC/src/Main.cpp b/FluidNC/src/Main.cpp
@@ -128,7 +128,7 @@ void setup() {
 #endif
 #ifdef ENABLE_BLUETOOTH
         WebUI::bt_config.begin();
-        allChannels.registration(&WebUI::SerialBT);
+        allChannels.registration(&WebUI::btChannel);
 #endif
         WebUI::inputBuffer.begin();
     } catch (const AssertionFailed& ex) {

diff --git a/FluidNC/src/WebUI/BTConfig.cpp b/FluidNC/src/WebUI/BTConfig.cpp
@@ -16,6 +16,7 @@
 namespace WebUI {
     BTConfig        bt_config;
     BluetoothSerial SerialBT;
+    BTChannel       btChannel;
 }
 // The instance variable for the BTConfig class is in config->_comms
 
@@ -24,6 +25,15 @@ const uint8_t* esp_bt_dev_get_address(void);
 }
 
 namespace WebUI {
+    size_t BTChannel::write(uint8_t data) {
+        static uint8_t lastchar = '\0';
+        if (_addCR && data == '\n' && lastchar != '\r') {
+            SerialBT.write('\r');
+        }
+        lastchar = data;
+        return SerialBT.write(data);
+    }
+
     BTConfig* BTConfig::instance = nullptr;
 
     BTConfig::BTConfig() {}

diff --git a/FluidNC/src/WebUI/BTConfig.h b/FluidNC/src/WebUI/BTConfig.h
@@ -16,6 +16,21 @@ const char* const DEFAULT_BT_NAME = "FluidNC";
 namespace WebUI {
     extern BluetoothSerial SerialBT;
 
+    class BTChannel : public Channel {
+    private:
+    public:
+        // BTChannel(bool addCR = false) : _linelen(0), _addCR(addCR) {}
+        BTChannel() : Channel("bluetooth", true) {}
+        virtual ~BTChannel() = default;
+
+        int    available() override { return SerialBT.available(); }
+        int    read() override { return SerialBT.read(); }
+        int    peek() override { return SerialBT.peek(); }
+        void   flush() override { return SerialBT.flush(); }
+        size_t write(uint8_t data) override;
+    };
+    extern BTChannel btChannel;
+
     class BTConfig {
     private:
         static BTConfig* instance;  // BT Callback does not support passing parameters. Sigh.