wip

workspace/AUTOM10/AUTOM10.ioc

@@ -1,28 +1,54 @@
 #MicroXplorer Configuration settings - do not modify
 ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_4
-ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,NbrOfConversionFlag,master
+ADC1.Channel-1\#ChannelRegularConversion=ADC_CHANNEL_5
+ADC1.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_6
+ADC1.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_7
+ADC1.Channel-4\#ChannelRegularConversion=ADC_CHANNEL_8
+ADC1.ContinuousConvMode=ENABLE
+ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,NbrOfConversionFlag,master,NbrOfConversion,Rank-1\#ChannelRegularConversion,Channel-1\#ChannelRegularConversion,SamplingTime-1\#ChannelRegularConversion,Rank-2\#ChannelRegularConversion,Channel-2\#ChannelRegularConversion,SamplingTime-2\#ChannelRegularConversion,Rank-3\#ChannelRegularConversion,Channel-3\#ChannelRegularConversion,SamplingTime-3\#ChannelRegularConversion,Rank-4\#ChannelRegularConversion,Channel-4\#ChannelRegularConversion,SamplingTime-4\#ChannelRegularConversion,ContinuousConvMode
+ADC1.NbrOfConversion=5
 ADC1.NbrOfConversionFlag=1
 ADC1.Rank-0\#ChannelRegularConversion=1
-ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_1CYCLE_5
+ADC1.Rank-1\#ChannelRegularConversion=2
+ADC1.Rank-2\#ChannelRegularConversion=3
+ADC1.Rank-3\#ChannelRegularConversion=4
+ADC1.Rank-4\#ChannelRegularConversion=5
+ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_28CYCLES_5
+ADC1.SamplingTime-1\#ChannelRegularConversion=ADC_SAMPLETIME_28CYCLES_5
+ADC1.SamplingTime-2\#ChannelRegularConversion=ADC_SAMPLETIME_28CYCLES_5
+ADC1.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_28CYCLES_5
+ADC1.SamplingTime-4\#ChannelRegularConversion=ADC_SAMPLETIME_28CYCLES_5
 ADC1.master=1
 CAD.formats=
 CAD.pinconfig=
 CAD.provider=
+Dma.ADC1.0.Direction=DMA_PERIPH_TO_MEMORY
+Dma.ADC1.0.Instance=DMA1_Channel1
+Dma.ADC1.0.MemDataAlignment=DMA_MDATAALIGN_HALFWORD
+Dma.ADC1.0.MemInc=DMA_MINC_ENABLE
+Dma.ADC1.0.Mode=DMA_CIRCULAR
+Dma.ADC1.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
+Dma.ADC1.0.PeriphInc=DMA_PINC_DISABLE
+Dma.ADC1.0.Priority=DMA_PRIORITY_LOW
+Dma.ADC1.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.Request0=ADC1
+Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
 Mcu.CPN=STM32F103C8T6
 Mcu.Family=STM32F1
 Mcu.IP0=ADC1
-Mcu.IP1=NVIC
-Mcu.IP2=RCC
-Mcu.IP3=SYS
-Mcu.IP4=TIM2
-Mcu.IP5=TIM4
-Mcu.IP6=USART1
-Mcu.IP7=USB
-Mcu.IP8=USB_DEVICE
-Mcu.IPNb=9
+Mcu.IP1=DMA
+Mcu.IP2=NVIC
+Mcu.IP3=RCC
+Mcu.IP4=SYS
+Mcu.IP5=TIM2
+Mcu.IP6=TIM4
+Mcu.IP7=USART1
+Mcu.IP8=USB
+Mcu.IP9=USB_DEVICE
+Mcu.IPNb=10
 Mcu.Name=STM32F103C(8-B)Tx
 Mcu.Package=LQFP48
 Mcu.Pin0=PC13-TAMPER-RTC
@@ -73,6 +99,7 @@ Mcu.UserName=STM32F103C8Tx
 MxCube.Version=6.15.0
 MxDb.Version=DB.6.0.150
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
+NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -260,7 +287,7 @@ ProjectManager.ToolChainLocation=
 ProjectManager.UAScriptAfterPath=
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_TIM4_Init-TIM4-false-HAL-true,6-MX_ADC1_Init-ADC1-false-HAL-true,7-MX_USART1_UART_Init-USART1-false-HAL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,5-MX_TIM2_Init-TIM2-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true,7-MX_ADC1_Init-ADC1-false-HAL-true,8-MX_USART1_UART_Init-USART1-false-HAL-true
 RCC.ADCFreqValue=12000000
 RCC.ADCPresc=RCC_ADCPCLK2_DIV6
 RCC.AHBFreq_Value=72000000

workspace/AUTOM10/Core/Inc/adc.h

@@ -0,0 +1,16 @@
+/*
+ * adc.h
+ *
+ *  Created on: Dec 8, 2025
+ *      Author: user
+ */
+
+#ifndef INC_ADC_H_
+#define INC_ADC_H_
+#include "stm32f1xx_hal.h"
+#define ADC_NUM_CHANNELS   5      // CH4..CH8
+#define ADC_AVG_WINDOW     5      // 5 * 10ms = 50ms averaging window
+
+void manageAdc(void);
+void readAdc(void);
+#endif /* INC_ADC_H_ */

workspace/AUTOM10/Core/Inc/main.h

@@ -123,7 +123,8 @@ void Error_Handler(void);
 #define IN8_GPIO_Port GPIOB
 
 /* USER CODE BEGIN Private defines */
-
+#define INP1 1
+#define INP2 2
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

workspace/AUTOM10/Core/Inc/stm32f1xx_hal_conf.h

@@ -42,7 +42,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

workspace/AUTOM10/Core/Inc/stm32f1xx_it.h

@@ -55,6 +55,7 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void DMA1_Channel1_IRQHandler(void);
 void USB_LP_CAN1_RX0_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 

workspace/AUTOM10/Core/Src/adc.c

@@ -0,0 +1,66 @@
+/*
+ * adc.c
+ *
+ *  Created on: Dec 8, 2025
+ *      Author: user
+ */
+#include "adc.h"
+
+/* Filled by ADC+DMA: latest raw value of each channel */
+volatile uint16_t adc_dma_buf[ADC_NUM_CHANNELS];
+
+/* Smoothed value (50ms average with settings above) */
+volatile uint16_t adc_avg[ADC_NUM_CHANNELS];
+
+/* Internal accumulators used only in the timer ISR */
+static uint32_t adc_sum[ADC_NUM_CHANNELS];
+static uint8_t  adc_sum_count = 0;
+
+/* Optional flag to tell main loop that a new averaged set is ready */
+volatile uint8_t adc_avg_ready = 0;
+
+uint16_t ch4 ;
+uint16_t ch5 ;
+uint16_t ch6 ;
+uint16_t ch7 ;
+uint16_t ch8 ;
+
+void manageAdc(void){
+
+    if (adc_avg_ready)
+    {
+        adc_avg_ready = 0;
+
+        // Read averaged channels (example mapping)
+        ch4 = adc_avg[0];
+        ch5 = adc_avg[1];
+        ch6 = adc_avg[2];
+        ch7 = adc_avg[3];
+        ch8 = adc_avg[4];
+
+        // Use them (convert to volts, control, etc.)
+        // float v4 = (3.3f * ch4) / 4095.0f;
+    }
+}
+
+void readAdc(void){
+    for (uint8_t i = 0; i < ADC_NUM_CHANNELS; i++)
+    {
+        adc_sum[i] += adc_dma_buf[i];
+    }
+
+    adc_sum_count++;
+
+    /* When we collected ADC_AVG_WINDOW samples → compute average */
+    if (adc_sum_count >= ADC_AVG_WINDOW)
+    {
+        for (uint8_t i = 0; i < ADC_NUM_CHANNELS; i++)
+        {
+            adc_avg[i] = (uint16_t)(adc_sum[i] / ADC_AVG_WINDOW);
+            adc_sum[i] = 0;
+        }
+
+        adc_sum_count = 0;
+        adc_avg_ready = 1;    // tell main loop new data is ready
+    }
+}

workspace/AUTOM10/Core/Src/cdc_int.c

@@ -13,6 +13,12 @@ extern TIM_HandleTypeDef htim2;
 extern TIM_HandleTypeDef htim3;
 extern TIM_HandleTypeDef htim4;
 extern const uint16_t EE_VirtAddrs[];
+extern uint8_t pulsanti;
+extern uint16_t ch4 ;
+extern uint16_t ch5 ;
+extern uint16_t ch6 ;
+extern uint16_t ch7 ;
+extern uint16_t ch8 ;
 
 bool toHex(char c1,char c2,char c3,char c4,uint16_t* retval){
 	if((c1>='0')&&(c1<='9')){
@@ -75,9 +81,10 @@ void manageCDC(void){
 				  while (CDC_Transmit_FS(s, 5) == USBD_BUSY);
 				  sprintf((char*)s,"\npwm %d%d%d%d%d%d%d%d",IsPwmRunning(timMot1,FWMot1),IsPwmRunning(timMot1,BWMot1),IsPwmRunning(timMot2,FWMot2),IsPwmRunning(timMot2,BWMot2),IsPwmRunning(timMot3,FWMot3),IsPwmRunning(timMot3,BWMot3),IsPwmRunning(timMot4,FWMot4),IsPwmRunning(timMot4,BWMot4));
 				  while (CDC_Transmit_FS(s, strlen((char*)s)) == USBD_BUSY);
-				  __HAL_TIM_GET_COMPARE(&htim3, TIM_CHANNEL_1);
 				  sprintf((char*)s,"\n0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx",(uint32_t)__HAL_TIM_GET_COMPARE(timMot1,FWMot1),(uint32_t)__HAL_TIM_GET_COMPARE(timMot1,BWMot1),(uint32_t)__HAL_TIM_GET_COMPARE(timMot2,FWMot2),(uint32_t)__HAL_TIM_GET_COMPARE(timMot2,BWMot2),(uint32_t)__HAL_TIM_GET_COMPARE(timMot3,FWMot3),(uint32_t)__HAL_TIM_GET_COMPARE(timMot3,BWMot3),(uint32_t)__HAL_TIM_GET_COMPARE(timMot4,FWMot4),(uint32_t)__HAL_TIM_GET_COMPARE(timMot4,BWMot4));
 				  while (CDC_Transmit_FS(s, strlen((char*)s)) == USBD_BUSY);
+				  sprintf((char*)s,"\nP=0x%x ch4=%05d ch5=%05d ch6=%05d ch7=%05d ch8=%05d",pulsanti,ch4,ch5,ch6,ch7,ch8);
+				  while (CDC_Transmit_FS(s, strlen((char*)s)) == USBD_BUSY);
 				  break;
 			  case 'm':
 				  if(rxidx==8){

workspace/AUTOM10/Core/Src/main.c

@@ -26,6 +26,7 @@
 #include "cdc_int.h"
 #include "eeprom.h"
 #include "pwm.h"
+#include "adc.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -45,6 +46,7 @@
 
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc1;
+DMA_HandleTypeDef hdma_adc1;
 
 TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim4;
@@ -52,15 +54,21 @@ TIM_HandleTypeDef htim4;
 UART_HandleTypeDef huart1;
 
 /* USER CODE BEGIN PV */
-TIM_HandleTypeDef htim1;
-TIM_HandleTypeDef htim2;
-TIM_HandleTypeDef htim3;
-TIM_HandleTypeDef htim4;
+
+extern volatile uint16_t adc_dma_buf[];
+extern uint16_t ch4 ;
+extern uint16_t ch5 ;
+extern uint16_t ch6 ;
+extern uint16_t ch7 ;
+extern uint16_t ch8 ;
+
+uint8_t pulsanti=0;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
+static void MX_DMA_Init(void);
 static void MX_TIM2_Init(void);
 static void MX_TIM4_Init(void);
 static void MX_ADC1_Init(void);
@@ -73,19 +81,31 @@ static void MX_USART1_UART_Init(void);
 /* USER CODE BEGIN 0 */
 void HAL_SYSTICK_Callback(void){
   static unsigned char c10ms = 0;
+  static uint8_t c100ms = 0;
+  static uint8_t c1s = 0;
+  static uint8_t inidx=0;
+  static uint8_t inbuf[4];
 
-	  static uint8_t c100ms = 0;
-	  static uint8_t c1s = 0;
-	  if (++c10ms >= 10) {               // 10 ms
-		  c10ms = 0;
-		  if (++c100ms >= 10) {               // 10 ms
-			  c100ms = 0;	    //flag_10ms = 1;                // set a flag; do real work in main loop
-			  if (++c1s >= 10) {               // 10 ms
-				  c1s = 0;
-				  HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
-			  }
+  if (++c10ms >= 10) {               // 10 ms
+	  c10ms = 0;
+//**** legge i tasti********************************************************************************
+	  inidx++;
+	  inidx&=0x03;
+	  if(HAL_GPIO_ReadPin(P1_GPIO_Port, P1_Pin)==GPIO_PIN_SET)inbuf[inidx]|=INP1;else inbuf[inidx]&=(~INP1);
+	  if(HAL_GPIO_ReadPin(P2_GPIO_Port, P2_Pin)==GPIO_PIN_SET)inbuf[inidx]|=INP2;else inbuf[inidx]&=(~INP2);
+	  pulsanti|=(inbuf[0]&inbuf[1]&inbuf[2]&inbuf[3]);
+	  pulsanti&=(inbuf[0]|inbuf[1]|inbuf[2]|inbuf[3]);
+//**** legge adc ***********************************************************************************
+	  readAdc();
+	  if (++c100ms >= 10) {               // 10 ms
+
+		  c100ms = 0;	    //flag_10ms = 1;                // set a flag; do real work in main loop
+		  if (++c1s >= 10) {               // 10 ms
+			  c1s = 0;
+			  HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
 		  }
 	  }
+  }
 }
 
 /* USER CODE END 0 */
@@ -119,12 +139,14 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
+  MX_DMA_Init();
   MX_USB_DEVICE_Init();
   MX_TIM2_Init();
   MX_TIM4_Init();
   MX_ADC1_Init();
   MX_USART1_UART_Init();
   /* USER CODE BEGIN 2 */
+  HAL_ADC_Start_DMA(&hadc1, (uint32_t *)adc_dma_buf, ADC_NUM_CHANNELS);
   StopMot(timMot1,FWMot1);
   StopMot(timMot1,BWMot1);
   StopMot(timMot2,FWMot2);
@@ -144,6 +166,7 @@ int main(void)
   /* USER CODE BEGIN WHILE */
   while (1){
 	  manageCDC();
+	  manageAdc();
 //	  while (CDC_Available()) {
 	//	  int c = CDC_ReadByte();
       //if (c < 0) break;
@@ -235,12 +258,12 @@ static void MX_ADC1_Init(void)
   /** Common config
   */
   hadc1.Instance = ADC1;
-  hadc1.Init.ScanConvMode = ADC_SCAN_DISABLE;
-  hadc1.Init.ContinuousConvMode = DISABLE;
+  hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
+  hadc1.Init.ContinuousConvMode = ENABLE;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
   hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
   hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-  hadc1.Init.NbrOfConversion = 1;
+  hadc1.Init.NbrOfConversion = 5;
   if (HAL_ADC_Init(&hadc1) != HAL_OK)
   {
     Error_Handler();
@@ -250,7 +273,43 @@ static void MX_ADC1_Init(void)
   */
   sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_28CYCLES_5;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_5;
+  sConfig.Rank = ADC_REGULAR_RANK_2;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_6;
+  sConfig.Rank = ADC_REGULAR_RANK_3;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_7;
+  sConfig.Rank = ADC_REGULAR_RANK_4;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_8;
+  sConfig.Rank = ADC_REGULAR_RANK_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
   {
     Error_Handler();
@@ -444,6 +503,22 @@ static void MX_USART1_UART_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);
+
+}
+
 /**
   * @brief GPIO Initialization Function
   * @param None

workspace/AUTOM10/Core/Src/stm32f1xx_hal_msp.c

@@ -23,6 +23,7 @@
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
+extern DMA_HandleTypeDef hdma_adc1;
 
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
@@ -117,6 +118,23 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     HAL_GPIO_Init(ANEM_GPIO_Port, &GPIO_InitStruct);
 
+    /* ADC1 DMA Init */
+    /* ADC1 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_CIRCULAR;
+    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 */
@@ -152,6 +170,8 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
 
     HAL_GPIO_DeInit(ANEM_GPIO_Port, ANEM_Pin);
 
+    /* ADC1 DMA DeInit */
+    HAL_DMA_DeInit(hadc->DMA_Handle);
     /* USER CODE BEGIN ADC1_MspDeInit 1 */
 
     /* USER CODE END ADC1_MspDeInit 1 */

workspace/AUTOM10/Core/Src/stm32f1xx_it.c

@@ -56,6 +56,7 @@
 
 /* External variables --------------------------------------------------------*/
 extern PCD_HandleTypeDef hpcd_USB_FS;
+extern DMA_HandleTypeDef hdma_adc1;
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -198,6 +199,20 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/
 
+/**
+  * @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 USB low priority or CAN RX0 interrupts.
   */

workspace/AUTOM10/Debug/Core/Src/adc.cyclo

@@ -0,0 +1,2 @@
+../Core/Src/adc.c:28:6:manageAdc	2
+../Core/Src/adc.c:46:6:readAdc	4

workspace/AUTOM10/Debug/Core/Src/adc.d

@@ -0,0 +1,62 @@
+Core/Src/adc.o: ../Core/Src/adc.c ../Core/Inc/adc.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h \
+ ../Core/Inc/stm32f1xx_hal_conf.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h \
+ ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h \
+ ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h \
+ ../Drivers/CMSIS/Include/core_cm3.h \
+ ../Drivers/CMSIS/Include/cmsis_version.h \
+ ../Drivers/CMSIS/Include/cmsis_compiler.h \
+ ../Drivers/CMSIS/Include/cmsis_gcc.h \
+ ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h \
+ ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h
+../Core/Inc/adc.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h:
+../Core/Inc/stm32f1xx_hal_conf.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h:
+../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h:
+../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h:
+../Drivers/CMSIS/Include/core_cm3.h:
+../Drivers/CMSIS/Include/cmsis_version.h:
+../Drivers/CMSIS/Include/cmsis_compiler.h:
+../Drivers/CMSIS/Include/cmsis_gcc.h:
+../Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h:
+../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h:

workspace/AUTOM10/Debug/Core/Src/adc.su

@@ -0,0 +1,2 @@
+../Core/Src/adc.c:28:6:manageAdc	4	static
+../Core/Src/adc.c:46:6:readAdc	16	static

workspace/AUTOM10/Debug/Core/Src/cdc_int.cyclo

@@ -1,4 +1,4 @@
 ../Core/Src/eeprom.h:77:24:EEW_Read	1
 ../Core/Src/eeprom.h:82:24:EEW_Write	1
-../Core/Src/cdc_int.c:17:6:toHex	17
-../Core/Src/cdc_int.c:53:6:manageCDC	60
+../Core/Src/cdc_int.c:23:6:toHex	17
+../Core/Src/cdc_int.c:59:6:manageCDC	61

workspace/AUTOM10/Debug/Core/Src/cdc_int.su

@@ -1,4 +1,4 @@
 ../Core/Src/eeprom.h:77:24:EEW_Read	16	static
 ../Core/Src/eeprom.h:82:24:EEW_Write	16	static
-../Core/Src/cdc_int.c:17:6:toHex	16	static
-../Core/Src/cdc_int.c:53:6:manageCDC	184	static
+../Core/Src/cdc_int.c:23:6:toHex	16	static
+../Core/Src/cdc_int.c:59:6:manageCDC	184	static

workspace/AUTOM10/Debug/Core/Src/main.cyclo

@@ -1,9 +1,10 @@
-../Core/Src/main.c:74:6:HAL_SYSTICK_Callback	4
-../Core/Src/main.c:97:5:main	3
-../Core/Src/main.c:174:6:SystemClock_Config	4
-../Core/Src/main.c:222:13:MX_ADC1_Init	3
-../Core/Src/main.c:269:13:MX_TIM2_Init	9
-../Core/Src/main.c:345:13:MX_TIM4_Init	9
-../Core/Src/main.c:419:13:MX_USART1_UART_Init	2
-../Core/Src/main.c:452:13:MX_GPIO_Init	1
-../Core/Src/main.c:528:6:Error_Handler	1
+../Core/Src/main.c:82:6:HAL_SYSTICK_Callback	6
+../Core/Src/main.c:117:5:main	3
+../Core/Src/main.c:197:6:SystemClock_Config	4
+../Core/Src/main.c:245:13:MX_ADC1_Init	7
+../Core/Src/main.c:328:13:MX_TIM2_Init	9
+../Core/Src/main.c:404:13:MX_TIM4_Init	9
+../Core/Src/main.c:478:13:MX_USART1_UART_Init	2
+../Core/Src/main.c:509:13:MX_DMA_Init	1
+../Core/Src/main.c:527:13:MX_GPIO_Init	1
+../Core/Src/main.c:603:6:Error_Handler	1

workspace/AUTOM10/Debug/Core/Src/main.d

@@ -38,7 +38,8 @@ Core/Src/main.o: ../Core/Src/main.c ../Core/Inc/main.h \
  ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h \
  ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h \
  ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h \
- ../Core/Inc/cdc_int.h ../Core/Src/eeprom.h ../Core/Inc/pwm.h
+ ../Core/Inc/cdc_int.h ../Core/Src/eeprom.h ../Core/Inc/pwm.h \
+ ../Core/Inc/adc.h
 ../Core/Inc/main.h:
 ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h:
 ../Core/Inc/stm32f1xx_hal_conf.h:
@@ -83,3 +84,4 @@ Core/Src/main.o: ../Core/Src/main.c ../Core/Inc/main.h \
 ../Core/Inc/cdc_int.h:
 ../Core/Src/eeprom.h:
 ../Core/Inc/pwm.h:
+../Core/Inc/adc.h:

workspace/AUTOM10/Debug/Core/Src/main.su

@@ -1,9 +1,10 @@
-../Core/Src/main.c:74:6:HAL_SYSTICK_Callback	8	static
-../Core/Src/main.c:97:5:main	8	static
-../Core/Src/main.c:174:6:SystemClock_Config	88	static
-../Core/Src/main.c:222:13:MX_ADC1_Init	24	static
-../Core/Src/main.c:269:13:MX_TIM2_Init	64	static
-../Core/Src/main.c:345:13:MX_TIM4_Init	64	static
-../Core/Src/main.c:419:13:MX_USART1_UART_Init	8	static
-../Core/Src/main.c:452:13:MX_GPIO_Init	40	static
-../Core/Src/main.c:528:6:Error_Handler	4	static,ignoring_inline_asm
+../Core/Src/main.c:82:6:HAL_SYSTICK_Callback	8	static
+../Core/Src/main.c:117:5:main	8	static
+../Core/Src/main.c:197:6:SystemClock_Config	88	static
+../Core/Src/main.c:245:13:MX_ADC1_Init	24	static
+../Core/Src/main.c:328:13:MX_TIM2_Init	64	static
+../Core/Src/main.c:404:13:MX_TIM4_Init	64	static
+../Core/Src/main.c:478:13:MX_USART1_UART_Init	8	static
+../Core/Src/main.c:509:13:MX_DMA_Init	16	static
+../Core/Src/main.c:527:13:MX_GPIO_Init	40	static
+../Core/Src/main.c:603:6:Error_Handler	4	static,ignoring_inline_asm

workspace/AUTOM10/Debug/Core/Src/stm32f1xx_hal_msp.cyclo

@@ -1,8 +1,8 @@
-../Core/Src/stm32f1xx_hal_msp.c:65:6:HAL_MspInit	1
-../Core/Src/stm32f1xx_hal_msp.c:92:6:HAL_ADC_MspInit	2
-../Core/Src/stm32f1xx_hal_msp.c:134:6:HAL_ADC_MspDeInit	2
-../Core/Src/stm32f1xx_hal_msp.c:168:6:HAL_TIM_Base_MspInit	3
-../Core/Src/stm32f1xx_hal_msp.c:195:6:HAL_TIM_MspPostInit	3
-../Core/Src/stm32f1xx_hal_msp.c:249:6:HAL_TIM_Base_MspDeInit	3
-../Core/Src/stm32f1xx_hal_msp.c:282:6:HAL_UART_MspInit	2
-../Core/Src/stm32f1xx_hal_msp.c:322:6:HAL_UART_MspDeInit	2
+../Core/Src/stm32f1xx_hal_msp.c:66:6:HAL_MspInit	1
+../Core/Src/stm32f1xx_hal_msp.c:93:6:HAL_ADC_MspInit	3
+../Core/Src/stm32f1xx_hal_msp.c:152:6:HAL_ADC_MspDeInit	2
+../Core/Src/stm32f1xx_hal_msp.c:188:6:HAL_TIM_Base_MspInit	3
+../Core/Src/stm32f1xx_hal_msp.c:215:6:HAL_TIM_MspPostInit	3
+../Core/Src/stm32f1xx_hal_msp.c:269:6:HAL_TIM_Base_MspDeInit	3
+../Core/Src/stm32f1xx_hal_msp.c:302:6:HAL_UART_MspInit	2
+../Core/Src/stm32f1xx_hal_msp.c:342:6:HAL_UART_MspDeInit	2

workspace/AUTOM10/Debug/Core/Src/stm32f1xx_hal_msp.su

@@ -1,8 +1,8 @@
-../Core/Src/stm32f1xx_hal_msp.c:65:6:HAL_MspInit	24	static
-../Core/Src/stm32f1xx_hal_msp.c:92:6:HAL_ADC_MspInit	48	static
-../Core/Src/stm32f1xx_hal_msp.c:134:6:HAL_ADC_MspDeInit	16	static
-../Core/Src/stm32f1xx_hal_msp.c:168:6:HAL_TIM_Base_MspInit	24	static
-../Core/Src/stm32f1xx_hal_msp.c:195:6:HAL_TIM_MspPostInit	40	static
-../Core/Src/stm32f1xx_hal_msp.c:249:6:HAL_TIM_Base_MspDeInit	16	static
-../Core/Src/stm32f1xx_hal_msp.c:282:6:HAL_UART_MspInit	40	static
-../Core/Src/stm32f1xx_hal_msp.c:322:6:HAL_UART_MspDeInit	16	static
+../Core/Src/stm32f1xx_hal_msp.c:66:6:HAL_MspInit	24	static
+../Core/Src/stm32f1xx_hal_msp.c:93:6:HAL_ADC_MspInit	48	static
+../Core/Src/stm32f1xx_hal_msp.c:152:6:HAL_ADC_MspDeInit	16	static
+../Core/Src/stm32f1xx_hal_msp.c:188:6:HAL_TIM_Base_MspInit	24	static
+../Core/Src/stm32f1xx_hal_msp.c:215:6:HAL_TIM_MspPostInit	40	static
+../Core/Src/stm32f1xx_hal_msp.c:269:6:HAL_TIM_Base_MspDeInit	16	static
+../Core/Src/stm32f1xx_hal_msp.c:302:6:HAL_UART_MspInit	40	static
+../Core/Src/stm32f1xx_hal_msp.c:342:6:HAL_UART_MspDeInit	16	static

workspace/AUTOM10/Debug/Core/Src/stm32f1xx_it.cyclo

@@ -1,10 +1,11 @@
-../Core/Src/stm32f1xx_it.c:69:6:NMI_Handler	1
-../Core/Src/stm32f1xx_it.c:84:6:HardFault_Handler	1
-../Core/Src/stm32f1xx_it.c:99:6:MemManage_Handler	1
-../Core/Src/stm32f1xx_it.c:114:6:BusFault_Handler	1
-../Core/Src/stm32f1xx_it.c:129:6:UsageFault_Handler	1
-../Core/Src/stm32f1xx_it.c:144:6:SVC_Handler	1
-../Core/Src/stm32f1xx_it.c:157:6:DebugMon_Handler	1
-../Core/Src/stm32f1xx_it.c:170:6:PendSV_Handler	1
-../Core/Src/stm32f1xx_it.c:183:6:SysTick_Handler	1
-../Core/Src/stm32f1xx_it.c:204:6:USB_LP_CAN1_RX0_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:70:6:NMI_Handler	1
+../Core/Src/stm32f1xx_it.c:85:6:HardFault_Handler	1
+../Core/Src/stm32f1xx_it.c:100:6:MemManage_Handler	1
+../Core/Src/stm32f1xx_it.c:115:6:BusFault_Handler	1
+../Core/Src/stm32f1xx_it.c:130:6:UsageFault_Handler	1
+../Core/Src/stm32f1xx_it.c:145:6:SVC_Handler	1
+../Core/Src/stm32f1xx_it.c:158:6:DebugMon_Handler	1
+../Core/Src/stm32f1xx_it.c:171:6:PendSV_Handler	1
+../Core/Src/stm32f1xx_it.c:184:6:SysTick_Handler	1
+../Core/Src/stm32f1xx_it.c:205:6:DMA1_Channel1_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:219:6:USB_LP_CAN1_RX0_IRQHandler	1

workspace/AUTOM10/Debug/Core/Src/stm32f1xx_it.su

@@ -1,10 +1,11 @@
-../Core/Src/stm32f1xx_it.c:69:6:NMI_Handler	4	static
-../Core/Src/stm32f1xx_it.c:84:6:HardFault_Handler	4	static
-../Core/Src/stm32f1xx_it.c:99:6:MemManage_Handler	4	static
-../Core/Src/stm32f1xx_it.c:114:6:BusFault_Handler	4	static
-../Core/Src/stm32f1xx_it.c:129:6:UsageFault_Handler	4	static
-../Core/Src/stm32f1xx_it.c:144:6:SVC_Handler	4	static
-../Core/Src/stm32f1xx_it.c:157:6:DebugMon_Handler	4	static
-../Core/Src/stm32f1xx_it.c:170:6:PendSV_Handler	4	static
-../Core/Src/stm32f1xx_it.c:183:6:SysTick_Handler	8	static
-../Core/Src/stm32f1xx_it.c:204:6:USB_LP_CAN1_RX0_IRQHandler	8	static
+../Core/Src/stm32f1xx_it.c:70:6:NMI_Handler	4	static
+../Core/Src/stm32f1xx_it.c:85:6:HardFault_Handler	4	static
+../Core/Src/stm32f1xx_it.c:100:6:MemManage_Handler	4	static
+../Core/Src/stm32f1xx_it.c:115:6:BusFault_Handler	4	static
+../Core/Src/stm32f1xx_it.c:130:6:UsageFault_Handler	4	static
+../Core/Src/stm32f1xx_it.c:145:6:SVC_Handler	4	static
+../Core/Src/stm32f1xx_it.c:158:6:DebugMon_Handler	4	static
+../Core/Src/stm32f1xx_it.c:171:6:PendSV_Handler	4	static
+../Core/Src/stm32f1xx_it.c:184:6:SysTick_Handler	8	static
+../Core/Src/stm32f1xx_it.c:205:6:DMA1_Channel1_IRQHandler	8	static
+../Core/Src/stm32f1xx_it.c:219:6:USB_LP_CAN1_RX0_IRQHandler	8	static

workspace/AUTOM10/Debug/Core/Src/subdir.mk

@@ -5,6 +5,7 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
+../Core/Src/adc.c \
 ../Core/Src/cdc_int.c \
 ../Core/Src/eeprom.c \
 ../Core/Src/main.c \
@@ -16,6 +17,7 @@ C_SRCS += \
 ../Core/Src/system_stm32f1xx.c 
 
 OBJS += \
+./Core/Src/adc.o \
 ./Core/Src/cdc_int.o \
 ./Core/Src/eeprom.o \
 ./Core/Src/main.o \
@@ -27,6 +29,7 @@ OBJS += \
 ./Core/Src/system_stm32f1xx.o 
 
 C_DEPS += \
+./Core/Src/adc.d \
 ./Core/Src/cdc_int.d \
 ./Core/Src/eeprom.d \
 ./Core/Src/main.d \
@@ -45,7 +48,7 @@ Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
 clean: clean-Core-2f-Src
 
 clean-Core-2f-Src:
-	-$(RM) ./Core/Src/cdc_int.cyclo ./Core/Src/cdc_int.d ./Core/Src/cdc_int.o ./Core/Src/cdc_int.su ./Core/Src/eeprom.cyclo ./Core/Src/eeprom.d ./Core/Src/eeprom.o ./Core/Src/eeprom.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/pwm.cyclo ./Core/Src/pwm.d ./Core/Src/pwm.o ./Core/Src/pwm.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su
+	-$(RM) ./Core/Src/adc.cyclo ./Core/Src/adc.d ./Core/Src/adc.o ./Core/Src/adc.su ./Core/Src/cdc_int.cyclo ./Core/Src/cdc_int.d ./Core/Src/cdc_int.o ./Core/Src/cdc_int.su ./Core/Src/eeprom.cyclo ./Core/Src/eeprom.d ./Core/Src/eeprom.o ./Core/Src/eeprom.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/pwm.cyclo ./Core/Src/pwm.d ./Core/Src/pwm.o ./Core/Src/pwm.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su
 
 .PHONY: clean-Core-2f-Src
 

workspace/AUTOM10/Debug/objects.list

@@ -1,3 +1,4 @@
+"./Core/Src/adc.o"
 "./Core/Src/cdc_int.o"
 "./Core/Src/eeprom.o"
 "./Core/Src/main.o"