Skip to content

Commit 367deff

Browse files
committed
Initial porting of TwoWire to API
1 parent 9b3c571 commit 367deff

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

cores/arduino/USB/USBAPI.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ class Serial_ : public Stream
157157
int availableForStore(void);
158158

159159
USBDeviceClass &usb;
160-
RingBuffer *_cdc_rx_buffer;
161160
bool stalled;
162161
};
163162
extern Serial_ SerialUSB;

cores/arduino/WInterrupts.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ static voidFuncPtr ISRcallback[EXTERNAL_NUM_INTERRUPTS];
2525
static uint32_t ISRlist[EXTERNAL_NUM_INTERRUPTS];
2626
static uint32_t nints; // Stores total number of attached interrupts
2727

28-
// LOW 0
29-
// HIGH 1
30-
#define CHANGE 2
31-
#define FALLING 3
32-
#define RISING 4
33-
3428
/* Configure I/O interrupt sources */
3529
static void __initialize()
3630
{
@@ -61,7 +55,7 @@ static void __initialize()
6155
* \brief Specifies a named Interrupt Service Routine (ISR) to call when an interrupt occurs.
6256
* Replaces any previous function that was attached to the interrupt.
6357
*/
64-
void attachInterrupt(pin_size_t pin, voidFuncPtr callback, InterruptMode mode)
58+
void attachInterrupt(pin_size_t pin, voidFuncPtr callback, PinStatus mode)
6559
{
6660
static int enabled = 0;
6761
uint32_t config;

libraries/Wire/Wire.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
#ifndef TwoWire_h
2121
#define TwoWire_h
2222

23-
#include "Stream.h"
23+
#include "api/HardwareI2C.h"
2424
#include "variant.h"
25-
2625
#include "SERCOM.h"
27-
#include "RingBuffer.h"
2826

2927
// WIRE_HAS_END means Wire has end()
3028
#define WIRE_HAS_END 1
3129

32-
class TwoWire : public Stream
30+
class TwoWire : public HardwareI2C
3331
{
3432
public:
3533
TwoWire(SERCOM *s, uint8_t pinSDA, uint8_t pinSCL);

platform.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ build.usb_manufacturer="Unknown"
7979
# ----------------
8080

8181
## Compile c files
82-
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
82+
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} -I{build.core.path}/api/deprecated {includes} "{source_file}" -o "{object_file}"
8383

8484
## Compile c++ files
85-
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
85+
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} -I{build.core.path}/api/deprecated {includes} "{source_file}" -o "{object_file}"
8686

8787
## Compile S files
88-
recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
88+
recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} -I{build.core.path}/api/deprecated {includes} "{source_file}" -o "{object_file}"
8989

9090
## Create archives
9191
# archive_file_path is needed for backwards compatibility with IDE 1.6.5 or older, IDE 1.6.6 or newer overrides this value

0 commit comments

Comments
 (0)