adafruit · tannewt · Oct 25, 2021 · Sep 29, 2021 · Oct 1, 2021 · Oct 1, 2021
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -1727,6 +1727,7 @@ msgstr ""
 msgid "Only connectable advertisements can be directed"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
 #: ports/stm/common-hal/alarm/pin/PinAlarm.c
 msgid "Only edge detection is available on this hardware"
 msgstr ""
@@ -1750,6 +1751,7 @@ msgstr ""
 msgid "Only one address is allowed"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c
 #: ports/espressif/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
 #: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -2070,6 +2072,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/SleepMemory.c
 #: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2224,6 +2227,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.c
 #: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"

diff --git a/ports/atmel-samd/boards/pycubed/board.c b/ports/atmel-samd/boards/pycubed/board.c
@@ -24,25 +24,12 @@
  * THE SOFTWARE.
  */
 
-
-#include <string.h>
-
 #include "supervisor/board.h"
-#include "py/mpconfig.h"
-#include "shared-bindings/nvm/ByteArray.h"
+#include "mpconfigboard.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "hal/include/hal_gpio.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
-nvm_bytearray_obj_t bootcnt = {
-    .base = {
-        .type = &nvm_bytearray_type
-    },
-    .len = (uint32_t)8192,
-    .start_address = (uint8_t *)(0x00080000 - 8192)
-};
-
-
 void board_init(void) {
     pwmio_pwmout_obj_t pwm;
     common_hal_pwmio_pwmout_construct(&pwm, &pin_PA23, 4096, 2, false);
@@ -54,8 +41,7 @@ bool board_requests_safe_mode(void) {
 }
 
 void reset_board(void) {
-    uint8_t value_out = 0;
-    common_hal_nvm_bytearray_get_bytes(&bootcnt,0,1,&value_out);
-    ++value_out;
-    common_hal_nvm_bytearray_set_bytes(&bootcnt,0,&value_out,1);
+}
+
+void board_deinit(void) {
 }
diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.h b/ports/atmel-samd/boards/pycubed/mpconfigboard.h
@@ -15,6 +15,9 @@
 // External flash W25Q80DV
 #define EXTERNAL_FLASH_QSPI_DUAL
 
+#define CIRCUITPY_DRIVE_LABEL "PYCUBED"
+#define CIRCUITPY_BOOT_COUNTER 1
+
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL  (&pin_PB13)

diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
@@ -10,17 +10,25 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = W25Q80DV
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_DRIVE_LABEL = "PYCUBED"
+CIRCUITPY_ULAB = 1
+CIRCUITPY_BINASCII = 1
+CIRCUITPY_SDCARDIO = 1
+CIRCUITPY_JSON = 1
+CIRCUITPY_MSGPACK = 1
+CIRCUITPY_ALARM = 1
 
-# Not needed.
+# no SAMD51 support... yet ;)
+# CIRCUITPY_DUALBANK=1
+
+# Not needed
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
+CIRCUITPY_BLEIO_HCI=0
+CIRCUITPY_BLEIO=0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/atmel-samd/boards/pycubed_mram/board.c b/ports/atmel-samd/boards/pycubed_mram/board.c
@@ -24,25 +24,12 @@
  * THE SOFTWARE.
  */
 
-
-#include <string.h>
-
 #include "supervisor/board.h"
-#include "py/mpconfig.h"
-#include "shared-bindings/nvm/ByteArray.h"
+#include "mpconfigboard.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "hal/include/hal_gpio.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 
-nvm_bytearray_obj_t bootcnt = {
-    .base = {
-        .type = &nvm_bytearray_type
-    },
-    .len = (uint32_t)8192,
-    .start_address = (uint8_t *)(0x00080000 - 8192)
-};
-
-
 void board_init(void) {
     pwmio_pwmout_obj_t pwm;
     common_hal_pwmio_pwmout_construct(&pwm, &pin_PA23, 4096, 2, false);
@@ -54,8 +41,7 @@ bool board_requests_safe_mode(void) {
 }
 
 void reset_board(void) {
-    uint8_t value_out = 0;
-    common_hal_nvm_bytearray_get_bytes(&bootcnt,0,1,&value_out);
-    ++value_out;
-    common_hal_nvm_bytearray_set_bytes(&bootcnt,0,&value_out,1);
+}
+
+void board_deinit(void) {
 }
diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.h
@@ -15,6 +15,9 @@
 
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
 
+#define CIRCUITPY_DRIVE_LABEL "PYCUBED"
+#define CIRCUITPY_BOOT_COUNTER 1
+
 #define BOARD_HAS_CRYSTAL 1
 
 #define DEFAULT_I2C_BUS_SCL  (&pin_PB13)

diff --git a/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_mram/mpconfigboard.mk
@@ -10,17 +10,25 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = MR2xH40
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_DRIVE_LABEL = "PYCUBED"
+CIRCUITPY_ULAB = 1
+CIRCUITPY_BINASCII = 1
+CIRCUITPY_SDCARDIO = 1
+CIRCUITPY_JSON = 1
+CIRCUITPY_MSGPACK = 1
+CIRCUITPY_ALARM = 1
 
-# Not needed.
+# no SAMD51 support... yet ;)
+# CIRCUITPY_DUALBANK=1
+
+# Not needed
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
+CIRCUITPY_BLEIO_HCI=0
+CIRCUITPY_BLEIO=0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
diff --git a/ports/atmel-samd/boards/pycubed_mram_v05/board.c b/ports/atmel-samd/boards/pycubed_mram_v05/board.c
@@ -42,3 +42,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/atmel-samd/boards/pycubed_mram_v05/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_mram_v05/mpconfigboard.mk
@@ -15,9 +15,9 @@ CIRCUITPY_BINASCII = 1
 CIRCUITPY_SDCARDIO = 1
 CIRCUITPY_JSON = 1
 CIRCUITPY_MSGPACK = 1
+CIRCUITPY_ALARM = 1
 
 # no SAMD51 support... yet ;)
-# CIRCUITPY_ALARM = 1
 # CIRCUITPY_DUALBANK=1
 
 # Not needed

diff --git a/ports/atmel-samd/boards/pycubed_v05/board.c b/ports/atmel-samd/boards/pycubed_v05/board.c
@@ -42,3 +42,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/atmel-samd/boards/pycubed_v05/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed_v05/mpconfigboard.mk
@@ -16,9 +16,9 @@ CIRCUITPY_BINASCII = 1
 CIRCUITPY_SDCARDIO = 1
 CIRCUITPY_JSON = 1
 CIRCUITPY_MSGPACK = 1
+CIRCUITPY_ALARM = 1
 
 # no SAMD51 support... yet ;)
-# CIRCUITPY_ALARM = 1
 # CIRCUITPY_DUALBANK=1
 
 # Not needed

diff --git a/ports/atmel-samd/common-hal/alarm/SleepMemory.c b/ports/atmel-samd/common-hal/alarm/SleepMemory.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Lucian Copeland 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 <string.h>
+
+#include "py/runtime.h"
+#include "common-hal/alarm/SleepMemory.h"
+#include "shared-bindings/nvm/ByteArray.h"
+
+void alarm_sleep_memory_reset(void) {
+
+}
+
+uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self) {
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
+    return 0;
+}
+
+bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len) {
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
+    return false;
+}
+
+void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len) {
+    mp_raise_NotImplementedError(translate("Sleep Memory not available"));
+    return;
+}
diff --git a/ports/atmel-samd/common-hal/alarm/SleepMemory.h b/ports/atmel-samd/common-hal/alarm/SleepMemory.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Lucian Copeland 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_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_SLEEPMEMORY_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t *start_address;
+    uint8_t len;
+} alarm_sleep_memory_obj_t;
+
+extern void alarm_sleep_memory_reset(void);
+
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_ALARM_SLEEPMEMORY_H
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,3 +42,6 @@ bool board_requests_safe_mode(void) { @@
     void reset_board(void) {
     }
+    void board_deinit(void) {
+    }