Motor position

FluidNC/src/ControlPin.cpp

@@ -33,7 +33,16 @@ void ControlPin::init() {
     _pin.setAttr(attr);
     _pin.attachInterrupt(ISRHandler, CHANGE, this);
     _rtVariable = false;
-    _value      = _pin.read();
+    _value                            = _pin.read();
+    // Control pins must start in inactive state
+    if (_value) {
+        log_error(_legend << " pin is active at startup");
+        rtAlarm = ExecAlarm::ControlPin;
+    }
+}
+
+String ControlPin::report() {
+    return get() ? String(_letter) : String("");
 }
 
 ControlPin::~ControlPin() {

FluidNC/src/ControlPin.h

@@ -9,11 +9,10 @@ class ControlPin {
     volatile bool& _rtVariable;  // The variable that is set when the pin is asserted
     int32_t        _debounceEnd = 0;
 
-    void IRAM_ATTR handleISR();
-    CreateISRHandlerFor(ControlPin, handleISR);
-
     // Interval during which we ignore repeated control pin activations
     const int debounceUs = 10000;  // 10000 us = 10 ms
+    void IRAM_ATTR handleISR();
+    CreateISRHandlerFor(ControlPin, handleISR);
 
 public:
     const char* _legend;  // The name that appears in init() messages and the name of the configuration item
@@ -29,5 +28,7 @@ class ControlPin {
     void init();
     bool get() { return _value; }
 
+    String report();
+
     ~ControlPin();
 };

FluidNC/src/Extenders/Extenders.cpp

@@ -0,0 +1,58 @@
+// Copyright (c) 2021 -  Stefan de Bruijn
+// Use of this source code is governed by a GPLv3 license that can be found in the LICENSE file.
+
+#include "Extenders.h"
+
+namespace Extenders {
+    PinExtender::PinExtender() : _driver(nullptr) {}
+
+    void PinExtender::validate() const {
+        if (_driver) {
+            _driver->validate();
+        }
+    }
+    void PinExtender::group(Configuration::HandlerBase& handler) { PinExtenderFactory::factory(handler, _driver); }
+    void PinExtender::init() {
+        if (_driver) {
+            _driver->init();
+        }
+    }
+
+    PinExtender::~PinExtender() { delete _driver; }
+
+    Extenders::Extenders() {
+        for (int i = 0; i < 16; ++i) {
+            _pinDrivers[i] = nullptr;
+        }
+    }
+
+    void Extenders::validate() const {}
+
+    void Extenders::group(Configuration::HandlerBase& handler) {
+        for (int i = 0; i < 10; ++i) {
+            char tmp[11 + 3];
+            tmp[0] = 0;
+            strcat(tmp, "pinextender");
+
+            for (size_t i = 0; i < 10; ++i) {
+                tmp[11] = char(i + '0');
+                tmp[12] = '\0';
+                handler.section(tmp, _pinDrivers[i]);
+            }
+        }
+    }
+
+    void Extenders::init() {
+        for (int i = 0; i < 16; ++i) {
+            if (_pinDrivers[i] != nullptr) {
+                _pinDrivers[i]->init();
+            }
+        }
+    }
+
+    Extenders::~Extenders() {
+        for (int i = 0; i < 16; ++i) {
+            delete _pinDrivers[i];
+        }
+    }
+}

FluidNC/src/Extenders/Extenders.h

@@ -0,0 +1,25 @@
+// Copyright (c) 2021 -  Stefan de Bruijn
+// Use of this source code is governed by a GPLv3 license that can be found in the LICENSE file.
+
+#pragma once
+
+#include "../Configuration/Configurable.h"
+#include "../Configuration/GenericFactory.h"
+#include "PinExtender.h"
+
+namespace Extenders {
+    class Extenders : public Configuration::Configurable {
+    public:
+        Extenders();
+
+        PinExtender* _pinDrivers[16];
+
+        void validate() const override;
+        void group(Configuration::HandlerBase& handler) override;
+        void init();
+
+        ~Extenders();
+    };
+
+    using PinExtenderFactory = Configuration::GenericFactory<PinExtenderDriver>;
+}