AMiRo-OS

From d5e13e540dec58ece6de3d246a166185418f3fd3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Thomas=20Sch=C3=B6pping?= <tschoepp@cit-ec.uni-bielefeld.de>

Date: Mon, 12 Jun 2017 17:27:13 +0200

Subject: [PATCH] Introduced support for the ADC analog watchdog (ADCv2 only).

---

 os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c | 20 +++++++++++++++++---

 os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.h | 21 ++++++++++++++++++++-

 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c

index b2e651e..d5875ee 100644

--- a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c

+++ b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c

@@ -124,7 +124,11 @@ OSAL_IRQ_HANDLER(STM32_ADC_HANDLER) {

     if (ADCD1.grpp != NULL)

       _adc_isr_error_code(&ADCD1, ADC_ERR_OVERFLOW);

   }

-  /* TODO: Add here analog watchdog handling.*/

+  if (sr & ADC_SR_AWD) {

+    if (ADCD1.grpp != NULL) {

+      _adc_isr_error_code(&ADCD1, ADC_ERR_WATCHDOG);

+    }

+  }

 #if defined(STM32_ADC_ADC1_IRQ_HOOK)

   STM32_ADC_ADC1_IRQ_HOOK

 #endif

@@ -141,7 +145,11 @@ OSAL_IRQ_HANDLER(STM32_ADC_HANDLER) {

     if (ADCD2.grpp != NULL)

       _adc_isr_error_code(&ADCD2, ADC_ERR_OVERFLOW);

   }

-  /* TODO: Add here analog watchdog handling.*/

+  if (sr & ADC_SR_AWD) {

+    if (ADCD2.grpp != NULL) {

+      _adc_isr_error_code(&ADCD2, ADC_ERR_WATCHDOG);

+    }

+  }

 #if defined(STM32_ADC_ADC2_IRQ_HOOK)

   STM32_ADC_ADC2_IRQ_HOOK

 #endif

@@ -158,7 +166,11 @@ OSAL_IRQ_HANDLER(STM32_ADC_HANDLER) {

     if (ADCD3.grpp != NULL)

       _adc_isr_error_code(&ADCD3, ADC_ERR_OVERFLOW);

   }

-  /* TODO: Add here analog watchdog handling.*/

+  if (sr & ADC_SR_AWD) {

+    if (ADCD3.grpp != NULL) {

+      _adc_isr_error_code(&ADCD3, ADC_ERR_WATCHDOG);

+    }

+  }

 #if defined(STM32_ADC_ADC3_IRQ_HOOK)

   STM32_ADC_ADC3_IRQ_HOOK

 #endif

@@ -350,6 +362,8 @@ void adc_lld_start_conversion(ADCDriver *adcp) {

   adcp->adc->SR    = 0;

   adcp->adc->SMPR1 = grpp->smpr1;

   adcp->adc->SMPR2 = grpp->smpr2;

+  adcp->adc->HTR   = grpp->htr;

+  adcp->adc->LTR   = grpp->ltr;

   adcp->adc->SQR1  = grpp->sqr1 | ADC_SQR1_NUM_CH(grpp->num_channels);

   adcp->adc->SQR2  = grpp->sqr2;

   adcp->adc->SQR3  = grpp->sqr3;

diff --git a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.h b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.h

index 13df506..fa266f0 100644

--- a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.h

+++ b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.h

@@ -313,7 +313,8 @@ typedef uint16_t adc_channels_num_t;

  */

 typedef enum {

   ADC_ERR_DMAFAILURE = 0,                   /**< DMA operations failure.    */

-  ADC_ERR_OVERFLOW = 1                      /**< ADC overflow condition.    */

+  ADC_ERR_OVERFLOW = 1,                     /**< ADC overflow condition.    */

+  ADC_ERR_WATCHDOG = 2                      /**< ADC watchdog condition.    */

 } adcerror_t;

 /**

@@ -392,6 +393,16 @@ typedef struct {

    */

   uint32_t                  smpr2;

   /**

+   * @brief   ADC watchdog high threshold register.

+   * @details This field defines the high threshold of the analog watchdog.

+   */

+  uint16_t                  htr;

+  /**

+   * @brief   ADC watchdog low threshold register.

+   * @details This field defines the low threshold of the analog watchdog.

+   */

+  uint16_t                  ltr;

+  /**

    * @brief   ADC SQR1 register initialization data.

    * @details Conversion group sequence 13...16 + sequence length.

    */

@@ -531,6 +542,14 @@ struct ADCDriver {

 #define ADC_SMPR1_SMP_VBAT(n)   ((n) << 24) /**< @brief VBAT sampling time. */

 /** @} */

+/**

+ * @name    Threshold settings helper macros

+ * @{

+ */

+#define ADC_HTR(n)              ((n > ADC_HTR_HT) ? ADC_HTR_HT : n) /**< @brief High threshold limitation.  */

+#define ADC_LTR(n)              ((n > ADC_LTR_LT) ? ADC_LTR_LT : n) /**< @brief Low threshold limitation.   */

+/** @} */

+

 /*===========================================================================*/

 /* External declarations.                                                    */

 /*===========================================================================*/

-- 

2.7.4

From 6a763db09751ded7e11e531825c1c12d9fbecca9 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Thomas=20Sch=C3=B6pping?= <tschoepp@cit-ec.uni-bielefeld.de>

Date: Fri, 13 Jul 2018 16:21:27 +0200

Subject: [PATCH] RTCv1: Fixed illegal type casts (from pointer to arithmetic type to pointer to real type).

---

 os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c

index df4b7e7..fedce93 100644

--- a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c

+++ b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c

@@ -130,14 +130,15 @@ static void rtc_decode(uint32_t tv_sec,

                        RTCDateTime *timespec) {

   struct tm tim;

   struct tm *t;

+  const time_t time = tv_sec;

   /* If the conversion is successful the function returns a pointer

      to the object the result was written into.*/

 #if defined(__GNUC__) || defined(__CC_ARM)

-  t = localtime_r((time_t *)&(tv_sec), &tim);

+  t = localtime_r(&time, &tim);

   osalDbgAssert(t != NULL, "conversion failed");

 #else

-  t = localtime(&tv_sec);

+  t = localtime(&time);

   memcpy(&tim, t, sizeof(struct tm));

 #endif

-- 

2.7.4