Skip to content

Updated USBDevice to use Callback #2633

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
Sep 10, 2016
Merged

Updated USBDevice to use Callback #2633

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/USBDevice/USBAudio/USBAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "USBDevice_Types.h"

#include "USBDevice.h"

#include "Callback.h"

/**
* USBAudio example
Expand Down Expand Up @@ -275,7 +275,7 @@ class USBAudio: public USBDevice {
volatile uint8_t * buf_stream_out;

// callback to update volume
FunctionPointer updateVol;
Callback<void()> updateVol;

// boolean showing that the SOF handler has been called. Useful for readNB.
volatile bool SOF_handler;
Expand Down
4 changes: 2 additions & 2 deletions libraries/USBDevice/USBSerial/USBSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "USBCDC.h"
#include "Stream.h"
#include "CircBuffer.h"

#include "Callback.h"

/**
* USBSerial example
Expand Down Expand Up @@ -153,7 +153,7 @@ class USBSerial: public USBCDC, public Stream {
}

private:
FunctionPointer rx;
Callback<void()> rx;
CircBuffer<uint8_t,128> buf;
void (*settingsChangedCallback)(int baud, int bits, int parity, int stop);
};
Expand Down