ENCODE

Signed-off-by: kevin <kevin@lmve.net>

f103c8t6_keil/MDK-ARM/MYDEIVERS/encode.c

@@ -53,3 +53,10 @@ void GEI_BUTTON_CODE(button *bt)
 
 }
 
+int GET_ENCODE(encoder *e)
+{
+	int buff;
+	buff=e->code;
+	e->code=0;
+	return buff;
+}

f103c8t6_keil/MDK-ARM/MYDEIVERS/encode.h

@@ -22,5 +22,5 @@ typedef struct
 } encoder;
 
 void GEI_BUTTON_CODE(button *bt);
-
+int GET_ENCODE(encoder *e);
 #endif /* ENCODER_H_ */

f103c8t6_keil/MDK-ARM/MYDEIVERS/hread_interface.h

@@ -17,6 +17,9 @@ extern TIM_HandleTypeDef htim2;
 #define MUTE(x)      HAL_GPIO_WritePin(mute_GPIO_Port, mute_Pin, x)
 #define tack_a()      HAL_GPIO_ReadPin(tack_a_GPIO_Port, tack_a_Pin)
 #define tack_b()      HAL_GPIO_ReadPin(tack_b_GPIO_Port, tack_b_Pin)
+
+
+
 #define RUNLED_TICK()  HAL_GPIO_TogglePin(run_led_GPIO_Port, run_led_Pin)
 
 void IIC_SAND_DATE(uint16_t DEVICE_ADD,uint16_t IN_DEVICE_ADD,uint8_t *DATAS,uint16_t LONG);

f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c

@@ -167,20 +167,26 @@ char getmorsecode(uint8_t len,uint8_t code)
 }
 
 
-button  B1;
+button  B1;//创建一个按钮
+encoder E1;//创建一个编码器
+int mode=0;
+uint32_t run_tick=0;
+char str[16];
+uint16_t fps=0,fps_=0;
+
+int encode_c=0;
 
 void mymain()
 {
-	int mode=0;
-	uint32_t run_tick=0;
-	char str[16];
-	uint16_t fps=0,fps_=0;
+	//按钮定义接口
+	B1.GPIOx=en_c_GPIO_Port;
+	B1.GPIO_Pin=en_c_Pin;
 	
-	OLED_Init();
 	
+	OLED_Init();//屏幕初始化
 	HAL_TIM_PWM_Start(&htim2,TIM_CHANNEL_3);//启动n通道的pwm
-	MUTE(1);
-	//add_a_note(1000,50,1000);
+	MUTE(1);//静音
+	//add_a_note(1000,50,1000);//开机响一声
 	
 	
 	while(1)
@@ -196,6 +202,14 @@ void mymain()
 				break;
 			case 1:
 				//主界面
+			
+				sprintf(str,"BUTTON:%d",B1.code);
+				OLED_Str(0,0,8,str,1);
+			
+				encode_c+=GET_ENCODE(&E1);
+				sprintf(str,"ENCODE:%d",encode_c);
+				OLED_Str(0,8,8,str,1);
+			
 				fps_++;
 				sprintf(str,"FPS:%d",fps);
 				OLED_Str(0,56,8,str,1);
@@ -208,7 +222,7 @@ void mymain()
 
 		
 		
-		
+		GEI_BUTTON_CODE(&B1);//循环更新按钮
 		OLED_Cache_to_hardware();//刷新屏幕
 		buzzer_play_server();
 		if(HAL_GetTick()>run_tick)
@@ -221,3 +235,30 @@ void mymain()
 	
 	}
 }
+
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+
+	switch (GPIO_Pin)
+	{
+  	case en_a_Pin:
+		switch(HAL_GPIO_ReadPin(en_b_GPIO_Port,en_b_Pin))
+		{
+			case 1:
+				E1.code+=1;
+				E1.move_flag=1;
+				break;
+			case 0:
+				E1.code-=1;
+				E1.move_flag=1;
+				break;
+		}
+		break;
+
+  	default:
+  	break;
+
+  	__HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin);
+  }
+}

f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.c

@@ -1105,10 +1105,3 @@ void OLED_square(int Start_x, int Start_y, int End_x, int End_y, char type)
 	}
 }
 
-
-
-
-
-
-
-

f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h

@@ -17,6 +17,10 @@
 #define Y_WIDTH 64
 #define Y_WIDTH_ 8
 
+
+
+
+
 void OLED_Init(void);
 
 void OLED_Cache_to_hardware();