Procházet zdrojové kódy

Fixed errors. TIM1 work.

Vladimir N. Shilov před 3 roky
rodič
revize
a394b14447
3 změnil soubory, kde provedl 37 přidání a 67 odebrání
  1. 2 2
      Inc/main.h
  2. 8 2
      ReadMe.txt
  3. 27 63
      Src/main.c

+ 2 - 2
Inc/main.h

@@ -149,8 +149,8 @@ typedef union {
 #define IN15_OFF      GPIOA->BRR = 0xF
 
 #define COLOR_R(x)    TIM1->CCR2 = x
-#define COLOR_B(x)    TIM1->CCR3 = x
-#define COLOR_G(x)    TIM1->CCR4 = x
+#define COLOR_G(x)    TIM1->CCR3 = x
+#define COLOR_B(x)    TIM1->CCR4 = x
 
 /* USER CODE END EM */
 

+ 8 - 2
ReadMe.txt

@@ -41,8 +41,8 @@ MCU - STM32G030K8.
 PWM:
  TIM1_CH1 - PWM_1
  TIM1_CH2 - PWM_R
- TIM1_CH3 - PWM_B
- TIM1_CH4 - PWM_G
+ TIM1_CH3 - PWM_G
+ TIM1_CH4 - PWM_B
  TIM3_CH1 - PWM_5
  TIM3_CH2 - PWM_4
  TIM3_CH3 - PWM_3
@@ -53,4 +53,10 @@ PWM:
 может стоит Т14 пинать по прерыванию в начале каждой секунды в режме one 
 pulse mode? тогда будет синхронизация со сменой секунд. пока оставлю в 
 качестве идеи.
+---
+12.01.2022
 
+Наконец то запустил первый таймер.
+На очереди - SPI.
+И глобальное причёсывание.
+И HSV2RGB...

+ 27 - 63
Src/main.c

@@ -95,7 +95,7 @@ static void MX_GPIO_Init(void);
 static void MX_DMA_Init(void);
 static void MX_I2C1_Init(void);
 static void MX_SPI1_Init(void);
-static void MX_TIM1_Init(void);
+static void Board_TIM1_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_TIM14_Init(void);
 static void MX_TIM16_Init(void);
@@ -157,9 +157,9 @@ int main(void)
   MX_DMA_Init();
   MX_I2C1_Init();
   MX_SPI1_Init();
-  MX_TIM1_Init();
+  Board_TIM1_Init();
   MX_TIM3_Init();
-  MX_TIM14_Init();
+//  MX_TIM14_Init();
   MX_TIM16_Init();
   MX_TIM17_Init();
   MX_USART1_UART_Init();
@@ -177,8 +177,6 @@ int main(void)
   sensor_Init();
 
   /** Start RGB & Tube Power PWM */
-  /* TIM1 LL_TIM_CC_EnableChannel */
-  TIM1->CCER |= (TIM_CCER_CC1E | TIM_CCER_CC2E | TIM_CCER_CC3E | TIM_CCER_CC4E);
   /* LL_TIM_EnableCounter */
   TIM1->CR1 |= TIM_CR1_CEN;
   /* TIM3 */
@@ -216,7 +214,7 @@ int main(void)
   RTC_ReadAll(&Clock);
 
   es_event_t event = eventNull;
-  Color_RGB(0xFF, 0x12, 0x0); // Nixie color. FF7E00 or FFBF00
+  Color_RGB(0xFF, 0x12, 0x0); // Nixie color. FF1200 or FF7E00 or FFBF00
   showTime();
 
   /* Infinite loop */
@@ -541,70 +539,35 @@ static void MX_SPI1_Init(void)
   * @param None
   * @retval None
   */
-static void MX_TIM1_Init(void)
+static void Board_TIM1_Init(void)
 {
 
   /* USER CODE BEGIN TIM1_Init 0 */
 
   /* USER CODE END TIM1_Init 0 */
-
-  LL_TIM_InitTypeDef TIM_InitStruct = {0};
-  LL_TIM_OC_InitTypeDef TIM_OC_InitStruct = {0};
-  LL_TIM_BDTR_InitTypeDef TIM_BDTRInitStruct = {0};
-
   LL_GPIO_InitTypeDef GPIO_InitStruct = {0};
 
   /* Peripheral clock enable */
   LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_TIM1);
 
   /* USER CODE BEGIN TIM1_Init 1 */
-
+  TIM1->PSC = (120 - 1); // prescaler
+  TIM1->ARR = (1000 - 1); // auto reload value
+  // initial pwm value
+  TIM1->CCR1 = 500;
+  TIM1->CCR2 = 500;
+  TIM1->CCR3 = 500;
+  TIM1->CCR4 = 500;
+  // pwm mode 1 for 4 chanels
+  TIM1->CCMR1 = (TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC1PE | TIM_CCMR1_OC2PE);
+  TIM1->CCMR2 = (TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 | TIM_CCMR2_OC3PE | TIM_CCMR2_OC4PE);
+  // reset int flag - not needed, int unused
+  //TIM1->SR |= TIM_SR_UIF;
+  TIM1->BDTR |= TIM_BDTR_MOE; // enable main output
+  TIM1->EGR |= TIM_EGR_UG; // force timer update
+  /* TIM1 LL_TIM_CC_EnableChannel */
+  TIM1->CCER |= (TIM_CCER_CC1E | TIM_CCER_CC2E | TIM_CCER_CC3E | TIM_CCER_CC4E);
   /* USER CODE END TIM1_Init 1 */
-  TIM_InitStruct.Prescaler = (240 - 1);
-  TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
-  TIM_InitStruct.Autoreload = 1000;
-  TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
-  TIM_InitStruct.RepetitionCounter = 0;
-  LL_TIM_Init(TIM1, &TIM_InitStruct);
-  LL_TIM_EnableARRPreload(TIM1);
-  LL_TIM_SetClockSource(TIM1, LL_TIM_CLOCKSOURCE_INTERNAL);
-  LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH1);
-  TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_PWM1;
-  TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE;
-  TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE;
-  TIM_OC_InitStruct.CompareValue = 500;
-  TIM_OC_InitStruct.OCPolarity = LL_TIM_OCPOLARITY_HIGH;
-  TIM_OC_InitStruct.OCNPolarity = LL_TIM_OCPOLARITY_HIGH;
-  TIM_OC_InitStruct.OCIdleState = LL_TIM_OCIDLESTATE_LOW;
-  TIM_OC_InitStruct.OCNIdleState = LL_TIM_OCIDLESTATE_LOW;
-  LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH1, &TIM_OC_InitStruct);
-  LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH1);
-  LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH2);
-  LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH2, &TIM_OC_InitStruct);
-  LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH2);
-  LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH3);
-  LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH3, &TIM_OC_InitStruct);
-  LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH3);
-  LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH4);
-  LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH4, &TIM_OC_InitStruct);
-  LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH4);
-  LL_TIM_SetTriggerOutput(TIM1, LL_TIM_TRGO_RESET);
-  LL_TIM_SetTriggerOutput2(TIM1, LL_TIM_TRGO2_RESET);
-  LL_TIM_DisableMasterSlaveMode(TIM1);
-  TIM_BDTRInitStruct.OSSRState = LL_TIM_OSSR_DISABLE;
-  TIM_BDTRInitStruct.OSSIState = LL_TIM_OSSI_DISABLE;
-  TIM_BDTRInitStruct.LockLevel = LL_TIM_LOCKLEVEL_OFF;
-  TIM_BDTRInitStruct.DeadTime = 0;
-  TIM_BDTRInitStruct.BreakState = LL_TIM_BREAK_DISABLE;
-  TIM_BDTRInitStruct.BreakPolarity = LL_TIM_BREAK_POLARITY_HIGH;
-  TIM_BDTRInitStruct.BreakFilter = LL_TIM_BREAK_FILTER_FDIV1;
-  TIM_BDTRInitStruct.BreakAFMode = LL_TIM_BREAK_AFMODE_INPUT;
-  TIM_BDTRInitStruct.Break2State = LL_TIM_BREAK2_DISABLE;
-  TIM_BDTRInitStruct.Break2Polarity = LL_TIM_BREAK2_POLARITY_HIGH;
-  TIM_BDTRInitStruct.Break2Filter = LL_TIM_BREAK2_FILTER_FDIV1;
-  TIM_BDTRInitStruct.Break2AFMode = LL_TIM_BREAK_AFMODE_INPUT;
-  TIM_BDTRInitStruct.AutomaticOutput = LL_TIM_AUTOMATICOUTPUT_DISABLE;
-  LL_TIM_BDTR_Init(TIM1, &TIM_BDTRInitStruct);
   /* USER CODE BEGIN TIM1_Init 2 */
 
   /* USER CODE END TIM1_Init 2 */
@@ -672,9 +635,9 @@ static void MX_TIM3_Init(void)
   /* USER CODE BEGIN TIM3_Init 1 */
 
   /* USER CODE END TIM3_Init 1 */
-  TIM_InitStruct.Prescaler = (240 - 1);
+  TIM_InitStruct.Prescaler = (120 - 1);
   TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
-  TIM_InitStruct.Autoreload = 1000;
+  TIM_InitStruct.Autoreload = (1000 - 1);
   TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
   LL_TIM_Init(TIM3, &TIM_InitStruct);
   LL_TIM_EnableARRPreload(TIM3);
@@ -770,18 +733,19 @@ static void MX_TIM14_Init(void)
   /* USER CODE END TIM14_Init 1 */
   TIM_InitStruct.Prescaler = (24000 - 1);
   TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
-  TIM_InitStruct.Autoreload = 1000;
+  TIM_InitStruct.Autoreload = (1000 - 1);
   TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
   LL_TIM_Init(TIM14, &TIM_InitStruct);
   LL_TIM_EnableARRPreload(TIM14);
-  TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_INACTIVE;
+  LL_TIM_OC_EnablePreload(TIM14, LL_TIM_CHANNEL_CH1);
+  TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_PWM1;
   TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE;
   TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE;
   TIM_OC_InitStruct.CompareValue = 750;
   TIM_OC_InitStruct.OCPolarity = LL_TIM_OCPOLARITY_HIGH;
   LL_TIM_OC_Init(TIM14, LL_TIM_CHANNEL_CH1, &TIM_OC_InitStruct);
   LL_TIM_OC_DisableFast(TIM14, LL_TIM_CHANNEL_CH1);
-  LL_TIM_OC_EnablePreload(TIM14, LL_TIM_CHANNEL_CH1);
+  LL_TIM_SetOnePulseMode(TIM14, LL_TIM_ONEPULSEMODE_SINGLE);
   /* USER CODE BEGIN TIM14_Init 2 */
   TIM14->DIER |= TIM_DIER_UIE;
   TIM14->DIER |= TIM_DIER_CC1IE;