it works, needs ctr value

2025-12-18 21:06:13 -06:00
parent 3c87175342
commit e468518b8c
7 changed files with 152 additions and 17 deletions
--- a/.mxproject
+++ b/.mxproject
--- a/ADCftPWM.ioc
+++ b/ADCftPWM.ioc
@@ -17,16 +17,19 @@ Mcu.IP1=NVIC
 Mcu.IP2=RCC
 Mcu.IP3=SYS
 Mcu.IP4=TIM1
-Mcu.IPNb=5
+Mcu.IP5=USART1
+Mcu.IPNb=6
 Mcu.Name=STM32F429ZITx
 Mcu.Package=LQFP144
 Mcu.Pin0=PA1
 Mcu.Pin1=PE14
-Mcu.Pin2=PA11
-Mcu.Pin3=PA12
-Mcu.Pin4=VP_SYS_VS_Systick
-Mcu.Pin5=VP_TIM1_VS_ClockSourceINT
-Mcu.PinsNb=6
+Mcu.Pin2=PA9
+Mcu.Pin3=PA10
+Mcu.Pin4=PA11
+Mcu.Pin5=PA12
+Mcu.Pin6=VP_SYS_VS_Systick
+Mcu.Pin7=VP_TIM1_VS_ClockSourceINT
+Mcu.PinsNb=8
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F429ZITx
@@ -44,6 +47,8 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:false
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 PA1.Signal=ADCx_IN1
+PA10.Mode=Asynchronous
+PA10.Signal=USART1_RX
 PA11.GPIOParameters=GPIO_Label
 PA11.GPIO_Label=LED_ON
 PA11.Locked=true
@@ -52,6 +57,8 @@ PA12.GPIOParameters=GPIO_Label
 PA12.GPIO_Label=LED_ERR
 PA12.Locked=true
 PA12.Signal=GPIO_Output
+PA9.Mode=Asynchronous
+PA9.Signal=USART1_TX
 PE14.Signal=S_TIM1_CH4
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -133,6 +140,8 @@ SH.S_TIM1_CH4.ConfNb=1
 TIM1.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM1.IPParameters=Channel-PWM Generation4 CH4,Period
 TIM1.Period=7999
+USART1.IPParameters=VirtualMode
+USART1.VirtualMode=VM_ASYNC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ClockSourceINT.Mode=Internal
--- a/Core/Inc/stm32f4xx_hal_conf.h
+++ b/Core/Inc/stm32f4xx_hal_conf.h
@@ -64,7 +64,7 @@
 /* #define HAL_MMC_MODULE_ENABLED */
 /* #define HAL_SPI_MODULE_ENABLED */
 #define HAL_TIM_MODULE_ENABLED
-/* #define HAL_UART_MODULE_ENABLED */
+#define HAL_UART_MODULE_ENABLED
 /* #define HAL_USART_MODULE_ENABLED */
 /* #define HAL_IRDA_MODULE_ENABLED */
 /* #define HAL_SMARTCARD_MODULE_ENABLED */
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -18,10 +18,12 @@
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
-#include "stm32f4xx_hal_tim.h"
+#include "stm32f4xx_hal_uart.h"

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include <stdint.h>
+#include <stdio.h>

 /* USER CODE END Includes */

@@ -45,6 +47,8 @@ ADC_HandleTypeDef hadc1;

 TIM_HandleTypeDef htim1;

+UART_HandleTypeDef huart1;
+
 /* USER CODE BEGIN PV */
 uint16_t duty;
 int ctr = 7999; // or 65534?
@@ -56,6 +60,7 @@ void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC1_Init(void);
 static void MX_TIM1_Init(void);
+static void MX_USART1_UART_Init(void);
 /* USER CODE BEGIN PFP */

 /* USER CODE END PFP */
@@ -96,9 +101,10 @@ int main(void)
  MX_GPIO_Init();
  MX_ADC1_Init();
  MX_TIM1_Init();
+  MX_USART1_UART_Init();
  /* USER CODE BEGIN 2 */
  uint16_t val_raw;
-  //float voltage;
+  float proc;

  HAL_GPIO_WritePin(LED_ERR_GPIO_Port, LED_ERR_Pin, GPIO_PIN_RESET);
  HAL_GPIO_WritePin(LED_ON_GPIO_Port, LED_ON_Pin, GPIO_PIN_SET);
@@ -117,14 +123,24 @@ int main(void)

    val_raw = HAL_ADC_GetValue(&hadc1);

-    //duty = (((val_raw/4096)*ctr)/ctr)*100;
+    /*
+     * Mapping % of 4096 to % of counter value
+     * (i.e. 100/4096 --> 200/8912)
+     */
+    proc = (float)val_raw / 4096;
+    proc *= ctr;
+    duty = (uint16_t)proc;

-    duty = 6000;
+    printf("duty:%u        proc:%u        raw:%u\r\n", duty, (uint16_t)proc, val_raw);
+    //printf("duty:%u        raw:%u\r\n", duty, val_raw);
+
+    /* Cap it */
+    if (duty > ctr)
+      duty = ctr;

-    //duty = (uint16_t)(val_raw/4096);
    __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_4, duty);

-    HAL_Delay(500);
+    HAL_Delay(100);
    /* USER CODE END WHILE */

    /* USER CODE BEGIN 3 */
@@ -332,6 +348,39 @@ static void MX_TIM1_Init(void)

 }

+/**
+  * @brief USART1 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_USART1_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART1_Init 0 */
+
+  /* USER CODE END USART1_Init 0 */
+
+  /* USER CODE BEGIN USART1_Init 1 */
+
+  /* USER CODE END USART1_Init 1 */
+  huart1.Instance = USART1;
+  huart1.Init.BaudRate = 115200;
+  huart1.Init.WordLength = UART_WORDLENGTH_8B;
+  huart1.Init.StopBits = UART_STOPBITS_1;
+  huart1.Init.Parity = UART_PARITY_NONE;
+  huart1.Init.Mode = UART_MODE_TX_RX;
+  huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart1.Init.OverSampling = UART_OVERSAMPLING_16;
+  if (HAL_UART_Init(&huart1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART1_Init 2 */
+
+  /* USER CODE END USART1_Init 2 */
+
+}
+
 /**
  * @brief GPIO Initialization Function
  * @param None
@@ -364,6 +413,13 @@ static void MX_GPIO_Init(void)
 }

 /* USER CODE BEGIN 4 */
+int
+__io_putchar(int ch)
+{
+  uint8_t c = ch;
+  HAL_UART_Transmit(&huart1, &c, 1, HAL_MAX_DELAY);
+  return ch;
+}

 /* USER CODE END 4 */

--- a/Core/Src/stm32f4xx_hal_msp.c
+++ b/Core/Src/stm32f4xx_hal_msp.c
@@ -214,6 +214,72 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)

 }

+/**
+  * @brief UART MSP Initialization
+  * This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef* huart)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  if(huart->Instance==USART1)
+  {
+    /* USER CODE BEGIN USART1_MspInit 0 */
+
+    /* USER CODE END USART1_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_USART1_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART1 GPIO Configuration
+    PA9     ------> USART1_TX
+    PA10     ------> USART1_RX
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_USART1;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USER CODE BEGIN USART1_MspInit 1 */
+
+    /* USER CODE END USART1_MspInit 1 */
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  * This function freeze the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
+{
+  if(huart->Instance==USART1)
+  {
+    /* USER CODE BEGIN USART1_MspDeInit 0 */
+
+    /* USER CODE END USART1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART1_CLK_DISABLE();
+
+    /**USART1 GPIO Configuration
+    PA9     ------> USART1_TX
+    PA10     ------> USART1_RX
+    */
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
+
+    /* USER CODE BEGIN USART1_MspDeInit 1 */
+
+    /* USER CODE END USART1_MspDeInit 1 */
+  }
+
+}
+
 /* USER CODE BEGIN 1 */

 /* USER CODE END 1 */
--- a/5
+++ b/5
@@ -1,5 +1,5 @@
 ##########################################################################################################################
-# File automatically-generated by tool: [projectgenerator] version: [4.7.0-B52] date: [Thu Dec 18 19:20:16 CST 2025] 
+# File automatically-generated by tool: [projectgenerator] version: [4.7.0-B52] date: [Thu Dec 18 20:23:08 CST 2025] 
 ##########################################################################################################################

 # ------------------------------------------------
@@ -59,7 +59,8 @@ Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c \
 Core/Src/system_stm32f4xx.c \
 Core/Src/sysmem.c \
-Core/Src/syscalls.c
+Core/Src/syscalls.c \
+Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c

 # ASM sources
 ASM_SOURCES =  \
--- a/uart.sh
+++ b/uart.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+minicom -D /dev/ttyACM0
+