I2C slave: allow function wrapped callbacks

hitech95 · fpistm · commit 0c2d58cd6423 · 2022-11-30T15:55:16.000+01:00
Signed-off-by: hitech95 &lt;nicveronese@gmail.com&gt;
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
@@ -438,13 +438,13 @@ void TwoWire::onRequestService(i2c_t *obj)
 }
 
 // sets function called on slave write
-void TwoWire::onReceive(void (*function)(int))
+void TwoWire::onReceive(cb_function_receive_t function)
 {
   user_onReceive = function;
 }
 
 // sets function called on slave read
-void TwoWire::onRequest(void (*function)(void))
+void TwoWire::onRequest(cb_function_request_t function)
 {
   user_onRequest = function;
 }
diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
@@ -22,6 +22,8 @@
 #ifndef TwoWire_h
 #define TwoWire_h
 
+#include <functional>
+
 #include "Stream.h"
 #include "Arduino.h"
 extern "C" {
@@ -40,6 +42,10 @@ extern "C" {
 #define WIRE_HAS_END 1
 
 class TwoWire : public Stream {
+  public:
+    typedef std::function<void(int)> cb_function_receive_t;
+    typedef std::function<void(void)> cb_function_request_t;
+
   private:
     uint8_t *rxBuffer;
     uint16_t rxBufferAllocated;
@@ -56,8 +62,9 @@ class TwoWire : public Stream {
     uint8_t ownAddress;
     i2c_t _i2c;
 
-    void (*user_onRequest)(void);
-    void (*user_onReceive)(int);
+    std::function<void(int)> user_onReceive;
+    std::function<void(void)> user_onRequest;
+
     static void onRequestService(i2c_t *);
     static void onReceiveService(i2c_t *);
 
@@ -110,8 +117,9 @@ class TwoWire : public Stream {
     virtual int read(void);
     virtual int peek(void);
     virtual void flush(void);
-    void onReceive(void (*)(int));
-    void onRequest(void (*)(void));
+
+    void onReceive(cb_function_receive_t callback);
+    void onRequest(cb_function_request_t callback);
 
     inline size_t write(unsigned long n)
     {

Original file line number	Diff line number	Diff line change
`@@ -438,13 +438,13 @@ void TwoWire::onRequestService(i2c_t *obj)`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`// sets function called on slave write`
`441`		`-void TwoWire::onReceive(void (*function)(int))`
	`441`	`+void TwoWire::onReceive(cb_function_receive_t function)`
`442`	`442`	`{`
`443`	`443`	`user_onReceive = function;`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`// sets function called on slave read`
`447`		`-void TwoWire::onRequest(void (*function)(void))`
	`447`	`+void TwoWire::onRequest(cb_function_request_t function)`
`448`	`448`	`{`
`449`	`449`	`user_onRequest = function;`
`450`	`450`	`}`