1.6

Cai-Zi · May 5, 2021 · 05ededd · 05ededd
1 parent 7c89e8b
commit 05ededd
Show file tree

Hide file tree

Showing 6 changed files with 1,082 additions and 1,078 deletions.
diff --git a/software/HARDWARE/Config/beeper.c b/software/HARDWARE/Config/beeper.c
@@ -19,19 +19,16 @@ void BEEPER_Init(void)
 //蜂鸣器短响一次
 void beeperOnce(void)
 {
-	u8 i;
+//	u8 i;
 	if (setData.beeperFlag) {
-//		for (i=0; i<200; i++) {
+//		for (i=0; i<20; i++) {
 //			Beeper = 1;
-//			delay_us(200);
+//			delay_us(120);
 //			Beeper = 0;
-//			delay_us(200);
+//			delay_us(125);
 //		}
-		for (i=0; i<255; i++) {
-			Beeper = 1;
-			delay_us(120);
-			Beeper = 0;
-			delay_us(125);
-		}
+		Beeper = 1;
+		delay_ms(10);
+		Beeper = 0;
 	}
 }
diff --git a/software/HARDWARE/Config/menu.c b/software/HARDWARE/Config/menu.c
@@ -114,34 +114,34 @@ void homeWindow(void)
 		OLED_DrawPointNum(0,17,bai*6,1);//当前温度-百位
 		OLED_DrawPointNum(25,17,shi*6,1);//当前温度-十位
 		OLED_DrawPointNum(50,17,ge*6,1);//当前温度-个位
-		if(percent_dis)OLED_ShowNum(78,48,(u16)100*uk/255,3,16);//加热PWM百分比
+		if(PWM_SHOW)OLED_ShowNum(78,48,(u16)100*uk/255,3,16);//加热PWM百分比
 	}else
 	{
 		OLED_ShowString(0,17, (u8 *)"          ",16,1);
 		OLED_ShowString(0,33, (u8 *)"          ",16,1);
 		OLED_ShowString(0,48, (u8 *)"             ",16,1);
 	    OLED_ShowChineseWords(12,22,line1Index,3,1);
 	    OLED_ShowChineseWords(21,40,line2Index,2,1);
-//		if(percent_dis)OLED_DrawPointBMP(76,48,lock,20,14,1);//显示锁定
+//		if(PWM_SHOW)OLED_DrawPointBMP(76,48,lock,20,14,1);//显示锁定
 	}
 
 	OLED_ShowNum(78,24,(u16)NTC_temp,2,16);//手柄温度
 	OLED_DrawPointBMP(94,24,tempSign,16,16,1);//℃
 
 	if(shutFlag||err==1){
 		OLED_DrawPointBMP(112,24,sleepSign,16,15,1);//休眠标志
-		if(percent_dis)OLED_ShowString(104,48, (u8 *)"OFF",16,1);//加热设置
+		if(PWM_SHOW)OLED_ShowString(104,48, (u8 *)"OFF",16,1);//加热设置
 		else OLED_ShowString(94,48, (u8 *)"OFF",16,1);//加热设置
 
 	}
 	else if(sleepFlag){
 		OLED_DrawPointBMP(112,24,sleepSign,16,15,1);//加热标志
-		if(percent_dis)OLED_ShowString(104,48, (u8 *)" ON",16,1);//加热设置
+		if(PWM_SHOW)OLED_ShowString(104,48, (u8 *)" ON",16,1);//加热设置
 		else OLED_ShowString(88,48, (u8 *)" ON ",16,1);//加热设置
 	}
 	else{
 		OLED_DrawPointBMP(112,24,heatSign,16,15,1);//加热标志
-		if(percent_dis)OLED_ShowString(104,48, (u8 *)" ON",16,1);//加热设置
+		if(PWM_SHOW)OLED_ShowString(104,48, (u8 *)" ON",16,1);//加热设置
 		else OLED_ShowString(88,48, (u8 *)" ON ",16,1);//加热设置
 	}
 
@@ -284,11 +284,11 @@ void menu_gybjTip(void){
 
 
 	OLED_ShowChineseWords(0,16,rqIndex,2,1);
-	OLED_ShowString(32,16,(u8*)": 2020.11.05",16,1);
+	OLED_ShowString(32,16,(u8*)REA_TIME,16,1);
 
 
 	OLED_ShowChineseWords(0,32,bbIndex,2,1);
-	OLED_ShowString(32,32,(u8*)": V1.2",16,1);
+	OLED_ShowString(32,32,(u8*)VERSION,16,1);
 
 	OLED_ShowString(0,48,(u8*)"QQ",16,1);
 	OLED_ShowChinese(16,48,39,16,1);

diff --git a/software/HARDWARE/Config/oled.c b/software/HARDWARE/Config/oled.c
@@ -166,7 +166,8 @@ void OLED_Fill(u8 x1,u8 y1,u8 x2,u8 y2,u8 dot)
 	for(x=x1;x<=x2;x++)
 	{
 		for(y=y1;y<=y2;y++)OLED_DrawPoint(x,y,dot);
-	}
+	}													    
+	OLED_Refresh_Gram();//更新显示
 }
 
 //在指定位置显示一个字符,包括部分字符

diff --git a/software/HARDWARE/main.h b/software/HARDWARE/main.h
@@ -50,7 +50,11 @@
 #define TIME_SHUT  20       // 关闭加热器的时间（分钟）
 
 // 是否显示百分比（0=禁用）
-#define percent_dis 1        // 是否显示pwm百分比   0不显示
+#define PWM_SHOW 1        // 是否显示pwm百分比   0不显示
+
+//版本信息
+#define VERSION ": V1.6"
+#define REA_TIME ": 2021.05.04"
 
 #define TEMPARRLEN 8 //温度数组元素个数
 #define NTC_TEMPARRLEN 15 //温度数组元素个数