颜色控制器测试

Signed-off-by: fong <wuwenfengmi@outlook.com>

SW_APPs/Main_APP.c

@@ -12,6 +12,9 @@
 #include "key.h"
 #include "buzzer.h"
 
+#include "APP_colorcontrol.h"
+#include "APP_keyboard.h"
+
 extern TIM_HandleTypeDef htim4;
 extern touch_device t0;
 
@@ -47,8 +50,10 @@ void main_app()
 	//New_Window(ui,80,80,60,90,YELLOW,"YELLOW");
 	//New_Window(ui,120,90,70,60,MAGENTA,"MAGENTA");
 
-	APP_morsecode_init(New_Window(ui,25,30,200,150,CYAN,"Morse code"));
+	//APP_morsecode_init(New_Window(ui,25,30,200,150,CYAN,"Morse code"));
 
+	APP_COLORCONTROL_init(New_Window(ui,20,30,300,64,CYAN,"COLORCONTROL"));
+	APP_KEYBOARD_init(New_Window(ui,10,60,200,100,WHITE,"KEYBOARD"));
 	ui->refresh_ui_flag=1;
 
 	//add_a_note(1000,50,1000);
@@ -70,7 +75,7 @@ void main_app()
 // 交叉编译测试
 		//APP_blood_loop();
 		//APP_IDcard_loop();
-		APP_morsecode_loop();
+		//APP_morsecode_loop();
 
 		GEI_BUTTON_CODE(&k1,KEY1);
 		GEI_BUTTON_CODE(&k2,KEY2);