From c9571fe1ea96f617fa7cc0917261cdcde0720dfd Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 1 Apr 2019 17:54:35 -0400 Subject: [PATCH 1/5] ROTARYIO_MODULE mistakenly omitted from module list --- py/circuitpy_mpconfig.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 7db60a39cb..6da3ae9109 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -360,6 +360,13 @@ extern const struct _mp_obj_module_t os_module; #define OS_MODULE_ALT_NAME #endif +#if CIRCUITPY_PEW +extern const struct _mp_obj_module_t pew_module; +#define PEW_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__pew),(mp_obj_t)&pew_module }, +#else +#define PEW_MODULE +#endif + #if CIRCUITPY_PIXELBUF extern const struct _mp_obj_module_t pixelbuf_module; #define PIXELBUF_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__pixelbuf),(mp_obj_t)&pixelbuf_module }, @@ -474,13 +481,6 @@ extern const struct _mp_obj_module_t ustack_module; #define USTACK_MODULE #endif -#if CIRCUITPY_PEW -extern const struct _mp_obj_module_t pew_module; -#define PEW_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__pew),(mp_obj_t)&pew_module }, -#else -#define PEW_MODULE -#endif - // These modules are not yet in shared-bindings, but we prefer the non-uxxx names. #if MICROPY_PY_UERRNO #define ERRNO_MODULE { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, @@ -546,6 +546,7 @@ extern const struct _mp_obj_module_t pew_module; PULSEIO_MODULE \ RANDOM_MODULE \ RE_MODULE \ + ROTARYIO_MODULE \ RTC_MODULE \ SAMD_MODULE \ STAGE_MODULE \ From cdd77b597288312732b80696d0c4b20c59317b1a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 4 Apr 2019 16:04:11 -0400 Subject: [PATCH 2/5] remove CPy-specific EIC handlers from samd-peripherals --- ports/atmel-samd/Makefile | 1 + ports/atmel-samd/common-hal/pulseio/PulseIn.c | 5 +- .../common-hal/rotaryio/IncrementalEncoder.c | 14 ++++- ports/atmel-samd/eic_handler.c | 54 +++++++++++++++++++ ports/atmel-samd/eic_handler.h | 36 +++++++++++++ ports/atmel-samd/peripherals | 2 +- 6 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 ports/atmel-samd/eic_handler.c create mode 100644 ports/atmel-samd/eic_handler.h diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index 0851b6bbb9..9b110c1bbc 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -212,6 +212,7 @@ SRC_C = \ bindings/samd/__init__.c \ boards/$(BOARD)/board.c \ boards/$(BOARD)/pins.c \ + eic_handler.c \ fatfs_port.c \ freetouch/adafruit_ptc.c \ lib/libc/string0.c \ diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c index aaa69a6f86..a2494f102f 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseIn.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseIn.c @@ -32,6 +32,7 @@ #include "hal/include/hal_gpio.h" #include "background.h" +#include "eic_handler.h" #include "mpconfigport.h" #include "py/gc.h" #include "py/runtime.h" @@ -54,7 +55,8 @@ static void pulsein_set_config(pulseio_pulsein_obj_t* self, bool first_edge) { } else { sense_setting = EIC_CONFIG_SENSE0_RISE_Val; } - turn_on_eic_channel(self->channel, sense_setting, EIC_HANDLER_PULSEIN); + set_eic_handler(self->channel, EIC_HANDLER_PULSEIN); + turn_on_eic_channel(self->channel, sense_setting); } void pulsein_interrupt_handler(uint8_t channel) { @@ -153,6 +155,7 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t* self) { if (common_hal_pulseio_pulsein_deinited(self)) { return; } + set_eic_handler(self->channel, EIC_HANDLER_NO_INTERRUPT); turn_off_eic_channel(self->channel); reset_pin_number(self->pin); self->pin = NO_PIN; diff --git a/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c b/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c index 080cd61b5e..e3bcf395b5 100644 --- a/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c @@ -28,6 +28,7 @@ #include "atmel_start_pins.h" +#include "eic_handler.h" #include "samd/external_interrupts.h" #include "py/runtime.h" #include "supervisor/shared/translate.h" @@ -76,8 +77,11 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode claim_pin(pin_a); claim_pin(pin_b); - turn_on_eic_channel(self->eic_channel_a, EIC_CONFIG_SENSE0_BOTH_Val, EIC_HANDLER_INCREMENTAL_ENCODER); - turn_on_eic_channel(self->eic_channel_b, EIC_CONFIG_SENSE0_BOTH_Val, EIC_HANDLER_INCREMENTAL_ENCODER); + set_eic_handler(self->eic_channel_a, EIC_HANDLER_INCREMENTAL_ENCODER); + turn_on_eic_channel(self->eic_channel_a, EIC_CONFIG_SENSE0_BOTH_Val); + + set_eic_handler(self->eic_channel_b, EIC_HANDLER_INCREMENTAL_ENCODER); + turn_on_eic_channel(self->eic_channel_b, EIC_CONFIG_SENSE0_BOTH_Val); } bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t* self) { @@ -88,10 +92,16 @@ void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_o if (common_hal_rotaryio_incrementalencoder_deinited(self)) { return; } + + set_eic_handler(self->eic_channel_a, EIC_HANDLER_NO_INTERRUPT); turn_off_eic_channel(self->eic_channel_a); + + set_eic_handler(self->eic_channel_b, EIC_HANDLER_NO_INTERRUPT); turn_off_eic_channel(self->eic_channel_b); + reset_pin_number(self->pin_a); self->pin_a = NO_PIN; + reset_pin_number(self->pin_b); self->pin_b = NO_PIN; } diff --git a/ports/atmel-samd/eic_handler.c b/ports/atmel-samd/eic_handler.c new file mode 100644 index 0000000000..e53d51e9ea --- /dev/null +++ b/ports/atmel-samd/eic_handler.c @@ -0,0 +1,54 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 Dan Halbert for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "common-hal/pulseio/PulseIn.h" +#include "common-hal/rotaryio/IncrementalEncoder.h" +#include "shared-bindings/microcontroller/__init__.h" +//#include "samd/external_interrupts.h" +#include "eic_handler.h" + +// Which handler should be called for a particular channel? +static uint8_t eic_channel_handler[EIC_EXTINT_NUM]; + +void set_eic_handler(uint8_t channel, uint8_t eic_handler) { + eic_channel_handler[channel] = eic_handler; +} + +void shared_eic_handler(uint8_t channel) { + uint8_t handler = eic_channel_handler[channel]; + switch (handler) { + case EIC_HANDLER_PULSEIN: + pulsein_interrupt_handler(channel); + break; + + case EIC_HANDLER_INCREMENTAL_ENCODER: + incrementalencoder_interrupt_handler(channel); + break; + + default: + break; + } +} diff --git a/ports/atmel-samd/eic_handler.h b/ports/atmel-samd/eic_handler.h new file mode 100644 index 0000000000..2f9ccd67f0 --- /dev/null +++ b/ports/atmel-samd/eic_handler.h @@ -0,0 +1,36 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 Dan Halbert for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#ifndef MICROPY_INCLUDED_ATMEL_SAMD_EIC_HANDLER_H +#define MICROPY_INCLUDED_ATMEL_SAMD_EIC_HANDLER_H + +#define EIC_HANDLER_NO_INTERRUPT 0x0 +#define EIC_HANDLER_PULSEIN 0x1 +#define EIC_HANDLER_INCREMENTAL_ENCODER 0x2 + +void set_eic_handler(uint8_t channel, uint8_t eic_handler); +void shared_eic_handler(uint8_t channel); + +#endif // MICROPY_INCLUDED_ATMEL_SAMD_EIC_HANDLER_H diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index 6416828bb6..15d5740b7b 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit 6416828bb6821779d4c62fa3c7d41c95634173c0 +Subproject commit 15d5740b7ba791cdeb010bcc2e3f6d6f26ad2d6d From 2528b67e775f79274a74399a8559c1c581606007 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 4 Apr 2019 16:36:14 -0400 Subject: [PATCH 3/5] update samd-peripherals --- ports/atmel-samd/peripherals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index 15d5740b7b..778d4f3736 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit 15d5740b7ba791cdeb010bcc2e3f6d6f26ad2d6d +Subproject commit 778d4f3736728da7ba7795c5c44176c415c903cf From 29df5930ddf56402533cca92bcdee3cd6df56bfb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 4 Apr 2019 16:48:38 -0400 Subject: [PATCH 4/5] #if EIC handlers; turn off rotaryio in pirkey for space reasons --- ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk | 1 + ports/atmel-samd/eic_handler.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk index 017510be84..97e854a11c 100644 --- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk @@ -13,6 +13,7 @@ LONGINT_IMPL = NONE CIRCUITPY_ANALOGIO = 0 CIRCUITPY_MATH = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 +CIRCUITPY_ROTARYIO = 0 CIRCUITPY_RTC = 0 CIRCUITPY_SAMD = 0 CIRCUITPY_USB_MIDI = 0 diff --git a/ports/atmel-samd/eic_handler.c b/ports/atmel-samd/eic_handler.c index e53d51e9ea..db5f260e52 100644 --- a/ports/atmel-samd/eic_handler.c +++ b/ports/atmel-samd/eic_handler.c @@ -40,13 +40,17 @@ void set_eic_handler(uint8_t channel, uint8_t eic_handler) { void shared_eic_handler(uint8_t channel) { uint8_t handler = eic_channel_handler[channel]; switch (handler) { +#if CIRCUITPY_PULSEIO case EIC_HANDLER_PULSEIN: pulsein_interrupt_handler(channel); break; +#endif +#if CIRCUITPY_ROTARYIO case EIC_HANDLER_INCREMENTAL_ENCODER: incrementalencoder_interrupt_handler(channel); break; +#endif default: break; From 682e83a63c905e1aa3fe3c4a3ad9c051b3ed09d0 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 4 Apr 2019 20:28:32 -0400 Subject: [PATCH 5/5] Turn off rotaryio on pewpew10 so de_DE will fit --- ports/atmel-samd/boards/pewpew10/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk index 983e48e21c..d37b87439e 100644 --- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk @@ -16,6 +16,7 @@ CIRCUITPY_PEW = 1 CIRCUITPY_ANALOGIO = 1 CIRCUITPY_MATH = 1 CIRCUITPY_NEOPIXEL_WRITE = 1 +CIRCUITPY_ROTARYIO = 0 CIRCUITPY_RTC = 0 CIRCUITPY_SAMD = 0 CIRCUITPY_USB_MIDI = 0