Use std::function instead of raw function pointer

Since lambdas with captures can no longer be converted to function pointers
gianluca-nitti · Aug 13, 2020 · 6a78463 · 6a78463
1 parent c9b9e4f
commit 6a78463
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/CH375.cpp b/src/CH375.cpp
@@ -48,7 +48,7 @@ bool CH375::test() {
   return ((uint8_t) receive()) == ((uint8_t) ~b);
 }
 
-bool CH375::setBaudRate(uint32_t baudRate, void (*setLocalBaudRate)(void)) {
+bool CH375::setBaudRate(uint32_t baudRate, std::function<void(void)> setLocalBaudRate) {
   sendCommand(CH375_CMD_SET_BAUDRATE);
   sendData(0x03);
   sendData((uint8_t) (256 - 6000000/baudRate)); //TODO: may be architecture-dependend, check on AVR

diff --git a/src/CH375.h b/src/CH375.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <functional>
 #include "Arduino.h"
 
 #define CH375_CMD_GET_IC_VER 0x01
@@ -105,7 +106,7 @@ class CH375 {
     CH375(Stream& _stream, int _interruptPin);
     bool init();
     bool test();
-    bool setBaudRate(uint32_t baudRate, void (*setLocalBaudRate)(void));
+    bool setBaudRate(uint32_t baudRate, std::function<void(void)> setLocalBaudRate);
     uint8_t getChipVersion();
     void rd_usb_data(uint8_t* buf, uint8_t maxLen);
     void wr_usb_data(uint8_t* buf, uint8_t len);