use std:function for resetPin addReconfigurePinCallback method

Author: fabik111

examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino

@@ -25,18 +25,18 @@
  * by Fabio Centonze
  */
 
- #include <Arduino_ConnectionHandler.h>
- #include <GenericConnectionHandler.h>
- #include <Arduino_KVStore.h>
- #include <NetworkConfigurator.h>
- #include <ConfiguratorAgents/agents/BLE/BLEAgent.h>
- #include <ConfiguratorAgents/agents/Serial/SerialAgent.h>
+#include <Arduino_ConnectionHandler.h>
+#include <GenericConnectionHandler.h>
+#include <Arduino_KVStore.h>
+#include <NetworkConfigurator.h>
+#include <ConfiguratorAgents/agents/BLE/BLEAgent.h>
+#include <ConfiguratorAgents/agents/Serial/SerialAgent.h>
 
- KVStore kvstore;
- BLEAgentClass BLEAgent;
- SerialAgentClass SerialAgent;
- GenericConnectionHandler conMan;
- NetworkConfiguratorClass NetworkConfigurator(conMan);
+KVStore kvstore;
+BLEAgentClass BLEAgent;
+SerialAgentClass SerialAgent;
+GenericConnectionHandler conMan;
+NetworkConfiguratorClass NetworkConfigurator(conMan);
 
 void setup() {
   /* Initialize serial debug port and wait up to 5 seconds for port to open */
@@ -63,6 +63,8 @@ void setup() {
   /* Add the interfaces that are enabled for configuring the network*/
   NetworkConfigurator.addAgent(BLEAgent);
   NetworkConfigurator.addAgent(SerialAgent);
+  /* Add a custom callback function to be invoked every time the interrupt on reconfiguration pin is fired*/
+  NetworkConfigurator.addReconfigurePinCallback(onResetPinInterrupt);
   /* Start the network configurator */
   NetworkConfigurator.begin();
 
@@ -85,6 +87,11 @@ void loop() {
   }
 }
 
+void onResetPinInterrupt() {
+  //Add your custom code here
+  //This function is called when the reconfiguration pin interrupt is fired
+}
+
 void onNetworkConnect() {
   Serial.println(">>>> CONNECTED to network");
 }

src/NetworkConfigurator.cpp

@@ -193,7 +193,7 @@ void NetworkConfiguratorClass::setReconfigurePin(uint32_t pin) {
   _resetInput->setPin(pin);
 }
 
-void NetworkConfiguratorClass::addReconfigurePinCallback(void (*callback)()) {
+void NetworkConfiguratorClass::addReconfigurePinCallback(ResetInput::ResetInputCallback callback) {
   _resetInput->setPinChangedCallback(callback);
 }
 

src/NetworkConfigurator.h

@@ -107,8 +107,7 @@ class NetworkConfiguratorClass {
    * interrupt on the reconfiguration pin is fired.
    * @param callback Pointer to the callback function.
    */
-  //TODO add to example
-  void addReconfigurePinCallback(void (*callback)());//TODO add version with std:function https://github.com/arduino-libraries/ArduinoMqttClient/blob/0a0706262ad56043954b008a7f89adf3b783ec88/src/MqttClient.h#L38
+  void addReconfigurePinCallback(ResetInput::ResetInputCallback callback);
 
   /**
    * @brief Checks if BLE (Bluetooth Low Energy) is enabled.
@@ -125,7 +124,7 @@ class NetworkConfiguratorClass {
   /**
    * @brief Disconnects the current agent from the peer.
    */
-  void disconnectAgent();//TODO think about a method for returning the agent and call its disconnect
+  void disconnectAgent();
 
   /**
    * @brief Adds a new configurator agent.

src/Utility/ResetInput/ResetInput.cpp

@@ -53,7 +53,7 @@ bool ResetInput::isEventFired() {
   return _fireEvent;
 }
 
-void ResetInput::setPinChangedCallback(void (*callback)()) {
+void ResetInput::setPinChangedCallback(ResetInputCallback callback) {
   _pressedCustomCallback = callback;
 }
 

src/Utility/ResetInput/ResetInput.h

@@ -9,21 +9,23 @@
 #pragma once
 
 #include "Arduino.h"
+#include <functional>
 
 class ResetInput{
 public:
+  typedef std::function<void()> ResetInputCallback;
   static ResetInput& getInstance();
   // Setup the interrupt pin
   void begin();
   // Monitor if the event is fired
   bool isEventFired();
   // Add a custom function to be called when the pin status changes. It must be set before calling the begin method
-  void setPinChangedCallback(void (*callback)());
+  void setPinChangedCallback(ResetInputCallback callback);
   // Set the pin to be monitored. It must be set before calling the begin method
   void setPin(uint32_t pin);
 private:
   ResetInput();
-  static inline void (*_pressedCustomCallback)();
+  static inline ResetInputCallback _pressedCustomCallback;
   uint32_t _pin;
   static inline volatile bool _pressed;
   static inline volatile bool _fireEvent;