Analog2DigitalConverter, RealTimeClock, TimerCounter: attach ISR handler on demand

Author: jnsbyr

library.json

@@ -12,7 +12,7 @@
         "type": "git",
         "url": "https://github.com/jnsbyr/arduino-samd21lpe"
     },
-    "version": "1.0.8",
+    "version": "1.0.9",
     "examples": "examples/*/*.ino",
     "license": "Apache-2.0",
     "frameworks": "arduino",

library.properties

@@ -1,5 +1,5 @@
 name=SAMD21 Low Power Extensions
-version=1.0.8
+version=1.0.9
 author=Jens B.
 maintainer=Jens B.
 sentence=low power extensions for SAMD21

src/Analog2DigitalConverter.cpp

@@ -253,6 +253,9 @@ void Analog2DigitalConverter::start(uint8_t muxPosVal, void (*callback)())
     NVIC_DisableIRQ(ADC_IRQn);
     NVIC_ClearPendingIRQ(ADC_IRQn);
     NVIC_SetPriority(ADC_IRQn, 0x00);
+  #ifndef SAMD21LPE_USE_STATIC_ISR_HANDLER
+    System::getVectorTable().pfnADC_Handler = (void*)isrHandler;
+  #endif
     NVIC_EnableIRQ(ADC_IRQn);
 
     // enable result ready interrupt
@@ -472,7 +475,9 @@ const Analog2DigitalConverter::Pin Analog2DigitalConverter::PIN_MAPPING[Analog2D
   { 0, 11, PORT_PA11 }
 };
 
+#ifdef SAMD21LPE_USE_STATIC_ISR_HANDLER
 void ADC_Handler()
 {
   SAMD21LPE::Analog2DigitalConverter::isrHandler();
 }
+#endif

src/RealTimeClock.cpp

@@ -57,6 +57,9 @@ void RealTimeClock::enable(uint8_t clkGenId, uint32_t clkGenFrequency, uint8_t c
     NVIC_DisableIRQ(RTC_IRQn);
     NVIC_ClearPendingIRQ(RTC_IRQn);
     NVIC_SetPriority(RTC_IRQn, min(irqPriority, (1 << __NVIC_PRIO_BITS) - 1));
+  #ifndef SAMD21LPE_USE_STATIC_ISR_HANDLER
+    System::getVectorTable().pfnRTC_Handler = (void*)isrHandler;
+  #endif
     NVIC_EnableIRQ(RTC_IRQn);
 
     // setup RTC for mode 0, no continuous read, optionally clear on match (periodic timer) and enable
@@ -81,6 +84,9 @@ void RealTimeClock::disable()
   // clear RTC interrupts
   NVIC_DisableIRQ(RTC_IRQn);
   NVIC_ClearPendingIRQ(RTC_IRQn);
+#ifndef SAMD21LPE_USE_STATIC_ISR_HANDLER
+  System::getVectorTable().pfnRTC_Handler = nullptr;
+#endif
 }
 
 uint32_t RealTimeClock::toClockTicks(uint32_t duration) const
@@ -206,10 +212,12 @@ void RealTimeClock::isrHandler()
   }
 }
 
+#ifdef SAMD21LPE_USE_STATIC_ISR_HANDLER
 /**
  * SAMD21 RTC interrupt handler
  */
 void RTC_Handler()
 {
   RealTimeClock::instance().isrHandler();
 }
+#endif

src/TimerCounter.cpp

@@ -122,6 +122,22 @@ bool TimerCounter::enable(uint8_t id, uint8_t clkGenId, uint32_t clkGenFrequency
     NVIC_DisableIRQ(irq);
     NVIC_ClearPendingIRQ(irq);
     NVIC_SetPriority(irq, irqPriority);
+  #ifndef SAMD21LPE_USE_STATIC_ISR_HANDLER
+    switch (id)
+    {
+      case 3:
+        System::getVectorTable().pfnTC3_Handler = (void*)isrHandlerTC3;
+        break;
+
+      case 4:
+        System::getVectorTable().pfnTC4_Handler = (void*)isrHandlerTC4;
+        break;
+
+      case 5:
+        System::getVectorTable().pfnTC5_Handler = (void*)isrHandlerTC5;
+        break;
+    }
+  #endif
     NVIC_EnableIRQ(irq);
 
     // enable overflow interrupt (needed for oneshot mode)
@@ -359,6 +375,8 @@ void TimerCounter::isrHandler(uint8_t id)
 
 TimerCounter* TimerCounter::timerCounter[3] = { nullptr };
 
+#ifdef SAMD21LPE_USE_STATIC_ISR_HANDLER
+
 /**
  * SAMD21 TC3 interrupt handler
  */
@@ -382,3 +400,5 @@ void TC5_Handler()
 {
   SAMD21LPE::TimerCounter::isrHandler(2);
 }
+
+#endif