Skip to content

Commit de61bd0

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#887 from tannewt/rotaryio
Add rotary encoder support.
2 parents ae31c4a + 7171990 commit de61bd0

File tree

101 files changed

+2010
-1091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2010
-1091
lines changed

‎conf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
"ports/atmel-samd/asf4_conf",
102102
"ports/atmel-samd/external_flash",
103103
"ports/atmel-samd/freetouch",
104+
"ports/atmel-samd/peripherals",
104105
"ports/atmel-samd/QTouch",
105106
"ports/atmel-samd/tools",
106107
"ports/bare-arm",

‎ports/atmel-samd/Makefile‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,19 +242,26 @@ SRC_C = \
242242
audio_dma.c \
243243
board_busses.c \
244244
background.c \
245-
clocks.c \
246-
$(CHIP_FAMILY)_clocks.c \
247-
events.c \
248245
fatfs_port.c \
249246
flash_api.c \
250247
mphalport.c \
251248
reset.c \
252-
$(CHIP_FAMILY)_peripherals.c \
253-
peripherals.c \
254-
$(CHIP_FAMILY)_pins.c \
255-
shared_dma.c \
249+
peripherals/clocks.c \
250+
peripherals/dma.c \
251+
peripherals/events.c \
252+
peripherals/external_interrupts.c \
253+
peripherals/sercom.c \
254+
peripherals/timers.c \
255+
peripherals/$(CHIP_FAMILY)/adc.c \
256+
peripherals/$(CHIP_FAMILY)/cache.c \
257+
peripherals/$(CHIP_FAMILY)/clocks.c \
258+
peripherals/$(CHIP_FAMILY)/dma.c \
259+
peripherals/$(CHIP_FAMILY)/events.c \
260+
peripherals/$(CHIP_FAMILY)/external_interrupts.c \
261+
peripherals/$(CHIP_FAMILY)/pins.c \
262+
peripherals/$(CHIP_FAMILY)/sercom.c \
263+
peripherals/$(CHIP_FAMILY)/timers.c \
256264
tick.c \
257-
timers.c \
258265
usb.c \
259266
usb_mass_storage.c \
260267
bindings/samd/__init__.c \
@@ -301,6 +308,8 @@ SRC_COMMON_HAL = \
301308
microcontroller/Processor.c \
302309
neopixel_write/__init__.c \
303310
os/__init__.c \
311+
rotaryio/__init__.c \
312+
rotaryio/IncrementalEncoder.c \
304313
rtc/__init__.c \
305314
rtc/RTC.c \
306315
storage/__init__.c \
@@ -391,7 +400,7 @@ ifneq ($(CHIP_VARIANT),SAMD51G18A)
391400
audiobusio/__init__.c \
392401
audiobusio/I2SOut.c \
393402
audiobusio/PDMIn.c
394-
SRC_C += i2s.c
403+
SRC_C += peripherals/i2s.c peripherals/$(CHIP_FAMILY)/i2s.c
395404
endif
396405
endif
397406

‎ports/atmel-samd/audio_dma.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
*/
2626

2727
#include "audio_dma.h"
28-
#include "clocks.h"
29-
#include "events.h"
30-
#include "shared_dma.h"
28+
#include "peripherals/clocks.h"
29+
#include "peripherals/events.h"
30+
#include "peripherals/dma.h"
3131

3232
#include "shared-bindings/audioio/RawSample.h"
3333
#include "shared-bindings/audioio/WaveFile.h"

‎ports/atmel-samd/bindings/samd/Clock.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "clocks.h"
2827
#include "bindings/samd/Clock.h"
29-
28+
#include "peripherals/clocks.h"
3029
#include "py/obj.h"
3130
#include "py/objproperty.h"
3231
#include "py/runtime.h"

‎ports/atmel-samd/board_busses.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030

3131
#include "shared-bindings/microcontroller/Pin.h"
3232
#include "mpconfigboard.h"
33-
#include "pins.h"
33+
#include "peripherals/pins.h"
3434
#include "py/runtime.h"
3535

36-
37-
3836
#if !defined(DEFAULT_I2C_BUS_SDA) || !defined(DEFAULT_I2C_BUS_SCL)
3937
STATIC mp_obj_t board_i2c(void) {
4038
mp_raise_NotImplementedError("No default I2C bus");
@@ -112,4 +110,4 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi);
112110
return uart_singleton;
113111
}
114112
#endif
115-
MP_DEFINE_CONST_FUN_OBJ_0(board_uart_obj, board_uart);
113+
MP_DEFINE_CONST_FUN_OBJ_0(board_uart_obj, board_uart);

‎ports/atmel-samd/boards/arduino_zero/pins.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
#include "samd21_pins.h"
43
#include "board_busses.h"
54

6-
75
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
86
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
97
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },

‎ports/atmel-samd/boards/circuitplayground_express/board.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "hal/include/hal_gpio.h"
3232
#include "shared-bindings/digitalio/DigitalInOut.h"
3333
#include "shared-bindings/neopixel_write/__init__.h"
34-
#include "samd21_pins.h"
3534

3635
void board_init(void)
3736
{

‎ports/atmel-samd/boards/circuitplayground_express/pins.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "samd21_pins.h"
1+
#include "shared-bindings/board/__init__.h"
2+
23
#include "board_busses.h"
34

45
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {

‎ports/atmel-samd/boards/circuitplayground_express_crickit/board.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "hal/include/hal_gpio.h"
3232
#include "shared-bindings/digitalio/DigitalInOut.h"
3333
#include "shared-bindings/neopixel_write/__init__.h"
34-
#include "samd21_pins.h"
3534

3635
void board_init(void)
3736
{

‎ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "samd21_pins.h"
1+
#include "shared-bindings/board/__init__.h"
2+
23
#include "board_busses.h"
34

45
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {

0 commit comments

Comments
 (0)