return callback handler

ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.cpp

@@ -5,10 +5,11 @@ AnalogCard::AnalogCard() : dac0(DAC0_ADDRESS),
                            dac1(DAC1_ADDRESS),
                            dac2(DAC2_ADDRESS),
                            dac3(DAC3_ADDRESS),
-                            analogInputBankA(),
-                            analogInputBankB(),
-                            dac_change_callbacks()
+                           analogInputBankA(),
+                           analogInputBankB(),
+                           dac_change_callbacks()
 {
+    this->handler_count = 0;
 }
 
 void AnalogCard::dacWrite(uint8_t pin, uint16_t value)
@@ -22,10 +23,10 @@ void AnalogCard::setDACState(uint8_t pin, bool state)
 {
     ESP_LOGD("AnalogCard", "Setting DAC state: %d, %d", pin, state);
     this->dac_state[pin] = state;
-    this->sendDataToDAC(pin, this->dac_value[pin]*state);
-    for (int i = 0; i < this->dac_change_callbacks.size(); i++)
+    this->sendDataToDAC(pin, this->dac_value[pin] * state);
+    for (const auto& callback : this->dac_change_callbacks)
     {
-        this->dac_change_callbacks[i](pin, state, this->dac_value[pin]);
+        callback.second(pin, state, this->dac_value[pin]);
     }
 }
 
@@ -33,13 +34,14 @@ void AnalogCard::setDACValue(uint8_t pin, uint16_t value)
 {
     ESP_LOGD("AnalogCard", "Setting DAC value: %d, %d", pin, value);
     this->dac_value[pin] = value;
-    this->sendDataToDAC(pin, value*this->dac_state[pin]);
-    for (int i = 0; i < this->dac_change_callbacks.size(); i++)
+    this->sendDataToDAC(pin, value * this->dac_state[pin]);
+    for (const auto& callback : this->dac_change_callbacks)
     {
-        this->dac_change_callbacks[i](pin, this->dac_state[pin], value);
+        callback.second(pin, this->dac_state[pin], value);
     }
 }
     
+
 uint16_t AnalogCard::getDACValue(uint8_t pin)
 {
     return this->dac_value[pin];
@@ -124,20 +126,13 @@ uint8_t AnalogCard::getType()
     return CARD_TYPE_ANALOG;
 }
 
-void AnalogCard::registerDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback)
+uint8_t AnalogCard::registerDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback)
 {
-    this->dac_change_callbacks.push_back(callback);
+    this->dac_change_callbacks[this->handler_count] = callback;
+    return this->handler_count++;
 }
 
-// void AnalogCard::deregisterDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback)
-// {
-//     for (int i = 0; i < this->dac_change_callbacks.size(); i++)
-//     {
-//         if (this->dac_change_callbacks[i].target<void(uint8_t, bool, uint16_t)>() == callback.target<void(uint8_t, bool, uint16_t)>())
-//         {
-//             this->dac_change_callbacks.erase(this->dac_change_callbacks.begin() + i);
-//             break;
-//         }
-//     }
-
-// }
+void AnalogCard::deregisterDACChangeCallback(uint8_t handler)
+{
+    this->dac_change_callbacks.erase(handler);
+}

ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.hpp

@@ -3,6 +3,7 @@
 #include <Adafruit_ADS1X15.h>
 #include <MCP4725.h>
 #include <vector>
+#include <map>
 
 #define CARD_TYPE_ANALOG 0x02
 
@@ -25,11 +26,12 @@ class AnalogCard : public ExpansionCard {
         uint16_t getDACValue(uint8_t pin);
         void setDACState(uint8_t pin, bool state);
         void setDACValue(uint8_t pin, uint16_t value);
-        void registerDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
-        //void deregisterDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
+        uint8_t registerDACChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
+        void deregisterDACChangeCallback(uint8_t handler);
         uint8_t getType();
     private:
-        std::vector<std::function<void(uint8_t, bool, uint16_t)>> dac_change_callbacks;
+        uint8_t handler_count;
+        std::map<uint8_t, std::function<void(uint8_t, bool, uint16_t)>> dac_change_callbacks;
         bool dac_state[4];
         uint16_t dac_value[4];
         MCP4725 dac0;

ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.cpp

@@ -5,6 +5,7 @@ AnalogIoT::AnalogIoT() : adc_conversion_callbacks() {
         adc_publish_enabled[i] = false;
         adc_conversion_interval[i] = 1000;
     }
+    this->adc_conversion_callback_index = 0;
 }
 
 AnalogIoT::~AnalogIoT() {
@@ -49,8 +50,8 @@ void AnalogIoT::publishADC(uint8_t pin) {
         delete[] topic;
         delete[] payload;
         // Call all callbacks
-        for (int i = 0; i < this->adc_conversion_callbacks.size(); i++) {
-            this->adc_conversion_callbacks[i](pin, value);
+        for (auto& callback : this->adc_conversion_callbacks) {
+            callback.second(pin, value);
         }
     }
 }
@@ -64,17 +65,13 @@ void AnalogIoT::setADCsPublishEnabled(bool enabled) {
         adc_publish_enabled[i] = enabled;
     }
 }
-void AnalogIoT::registerADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback) {
-    this->adc_conversion_callbacks.push_back(callback);
+uint8_t AnalogIoT::registerADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback) {
+    this->adc_conversion_callbacks[this->adc_conversion_callback_index] = callback;
+    return this->adc_conversion_callback_index++;
+}
+void AnalogIoT::deregisterADCConversionCallback(uint8_t handler) {
+    this->adc_conversion_callbacks.erase(handler);
 }
-// void AnalogIoT::deregisterADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback) {
-//     for (int i = 0; i < this->adc_conversion_callbacks.size(); i++) {
-//         if (this->adc_conversion_callbacks[i].target<void(uint8_t, uint16_t)>() == callback.target<void(uint8_t, uint16_t)>()) {
-//             this->adc_conversion_callbacks.erase(this->adc_conversion_callbacks.begin() + i);
-//             break;
-//         }
-//     }
-// }
 void AnalogIoT::setADCConversionInterval(uint8_t pin, uint16_t interval) {
     adc_conversion_interval[pin] = interval;
 }

ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <IoTComponent.hpp>
 #include <AnalogCard.hpp>
-#include <vector>
+#include <map>
 
 #define DAC_SET_STATE_TOPIC "/set/state"
 #define DAC_SET_VALUE_TOPIC "/set/value"
@@ -25,8 +25,8 @@ class AnalogIoT : public IoTComponent {
         void publishDACValue(uint8_t pin);
         void setADCsPublishInterval(uint32_t interval);
         void setADCsPublishEnabled(bool enabled);
-        void registerADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback);
-        // void deregisterADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback);
+        uint8_t registerADCConversionCallback(std::function<void(uint8_t, uint16_t)> callback);
+        void deregisterADCConversionCallback(uint8_t handler);
         void setADCConversionInterval(uint8_t pin, uint16_t interval);
         void setADCConversionEnabled(uint8_t pin, bool enabled);
         bool processADCSetConversionIntervalMessage(char *topic, char *payload, uint8_t topic_length);
@@ -39,6 +39,7 @@ class AnalogIoT : public IoTComponent {
         void loop();
         uint8_t getType();
     private:
+        uint8_t adc_conversion_callback_index = 0;
         uint8_t dac_set_state_length;
         uint8_t dac_set_value_length;
         uint8_t dac_state_length;
@@ -50,5 +51,5 @@ class AnalogIoT : public IoTComponent {
         bool adc_publish_enabled[8];
         uint16_t adc_conversion_interval[8];
         uint32_t last_adc_conversion[8];
-        std::vector<std::function<void(uint8_t, uint16_t)>> adc_conversion_callbacks;
+        std::map<uint8_t, std::function<void(uint8_t, uint16_t)>> adc_conversion_callbacks;
 };

ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.cpp

@@ -22,8 +22,6 @@ ClimateCard::ClimateCard(uint8_t ir_pin, AirConditioner ac, uint8_t sensor_type,
     this->state.ac_temperature = 25;
     this->state.ac_mode = 0;
     this->state.ac_fan_speed = 0;
-    // Initialize callbacks
-    this->callbacks = std::vector<std::function<void(uint8_t, uint8_t, uint8_t)>>();
 }
 
 ClimateCard::ClimateCard(uint8_t ir_pin, AirConditioner ac) : ClimateCard(ir_pin, ac, AC_SENSOR_TYPE_NONE, 0)
@@ -89,46 +87,24 @@ void ClimateCard::saveStateToFRAM()
     fram->write8(fram_address, state.ac_temperature);
     fram->write8(fram_address + 1, state.ac_mode);
     fram->write8(fram_address + 2, state.ac_fan_speed);
-    Serial.println("Saved state to FRAM");
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    Serial.write(0xFF);
 }
 
 void ClimateCard::loadStateFromFRAM()
 {
-    Serial.print("Loading temperature from FRAM at address ");
-    Serial.print(fram_address);
-    Serial.print(": ");
-    Serial.println(fram->read8(fram_address));
-    state.ac_temperature = fram->read8(fram_address);
-    Serial.print("Loading mode from FRAM at address ");
-    Serial.print(fram_address + 1);
-    Serial.print(": ");
-    Serial.println(fram->read8(fram_address + 1));
-    state.ac_mode = fram->read8(fram_address + 1);
-    Serial.print("Loading fan speed from FRAM at address ");
-    Serial.print(fram_address + 2);
-    Serial.print(": ");
-    Serial.println(fram->read8(fram_address + 2));
-    state.ac_fan_speed = fram->read8(fram_address + 2);
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    // if (state.ac_temperature > ac.max_temperature)
-    //     state.ac_temperature = ac.max_temperature;
-    // else if (state.ac_temperature < ac.min_temperature)
-    //     state.ac_temperature = ac.min_temperature;
-    // // If mode is out of range, set to 0
-    // if (state.ac_mode > ac.modes)
-    //     state.ac_mode = 0;
-    // // If fan speed is out of range, set to 0
-    // if (state.ac_fan_speed > ac.fan_speeds)
-    //     state.ac_fan_speed = 0;
+    if (state.ac_temperature > ac.max_temperature)
+        state.ac_temperature = ac.max_temperature;
+    else if (state.ac_temperature < ac.min_temperature)
+        state.ac_temperature = ac.min_temperature;
+    // If mode is out of range, set to 0
+    if (state.ac_mode > ac.modes)
+        state.ac_mode = 0;
+    // If fan speed is out of range, set to 0
+    if (state.ac_fan_speed > ac.fan_speeds)
+        state.ac_fan_speed = 0;
     updateAirConditioner();
-    for (uint8_t i = 0; i < callbacks.size(); i++)
+    for (const auto& callback : callbacks)
     {
-        callbacks[i](this->state.ac_mode, this->state.ac_fan_speed, this->state.ac_temperature);
+        callback.second(this->state.ac_mode, this->state.ac_fan_speed, this->state.ac_temperature);
     }
 }
 
@@ -161,13 +137,10 @@ void ClimateCard::setFanSpeed(uint8_t fan_speed)
         saveStateToFRAM();
 }
 
-void ClimateCard::registerChangeCallback(std::function<void(uint8_t, uint8_t, uint8_t)> callback)
+uint8_t ClimateCard::registerChangeCallback(std::function<void(uint8_t, uint8_t, uint8_t)> callback)
 {
-    Serial.print("Registering callback");
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    callbacks.push_back(callback);
+    callbacks[callbacks_handler_count] = callback;
+    return callbacks_handler_count++;
 }
 
 uint8_t ClimateCard::getType()
@@ -202,9 +175,9 @@ void ClimateCard::updateSensor()
         room_temperature = ds18b20->getTempC();
         break;
     }
-    for (uint8_t i = 0; i < sensor_callbacks.size(); i++)
+    for (const auto& callback : sensor_callbacks)
     {
-        sensor_callbacks[i](room_temperature, humidity);
+        callback.second(room_temperature, humidity);
     }
 }
 
@@ -229,14 +202,9 @@ void ClimateCard::updateAirConditioner()
     // rmt_write_items(RMT_TX_CHANNEL, items, itemCount, true);
     // rmt_wait_tx_done(RMT_TX_CHANNEL, portMAX_DELAY);
     // // Publish state
-    Serial.print("Callbacks: ");
-    Serial.println(callbacks.size());
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    Serial.write(0xFF);
-    for (uint8_t i = 0; i < callbacks.size(); i++)
+    for (const auto& callback : callbacks)
     {
-        callbacks[i](this->state.ac_mode, this->state.ac_fan_speed, this->state.ac_temperature);
+        callback.second(this->state.ac_mode, this->state.ac_fan_speed, this->state.ac_temperature);
     }
 }
 
@@ -270,8 +238,18 @@ uint8_t ClimateCard::getFanSpeed()
     return state.ac_fan_speed;
 }
 
-void ClimateCard::registerSensorCallback(std::function<void(float, float)> callback)
+uint8_t ClimateCard::registerSensorCallback(std::function<void(float, float)> callback)
 {
-    sensor_callbacks.push_back(callback);
+    sensor_callbacks[sensor_callbacks_handler_count] = callback;
+    return sensor_callbacks_handler_count++;
 }
 
+void ClimateCard::unregisterChangeCallback(uint8_t handler)
+{
+    callbacks.erase(handler);
+}
+
+void ClimateCard::unregisterSensorCallback(uint8_t handler)
+{
+    sensor_callbacks.erase(handler);
+}

ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.hpp

@@ -5,7 +5,7 @@
 #include <OneWire.h>
 #include <DS18B20.h>
 #include <dhtnew.h>
-#include <vector>
+#include <map>
 
 #define RMT_TX_CHANNEL RMT_CHANNEL_0
 
@@ -58,8 +58,10 @@ class ClimateCard : public ExpansionCard {
         float getRoomTemperature();
         float getHumidity();
         uint8_t getSensorType();
-        void registerChangeCallback(std::function<void(uint8_t, uint8_t, uint8_t)> callback);
-        void registerSensorCallback(std::function<void(float, float)> callback);
+        uint8_t registerChangeCallback(std::function<void(uint8_t, uint8_t, uint8_t)> callback);
+        uint8_t registerSensorCallback(std::function<void(float, float)> callback);
+        void unregisterChangeCallback(uint8_t handler);
+        void unregisterSensorCallback(uint8_t handler);
         uint8_t getType();
     private:
         // Sensor objects
@@ -67,8 +69,10 @@ class ClimateCard : public ExpansionCard {
         DHTNEW *dht;
         DS18B20 *ds18b20;
         // Callbacks
-        std::vector<std::function<void(uint8_t, uint8_t, uint8_t)>> callbacks;
-        std::vector<std::function<void(float, float)>> sensor_callbacks;
+        uint8_t callbacks_handler_count = 0;
+        uint8_t sensor_callbacks_handler_count = 0;
+        std::map<uint8_t,std::function<void(uint8_t, uint8_t, uint8_t)>> callbacks;
+        std::map<uint8_t,std::function<void(float, float)>> sensor_callbacks;
         // Update functions
         void updateSensor();
         void updateAirConditioner();

ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.cpp

@@ -5,6 +5,7 @@ DigitalInputCard::DigitalInputCard(uint8_t address_a, uint8_t address_b) : callb
 {
     this->address_a = address_a;
     this->address_b = address_b;
+    this->callbacks_handler_index = 0;
 }
 // Instantiate the card with the specified position on the dip switch
 // Bit 0,1,2 are for bank A
@@ -95,8 +96,8 @@ void DigitalInputCard::handlePinChange(int pin, uint8_t &currentBuffer, uint8_t
         {
             lastDebounceTime[pin] = millis();
             previousBuffer ^= (-((currentBuffer >> (7 - pin)) & 1) ^ previousBuffer) & (1UL << (7 - pin));
-            for (int i = 0; i < callbacks.size(); i++)
-                callbacks[i](virtualPin, ((currentBuffer >> (7 - pin)) & 1));
+            for(const auto& callback : callbacks)
+                callback.second(virtualPin, ((currentBuffer >> (7 - pin)) & 1));
         }
     }
     // Handle Bank B
@@ -106,8 +107,8 @@ void DigitalInputCard::handlePinChange(int pin, uint8_t &currentBuffer, uint8_t
         {
             lastDebounceTime[pin] = millis();
             previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
-            for (int i = 0; i < callbacks.size(); i++)
-                callbacks[i](virtualPin, ((currentBuffer >> (15 - pin)) & 1));
+            for (const auto& callback : callbacks)
+                callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
         }
     }
 }
@@ -156,11 +157,10 @@ uint8_t DigitalInputCard::getInputBufferB()
     return inputBufferB_rearranged;
 }
 // Register a callback function to be called when a pin changes
-void DigitalInputCard::registerCallback(std::function<void(uint8_t, bool)> callback)
+uint8_t DigitalInputCard::registerCallback(std::function<void(uint8_t, bool)> callback)
 {
-    ESP_LOGD("DigitalInputCard", "Registering callback");
-    callbacks.push_back(callback);
-    ESP_LOGD("DigitalInputCard", "Callback registered");
+    callbacks[this->callbacks_handler_index] = callback;
+    return this->callbacks_handler_index++;
 }
 
 // Refresh the input buffer for bank A
@@ -180,17 +180,10 @@ void DigitalInputCard::setDebounceTime(uint8_t pin, uint32_t debounceTime)
     this->debounceTime[pin] = debounceTime;
 }
 
-// void DigitalInputCard::unregisterCallback(std::function<void(uint8_t, bool)> callback)
-// {
-//     for (int i = 0; i < callbacks.size(); i++)
-//     {
-//         if (callbacks[i].target<void(uint8_t, bool)>() == callback.target<void(uint8_t, bool)>())
-//         {
-//             callbacks.erase(callbacks.begin() + i);
-//             break;
-//         }
-//     }
-// }
+void DigitalInputCard::unregisterCallback(uint8_t handler)
+{
+    callbacks.erase(handler);
+}
 
 void DigitalInputCard::loadPinMap(uint8_t pinMap[16])
 {

ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <ExpansionCard.hpp>
 #include <PCF8574.h>
-#include <vector>
+#include <map>
 
 #define CARD_TYPE_DIGITAL_INPUT 0x01
 
@@ -26,9 +26,9 @@ class DigitalInputCard : public ExpansionCard {
         // Set the debounce time for the specified pin
         void setDebounceTime(uint8_t pin, uint32_t debounceTime);
         // Register a callback function to be called when a pin changes
-        void registerCallback(std::function<void(uint8_t, bool)> callback);
+        uint8_t registerCallback(std::function<void(uint8_t, bool)> callback);
         // Unregister the callback function
-        //void unregisterCallback(std::function<void(uint8_t, bool)> callback);
+        void unregisterCallback(uint8_t handler);
         // Load a new pin map
         void loadPinMap(uint8_t pinMap[16]);
         // Get type of card
@@ -48,7 +48,8 @@ class DigitalInputCard : public ExpansionCard {
         uint8_t pinMap[16];
         // A map of the virtual pin to the physical pin
         uint8_t virtualPinMap[16];
-        std::vector<std::function<void(uint8_t, bool)>> callbacks;
+        uint8_t callbacks_handler_index = 0;
+        std::map<uint8_t, std::function<void(uint8_t, bool)>> callbacks;
         void refreshInputBankA();
         void refreshInputBankB();
         void handlePinChange(int pin, uint8_t& currentBuffer, uint8_t& previousBuffer);

ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.cpp

@@ -7,15 +7,14 @@ DigitalOutputCard::DigitalOutputCard(uint8_t address) : change_callbacks(){
         this->pinMap[i] = i;
         this->virtualPinMap[i] = i;
     }
+    this->framBinded = false;
+    this->callbacks_handler_index = 0;
 }
 // Instantiate the card with the specified position on the dip switch
-DigitalOutputCard::DigitalOutputCard(bool bit0, bool bit1, bool bit2, bool bit3, bool bit4) {
-    this->address = 0x20;
-    if (bit0) this->address += 1;
-    if (bit1) this->address += 2;
-    if (bit2) this->address += 4;
-    if (bit3) this->address += 8;
-    if (bit4) this->address += 16;
+DigitalOutputCard::DigitalOutputCard(bool bit0, bool bit1, bool bit2, bool bit3, bool bit4) :
+    DigitalOutputCard(0x20+bit0+bit1*2+bit2*4+bit3*8+bit4*16)
+{
+
     
 }
 // Initialize the card
@@ -36,8 +35,9 @@ void DigitalOutputCard::digitalWrite(uint8_t pin, bool state) {
         this->saveStateToFRAM();
         this->savePinValueToFRAM(pin);
     }
-    for (int i = 0; i < change_callbacks.size(); i++) {
-        change_callbacks[i](pin, state, state ? 4095 : 0);
+    for (const auto& callback : change_callbacks)
+    {
+        callback.second(pin, state, state ? 4095 : 0);
     }
 }
 // Set the output to the specified pwm value
@@ -52,8 +52,9 @@ void DigitalOutputCard::analogWrite(uint8_t pin, uint16_t value) {
     }
     this->state_buffer[pin] = value > 0;
     this->value_buffer[pin] = value;
-    for (int i = 0; i < change_callbacks.size(); i++) {
-        change_callbacks[i](pin, value > 0, value);
+    for (const auto& callback : change_callbacks)
+    {
+        callback.second(pin, value > 0, value);
     }
 }
 
@@ -82,8 +83,8 @@ void DigitalOutputCard::setState(uint8_t pin, bool state) {
     if(this->framAutoSave) {
         this->saveStateToFRAM();
     }
-    for(int i = 0; i < change_callbacks.size(); i++) {
-        change_callbacks[i](pin, state, value_buffer[pin]);
+    for(const auto& callback : change_callbacks) {
+        callback.second(pin, state, value_buffer[pin]);
     }
 }
 
@@ -95,23 +96,20 @@ void DigitalOutputCard::setValue(uint8_t pin, uint16_t value) {
     if (this->framAutoSave) {
         this->savePinValueToFRAM(pin);
     }
-    for (int i = 0; i < change_callbacks.size(); i++) {
-        change_callbacks[i](pin, state_buffer[pin], value);
+    for (const auto& callback : change_callbacks)
+    {
+        callback.second(pin, state_buffer[pin], value);
     }
 }
 
-void DigitalOutputCard::registerChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback) {
-    this->change_callbacks.push_back(callback);
+uint8_t DigitalOutputCard::registerChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback) {
+    this->change_callbacks[this->callbacks_handler_index] = callback;
+    return this->callbacks_handler_index++;
 }
 
-// void DigitalOutputCard::deregisterChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback) {
-//     for(int i = 0; i < change_callbacks.size(); i++) {
-//         if(change_callbacks[i].target<void(uint8_t, bool, uint16_t)>() == callback.target<void(uint8_t, bool, uint16_t)>()) {
-//             change_callbacks.erase(change_callbacks.begin()+i);
-//             break;
-//         }
-//     }
-// }
+void DigitalOutputCard::deregisterChangeCallback(uint8_t handler) {
+    this->change_callbacks.erase(handler);
+}
 
 void DigitalOutputCard::loadPinMap(uint8_t pinMap[16]) {
     for(int i = 0; i < 16; i++) {

ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.hpp

@@ -2,7 +2,7 @@
 #include <ExpansionCard.hpp>
 #include <Adafruit_PWMServoDriver.h>
 #include <FRAM.h>
-#include <vector>
+#include <map>
 
 // Protocol for digital output card
 // Note that pin is always 2 characters long and padded with 0 if necessary
@@ -48,9 +48,9 @@ public:
     // Get the pwm value of the specified pin
     uint16_t getValue(uint8_t pin);
     // Register a callback function that will be called when the state of a pin changes
-    void registerChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
+    uint8_t registerChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
     // Deregister the callback function
-    // void deregisterChangeCallback(std::function<void(uint8_t, bool, uint16_t)> callback);
+    void deregisterChangeCallback(uint8_t handler);
     // Load a new pin map
     void loadPinMap(uint8_t pinMap[16]);  
     // Bind the fram object to the card
@@ -90,7 +90,8 @@ private:
     // The pwm value of the card
     uint16_t value_buffer[16];
     // The callback function
-    std::vector<std::function<void(uint8_t, bool, uint16_t)>> change_callbacks;
+    uint8_t callbacks_handler_index = 0;
+    std::map<uint8_t, std::function<void(uint8_t, bool, uint16_t)>> change_callbacks;
     // Physical pin to virtual pin map
     uint8_t pinMap[16];
     // Return 16 bit value representing all 16 channels

ESPMegaPRO-firmware/src/main.cpp

@@ -52,37 +52,37 @@ void setup() {
     espmega.enableIotModule();
     ETH.begin();
     espmega.iot->bindEthernetInterface(&ETH);
-    NetworkConfig config = {
-        .ip = {192, 168, 0, 11},
-        .gateway = {192, 168, 0, 1},
-        .subnet = {255, 255, 255, 0},
-        .dns1 = {192, 168, 0, 1},
-        .dns2 = {192, 168, 0, 1},
-        .useStaticIp = true,
-        .useWifi = false,
-        .wifiUseAuth = false,
-    };
-    strcpy(config.ssid, "ssid");
-    strcpy(config.password, "password");
-    strcpy(config.hostname, "espmega");
-    Serial.println("Setting network config");
-    espmega.iot->setNetworkConfig(config);
-    espmega.iot->saveNetworkConfig();
-    // espmega.iot->loadNetworkConfig();
+    // NetworkConfig config = {
+    //     .ip = {192, 168, 0, 11},
+    //     .gateway = {192, 168, 0, 1},
+    //     .subnet = {255, 255, 255, 0},
+    //     .dns1 = {192, 168, 0, 1},
+    //     .dns2 = {192, 168, 0, 1},
+    //     .useStaticIp = true,
+    //     .useWifi = false,
+    //     .wifiUseAuth = false,
+    // };
+    // strcpy(config.ssid, "ssid");
+    // strcpy(config.password, "password");
+    // strcpy(config.hostname, "espmega");
+    // Serial.println("Setting network config");
+    // espmega.iot->setNetworkConfig(config);
+    // espmega.iot->saveNetworkConfig();
+    espmega.iot->loadNetworkConfig();
     Serial.println("Connecting to network");
     espmega.iot->connectNetwork();
     Serial.println("Begin MQTT Modules");
-    MqttConfig mqtt_config =  {
-        .mqtt_port = 1883,
-        .mqtt_useauth = false
-    };
-    Serial.println("Setting MQTT Server");
-    strcpy(mqtt_config.mqtt_server, "192.168.0.26");
-    strcpy(mqtt_config.base_topic, "/espmegaoop");
-    Serial.println("Loading MQTT Config Struct to IoT Module");
-    espmega.iot->setMqttConfig(mqtt_config);
-    espmega.iot->saveMqttConfig();
-    // espmega.iot->loadMqttConfig();
+    // MqttConfig mqtt_config =  {
+    //     .mqtt_port = 1883,
+    //     .mqtt_useauth = false
+    // };
+    // Serial.println("Setting MQTT Server");
+    // strcpy(mqtt_config.mqtt_server, "192.168.0.26");
+    // strcpy(mqtt_config.base_topic, "/espmegaoop");
+    // Serial.println("Loading MQTT Config Struct to IoT Module");
+    // espmega.iot->setMqttConfig(mqtt_config);
+    // espmega.iot->saveMqttConfig();
+    espmega.iot->loadMqttConfig();
     Serial.println("Connecting to MQTT");
     espmega.iot->connectToMqtt();
     Serial.println("Registering Output Card");
@@ -112,13 +112,13 @@ void setup() {
 // Every 20 seconds, dump FRAM 0-500 to serial
 void loop() {
     espmega.loop();
-    static uint32_t last_fram_dump = 0;
-    if (millis() - last_fram_dump >= 20000) {
-        last_fram_dump = millis();
-        Serial.println("Dumping FRAM");
-        espmega.dumpFRAMtoSerial(0, 500);
-        Serial.println("Dumping FRAM ASCII");
-        espmega.dumpFRAMtoSerialASCII(0, 500);
-    }
+    // static uint32_t last_fram_dump = 0;
+    // if (millis() - last_fram_dump >= 20000) {
+    //     last_fram_dump = millis();
+    //     Serial.println("Dumping FRAM");
+    //     espmega.dumpFRAMtoSerial(0, 500);
+    //     Serial.println("Dumping FRAM ASCII");
+    //     espmega.dumpFRAMtoSerialASCII(0, 500);
+    // }
 
 }