You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/12/21 14:22:47 UTC
[incubator-nuttx] branch master updated: Changes in the watchdog
auto-monitor menu
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 8811214 Changes in the watchdog auto-monitor menu
8811214 is described below
commit 881121444cdb6603ab006a6a2f3a8c267543e4b4
Author: Sara Souza <sa...@espressif.com>
AuthorDate: Mon Dec 21 08:42:00 2020 -0300
Changes in the watchdog auto-monitor menu
---
drivers/timers/Kconfig | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/drivers/timers/Kconfig b/drivers/timers/Kconfig
index 431b2f8..fedf15b 100644
--- a/drivers/timers/Kconfig
+++ b/drivers/timers/Kconfig
@@ -313,27 +313,22 @@ if WATCHDOG
config WATCHDOG_DEVPATH
string "Watchdog Device Path"
default "/dev/watchdog0"
+ ---help---
+ Please, check how your specific chip or board uses this symbol.
+ FYI: It's NOT used by the Auto-monitor feature.
-config WATCHDOG_AUTOMONITOR
+menuconfig WATCHDOG_AUTOMONITOR
bool "Auto-monitor"
---help---
The auto-monitor provides an OS-internal mechanism for automatically
- start and repeatedly reset the counting after the watchdog is register.
+ start and repeatedly reset the WDTs that were previous selected.
+ Once the Auto-monitor is enabled, it will reset all
+ registered watchdog timers. If you start a specific WDT, the auto-monitor
+ will stop for that WDT and the application should take care of this from
+ now on.
if WATCHDOG_AUTOMONITOR
-config WATCHDOG_AUTOMONITOR_TIMEOUT
- int "Auto-monitor reset timeout(second)"
- default 60
-
-config WATCHDOG_AUTOMONITOR_PING_INTERVAL
- int "Auto-monitor keep a live interval"
- default WATCHDOG_AUTOMONITOR_TIMEOUT
- range 1 WATCHDOG_AUTOMONITOR_TIMEOUT
- ---help---
- If the interval is same as WATCHDOG_AUTOMONITOR_TIMEOUT
- the default value will change to (WATCHDOG_AUTOMONITOR_TIMEOUT / 2).
-
choice
prompt "Auto-monitor keepalive by"
default WATCHDOG_AUTOMONITOR_BY_TIMER
@@ -354,6 +349,24 @@ config WATCHDOG_AUTOMONITOR_BY_IDLE
endchoice
+config WATCHDOG_AUTOMONITOR_TIMEOUT
+ int "Auto-monitor reset timeout(second)"
+ default 60
+
+if WATCHDOG_AUTOMONITOR_BY_TIMER || WATCHDOG_AUTOMONITOR_BY_WORKER
+
+config WATCHDOG_AUTOMONITOR_PING_INTERVAL
+ int "Auto-monitor keep a live interval"
+ default WATCHDOG_AUTOMONITOR_TIMEOUT
+ range 1 WATCHDOG_AUTOMONITOR_TIMEOUT
+ ---help---
+ If the interval is same as WATCHDOG_AUTOMONITOR_TIMEOUT
+ the default value will change to (WATCHDOG_AUTOMONITOR_TIMEOUT / 2).
+ This interval will only be used by auto-monitor by Worker callback
+ or by Timer callback.
+
+endif # WATCHDOG_AUTOMONITOR_BY_TIMER || WATCHDOG_AUTOMONITOR_BY_WORKER
+
endif # WATCHDOG_AUTOMONITOR
endif # WATCHDOG