Merge pull request #4816 from hierophect/rp2040-alarms

dhalbert · web-flow · commit 836db4e4a182 · 2021-06-24T08:15:57.000-04:00
RP2040: add Alarm module
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -1702,6 +1702,7 @@ msgstr ""
 
 #: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
 #: ports/nrf/common-hal/alarm/time/TimeAlarm.c
+#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
 #: ports/stm/common-hal/alarm/time/TimeAlarm.c
 msgid "Only one alarm.time alarm can be set."
 msgstr ""
@@ -2035,6 +2036,7 @@ msgstr ""
 msgid "Size not supported"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
 #: ports/stm/common-hal/alarm/SleepMemory.c
 msgid "Sleep Memory not available"
 msgstr ""
@@ -2179,6 +2181,7 @@ msgstr ""
 msgid "Total data to write is larger than %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
 #: ports/stm/common-hal/alarm/touch/TouchAlarm.c
 msgid "Touch alarms not available"
 msgstr ""
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -41,3 +41,6 @@ void reset_board(void) {
     // turn off any left over LED
     board_reset_user_neopixels(&pin_GPIO19, 12);
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/board.c b/ports/raspberrypi/boards/pimoroni_keybow2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/board.c b/ports/raspberrypi/boards/pimoroni_pga2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/board.c b/ports/raspberrypi/boards/pimoroni_picosystem/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040/board.c b/ports/raspberrypi/boards/pimoroni_tiny2040/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/board.c b/ports/raspberrypi/boards/raspberry_pi_pico/board.c
@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c
@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {
 
 void reset_board(void) {
 }
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.c b/ports/raspberrypi/common-hal/alarm/SleepMemory.c
@@ -0,0 +1,47 @@
+/*
+ * 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"
+
+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"));
+}
diff --git a/ports/raspberrypi/common-hal/alarm/SleepMemory.h b/ports/raspberrypi/common-hal/alarm/SleepMemory.h
@@ -0,0 +1,38 @@
+/*
+ * 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_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+} alarm_sleep_memory_obj_t;
+
+extern void alarm_sleep_memory_reset(void);
+
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_ALARM_SLEEPMEMORY_H
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c
diff --git a/ports/raspberrypi/common-hal/alarm/__init__.h b/ports/raspberrypi/common-hal/alarm/__init__.h
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.h
diff --git a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
diff --git a/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h b/ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.h
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk

Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,6 @@ bool board_requests_safe_mode(void) {`
`38`	`38`
`39`	`39`	`void reset_board(void) {`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+void board_deinit(void) {`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,6 @@ bool board_requests_safe_mode(void) {`
`35`	`35`
`36`	`36`	`void reset_board(void) {`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+void board_deinit(void) {`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,6 @@ void reset_board(void) {`
`41`	`41`	`// turn off any left over LED`
`42`	`42`	`board_reset_user_neopixels(&pin_GPIO19, 12);`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+void board_deinit(void) {`
	`46`	`+}`