Skip to content

I2C slave: allow function wrapped callbacks #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2022
Merged

I2C slave: allow function wrapped callbacks #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
16 changes: 12 additions & 4 deletions libraries/Wire/src/Wire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef TwoWire_h
#define TwoWire_h

#include <functional>

#include "Stream.h"
#include "Arduino.h"
extern "C" {
Expand All @@ -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;
Expand All @@ -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 *);

Expand Down Expand Up @@ -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)
{
Expand Down