send deviceID instead of name from input device

src/Config.cpp

@@ -100,15 +100,15 @@ bool configStoredInEEPROM()
 // reads the EEPROM until NUL terminator and returns the number of characters incl. terminator, starting from given address
 bool readconfigLengthEEPROM()
 {
-    uint16_t addreeprom = MEM_OFFSET_CONFIG;
+    uint16_t addrMem = MEM_OFFSET_CONFIG;
     uint16_t length     = MFeeprom.get_length();
     configLengthEEPROM  = 0;
 
     if (MFeeprom.read_byte(MEM_OFFSET_CONFIG) == 0xFF)
         return false;
-    while (MFeeprom.read_byte(addreeprom++) != 0x00) {
+    while (MFeeprom.read_byte(addrMem++) != 0x00) {
         configLengthEEPROM++;
-        if (addreeprom > length) {
+        if (addrMem > length) {
             cmdMessenger.sendCmd(kStatus, F("Loading config failed")); // text or "-1" like config upload?
             return false;
         }
@@ -414,15 +414,15 @@ void readConfigFromMemory(bool configFromFlash)
     do {
         switch (command) {
         case kTypeButton:
-            params[0] = readUint(&addrMem, configFromFlash);                              // Pin number
-            Button::Add(params[0], &nameBuffer[pNameBuffer]);                             // MUST be before readName because readName returns the pointer for the NEXT Name
-            copy_success = readName(&addrMem, nameBuffer, &pNameBuffer, configFromFlash); // copy the NULL terminated name to nameBuffer and set to next free memory location
+            params[0] = readUint(&addrMem, configFromFlash); // Pin number
+            Button::Add(params[0]);
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 
         case kTypeOutput:
             params[0] = readUint(&addrMem, configFromFlash); // Pin number
             Output::Add(params[0]);
-            copy_success = readEndCommand(&addrMem, ':', configFromFlash); // check EEPROM until end of name
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 
 #if MF_SEGMENT_SUPPORT == 1
@@ -493,8 +493,8 @@ void readConfigFromMemory(bool configFromFlash)
             if (command == kTypeEncoder)
                 params[2] = readUint(&addrMem, configFromFlash); // type
 
-            Encoder::Add(params[0], params[1], params[2], &nameBuffer[pNameBuffer]);      // MUST be before readName because readName returns the pointer for the NEXT Name
-            copy_success = readName(&addrMem, nameBuffer, &pNameBuffer, configFromFlash); // copy the NULL terminated name to nameBuffer and set to next free memory location
+            Encoder::Add(params[0], params[1], params[2]);
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 
 #if MF_LCD_SUPPORT == 1
@@ -503,17 +503,16 @@ void readConfigFromMemory(bool configFromFlash)
             params[1] = readUint(&addrMem, configFromFlash); // columns
             params[2] = readUint(&addrMem, configFromFlash); // lines
             LCDDisplay::Add(params[0], params[1], params[2]);
-            copy_success = readEndCommand(&addrMem, ':', configFromFlash); // check EEPROM until end of name
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 #endif
 
 #if MF_ANALOG_SUPPORT == 1
         case kTypeAnalogInput:
-            params[0] = readUint(&addrMem, configFromFlash);                              // pin number
-            params[1] = readUint(&addrMem, configFromFlash);                              // sensitivity
-            Analog::Add(params[0], &nameBuffer[pNameBuffer], params[1]);                  // MUST be before readName because readName returns the pointer for the NEXT Name
-            copy_success = readName(&addrMem, nameBuffer, &pNameBuffer, configFromFlash); // copy the NULL terminated name to to nameBuffer and set to next free memory location
-                                                                                          //    copy_success = readEndCommand(&addrMem, ':');       // once the nameBuffer is not required anymore uncomment this line and delete the line before
+            params[0] = readUint(&addrMem, configFromFlash); // pin number
+            params[1] = readUint(&addrMem, configFromFlash); // sensitivity
+            Analog::Add(params[0], params[1]);
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 #endif
 
@@ -524,7 +523,7 @@ void readConfigFromMemory(bool configFromFlash)
             params[2] = readUint(&addrMem, configFromFlash); // data Pin
             params[3] = readUint(&addrMem, configFromFlash); // number of daisy chained modules
             OutputShifter::Add(params[0], params[1], params[2], params[3]);
-            copy_success = readEndCommand(&addrMem, ':', configFromFlash); // check EEPROM until end of name
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 #endif
 
@@ -534,9 +533,8 @@ void readConfigFromMemory(bool configFromFlash)
             params[1] = readUint(&addrMem, configFromFlash); // clock Pin
             params[2] = readUint(&addrMem, configFromFlash); // data Pin
             params[3] = readUint(&addrMem, configFromFlash); // number of daisy chained modules
-            InputShifter::Add(params[0], params[1], params[2], params[3], &nameBuffer[pNameBuffer]);
-            copy_success = readName(&addrMem, nameBuffer, &pNameBuffer, configFromFlash); // copy the NULL terminated name to to nameBuffer and set to next free memory location
-                                                                                          //    copy_success = readEndCommand(&addrMem, ':');       // once the nameBuffer is not required anymore uncomment this line and delete the line before
+            InputShifter::Add(params[0], params[1], params[2], params[3]);
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 #endif
 
@@ -552,8 +550,8 @@ void readConfigFromMemory(bool configFromFlash)
             params[4] = readUint(&addrMem, configFromFlash); // Sel3 pin
             MUX.attach(params[1], params[2], params[3], params[4]);
             params[5] = readUint(&addrMem, configFromFlash); // 8-bit registers (1-2)
-            DigInMux::Add(params[0], params[5], &nameBuffer[pNameBuffer]);
-            copy_success = readName(&addrMem, nameBuffer, &pNameBuffer, configFromFlash);
+            DigInMux::Add(params[0], params[5]);
+            copy_success = readEndCommand(&addrMem, ':', configFromFlash);
             break;
 #endif
 
@@ -584,8 +582,8 @@ void readConfigFromMemory(bool configFromFlash)
         }
         command = readUint(&addrMem, configFromFlash);
     } while (command && copy_success);
-    if (!copy_success) {                            // too much/long names for input devices
-        nameBuffer[MEMLEN_NAMES_BUFFER - 1] = 0x00; // terminate the last copied (part of) string with 0x00
+    if (!copy_success) { // EEPROM size exceeded while reading the config, might happen if EEPROM is corrupted
+        configActivated = false;
         cmdMessenger.sendCmd(kStatus, F("Failure on reading config"));
     }
 }

src/MF_Analog/Analog.cpp

@@ -15,10 +15,10 @@ namespace Analog
     uint8_t   analogRegistered = 0;
     uint8_t   maxAnalogIn      = 0;
 
-    void handlerOnAnalogChange(int value, const char *name)
+    void handlerOnAnalogChange(int value, uint8_t deviceID)
     {
         cmdMessenger.sendCmdStart(kAnalogChange);
-        cmdMessenger.sendCmdArg(name);
+        cmdMessenger.sendCmdArg(deviceID);
         cmdMessenger.sendCmdArg(value);
         cmdMessenger.sendCmdEnd();
     };
@@ -27,18 +27,18 @@ namespace Analog
     {
         if (!FitInMemory(sizeof(MFAnalog) * count))
             return false;
-        analog      = new (allocateMemory(sizeof(MFAnalog) * count)) MFAnalog;
+        analog      = new (allocateMemory(sizeof(MFAnalog) * count)) MFAnalog();
         maxAnalogIn = count;
         return true;
     }
 
-    void Add(uint8_t pin, char const *name, uint8_t sensitivity)
+    void Add(uint8_t pin, uint8_t sensitivity)
     {
         if (analogRegistered == maxAnalogIn)
             return;
 
         analog[analogRegistered] = MFAnalog();
-        analog[analogRegistered].attach(pin, name, sensitivity);
+        analog[analogRegistered].attach(pin, analogRegistered, sensitivity);
         MFAnalog::attachHandler(handlerOnAnalogChange);
         analogRegistered++;
 #ifdef DEBUG2CMDMESSENGER

src/MF_Analog/Analog.h

@@ -10,7 +10,7 @@
 namespace Analog
 {
     bool setupArray(uint16_t count);
-    void Add(uint8_t pin, char const *name = "AnalogInput", uint8_t sensitivity = 3);
+    void Add(uint8_t pin, uint8_t sensitivity = 3);
     void Clear();
     void read();
     void readAverage();

src/MF_Analog/MFAnalog.cpp

@@ -13,11 +13,11 @@ MFAnalog::MFAnalog()
     _initialized = false;
 }
 
-void MFAnalog::attach(uint8_t pin, const char *name, uint8_t sensitivity)
+void MFAnalog::attach(uint8_t pin, uint8_t deviceID, uint8_t sensitivity)
 {
     _sensitivity = sensitivity;
     _pin         = pin;
-    _name        = name;
+    _deviceID    = deviceID;
 #if defined(ARDUINO_AVR_PROMICRO16)
     // ProMicro has a special pin assignment for analog pins
     // therefore reading from A6 and A7 does not work
@@ -52,7 +52,7 @@ void MFAnalog::readChannel(uint8_t alwaysTrigger)
     if (alwaysTrigger || valueHasChanged(newValue)) {
         _lastValue = newValue;
         if (_handler != NULL) {
-            (*_handler)(_lastValue, _name);
+            (*_handler)(_lastValue, _deviceID);
         }
     }
 }

src/MF_Analog/MFAnalog.h

@@ -16,7 +16,7 @@
 
 extern "C" {
 // callback functions
-typedef void (*analogEvent)(int, const char *);
+typedef void (*analogEvent)(int, uint8_t);
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ class MFAnalog
 public:
     MFAnalog();
     static void attachHandler(analogEvent handler);
-    void        attach(uint8_t pin, const char *name, uint8_t sensitivity);
+    void        attach(uint8_t pin, uint8_t deviceID, uint8_t sensitivity);
     void        update();
     void        retrigger();
     void        readBuffer();
@@ -35,8 +35,9 @@ class MFAnalog
 
 private:
     static analogEvent _handler;
-    int                _lastValue;
+    int16_t            _lastValue;
     uint8_t            _sensitivity;
+    uint8_t            _deviceID;
 
     uint16_t         ADC_Buffer[ADC_MAX_AVERAGE] = {0}; // Buffer for all values from each channel
     uint16_t         ADC_Average_Total           = 0;   // sum of sampled values, must be divided by ADC_MAX_AVERAGE to get actual value

src/MF_Button/Button.cpp

@@ -14,10 +14,10 @@ namespace Button
     uint8_t   buttonsRegistered = 0;
     uint8_t   maxButtons        = 0;
 
-    void handlerButtonOnChange(uint8_t eventId, const char *name)
+    void handlerButtonOnChange(uint8_t eventId, uint8_t deviceID)
     {
         cmdMessenger.sendCmdStart(kButtonChange);
-        cmdMessenger.sendCmdArg(name);
+        cmdMessenger.sendCmdArg(deviceID);
         cmdMessenger.sendCmdArg(eventId);
         cmdMessenger.sendCmdEnd();
     };
@@ -31,12 +31,12 @@ namespace Button
         return true;
     }
 
-    void Add(uint8_t pin, char const *name)
+    void Add(uint8_t pin)
     {
         if (buttonsRegistered == maxButtons)
             return;
         buttons[buttonsRegistered] = MFButton();
-        buttons[buttonsRegistered].attach(pin, name);
+        buttons[buttonsRegistered].attach(pin, buttonsRegistered);
         MFButton::attachHandler(handlerButtonOnChange);
         buttonsRegistered++;
 #ifdef DEBUG2CMDMESSENGER

src/MF_Button/Button.h

@@ -11,7 +11,7 @@
 namespace Button
 {
     bool setupArray(uint16_t count);
-    void Add(uint8_t pin, char const *name = "Button");
+    void Add(uint8_t pin);
     void Clear();
     void read();
     void OnTrigger();

src/MF_Button/MFButton.cpp

@@ -12,10 +12,10 @@ MFButton::MFButton()
     _initialized = false;
 }
 
-void MFButton::attach(uint8_t pin, const char *name)
+void MFButton::attach(uint8_t pin, uint8_t deviceID)
 {
     _pin  = pin;
-    _name = name;
+    _deviceID = deviceID;
     pinMode(_pin, INPUT_PULLUP);      // set pin to input
     _state       = digitalRead(_pin); // initialize on actual status
     _initialized = true;
@@ -47,7 +47,7 @@ void MFButton::triggerOnPress()
     if (!_initialized)
         return;
     if (_inputHandler && _state == LOW) {
-        (*_inputHandler)(btnOnPress, _name);
+        (*_inputHandler)(btnOnPress, _deviceID);
     }
 }
 
@@ -56,7 +56,7 @@ void MFButton::triggerOnRelease()
     if (!_initialized)
         return;
     if (_inputHandler && _state == HIGH) {
-        (*_inputHandler)(btnOnRelease, _name);
+        (*_inputHandler)(btnOnRelease, _deviceID);
     }
 }
 

src/MF_Button/MFButton.h

@@ -10,7 +10,7 @@
 
 extern "C" {
 // callback functions always follow the signature: void cmd(void);
-typedef void (*buttonEvent)(uint8_t, const char *);
+typedef void (*buttonEvent)(uint8_t, uint8_t);
 };
 
 enum {
@@ -25,15 +25,15 @@ class MFButton
 public:
     MFButton();
     static void attachHandler(buttonEvent newHandler);
-    void        attach(uint8_t pin, const char *name);
+    void        attach(uint8_t pin, uint8_t deviceID);
     void        detach();
     void        update();
     void        trigger(uint8_t state);
     void        triggerOnPress();
     void        triggerOnRelease();
 
 private:
-    const char *_name;
+    uint8_t     _deviceID;
     uint8_t     _pin;
     bool        _initialized;
     bool        _state;

src/MF_DigInMux/DigInMux.cpp

@@ -16,10 +16,10 @@ namespace DigInMux
     uint8_t     digInMuxRegistered = 0;
     uint8_t     maxDigInMux        = 0;
 
-    void handlerOnDigInMux(uint8_t eventId, uint8_t channel, const char *name)
+    void handlerOnDigInMux(uint8_t eventId, uint8_t channel, uint8_t deviceID)
     {
         cmdMessenger.sendCmdStart(kDigInMuxChange);
-        cmdMessenger.sendCmdArg(name);
+        cmdMessenger.sendCmdArg(deviceID);
         cmdMessenger.sendCmdArg(channel);
         cmdMessenger.sendCmdArg(eventId);
         cmdMessenger.sendCmdEnd();
@@ -34,12 +34,12 @@ namespace DigInMux
         return true;
     }
 
-    void Add(uint8_t dataPin, uint8_t nRegs, char const *name)
+    void Add(uint8_t dataPin, uint8_t nRegs)
     {
         if (digInMuxRegistered == maxDigInMux)
             return;
-        digInMux[digInMuxRegistered] = MFDigInMux(&MUX, name);
-        digInMux[digInMuxRegistered].attach(dataPin, (nRegs == 1), name);
+        digInMux[digInMuxRegistered] = MFDigInMux(&MUX);
+        digInMux[digInMuxRegistered].attach(dataPin, (nRegs == 1), digInMuxRegistered);
         MFDigInMux::attachHandler(handlerOnDigInMux);
         digInMuxRegistered++;
 

src/MF_DigInMux/DigInMux.h

@@ -11,7 +11,7 @@
 namespace DigInMux
 {
     bool setupArray(uint16_t count);
-    void Add(uint8_t dataPin, uint8_t nRegs, char const *name = "DigInMux");
+    void Add(uint8_t dataPin, uint8_t nRegs);
     void Clear();
     void read();
     void OnTrigger();

src/MF_DigInMux/MFDigInMux.cpp

@@ -15,13 +15,11 @@ MuxDigInEvent MFDigInMux::_inputHandler = NULL;
 MFDigInMux::MFDigInMux(void)
 {
     _MUX   = NULL;
-    _name  = "MUXDigIn";
     _flags = 0x00;
     clear();
 }
 
-MFDigInMux::MFDigInMux(MFMuxDriver *MUX, const char *name)
-    : _name(name)
+MFDigInMux::MFDigInMux(MFMuxDriver *MUX)
 {
     if (MUX) _MUX = MUX;
     _flags = 0x00;
@@ -34,12 +32,12 @@ void MFDigInMux::setMux(MFMuxDriver *MUX)
 }
 
 // Registers a new MUX input block and configures the driver pins
-void MFDigInMux::attach(uint8_t dataPin, bool halfSize, char const *name)
+void MFDigInMux::attach(uint8_t dataPin, bool halfSize, uint8_t deviceID)
 {
     // if(!_MUX) return;     // no need to check, the object can be set up in advance before the MUX is configured
-    _dataPin = dataPin;
-    _name    = name;
-    _flags   = 0x00;
+    _dataPin  = dataPin;
+    _deviceID = deviceID;
+    _flags    = 0x00;
     if (halfSize) bitSet(_flags, MUX_HALFSIZE);
     pinMode(_dataPin, INPUT_PULLUP);
     bitSet(_flags, MUX_INITED);
@@ -140,7 +138,7 @@ void MFDigInMux::trigger(uint8_t channel, bool state)
 {
     if (!_MUX) return;
     if (!_inputHandler) return;
-    (*_inputHandler)((state ? MuxDigInOnRelease : MuxDigInOnPress), channel, _name);
+    (*_inputHandler)((state ? MuxDigInOnRelease : MuxDigInOnPress), channel, _deviceID);
 }
 
 // Attaches a new event handler for the specified event.