summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports/nrf/common-hal/microcontroller/__init__.c1
-rw-r--r--ports/nrf/common-hal/watchdog/WatchDogTimer.c231
-rw-r--r--ports/nrf/common-hal/watchdog/WatchDogTimer.h17
-rw-r--r--shared-bindings/watchdog/WatchDogMode.c32
-rw-r--r--shared-bindings/watchdog/WatchDogMode.h4
-rw-r--r--shared-bindings/watchdog/WatchDogTimer.c172
-rw-r--r--shared-bindings/watchdog/WatchDogTimer.h19
7 files changed, 269 insertions, 207 deletions
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
index cc5f2a285..f5caf68ef 100644
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -123,7 +123,6 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = {
.type = &watchdog_watchdogtimer_type,
},
.timeout = 0.0f,
- .sleep = false,
.mode = WATCHDOGMODE_NONE,
};
#endif
diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.c b/ports/nrf/common-hal/watchdog/WatchDogTimer.c
index 32af25866..bec0ac473 100644
--- a/ports/nrf/common-hal/watchdog/WatchDogTimer.c
+++ b/ports/nrf/common-hal/watchdog/WatchDogTimer.c
@@ -69,88 +69,46 @@ STATIC void watchdogtimer_timer_event_handler(nrf_timer_event_t event_type, void
#endif
}
-// This function is called if the timer expires. The system will reboot in 1/16384 of a second.
-// Issue a reboot ourselves so we can do any cleanup necessary.
+static void timer_free(void) {
+ timer_refcount--;
+ if (timer_refcount == 0) {
+ nrf_peripherals_free_timer(timer);
+ timer = NULL;
+ }
+}
+
+// This function is called if the timer expires. The system will reboot
+// in 1/16384 of a second. Issue a reboot ourselves so we can do any
+// cleanup necessary.
STATIC void watchdogtimer_watchdog_event_handler(void) {
reset_cpu();
}
-//| def feed(self):
-//| """Feed the watchdog timer. This must be called regularly, otherwise
-//| the timer will expire."""
-//| ...
-//|
-STATIC mp_obj_t watchdog_watchdogtimer_feed(mp_obj_t self_in) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
+void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {
if (self->mode == WATCHDOGMODE_RESET) {
nrfx_wdt_feed(&wdt);
} else if (self->mode == WATCHDOGMODE_RAISE) {
nrfx_timer_clear(timer);
- } else if (self->mode == WATCHDOGMODE_NONE) {
- mp_raise_ValueError(translate("WatchDogTimer is not currently running"));
}
- return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watchdogtimer_feed);
-
-//| def deinit(self):
-//| """Stop the watchdog timer. This may raise an error if the watchdog
-//| timer cannot be disabled on this platform."""
-//| ...
-//|
-STATIC mp_obj_t watchdog_watchdogtimer_deinit(mp_obj_t self_in) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (self->mode == WATCHDOGMODE_RAISE) {
- timer_refcount--;
- if (timer_refcount == 0) {
- nrf_peripherals_free_timer(timer);
- timer = NULL;
- }
- self->mode = WATCHDOGMODE_NONE;
- } else if (self->mode == WATCHDOGMODE_RESET) {
- mp_raise_NotImplementedError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET"));
+void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
+ if (timer) {
+ timer_free();
}
-
- return mp_const_none;
+ self->mode = WATCHDOGMODE_NONE;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_deinit_obj, watchdog_watchdogtimer_deinit);
void watchdog_reset(void) {
- if (common_hal_mcu_watchdogtimer_obj.mode == WATCHDOGMODE_RAISE) {
- common_hal_mcu_watchdogtimer_obj.mode = WATCHDOGMODE_NONE;
- timer_refcount--;
- if (timer_refcount == 0) {
- nrf_peripherals_free_timer(timer);
- timer = NULL;
- }
- }
+ common_hal_watchdog_deinit(&common_hal_mcu_watchdogtimer_obj);
}
-//| timeout: float = ...
-//| """The maximum number of seconds that can elapse between calls
-//| to feed()"""
-//|
-STATIC mp_obj_t watchdog_watchdogtimer_obj_get_timeout(mp_obj_t self_in) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- return mp_obj_new_float(self->timeout);
+mp_float_t common_hal_watchdog_get_timeout(watchdog_watchdogtimer_obj_t *self) {
+ return self->timeout;
}
-MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_timeout_obj, watchdog_watchdogtimer_obj_get_timeout);
-
-STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout_obj) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- mp_float_t timeout = mp_obj_get_float(timeout_obj);
-
- if (timeout <= 0) {
- mp_raise_ValueError(translate("watchdog timeout must be greater than 0"));
- }
- if (self->mode == WATCHDOGMODE_RESET) {
- // If the WatchDogTimer is already running in "RESET" mode, raise an error
- // since the mode cannot be changed once started.
- mp_raise_TypeError(translate("cannot change the timeout once mode is WatchDogMode.RESET"));
- } else if (self->mode == WATCHDOGMODE_RAISE) {
+void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self, mp_float_t timeout) {
+ if (self->mode == WATCHDOGMODE_RAISE) {
// If the WatchDogTimer is already running in "RAISE" mode, reset the timer
// with the new value.
uint64_t ticks = timeout * 31250ULL;
@@ -162,108 +120,42 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_
}
self->timeout = timeout;
- return mp_const_none;
}
-MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_timeout_obj, watchdog_watchdogtimer_obj_set_timeout);
-
-const mp_obj_property_t watchdog_watchdogtimer_timeout_obj = {
- .base.type = &mp_type_property,
- .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_timeout_obj,
- (mp_obj_t)&watchdog_watchdogtimer_set_timeout_obj,
- (mp_obj_t)&mp_const_none_obj},
-};
-//| mode: watchdog.WatchDogMode = ...
-//| """The current operating mode of the WatchDogTimer `watchdog.WatchDogMode`.
-//|
-//| Setting a WatchDogMode activates the WatchDog::
-//|
-//| import microcontroller
-//| import watchdog
-//|
-//| w = microcontroller.watchdog
-//| w.timeout = 5
-//| w.mode = watchdog.WatchDogMode.RAISE
-//|
-//|
-//| Once set, the WatchDogTimer will perform the specified action if the timer expires.
-//|
-STATIC mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- switch (self->mode) {
- case WATCHDOGMODE_NONE: default: return (mp_obj_t)MP_ROM_PTR(&watchdog_watchdogmode_none_obj);
- case WATCHDOGMODE_RAISE: return (mp_obj_t)MP_ROM_PTR(&watchdog_watchdogmode_raise_obj);
- case WATCHDOGMODE_RESET: return (mp_obj_t)MP_ROM_PTR(&watchdog_watchdogmode_reset_obj);
- }
+watchdog_watchdogmode_t common_hal_watchdog_get_mode(watchdog_watchdogtimer_obj_t *self) {
+ return self->mode;
}
-MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_mode_obj, watchdog_watchdogtimer_obj_get_mode);
-STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t mode_obj) {
- watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
- watchdog_watchdogmode_obj_t *mode = MP_OBJ_TO_PTR(mode_obj);
- if (mode == MP_ROM_PTR(&watchdog_watchdogmode_none_obj)) {
- if (self->mode == WATCHDOGMODE_RESET) {
- mp_raise_TypeError(translate("WatchDogTimer mode cannot be changed once set to WatchDogMode.RESET"));
- }
- else if (self->mode == WATCHDOGMODE_RAISE) {
- timer_refcount--;
- if (timer_refcount == 0) {
- nrf_peripherals_free_timer(timer);
- timer = NULL;
- }
- }
- self->mode = WATCHDOGMODE_NONE;
+void common_hal_watchdog_set_mode(watchdog_watchdogtimer_obj_t *self, watchdog_watchdogmode_t new_mode) {
+ watchdog_watchdogmode_t current_mode = self->mode;
- } else if (mode == MP_ROM_PTR(&watchdog_watchdogmode_raise_obj)) {
- if (self->timeout <= 0) {
- mp_raise_ValueError(translate("watchdog timeout must be greater than 0"));
- }
- if (self->mode == WATCHDOGMODE_RESET) {
- mp_raise_ValueError(translate("WatchDogTimer mode cannot be changed once set to WatchDogMode.RESET"));
+ if (new_mode == WATCHDOGMODE_RAISE) {
+ if (timer_refcount == 0) {
+ timer = nrf_peripherals_allocate_timer_or_throw();
}
- else if (self->mode == WATCHDOGMODE_NONE || self->mode == WATCHDOGMODE_RAISE) {
- if (timer_refcount == 0) {
- timer = nrf_peripherals_allocate_timer_or_throw();
- }
- if (timer == NULL) {
- mp_raise_RuntimeError(translate("timer was null"));
- }
- timer_refcount++;
-
- nrfx_timer_config_t timer_config = {
- .frequency = NRF_TIMER_FREQ_31250Hz,
- .mode = NRF_TIMER_MODE_TIMER,
- .bit_width = NRF_TIMER_BIT_WIDTH_32,
- .interrupt_priority = NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY,
- .p_context = self,
- };
-
- nrfx_timer_init(timer, &timer_config, &watchdogtimer_timer_event_handler);
+ timer_refcount++;
+
+ nrfx_timer_config_t timer_config = {
+ .frequency = NRF_TIMER_FREQ_31250Hz,
+ .mode = NRF_TIMER_MODE_TIMER,
+ .bit_width = NRF_TIMER_BIT_WIDTH_32,
+ .interrupt_priority = NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY,
+ .p_context = self,
+ };
- uint64_t ticks = nrfx_timer_ms_to_ticks(timer, self->timeout * 1000);
- if (ticks > UINT32_MAX) {
- mp_raise_ValueError(translate("timeout duration exceeded the maximum supported value"));
- }
+ nrfx_timer_init(timer, &timer_config, &watchdogtimer_timer_event_handler);
- // true enables interrupt.
- nrfx_timer_clear(timer);
- nrfx_timer_compare(timer, NRF_TIMER_CC_CHANNEL0, ticks, true);
- nrfx_timer_resume(timer);
+ uint64_t ticks = nrfx_timer_ms_to_ticks(timer, self->timeout * 1000);
+ if (ticks > UINT32_MAX) {
+ mp_raise_ValueError(translate("timeout duration exceeded the maximum supported value"));
}
- self->mode = WATCHDOGMODE_RAISE;
- } else if (mode == MP_ROM_PTR(&watchdog_watchdogmode_reset_obj)) {
- if (self->timeout <= 0) {
- mp_raise_ValueError(translate("watchdog timeout must be greater than 0"));
- }
- if (self->mode == WATCHDOGMODE_RAISE) {
- timer_refcount--;
- if (timer_refcount == 0) {
- nrf_peripherals_free_timer(timer);
- timer = NULL;
- }
- }
+ // true enables interrupt.
+ nrfx_timer_clear(timer);
+ nrfx_timer_compare(timer, NRF_TIMER_CC_CHANNEL0, ticks, true);
+ nrfx_timer_resume(timer);
+ } else if (new_mode == WATCHDOGMODE_RESET) {
uint64_t ticks = self->timeout * 1000.0f;
if (ticks > UINT32_MAX) {
mp_raise_ValueError(translate("timeout duration exceeded the maximum supported value"));
@@ -286,31 +178,12 @@ STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t m
}
nrfx_wdt_enable(&wdt);
nrfx_wdt_feed(&wdt);
- self->mode = WATCHDOGMODE_RESET;
}
- return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_mode_obj, watchdog_watchdogtimer_obj_set_mode);
-
-const mp_obj_property_t watchdog_watchdogtimer_mode_obj = {
- .base.type = &mp_type_property,
- .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_mode_obj,
- (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj,
- (mp_obj_t)&mp_const_none_obj},
-};
-
-STATIC const mp_rom_map_elem_t watchdog_watchdogtimer_locals_dict_table[] = {
- { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&watchdog_watchdogtimer_feed_obj) },
- { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&watchdog_watchdogtimer_deinit_obj) },
- { MP_ROM_QSTR(MP_QSTR_timeout), MP_ROM_PTR(&watchdog_watchdogtimer_timeout_obj) },
- { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&watchdog_watchdogtimer_mode_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(watchdog_watchdogtimer_locals_dict, watchdog_watchdogtimer_locals_dict_table);
+ // If we just switched away from RAISE, disable the timmer.
+ if (current_mode == WATCHDOGMODE_RAISE && new_mode != WATCHDOGMODE_RAISE) {
+ timer_free();
+ }
-const mp_obj_type_t watchdog_watchdogtimer_type = {
- { &mp_type_type },
- .name = MP_QSTR_WatchDogTimer,
- // .make_new = watchdog_watchdogtimer_make_new,
- .locals_dict = (mp_obj_dict_t*)&watchdog_watchdogtimer_locals_dict,
-};
+ self->mode = new_mode;
+}
diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.h b/ports/nrf/common-hal/watchdog/WatchDogTimer.h
index f5ea453cc..8d6df934e 100644
--- a/ports/nrf/common-hal/watchdog/WatchDogTimer.h
+++ b/ports/nrf/common-hal/watchdog/WatchDogTimer.h
@@ -28,16 +28,17 @@
#define MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
#include "py/obj.h"
-#include "shared-bindings/watchdog/WatchDogTimer.h"
#include "shared-bindings/watchdog/WatchDogMode.h"
+#include "shared-bindings/watchdog/WatchDogTimer.h"
-typedef struct _watchdog_watchdogtimer_obj_t {
- mp_obj_base_t base;
- mp_float_t timeout;
- bool sleep;
- watchdog_watchdogmode_t mode;
-} watchdog_watchdogtimer_obj_t;
+struct _watchdog_watchdogtimer_obj_t {
+ mp_obj_base_t base;
+ mp_float_t timeout;
+ watchdog_watchdogmode_t mode;
+};
+// This needs to be called in order to disable the watchdog if it's set to
+// "RAISE". If set to "RESET", then the watchdog cannot be reset.
void watchdog_reset(void);
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
+#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_WATCHDOG_WATCHDOGTIMER_H
diff --git a/shared-bindings/watchdog/WatchDogMode.c b/shared-bindings/watchdog/WatchDogMode.c
index c5c4b23bc..cc75a6ea4 100644
--- a/shared-bindings/watchdog/WatchDogMode.c
+++ b/shared-bindings/watchdog/WatchDogMode.c
@@ -32,11 +32,6 @@
//| def __init__(self, ):
//| """Enum-like class to define the run mode of the watchdog timer."""
//|
-//| NONE: Any = ...
-//| """Take no action if the watchdog timer expires.
-//|
-//| :type watchdog.WatchDogMode:"""
-//|
//| RAISE: Any = ...
//| """Raise an exception when the WatchDogTimer expires.
//|
@@ -49,10 +44,6 @@
//|
const mp_obj_type_t watchdog_watchdogmode_type;
-const watchdog_watchdogmode_obj_t watchdog_watchdogmode_none_obj = {
- { &watchdog_watchdogmode_type },
-};
-
const watchdog_watchdogmode_obj_t watchdog_watchdogmode_raise_obj = {
{ &watchdog_watchdogmode_type },
};
@@ -61,8 +52,29 @@ const watchdog_watchdogmode_obj_t watchdog_watchdogmode_reset_obj = {
{ &watchdog_watchdogmode_type },
};
+watchdog_watchdogmode_t watchdog_watchdogmode_obj_to_type(mp_obj_t obj) {
+ if (obj == MP_ROM_PTR(&watchdog_watchdogmode_raise_obj)) {
+ return WATCHDOGMODE_RAISE;
+ } else if (obj == MP_ROM_PTR(&watchdog_watchdogmode_reset_obj)) {
+ return WATCHDOGMODE_RESET;
+ }
+ return WATCHDOGMODE_NONE;
+}
+
+mp_obj_t watchdog_watchdogmode_type_to_obj(watchdog_watchdogmode_t mode) {
+ switch (mode) {
+ case WATCHDOGMODE_RAISE:
+ return (mp_obj_t)MP_ROM_PTR(&watchdog_watchdogmode_raise_obj);
+ case WATCHDOGMODE_RESET:
+ return (mp_obj_t)MP_ROM_PTR(&watchdog_watchdogmode_reset_obj);
+ case WATCHDOGMODE_NONE:
+ default:
+ return (mp_obj_t)MP_ROM_PTR(&mp_const_none_obj);
+ }
+}
+
STATIC const mp_rom_map_elem_t watchdog_watchdogmode_locals_dict_table[] = {
- {MP_ROM_QSTR(MP_QSTR_NONE), MP_ROM_PTR(&watchdog_watchdogmode_none_obj)},
+ {MP_ROM_QSTR(MP_QSTR_NONE), MP_ROM_PTR(&mp_const_none_obj)},
{MP_ROM_QSTR(MP_QSTR_RAISE), MP_ROM_PTR(&watchdog_watchdogmode_raise_obj)},
{MP_ROM_QSTR(MP_QSTR_RESET), MP_ROM_PTR(&watchdog_watchdogmode_reset_obj)},
};
diff --git a/shared-bindings/watchdog/WatchDogMode.h b/shared-bindings/watchdog/WatchDogMode.h
index 77bf58db6..68022671f 100644
--- a/shared-bindings/watchdog/WatchDogMode.h
+++ b/shared-bindings/watchdog/WatchDogMode.h
@@ -37,10 +37,12 @@ typedef enum {
const mp_obj_type_t watchdog_watchdogmode_type;
+watchdog_watchdogmode_t watchdog_watchdogmode_obj_to_type(mp_obj_t obj);
+mp_obj_t watchdog_watchdogmode_type_to_obj(watchdog_watchdogmode_t mode);
+
typedef struct {
mp_obj_base_t base;
} watchdog_watchdogmode_obj_t;
-extern const watchdog_watchdogmode_obj_t watchdog_watchdogmode_none_obj;
extern const watchdog_watchdogmode_obj_t watchdog_watchdogmode_raise_obj;
extern const watchdog_watchdogmode_obj_t watchdog_watchdogmode_reset_obj;
diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c
index e69de29bb..5411d0bef 100644
--- a/shared-bindings/watchdog/WatchDogTimer.c
+++ b/shared-bindings/watchdog/WatchDogTimer.c
@@ -0,0 +1,172 @@
+/*
+ * 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 <math.h>
+#include <string.h>
+
+#include "py/obj.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+
+#include "common-hal/watchdog/WatchDogTimer.h"
+
+#include "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/watchdog/__init__.h"
+#include "shared-bindings/watchdog/WatchDogTimer.h"
+
+#include "supervisor/port.h"
+
+//| def feed(self):
+//| """Feed the watchdog timer. This must be called regularly, otherwise
+//| the timer will expire."""
+//| ...
+//|
+STATIC mp_obj_t watchdog_watchdogtimer_feed(mp_obj_t self_in) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ watchdog_watchdogmode_t current_mode = common_hal_watchdog_get_mode(self);
+
+ if (current_mode == WATCHDOGMODE_NONE) {
+ mp_raise_ValueError(translate("WatchDogTimer is not currently running"));
+ }
+ common_hal_watchdog_feed(self);
+ return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watchdogtimer_feed);
+
+//| def deinit(self):
+//| """Stop the watchdog timer. This may raise an error if the watchdog
+//| timer cannot be disabled on this platform."""
+//| ...
+//|
+STATIC mp_obj_t watchdog_watchdogtimer_deinit(mp_obj_t self_in) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ watchdog_watchdogmode_t current_mode = common_hal_watchdog_get_mode(self);
+
+ if (current_mode == WATCHDOGMODE_RESET) {
+ mp_raise_NotImplementedError(translate("WatchDogTimer cannot be deinitialized once mode is set to RESET"));
+ }
+
+ common_hal_watchdog_deinit(self);
+ return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_deinit_obj, watchdog_watchdogtimer_deinit);
+
+//| timeout: float = ...
+//| """The maximum number of seconds that can elapse between calls
+//| to feed()"""
+//|
+STATIC mp_obj_t watchdog_watchdogtimer_obj_get_timeout(mp_obj_t self_in) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ return mp_obj_new_float(common_hal_watchdog_get_timeout(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_timeout_obj, watchdog_watchdogtimer_obj_get_timeout);
+
+STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout_obj) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ mp_float_t timeout = mp_obj_get_float(timeout_obj);
+
+ if (timeout <= 0) {
+ mp_raise_ValueError(translate("watchdog timeout must be greater than 0"));
+ }
+
+ common_hal_watchdog_set_timeout(self, timeout);
+ return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_timeout_obj, watchdog_watchdogtimer_obj_set_timeout);
+
+const mp_obj_property_t watchdog_watchdogtimer_timeout_obj = {
+ .base.type = &mp_type_property,
+ .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_timeout_obj,
+ (mp_obj_t)&watchdog_watchdogtimer_set_timeout_obj,
+ (mp_obj_t)&mp_const_none_obj},
+};
+
+//| mode: watchdog.WatchDogMode = ...
+//| """The current operating mode of the WatchDogTimer `watchdog.WatchDogMode`.
+//|
+//| Setting a WatchDogMode activates the WatchDog::
+//|
+//| import microcontroller
+//| import watchdog
+//|
+//| w = microcontroller.watchdog
+//| w.timeout = 5
+//| w.mode = watchdog.WatchDogMode.RAISE
+//|
+//|
+//| Once set, the WatchDogTimer will perform the specified action if the timer expires."""
+//|
+STATIC mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ return watchdog_watchdogmode_type_to_obj(common_hal_watchdog_get_mode(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_mode_obj, watchdog_watchdogtimer_obj_get_mode);
+
+STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t mode_obj) {
+ watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+ watchdog_watchdogmode_t current_mode = common_hal_watchdog_get_mode(self);
+ watchdog_watchdogmode_t new_mode = watchdog_watchdogmode_obj_to_type(mode_obj);
+ mp_float_t current_timeout = common_hal_watchdog_get_timeout(self);
+
+ // When setting the mode, the timeout value must be greater than zero
+ if (new_mode == WATCHDOGMODE_RESET || new_mode == WATCHDOGMODE_RAISE) {
+ if (current_timeout <= 0) {
+ mp_raise_ValueError(translate("WatchDogTimer.timeout must be greater than 0"));
+ }
+ }
+
+ // Don't allow changing the mode once the watchdog timer has been started
+ if (current_mode == WATCHDOGMODE_RESET && new_mode != WATCHDOGMODE_RESET) {
+ mp_raise_TypeError(translate("WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"));
+ }
+
+ common_hal_watchdog_set_mode(self, new_mode);
+ return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(watchdog_watchdogtimer_set_mode_obj, watchdog_watchdogtimer_obj_set_mode);
+
+const mp_obj_property_t watchdog_watchdogtimer_mode_obj = {
+ .base.type = &mp_type_property,
+ .proxy = {(mp_obj_t)&watchdog_watchdogtimer_get_mode_obj,
+ (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj,
+ (mp_obj_t)&mp_const_none_obj},
+};
+
+STATIC const mp_rom_map_elem_t watchdog_watchdogtimer_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&watchdog_watchdogtimer_feed_obj) },
+ { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&watchdog_watchdogtimer_deinit_obj) },
+ { MP_ROM_QSTR(MP_QSTR_timeout), MP_ROM_PTR(&watchdog_watchdogtimer_timeout_obj) },
+ { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&watchdog_watchdogtimer_mode_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(watchdog_watchdogtimer_locals_dict, watchdog_watchdogtimer_locals_dict_table);
+
+const mp_obj_type_t watchdog_watchdogtimer_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_WatchDogTimer,
+ // .make_new = watchdog_watchdogtimer_make_new,
+ .locals_dict = (mp_obj_dict_t*)&watchdog_watchdogtimer_locals_dict,
+};
diff --git a/shared-bindings/watchdog/WatchDogTimer.h b/shared-bindings/watchdog/WatchDogTimer.h
index 375ca653d..48044748a 100644
--- a/shared-bindings/watchdog/WatchDogTimer.h
+++ b/shared-bindings/watchdog/WatchDogTimer.h
@@ -28,17 +28,20 @@
#define MICROPY_INCLUDED_SHARED_BINDINGS_WATCHDOG_WATCHDOGTIMER_H
#include <py/obj.h>
+#include "shared-bindings/watchdog/WatchDogMode.h"
-// extern void common_hal_wdt_init(uint32_t duration, bool pause_during_sleep);
-// extern void common_hal_wdt_feed(void);
-// extern void common_hal_wdt_disable(void);
+typedef struct _watchdog_watchdogtimer_obj_t watchdog_watchdogtimer_obj_t;
+extern void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self);
-// typedef struct _wdt_wdt_obj_t {
-// mp_obj_base_t base;
-// uint32_t timeout;
-// bool sleep;
-// } wdt_wdt_obj_t;
+extern void common_hal_watchdog_set_mode(watchdog_watchdogtimer_obj_t *self, watchdog_watchdogmode_t);
+extern watchdog_watchdogmode_t common_hal_watchdog_get_mode(watchdog_watchdogtimer_obj_t *self);
+
+extern void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self, mp_float_t timeout);
+extern mp_float_t common_hal_watchdog_get_timeout(watchdog_watchdogtimer_obj_t *self);
+
+extern void common_hal_watchdog_enable(watchdog_watchdogtimer_obj_t *self);
+extern void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self);
extern const mp_obj_type_t watchdog_watchdogtimer_type;
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-08 14:28:19 +0000