Skip to content
Snippets Groups Projects

Fix watchdog bootloop

Merged Jeff Gough requested to merge jeffmakes/firmware:wdt-fix into master

2.7 seconds was too aggressive for the latest build. Changed to 5.4 seconds, clearing every 5 seconds.

Clear watchdog on clearing software timer init so that clearing timer and watchdog timer start in sync.

Edited by swym

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • rahix
  • schneider
  • Jeff Gough added 2 commits

    added 2 commits

    • 2e4135ee - Move watchdog init code into watchdog module. Call watchdog_clearer_init() from hardware_init()
    • 086da6bd - Ran code-format.sh

    Compare with previous version

  • Jeff Gough added 1 commit

    added 1 commit

    • 636a7374 - Clear watchdog every 2 seconds

    Compare with previous version

  • Jeff Gough resolved all threads

    resolved all threads

  • schneider
  • assigned to @schneider

  • added 3-Epicardium label

  • rahix
  • swym changed the description

    changed the description

  • swym changed milestone to %v1.7

    changed milestone to %v1.7

  • Jeff Gough added 104 commits

    added 104 commits

    • 636a7374...c77e4c13 - 94 commits from branch card10:master
    • 3eaf1a5b - Set watchdog to timeout at 5.4 seconds. Start clearing timer earlier in boot.
    • 8f3a8a43 - Set watchdog clear period to 5 seconds, and clear the watchdog on clearer timer init
    • 4b13f2d7 - Ran code-format.sh
    • c3230208 - Move watchdog init code into watchdog module. Call watchdog_clearer_init() from hardware_init()
    • da3a5534 - Ran code-format.sh
    • 87240f73 - Clear watchdog every 2 seconds
    • f3c08bf4 - Merge branch 'wdt-fix' of git.card10.badge.events.ccc.de:jeffmakes/firmware into wdt-fix
    • 6d0f1256 - Move watchdog_init() into top of main() so it runs before any log writes. Init...
    • a537a1fc - Remove stupid include
    • c2354888 - Make watchdog reset log message more clear

    Compare with previous version

  • Jeff Gough added 1 commit

    added 1 commit

    Compare with previous version

  • Looks good to me! Thanks for keeping our codebase clean.

    However, I'm only a bot - so a human will still have to approve this request.

  • Jeff Gough resolved all threads

    resolved all threads

  • Author Contributor

    Moved watchdog_init() to top of main as discussed, clarified reset log message, rebased onto 1.6 and tested.

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading