Moved watchdog code to dedicated file

Setting watchdog hook from all hook changes

Author: siliconwitch

source/application/Makefile

@@ -36,6 +36,7 @@ C_FILES += \
 	flash.c \
 	luaport.c \
 	spi.c \
+	watchdog.c \
 	lua_libraries/bluetooth.c \
 	lua_libraries/camera.c \
 	lua_libraries/display.c \

source/application/lua_libraries/bluetooth.c

@@ -30,6 +30,7 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include "luaport.h"
+#include "watchdog.h"
 
 static int lua_bluetooth_is_connected(lua_State *L)
 {
@@ -93,7 +94,7 @@ static struct lua_bluetooth_callback
 
 static void lua_bluetooth_receive_callback_handler(lua_State *L, lua_Debug *ar)
 {
-    lua_sethook(L, NULL, 0, 0);
+    sethook_watchdog(L);
 
     lua_rawgeti(L, LUA_REGISTRYINDEX, lua_bluetooth_callback.function);
 

source/application/lua_libraries/imu.c

@@ -32,6 +32,7 @@
 #include "nrfx_gpiote.h"
 #include "nrfx_systick.h"
 #include "pinout.h"
+#include "watchdog.h"
 
 #define PI 3.14159265
 
@@ -55,7 +56,7 @@ static int lua_imu_callback_function = 0;
 
 static void lua_imu_tap_callback_handler(lua_State *L, lua_Debug *ar)
 {
-    lua_sethook(L, NULL, 0, 0);
+    sethook_watchdog(L);
 
     // Clear the interrupt by reading the status register
     check_error(i2c_read(ACCELEROMETER, 0x03, 0xFF).fail);

source/application/luaport.c

@@ -29,9 +29,9 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include "lualib.h"
-#include "main.h"
 #include "nrf_soc.h"
 #include "nrfx_log.h"
+#include "watchdog.h"
 
 lua_State *L_global = NULL;
 
@@ -51,7 +51,7 @@ void lua_write_to_repl(uint8_t *buffer, uint8_t length)
 
 static void lua_break_signal_handler(lua_State *L, lua_Debug *ar)
 {
-    lua_sethook(L, NULL, 0, 0);
+    sethook_watchdog(L);
     luaL_error(L, "break signal");
 }
 
@@ -73,7 +73,8 @@ void run_lua(bool factory_reset)
         error_with_message("Cannot create lua state: not enough memory");
     }
 
-    lua_sethook(L, reload_watchdog, LUA_MASKCOUNT, 100);
+    // Attach watchdog to hook
+    sethook_watchdog(L);
 
     // Open the standard libraries
     luaL_requiref(L, LUA_GNAME, luaopen_base, 1);

source/application/main.c

@@ -41,11 +41,9 @@
 #include "nrfx_log.h"
 #include "nrfx_rtc.h"
 #include "nrfx_systick.h"
-#include "nrfx_wdt.h"
 #include "pinout.h"
 #include "spi.h"
-
-static nrfx_wdt_t watchdog = NRFX_WDT_INSTANCE(0);
+#include "watchdog.h"
 
 bool not_real_hardware = false;
 bool stay_awake = false;
@@ -170,14 +168,7 @@ static void hardware_setup(bool *factory_reset)
 {
     // Configure watchdog
     {
-        nrfx_wdt_config_t watchdog_config = NRFX_WDT_DEFAULT_CONFIG;
-        nrfx_wdt_channel_id watchdog_channel = NRF_WDT_RR0;
-
-        check_error(nrfx_wdt_init(&watchdog, &watchdog_config, NULL));
-        check_error(nrfx_wdt_channel_alloc(&watchdog, &watchdog_channel));
-
-        nrfx_wdt_enable(&watchdog);
-        nrfx_wdt_feed(&watchdog);
+        init_watchdog();
     }
 
     // Configure systick so we can use it for simple delays
@@ -406,11 +397,6 @@ static void hardware_setup(bool *factory_reset)
     }
 }
 
-void reload_watchdog(void)
-{
-    nrfx_wdt_feed(&watchdog);
-}
-
 int main(void)
 {
     LOG("Frame firmware " BUILD_VERSION " (" GIT_COMMIT ")");
@@ -421,10 +407,10 @@ int main(void)
 
     bluetooth_setup(factory_reset);
 
-    nrfx_wdt_feed(&watchdog);
-
     while (1)
     {
+        reload_watchdog(NULL, NULL);
+
         run_lua(factory_reset);
 
         factory_reset = false;

source/application/main.h

@@ -30,5 +30,3 @@ extern bool not_real_hardware;
 extern bool stay_awake;
 
 void shutdown(bool enable_imu_wakeup);
-
-void reload_watchdog(void);

source/application/watchdog.c

@@ -0,0 +1,54 @@
+/*
+ * This file is a part of: https://github.com/brilliantlabsAR/frame-codebase
+ *
+ * Authored by: Raj Nakarja / Brilliant Labs Ltd. ([email protected])
+ *              Rohit Rathnam / Silicon Witchery AB ([email protected])
+ *              Uma S. Gupta / Techno Exponent ([email protected])
+ *
+ * ISC Licence
+ *
+ * Copyright © 2023 Brilliant Labs Ltd.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "lua.h"
+#include "nrfx_wdt.h"
+
+static nrfx_wdt_t watchdog = NRFX_WDT_INSTANCE(0);
+
+void init_watchdog(void)
+{
+    nrfx_wdt_config_t watchdog_config = {
+        .behaviour = NRF_WDT_BEHAVIOUR_RUN_SLEEP_MASK,
+        .reload_value = 6000,
+    };
+
+    nrfx_wdt_channel_id watchdog_channel = NRF_WDT_RR0;
+
+    check_error(nrfx_wdt_init(&watchdog, &watchdog_config, NULL));
+    check_error(nrfx_wdt_channel_alloc(&watchdog, &watchdog_channel));
+
+    nrfx_wdt_enable(&watchdog);
+    nrfx_wdt_feed(&watchdog);
+}
+
+void reload_watchdog(lua_State *L, lua_Debug *ar)
+{
+    nrfx_wdt_channel_feed(&watchdog, NRF_WDT_RR0);
+}
+
+void sethook_watchdog(lua_State *L)
+{
+    lua_sethook(L, reload_watchdog, LUA_MASKCOUNT, 2000);
+}

source/application/watchdog.h

@@ -0,0 +1,31 @@
+/*
+ * This file is a part of: https://github.com/brilliantlabsAR/frame-codebase
+ *
+ * Authored by: Raj Nakarja / Brilliant Labs Ltd. ([email protected])
+ *              Rohit Rathnam / Silicon Witchery AB ([email protected])
+ *              Uma S. Gupta / Techno Exponent ([email protected])
+ *
+ * ISC Licence
+ *
+ * Copyright © 2023 Brilliant Labs Ltd.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include "lua.h"
+
+void init_watchdog(void);
+void reload_watchdog(lua_State *L, lua_Debug *ar);
+void sethook_watchdog(lua_State *L);