summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Moore <nick@zoic.org>2019-02-02 18:38:10 +1100
committerNick Moore <nick@zoic.org>2019-03-28 09:50:09 +1100
commit77f307c64274e5b10b5030f67b5c07d1993ec42e (patch)
treeab8706271d42dd8d48034448bd65c3f3b41bb527
parent94822ee2088960e6f68c9d4f05606cdb47c9ba5c (diff)
starting on #1046 rtc for nRF
-rw-r--r--ports/nrf/common-hal/rtc/RTC.c58
-rw-r--r--ports/nrf/common-hal/rtc/RTC.h32
-rw-r--r--ports/nrf/common-hal/rtc/__init__.c0
-rw-r--r--ports/nrf/mpconfigport.h1
-rw-r--r--ports/nrf/mpconfigport.mk2
-rw-r--r--ports/nrf/supervisor/port.c5
6 files changed, 96 insertions, 2 deletions
diff --git a/ports/nrf/common-hal/rtc/RTC.c b/ports/nrf/common-hal/rtc/RTC.c
new file mode 100644
index 000000000..871fddc9d
--- /dev/null
+++ b/ports/nrf/common-hal/rtc/RTC.c
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Nick Moore 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 <stdlib.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
+#include "shared-bindings/rtc/__init__.h"
+#include "supervisor/shared/translate.h"
+
+void rtc_init(void) {
+}
+
+void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
+ tm->tm_year = 2000;
+ tm->tm_mon = 1;
+ tm->tm_mday = 2;
+ tm->tm_hour = 3;
+ tm->tm_min = 4;
+ tm->tm_sec = 5;
+ tm->tm_wday = 6;
+ tm->tm_yday = 2;
+}
+
+void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
+}
+
+// A positive value speeds up the clock by removing clock cycles.
+int common_hal_rtc_get_calibration(void) {
+ return 0;
+}
+
+void common_hal_rtc_set_calibration(int calibration) {
+}
diff --git a/ports/nrf/common-hal/rtc/RTC.h b/ports/nrf/common-hal/rtc/RTC.h
new file mode 100644
index 000000000..5374fa2c8
--- /dev/null
+++ b/ports/nrf/common-hal/rtc/RTC.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Noralf Trønnes
+ *
+ * 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_NRF_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_RTC_RTC_H
+
+extern void rtc_init(void);
+
+#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_RTC_RTC_H
diff --git a/ports/nrf/common-hal/rtc/__init__.c b/ports/nrf/common-hal/rtc/__init__.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ports/nrf/common-hal/rtc/__init__.c
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 1b2d8ea12..5ed521e85 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -57,5 +57,4 @@
CIRCUITPY_COMMON_ROOT_POINTERS \
ble_drv_evt_handler_entry_t* ble_drv_evt_handler_entries; \
-
#endif // NRF5_MPCONFIGPORT_H__
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index badfb6735..75acb40d9 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -23,7 +23,7 @@ CIRCUITPY_I2CSLAVE = 0
CIRCUITPY_NVM = 0
# rtc not yet implemented
-CIRCUITPY_RTC = 0
+CIRCUITPY_RTC = 1
# frequencyio not yet implemented
CIRCUITPY_FREQUENCYIO = 0
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index fd077a46a..3d20e94ae 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -45,8 +45,11 @@
#include "common-hal/pulseio/PWMOut.h"
#include "common-hal/pulseio/PulseOut.h"
#include "common-hal/pulseio/PulseIn.h"
+#include "common-hal/rtc/RTC.h"
#include "tick.h"
+#include "shared-bindings/rtc/__init__.h"
+
static void power_warning_handler(void) {
reset_into_safe_mode(BROWNOUT);
}
@@ -71,6 +74,7 @@ safe_mode_t port_init(void) {
// Configure millisecond timer initialization.
tick_init();
+ rtc_init();
// Will do usb_init() if chip supports USB.
board_init();
@@ -90,6 +94,7 @@ void reset_port(void) {
pulseout_reset();
pulsein_reset();
timers_reset();
+ rtc_reset();
bleio_reset();