works so far

include/stm32f1xx_hal_conf.h

@@ -56,7 +56,7 @@
 /*#define HAL_CORTEX_MODULE_ENABLED   */
 /*#define HAL_CRC_MODULE_ENABLED   */
 /*#define HAL_DAC_MODULE_ENABLED   */
-/*#define HAL_DMA_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
 /*#define HAL_ETH_MODULE_ENABLED   */
 /*#define HAL_FLASH_MODULE_ENABLED   */
 #define HAL_GPIO_MODULE_ENABLED

include/stm32f1xx_it.h

@@ -56,6 +56,7 @@ void PendSV_Handler(void);
 void SysTick_Handler(void);
 void EXTI3_IRQHandler(void);
 void EXTI4_IRQHandler(void);
+void DMA1_Channel1_IRQHandler(void);
 void EXTI9_5_IRQHandler(void);
 
 #ifdef __cplusplus

my_src/alarm.c

@@ -92,7 +92,7 @@ void enableAlarm(tAlarmType alarmType) {
   }
   if (buzzerHandle.inUse == 0) {
     buzzerHandle.inUse = 1;
-    schAdd(buzz, &buzzerHandle, 0, 10000);
+    schAdd(buzz, &buzzerHandle, 0, 30000);
   }
 }
 
@@ -100,4 +100,5 @@ void disableAlarm() {
   schDel(blink, NULL);
   HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, RESET);
   schDel(buzz, &buzzerHandle);
+  buzzerHandle.inUse = 0;
 }

my_src/hmi.c

@@ -12,10 +12,12 @@
 #include <PontCoopScheduler.h>
 #include "oled.h"
 #include "eeprom.h"
+#include "thermometer.h"
 
 
 
 const uint32_t STORAGE_MAGIC = 0xaffe000a;
+const uint8_t COLD_COUNT_THRESHOLD = 40;
 
 
 
@@ -23,12 +25,15 @@ const uint32_t STORAGE_MAGIC = 0xaffe000a;
 volatile tDisplay display = {
     .toggle = 0, .setModeTemperature = 0, .setModeTime = 0,
     .timerState = IDLE,
+    .thermometerEngineState = TE_IDLE,
     .toggleModeState = 1,
     .targetTemperature = 80, .currentTemperature = 75,
     .targetTime = 120, .currentTime = 0,
     .overrunTime = 0
 };
 
+
+
 typedef struct {
   uint32_t magic;
   uint32_t savedTemperature;
@@ -59,6 +64,7 @@ void updateDisplay(void *handle) {
   }
   LED_P8x16Str(0, 4, buf);
 
+
   sprintf(buf, "      %5ds", lDisplay->overrunTime);
 //  static uint32_t h = 0;
 //  static uint32_t c = 0;
@@ -69,6 +75,45 @@ void updateDisplay(void *handle) {
   LED_P8x16Str(0, 6, buf);
 }
 
+void thermometerEngine(void *handle) {
+  tDisplay *lDisplay = (tDisplay*) handle;
+  lDisplay->currentTemperature = thermometerGetValue();
+
+  switch (lDisplay->thermometerEngineState) {
+  case TE_IDLE:
+    if (lDisplay->currentTemperature > lDisplay->targetTemperature) {
+      lDisplay->thermometerEngineState = TE_HOT;
+      lDisplay->coldCount = 0;
+    }
+    break;
+  case TE_HOT:
+    if (lDisplay->currentTemperature <= lDisplay->targetTemperature) {
+      lDisplay->coldCount += 1;
+    }
+    if (lDisplay->coldCount >= COLD_COUNT_THRESHOLD) {
+      lDisplay->thermometerEngineState = TE_COLD;
+    }
+    break;
+  case TE_COLD:
+    enableAlarm(TEMPERATURE_ALARM);
+    lDisplay->thermometerEngineState = TE_UNCONFIRMED;
+    break;
+  case TE_UNCONFIRMED:
+    break;
+  case TE_CONFIRMED:
+    disableAlarm();
+    lDisplay->thermometerEngineState = TE_IDLE;
+    break;
+  default:
+    lDisplay->thermometerEngineState = TE_IDLE;
+  }
+}
+
+void thermometerEngineConfirmAlarm() {
+  if (display.thermometerEngineState == TE_UNCONFIRMED) {
+    display.thermometerEngineState = TE_CONFIRMED;
+  }
+}
 
 void hmiInit() {
   eepromRead(STORAGE_ADDRESS, &storage, sizeof(storage));
@@ -86,7 +131,8 @@ void hmiInit() {
     display.targetTime = storage.savedTime;
   }
 
-  schAdd(updateDisplay, &display, 0, 250);
+  schAdd(thermometerEngine, &display, 0, 250);
+  schAdd(updateDisplay, &display, 10, 250);
 }
 
 void clearSetMode(void *handle) {
@@ -172,6 +218,7 @@ void buttonShort() {
     toggleSetMode();
   } else if (display.timerState == IDLE) {
     startTimer();
+    thermometerEngineConfirmAlarm();
   } else if (display.timerState == RUNNING || display.timerState == OVERRUN) {
     stopTimer();
     disableAlarm();

my_src/hmi.h

@@ -13,11 +13,16 @@
 #include "stm32f1xx_hal.h"
 
 
+
+typedef enum { TE_IDLE, TE_HOT, TE_COLD, TE_UNCONFIRMED, TE_CONFIRMED } tThermometerEngineState;
+
 typedef struct {
   uint32_t toggle;
   uint32_t setModeTemperature;
   uint32_t setModeTime;
   tTimerState timerState;
+  tThermometerEngineState thermometerEngineState;
+  uint8_t coldCount;
   uint32_t toggleModeState;
   uint32_t targetTemperature;
   uint32_t currentTemperature;

my_src/main2.c

@@ -16,14 +16,15 @@
 
 
 
-#include <hmi.h>
 #include <stdlib.h>
 #include <PontCoopScheduler.h>
 #include "stm32f1xx_hal.h"
 
+#include "hmi.h"
 #include "oled.h"
 #include "timer.h"
 #include "alarm.h"
+#include "thermometer.h"
 
 
 void my_setup_1() {
@@ -48,6 +49,7 @@ void my_setup_2() {
   timerInit();
   oledInit();
   alarmInit();
+  thermometerInit();
 }
 
 

src/main.c

@@ -40,6 +40,7 @@
 
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc1;
+DMA_HandleTypeDef hdma_adc1;
 
 SPI_HandleTypeDef hspi1;
 
@@ -54,6 +55,7 @@ TIM_HandleTypeDef htim1;
 void SystemClock_Config(void);
 void Error_Handler(void);
 static void MX_GPIO_Init(void);
+static void MX_DMA_Init(void);
 static void MX_ADC1_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_TIM1_Init(void);
@@ -88,6 +90,7 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
+  MX_DMA_Init();
   MX_ADC1_Init();
   MX_SPI1_Init();
   MX_TIM1_Init();
@@ -167,7 +170,7 @@ static void MX_ADC1_Init(void)
     */
   hadc1.Instance = ADC1;
   hadc1.Init.ScanConvMode = ADC_SCAN_DISABLE;
-  hadc1.Init.ContinuousConvMode = DISABLE;
+  hadc1.Init.ContinuousConvMode = ENABLE;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
   hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
   hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -263,7 +266,7 @@ static void MX_TIM1_Init(void)
   }
 
   sConfigOC.OCMode = TIM_OCMODE_TOGGLE;
-  sConfigOC.Pulse = 100;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
@@ -278,6 +281,21 @@ static void MX_TIM1_Init(void)
 
 }
 
+/** 
+  * Enable DMA controller clock
+  */
+static void MX_DMA_Init(void) 
+{
+  /* DMA controller clock enable */
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel1_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+
+}
+
 /** Configure pins as 
         * Analog 
         * Input 

src/main.c-bak

@@ -39,6 +39,7 @@
 
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc1;
+DMA_HandleTypeDef hdma_adc1;
 
 SPI_HandleTypeDef hspi1;
 
@@ -53,6 +54,7 @@ TIM_HandleTypeDef htim1;
 void SystemClock_Config(void);
 void Error_Handler(void);
 static void MX_GPIO_Init(void);
+static void MX_DMA_Init(void);
 static void MX_ADC1_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_TIM1_Init(void);
@@ -86,6 +88,7 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
+  MX_DMA_Init();
   MX_ADC1_Init();
   MX_SPI1_Init();
   MX_TIM1_Init();
@@ -163,7 +166,7 @@ static void MX_ADC1_Init(void)
     */
   hadc1.Instance = ADC1;
   hadc1.Init.ScanConvMode = ADC_SCAN_DISABLE;
-  hadc1.Init.ContinuousConvMode = DISABLE;
+  hadc1.Init.ContinuousConvMode = ENABLE;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
   hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
   hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -218,9 +221,9 @@ static void MX_TIM1_Init(void)
   TIM_OC_InitTypeDef sConfigOC;
 
   htim1.Instance = TIM1;
-  htim1.Init.Prescaler = 0;
+  htim1.Init.Prescaler = 36;
   htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim1.Init.Period = 0;
+  htim1.Init.Period = 1000;
   htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim1.Init.RepetitionCounter = 0;
   if (HAL_TIM_Base_Init(&htim1) != HAL_OK)
@@ -259,7 +262,7 @@ static void MX_TIM1_Init(void)
   }
 
   sConfigOC.OCMode = TIM_OCMODE_TOGGLE;
-  sConfigOC.Pulse = 10000;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
@@ -274,6 +277,21 @@ static void MX_TIM1_Init(void)
 
 }
 
+/** 
+  * Enable DMA controller clock
+  */
+static void MX_DMA_Init(void) 
+{
+  /* DMA controller clock enable */
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel1_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+
+}
+
 /** Configure pins as 
         * Analog 
         * Input 

src/stm32f1xx_hal_msp.c

@@ -34,6 +34,8 @@
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f1xx_hal.h"
 
+extern DMA_HandleTypeDef hdma_adc1;
+
 extern void Error_Handler(void);
 /* USER CODE BEGIN 0 */
 
@@ -96,6 +98,23 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* Peripheral DMA init*/
+  
+    hdma_adc1.Instance = DMA1_Channel1;
+    hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+    hdma_adc1.Init.Mode = DMA_NORMAL;
+    hdma_adc1.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_adc1) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(hadc,DMA_Handle,hdma_adc1);
+
   /* USER CODE BEGIN ADC1_MspInit 1 */
 
   /* USER CODE END ADC1_MspInit 1 */
@@ -119,6 +138,8 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_0);
 
+    /* Peripheral DMA DeInit*/
+    HAL_DMA_DeInit(hadc->DMA_Handle);
   }
   /* USER CODE BEGIN ADC1_MspDeInit 1 */
 

src/stm32f1xx_it.c

@@ -40,6 +40,7 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
+extern DMA_HandleTypeDef hdma_adc1;
 
 /******************************************************************************/
 /*            Cortex-M3 Processor Interruption and Exception Handlers         */ 
@@ -211,6 +212,20 @@ void EXTI4_IRQHandler(void)
   /* USER CODE END EXTI4_IRQn 1 */
 }
 
+/**
+* @brief This function handles DMA1 channel1 global interrupt.
+*/
+void DMA1_Channel1_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel1_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_adc1);
+  /* USER CODE BEGIN DMA1_Channel1_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel1_IRQn 1 */
+}
+
 /**
 * @brief This function handles EXTI line[9:5] interrupts.
 */