Прога ужата до 20 кб флеш: удален HAL_TIM и HAL_GPIO

удалена ненужна по сути MyLibs библиотека
2025-03-06 12:44:55 +03:00
parent fad121a9fd
commit dbc9388f67
20 changed files with 484 additions and 1166 deletions
--- a/py_project/Core/Src/gpio.c
+++ b/py_project/Core/Src/gpio.c
@@ -46,19 +46,28 @@ void MX_GPIO_Init(void)
  __HAL_RCC_GPIOC_CLK_ENABLE();

  
-  /*Configure LED GPIO pin : PB0 (OneWire) */
-  GPIO_InitStruct.Pin = DS_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-  HAL_GPIO_Init(DS_GPIO_Port, &GPIO_InitStruct);
+  /* Íàñòðîéêà ïèíà PB0 (OneWire) */
+  DS_GPIO_Port->MODER &= ~(GPIO_MODER_MODE0);
+  DS_GPIO_Port->MODER |= (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE0_Pos);
+  DS_GPIO_Port->PUPDR &= ~(GPIO_PUPDR_PUPD0);
+  DS_GPIO_Port->PUPDR |= (GPIO_NOPULL << GPIO_PUPDR_PUPD0_Pos);
+  DS_GPIO_Port->OSPEEDR |= (GPIO_SPEED_FREQ_VERY_HIGH << GPIO_OSPEEDR_OSPEED0_Pos);
+  
+  /* Óñòàíîâêà PA1, PA4, PA5 â âûñîêèé óðîâåíü */
+  GPIOA->BSRR = GPIO_PIN_1 | GPIO_PIN_4 | GPIO_PIN_5;
  
  /*Configure LED GPIO pin : PA1 PA4 PA5 */
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5, GPIO_PIN_SET);
-  GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* Íàñòðîéêà ïèíîâ PA1, PA4, PA5 */
+  GPIOA->MODER &= ~(GPIO_MODER_MODE1 | GPIO_MODER_MODE4 | GPIO_MODER_MODE5);
+  GPIOA->MODER |= (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE1_Pos) |
+                  (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE4_Pos) |
+                  (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE5_Pos);
+  GPIOA->PUPDR &= ~(GPIO_PUPDR_PUPD1 | GPIO_PUPDR_PUPD4 | GPIO_PUPDR_PUPD5);
+  GPIOA->PUPDR |= (GPIO_NOPULL << GPIO_PUPDR_PUPD1_Pos) |
+                  (GPIO_NOPULL << GPIO_PUPDR_PUPD4_Pos) |
+                  (GPIO_NOPULL << GPIO_PUPDR_PUPD5_Pos);
+  GPIOA->OSPEEDR |= (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED1_Pos) |
+                    (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED4_Pos) |
+                    (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED5_Pos);
 }
 /************************ (C) COPYRIGHT Puya *****END OF FILE******************/
--- a/py_project/Core/Src/main.c
+++ b/py_project/Core/Src/main.c
@@ -73,35 +73,72 @@ int main(void)
  */
 static void APP_SystemClockConfig(void)
 {
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+//  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+//  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};

-  /* Oscillator configuration */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE; /* Select oscillator HSE, HSI, LSI, LSE */
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;                           /* Enable HSI */
-  RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1;                           /* HSI 1 frequency division */
-  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_24MHz;  /* Configure HSI clock 24MHz */
-  RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS_DISABLE;               /* Close HSE bypass */
-  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;                          /* Close LSI */
-  /*RCC_OscInitStruct.LSICalibrationValue = RCC_LSICALIBRATION_32768Hz;*/
-  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;                          /* Close LSE */
-  /*RCC_OscInitStruct.LSEDriver = RCC_LSEDRIVE_MEDIUM;*/
-  /* Configure oscillator */
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
+//  /* Oscillator configuration */
+//  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE; /* Select oscillator HSE, HSI, LSI, LSE */
+//  RCC_OscInitStruct.HSIState = RCC_HSI_ON;                           /* Enable HSI */
+//  RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1;                           /* HSI 1 frequency division */
+//  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_24MHz;  /* Configure HSI clock 24MHz */
+//  RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS_DISABLE;               /* Close HSE bypass */
+//  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;                          /* Close LSI */
+//  /*RCC_OscInitStruct.LSICalibrationValue = RCC_LSICALIBRATION_32768Hz;*/
+//  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;                          /* Close LSE */
+//  /*RCC_OscInitStruct.LSEDriver = RCC_LSEDRIVE_MEDIUM;*/
+//  /* Configure oscillator */
+//  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }

-  /* Clock source configuration */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1; /* Choose to configure clock HCLK, SYSCLK, PCLK1 */
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSISYS; /* Select HSISYS as the system clock */
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;        /* AHB clock 1 division */
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;         /* APB clock 1 division */
-  /* Configure clock source */
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
-  {
-    Error_Handler();
-  }
+//  /* Clock source configuration */
+//  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1; /* Choose to configure clock HCLK, SYSCLK, PCLK1 */
+//  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSISYS; /* Select HSISYS as the system clock */
+//  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;        /* AHB clock 1 division */
+//  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;         /* APB clock 1 division */
+//  /* Configure clock source */
+//  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+    /* Âêëþ÷åíèå HSI */
+    RCC->CR |= RCC_CR_HSION;
+    while (!(RCC->CR & RCC_CR_HSIRDY));
+    
+    /* Íàñòðîéêà äåëèòåëÿ HSI */
+    RCC->CR &= ~RCC_CR_HSIDIV;
+    RCC->CR |= RCC_HSI_DIV1;
+    
+    /* Êàëèáðîâêà HSI */
+    RCC->ICSCR &= ~RCC_ICSCR_HSI_TRIM;
+    RCC->ICSCR |= (RCC_HSICALIBRATION_24MHz << RCC_ICSCR_HSI_TRIM_Pos);
+    
+    /* Îòêëþ÷åíèå LSI è LSE */
+    RCC->CSR &= ~RCC_CSR_LSION;
+    RCC->BDCR &= ~RCC_BDCR_LSEON;
+    
+    /* Îòêëþ÷åíèå áàéïàñà HSE */
+    RCC->CR &= ~RCC_HSE_BYPASS_DISABLE;
+    
+    /* Óñòàíîâêà èñòî÷íèêà ñèñòåìíîé òàêòîâîé ÷àñòîòû */
+    RCC->CFGR &= ~RCC_CFGR_SW;
+    RCC->CFGR |= RCC_SYSCLKSOURCE_HSISYS;
+    while ((RCC->CFGR & RCC_CFGR_SWS) != RCC_SYSCLKSOURCE_HSISYS);
+    
+    /* Óñòàíîâêà äåëèòåëåé */
+    RCC->CFGR &= ~(RCC_CFGR_HPRE | RCC_CFGR_PPRE_1);
+    RCC->CFGR |= RCC_SYSCLK_DIV1 | RCC_HCLK_DIV1;
+    
+    /* Íàñòðîéêà çàäåðæêè ôëåø-ïàìÿòè */
+    FLASH->ACR &= ~FLASH_ACR_LATENCY;
+    FLASH->ACR |= FLASH_LATENCY_0;
+}
+
+uint32_t HAL_RCC_GetPCLK1Freq(void)
+{
+  /* Get HCLK source and Compute PCLK1 frequency ---------------------------*/
+  return (uint32_t)((SystemCoreClock) >> (APBPrescTable[(RCC->CFGR & RCC_CFGR_PPRE) >> RCC_CFGR_PPRE_Pos] & 0x1FU));
 }

 /**
--- a/py_project/Core/Src/tim.c
+++ b/py_project/Core/Src/tim.c
@@ -25,7 +25,7 @@
 /* USER CODE END 0 */

 //TIM_HandleTypeDef htim1;
-TIM_HandleTypeDef htim14;
+//TIM_HandleTypeDef htim14;

 /* TIM3 init function */
 void MX_TIM1_Init(void)
@@ -33,13 +33,13 @@ void MX_TIM1_Init(void)
    // Включение тактирования TIM1
    __HAL_RCC_TIM1_CLK_ENABLE();
    
-    // Установка предделителя (Prescaler)
+    // Установка предделителя (Prescaler) на 1/24 МГц
    TIM1->PSC = 0;
    
    // Установка режима счета вверх
    TIM1->CR1 &= ~TIM_CR1_DIR;
    
-    // Установка периода (ARR - Auto-reload register)
+    // Установка периода (ARR - Auto-reload register) на максимальное число
    TIM1->ARR = 0xFFFFFFFF;
    
    // Установка делителя частоты (Clock Division)
@@ -100,41 +100,68 @@ void MX_TIM1_Init(void)
 /* TIM2 init function */
 void MX_TIM14_Init(void)
 {
+  
+  // Включение тактирования TIM1
+  __HAL_RCC_TIM14_CLK_ENABLE();
+  
+  // Установка предделителя (Prescaler)
+  TIM14->PSC = 24-1;
+  
+  // Установка режима счета вверх
+  TIM14->CR1 &= ~TIM_CR1_DIR;
+  
+  // Установка периода (ARR - Auto-reload register) на 50 миллисекунд
+  TIM14->ARR = 50000;
+  
+  // Установка делителя частоты (Clock Division)
+  TIM14->CR1 &= ~TIM_CR1_CKD;
+  
+  // Отключение режима предзагрузки
+  TIM14->CR1 &= ~TIM_CR1_ARPE;
+  
+  // Выбор внутреннего источника тактирования
+  TIM14->SMCR &= ~TIM_SMCR_SMS;
+  
+  // Настройка триггерного выхода (TRGO)
+  TIM14->CR2 &= ~TIM_CR2_MMS;
+  
+  // Отключение режима Master/Slave
+  TIM14->SMCR &= ~TIM_SMCR_MSM;

-  /* USER CODE BEGIN TIM2_Init 0 */
+//  /* USER CODE BEGIN TIM2_Init 0 */

-  /* USER CODE END TIM2_Init 0 */
+//  /* USER CODE END TIM2_Init 0 */

-  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-  TIM_MasterConfigTypeDef sMasterConfig = {0};
+//  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+//  TIM_MasterConfigTypeDef sMasterConfig = {0};

-  /* USER CODE BEGIN TIM2_Init 1 */
+//  /* USER CODE BEGIN TIM2_Init 1 */

-  /* USER CODE END TIM2_Init 1 */
-  htim14.Instance = TIM14;
-  htim14.Init.Prescaler = (HAL_RCC_GetPCLK1Freq()/1000000) - 1;
-  htim14.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim14.Init.Period = 50000;
-  htim14.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
-  htim14.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init(&htim14) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  if (HAL_TIM_ConfigClockSource(&htim14, &sClockSourceConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
-  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization(&htim14, &sMasterConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN TIM2_Init 2 */
+//  /* USER CODE END TIM2_Init 1 */
+//  htim14.Instance = TIM14;
+//  htim14.Init.Prescaler = (24) - 1;
+//  htim14.Init.CounterMode = TIM_COUNTERMODE_UP;
+//  htim14.Init.Period = 50000;
+//  htim14.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+//  htim14.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+//  if (HAL_TIM_Base_Init(&htim14) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+//  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+//  if (HAL_TIM_ConfigClockSource(&htim14, &sClockSourceConfig) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+//  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+//  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+//  if (HAL_TIMEx_MasterConfigSynchronization(&htim14, &sMasterConfig) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+//  /* USER CODE BEGIN TIM2_Init 2 */

-  /* USER CODE END TIM2_Init 2 */
+//  /* USER CODE END TIM2_Init 2 */

 }
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
--- a/py_project/Core/Src/usart.c
+++ b/py_project/Core/Src/usart.c
@@ -72,16 +72,23 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
    PB04:TX,
    PB05:RX
    */
-    GPIO_InitStruct.Pin       = GPIO_PIN_4;
-    GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull      = GPIO_PULLUP;
-    GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
-    GPIO_InitStruct.Alternate = GPIO_AF1_USART1;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-    GPIO_InitStruct.Pin = GPIO_PIN_5;
-    GPIO_InitStruct.Alternate = GPIO_AF1_USART1;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    /* Íàñòðîéêà ïèíà GPIO_PIN_4 */
+    GPIOB->MODER &= ~(GPIO_MODER_MODE4);
+    GPIOB->MODER |= (GPIO_MODE_AF_PP << GPIO_MODER_MODE4_Pos);
+    GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPD4);
+    GPIOB->PUPDR |= (GPIO_PULLUP << GPIO_PUPDR_PUPD4_Pos);
+    GPIOB->OSPEEDR |= (GPIO_SPEED_FREQ_HIGH << GPIO_OSPEEDR_OSPEED4_Pos);
+    GPIOB->AFR[0] &= ~(0xF << GPIO_AFRL_AFSEL4_Pos);
+    GPIOB->AFR[0] |= (GPIO_AF1_USART1 << GPIO_AFRL_AFSEL4_Pos);
+    
+    /* Íàñòðîéêà ïèíà GPIO_PIN_5 */
+    GPIOB->MODER &= ~(GPIO_MODER_MODE5);
+    GPIOB->MODER |= (GPIO_MODE_AF_PP << GPIO_MODER_MODE5_Pos);
+    GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPD5);
+    GPIOB->PUPDR |= (GPIO_PULLUP << GPIO_PUPDR_PUPD5_Pos);
+    GPIOB->OSPEEDR |= (GPIO_SPEED_FREQ_HIGH << GPIO_OSPEEDR_OSPEED5_Pos);
+    GPIOB->AFR[0] &= ~(0xF << GPIO_AFRL_AFSEL5_Pos);
+    GPIOB->AFR[0] |= (GPIO_AF1_USART1 << GPIO_AFRL_AFSEL5_Pos);
  
    /* USART1 interrupt Init */
    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);