начата работа над графическим интерфейсом оболочки

matlab_stm_emulate

@@ -1 +1 @@
-Subproject commit 70e524f0410437403a44a8b8183c2673c788d396
+Subproject commit 47365da12496e8798abde4e6cc08373bda5f9a35

mcu_project/upp/Core/Src/main.c

@@ -18,7 +18,7 @@
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
-#include "adc.h"
+//#include "adc.h"
 #include "tim.h"
 #include "usart.h"
 #include "gpio.h"
@@ -89,15 +89,15 @@ int main(void)
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
-  MX_ADC1_Init();
+  //MX_ADC1_Init();
   MX_TIM2_Init();
-  MX_USART1_UART_Init();
-  MX_TIM1_Init();
+  //MX_USART1_UART_Init();
+  //MX_TIM1_Init();
   /* USER CODE BEGIN 2 */
 	upp_init();
-	HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
-	Upp.Duration = 8;
-	Upp.sine_freq = 50;
+	//HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
+	//Upp.Duration = 8;
+	//Upp.sine_freq = 50;
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -118,48 +118,49 @@ int main(void)
   */
 void SystemClock_Config(void)
 {
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  //RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  //RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  //RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
 
-  /** Initializes the RCC Oscillators according to the specified parameters
-  * in the RCC_OscInitTypeDef structure.
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
-  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
-  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
+  ///** Initializes the RCC Oscillators according to the specified parameters
+  //* in the RCC_OscInitTypeDef structure.
+  //*/
+  //RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  //RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  //RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+  //RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  //RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  //RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  //RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
+  //if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  //{
+  //  Error_Handler();
+  //}
 
-  /** Initializes the CPU, AHB and APB buses clocks
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  ///** Initializes the CPU, AHB and APB buses clocks
+  //*/
+  //RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+  //                            |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  //RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  //RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  //RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+  //RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
 
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
-  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
-  {
-    Error_Handler();
-  }
+  //if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  //{
+  //  Error_Handler();
+  //}
+  //PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
+  //PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+  //if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  //{
+  //  Error_Handler();
+  //}
 }
 
 /* USER CODE BEGIN 4 */
 
+uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) {}
 /* USER CODE END 4 */
 
 /**