屏幕和编码器OK

Core/Src/main.c

@@ -18,7 +18,6 @@
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
-#include "adc.h"
 #include "i2c.h"
 #include "tim.h"
 #include "usart.h"
@@ -34,6 +33,9 @@
 
 #include "bsp.h"
 #include "Modbus_Function.h"
+
+#include "drv_st7920.h"
+
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -133,7 +135,6 @@ int main(void)
   MX_USART3_UART_Init();
   MX_TIM3_Init();
   MX_TIM2_Init();
-  MX_ADC1_Init();
   /* USER CODE BEGIN 2 */
 
 
@@ -149,21 +150,12 @@ int main(void)
   
   
   //初始化电机参数
-  MOTOR_init();
   
-  __HAL_TIM_SET_AUTORELOAD(&htim3,motor.period);//设置脉冲宽度
-  
-  __HAL_TIM_SET_COMPARE(&htim3,TIM_CHANNEL_1,0); //设置脉冲延时
-  __HAL_TIM_SET_COMPARE(&htim3,TIM_CHANNEL_2,0); //设置脉冲延时
-  __HAL_TIM_SET_COMPARE(&htim3,TIM_CHANNEL_3,0); //设置脉冲延时
-  __HAL_TIM_SET_COMPARE(&htim3,TIM_CHANNEL_4,0); //设置脉冲延时
   
   HAL_TIM_Base_Start_IT(&htim3);
  
-  HAL_TIM_PWM_Start(&htim3,TIM_CHANNEL_1);
-  HAL_TIM_PWM_Start(&htim3,TIM_CHANNEL_2);
-  HAL_TIM_PWM_Start(&htim3,TIM_CHANNEL_3);
   HAL_TIM_PWM_Start(&htim3,TIM_CHANNEL_4);
+  TIM3->CCR4 = 10000;
   
   
   //初始化通讯
@@ -172,9 +164,9 @@ int main(void)
   
   Modbus_Init();
 
+  LCD_DEMO(); 
+
 
-  //启动模拟量输入
-  SYS_setADCStart();
 
 
   //开启系统定时器
@@ -190,6 +182,8 @@ int main(void)
 
     /* USER CODE BEGIN 3 */
 	  
+
+	  
 	if(tick_last != tick_count_200Hz)
 	{
 	  tick_last = tick_count_200Hz;
@@ -232,7 +226,6 @@ void SystemClock_Config(void)
 {
   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.
@@ -261,12 +254,6 @@ void SystemClock_Config(void)
   {
     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 */
@@ -294,7 +281,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     tick_count();
   }
   else if (htim->Instance == TIM3) {
-     MOTOR_thread();
+     //MOTOR_thread();
   }