Added normal timer mode

Author: timherreijgers

include/NextagEmbeddedPlatform/chips/atmega328p/descriptor.h

@@ -31,9 +31,10 @@ struct Atmega328pDescriptor
         static volatile uint8_t & counter;
         static volatile uint8_t & interrupt;
 
-        // static constexpr uint8_t timerModeMask = _BV(CS00) | _BV(CS01) | _BV(CS02);
+        static constexpr uint8_t timerModeMask = _BV(CS00) | _BV(CS01) | _BV(CS02);
         enum class TimerMode
         {
+            NORMAL = createCombinedRegisterValue(0, 0),
             CTC = createCombinedRegisterValue(_BV(WGM01), 0)
         };
 

include/NextagEmbeddedPlatform/concepts/drivers/timer.h

@@ -52,6 +52,7 @@ concept HasTimerInterrupt = requires(T t) {
 template <typename T>
 concept HasTimerMode = requires(T t) {
     typename T::TimerMode;
+    T::timerModeMask;
 };
 
 template <typename T>

include/NextagEmbeddedPlatform/drivers/timer.h

@@ -17,6 +17,7 @@ template <typename TimerDescriptor>
 class Timer
 {
 public:
+    using Descriptor = TimerDescriptor;
     using TimerMode = typename TimerDescriptor::TimerMode;
     using ClockSelect = typename TimerDescriptor::ClockSelect;
     using Interrupt = typename TimerDescriptor::Interrupt;
@@ -27,6 +28,7 @@ class Timer
     static void setMode(TimerMode timerMode)
         requires HasCombinedTimerMode<TimerDescriptor>
     {
+        TimerDescriptor::controlAB &= ~TimerDescriptor::timerModeMask;
         TimerDescriptor::controlAB |= static_cast<uint16_t>(timerMode);
     }
 

tests/drivers/timer/timer0_tests.cpp

@@ -30,10 +30,27 @@ class Timer0Tests : public NextagTest::Test
     }
 };
 
+TEST_F(Timer0Tests, SetModeToNormal_SetsCorrectRegisters)
+{
+    Timer0::setMode(Timer0::TimerMode::NORMAL);
+    TEST_ASSERT_BITS_LOW(_BV(WGM01) | _BV(WGM00), TCCR0A);
+    TEST_ASSERT_BIT_LOW(_BV(WGM02), TCCR0B);
+}
+
 TEST_F(Timer0Tests, SetModeToCTC_SetsCorrectRegisters)
 {
     Timer0::setMode(Timer0::TimerMode::CTC);
     TEST_ASSERT_BITS_HIGH(_BV(WGM01), TCCR0A);
+    TEST_ASSERT_BITS_LOW(_BV(WGM00), TCCR0A);
+    TEST_ASSERT_BITS_LOW(_BV(WGM02), TCCR0B);
+}
+
+TEST_F(Timer0Tests, SetModeToNormal_AfterSetToCTC_SetsCorrectRegisters)
+{
+    Timer0::setMode(Timer0::TimerMode::CTC);
+    Timer0::setMode(Timer0::TimerMode::NORMAL);
+    TEST_ASSERT_BITS_LOW(_BV(WGM01) | _BV(WGM00), TCCR0A);
+    TEST_ASSERT_BIT_LOW(_BV(WGM02), TCCR0B);
 }
 
 TEST_F(Timer0Tests, SetClockSource_SetsCorrectRegisterValue)