Skip to content

Tune up and test again AVR watchdog #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckormanyos merged 1 commit into from
Aug 9, 2025
Merged

Tune up and test again AVR watchdog #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ref_app/src/mcal/avr/mcal_wdg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Copyright Christopher Kormanyos 2007 - 2024.
// Copyright Christopher Kormanyos 2007 - 2025.
// Distributed under the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)
Expand Down Expand Up @@ -29,19 +29,28 @@ auto mcal::wdg::init(const config_type*) -> void
// Reset the watchdog timer.
asm volatile("wdr");

// Set the watchdog timer period and activate the watchdog timer.
// Start timed sequence in order to set the watchdog
// timer period and activate the watchdog timer.
mcal::reg::reg_access_static<std::uint8_t,
std::uint8_t,
mcal::reg::wdtcsr,
std::uint8_t(0x18U)>::reg_set();

// See Chapter 11.9.2, Table 11-2: Watchdog Timer Prescale Select.
// Select WDP3:WDP0 in WDTCSR to binary 0b0111, resulting
// in a watchdog period of approximately 2s.
// In "Atmel-7810-Automotive-Microcontrollers-ATmega328P_Datasheet.pdf",
// see Chapter 10.9.2, Table 10-3: Watchdog Timer Prescale Select.
// Set WDP3 (bit 5) and clear WDP2:WDP0 (bits 0, 1 and 2) in WDTCSR
// (i.e., set to hex 0x20). This results in a watchdog period
// of approximately 4s.
mcal::reg::reg_access_static<std::uint8_t,
std::uint8_t,
mcal::reg::wdtcsr,
std::uint8_t(0x08U) | std::uint8_t(0x07U)>::reg_set();
std::uint8_t(0x20U)>::reg_set();

// Set WDRF in the MCU status register.
mcal::reg::reg_access_static<std::uint8_t,
std::uint8_t,
mcal::reg::mcusr,
std::uint8_t(3U)>::bit_set();
}

auto mcal::wdg::secure::trigger() -> void
Expand Down
Loading