From e95a273ea56b3340542b78d7f23aad00cf963deb Mon Sep 17 00:00:00 2001
From: kevin <kevin@lmve.net>
Date: Sat, 2 Apr 2022 16:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AD=98=E5=86=99=E6=BB=A1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stm32F030F4_code/mydrivers/my.c | 74 ++++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/stm32F030F4_code/mydrivers/my.c b/stm32F030F4_code/mydrivers/my.c
index 51cca1b..e7f0ff4 100644
--- a/stm32F030F4_code/mydrivers/my.c
+++ b/stm32F030F4_code/mydrivers/my.c
@@ -8,6 +8,7 @@
 
 #include "my.h"
 
+#define morse_t0 50
 #define morse_t1 150
 #define morse_t2 (morse_t1*3)
 #define morse_hz 100
@@ -25,7 +26,7 @@ uint16_t morse_temp;
 
 char morse_input_flag=0;
 char morse_char_flag=0;
-char morse_x,morse_y;
+char morse_x=0,morse_y=0,morse_x_=0,morse_y_=0;
 char morse_flah=0;
 uint8_t morse_letter_temp=0;
 uint8_t morse_letter_flag=0;
@@ -159,7 +160,7 @@ char getmorsecode(uint8_t len,uint8_t code)
 		}
 
 	}
-	return 0;
+	return ' ';
 }
 
 void mymain()
@@ -189,36 +190,53 @@ void mymain()
 			}else
 			{
 				morse_temp=HAL_GetTick()-morse_t;
-				if(morse_temp>morse_t2)
+				if(morse_temp<morse_t0)
 				{
 					//time out error
+
+
+
 				}else if(morse_temp>morse_t1)
 				{
 					//-
 
 					OLED_ShowChar(morse_x,morse_y,'-');
 					morse_letter_temp|=(0x80>>morse_letter_flag);
+					morse_letter_flag++;
+					morse_x+=8;
+					if(morse_x>=X_WIDTH)
+					{
+						morse_x=0;
+						morse_y+=2;
+						if(morse_y>=Y_WIDTH_)
+						{
+							morse_y=0;
+
+							OLED_Init_Display_Buffer(0);
+						}
+					}
 				}else
 				{
 					//.
 
 					OLED_ShowChar(morse_x,morse_y,'.');
-
-				}
-				morse_letter_flag++;
-				morse_x+=8;
-				if(morse_x>=X_WIDTH)
-				{
-					morse_x=0;
-					morse_y+=2;
-					if(morse_y>=Y_WIDTH_)
+					morse_letter_flag++;
+					morse_x+=8;
+					if(morse_x>=X_WIDTH)
 					{
-						morse_y=0;
+						morse_x=0;
+						morse_y+=2;
+						if(morse_y>=Y_WIDTH_)
+						{
+							morse_y=0;
 
-						OLED_Init_Display_Buffer(0);
+							OLED_Init_Display_Buffer(0);
+						}
 					}
+
 				}
 
+
 				//play_ones(0,0);
 
 				morse_input_flag=1;
@@ -236,9 +254,33 @@ void mymain()
 			{
 
 				get_char_temp=getmorsecode(morse_letter_flag,morse_letter_temp);
-				morse_letter_flag=0;
 				morse_letter_temp=0;
-				OLED_ShowChar(0,6,get_char_temp);
+
+				while(morse_letter_flag!=0)
+				{
+					if(morse_x==0)
+					{
+						morse_x=X_WIDTH;
+						morse_y-=2;
+					}
+					morse_x-=8;
+					OLED_ShowChar(morse_x,morse_y,' ');
+					morse_letter_flag--;
+				}
+				OLED_ShowChar(morse_x,morse_y,get_char_temp);
+				morse_x+=8;
+				if(morse_x>=X_WIDTH)
+				{
+					morse_x=0;
+					morse_y+=2;
+					if(morse_y>=Y_WIDTH_)
+					{
+						morse_y=0;
+
+						OLED_Init_Display_Buffer(0);
+					}
+				}
+
 				morse_input_flag=0;
 			}