From 90f6096955e6439ec22eba2bcac3680056cdc9d3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 3 Oct 2022 15:29:03 -0400 Subject: [PATCH] fix ai-thinker creation ids; fix some typos elsewhere --- ports/atmel-samd/common-hal/analogio/AnalogOut.c | 4 ++-- .../espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk | 2 +- ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk | 4 ++-- ports/nrf/common-hal/watchdog/WatchDogTimer.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/atmel-samd/common-hal/analogio/AnalogOut.c b/ports/atmel-samd/common-hal/analogio/AnalogOut.c index b4d556429c..ec690e8ddb 100644 --- a/ports/atmel-samd/common-hal/analogio/AnalogOut.c +++ b/ports/atmel-samd/common-hal/analogio/AnalogOut.c @@ -45,8 +45,8 @@ #endif #define HAVE_ANALOGOUT ( \ - (defined(PIN_PA02) && !defined(IGNORE_PA02)) || \ - (defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PA05)) \ + (defined(PIN_PA02) && !defined(IGNORE_PIN_PA02)) || \ + (defined(SAM_D5X_E5X) && defined(PIN_PA05) && !defined(IGNORE_PIN_PA05)) \ ) void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk index 913f65f95c..210c4e46f1 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk @@ -1,5 +1,5 @@ CIRCUITPY_CREATOR_ID = 0x000C303B -CIRCUITPY_CREATION_ID = 0x00320001 +CIRCUITPY_CREATION_ID = 0x00C30001 IDF_TARGET = esp32c3 diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk index eb88c5caab..1ef07368bf 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk +++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk @@ -1,5 +1,5 @@ -CIRCUITPY_CREATOR_ID = 0x70010001 -CIRCUITPY_CREATION_ID = 0x00100001 +CIRCUITPY_CREATOR_ID = 0x000C303B +CIRCUITPY_CREATION_ID = 0x00C30002 IDF_TARGET = esp32c3 diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.c b/ports/nrf/common-hal/watchdog/WatchDogTimer.c index cd7aa449bf..99c360c46d 100644 --- a/ports/nrf/common-hal/watchdog/WatchDogTimer.c +++ b/ports/nrf/common-hal/watchdog/WatchDogTimer.c @@ -96,7 +96,7 @@ void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) { void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) { if (self->mode == WATCHDOGMODE_RESET) { if (gc_alloc_possible()) { - mp_raise_NotImplementedError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET")); + mp_raise_RuntimeError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET")); } // Don't change anything because RESET cannot be undone. return;