+10
-7
@@ -9,10 +9,7 @@
|
||||
#include "windows.h"
|
||||
#include "touch.h"
|
||||
#include "eeprom.h"
|
||||
|
||||
|
||||
#include "APP_blood.h"
|
||||
#include "APP_IDcard.h"
|
||||
#include "key.h"
|
||||
|
||||
extern touch_device t0;
|
||||
|
||||
@@ -27,7 +24,7 @@ void main_app()
|
||||
LCDx_Init();
|
||||
EPPROM_SLOWWRITE_INIT();
|
||||
|
||||
if(HAL_GPIO_ReadPin(KEY3_GPIO_Port, KEY3_Pin)==0)
|
||||
if(KEY1==0&&KEY3==0)
|
||||
{
|
||||
TP_adjustment(1);
|
||||
}else
|
||||
@@ -41,10 +38,12 @@ void main_app()
|
||||
|
||||
//APP_blood_init(New_Window(ui,10,10,128,128,WHITE,"MAX30102"));
|
||||
|
||||
APP_IDcard_init(New_Window(ui,25,30,150,100,GREEN,"IDcard"));
|
||||
//APP_IDcard_init(New_Window(ui,25,30,150,100,GREEN,"IDcard"));
|
||||
//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"));
|
||||
|
||||
ui->refresh_ui_flag=1;
|
||||
|
||||
while(1)
|
||||
@@ -63,8 +62,12 @@ void main_app()
|
||||
|
||||
// 交叉编译测试
|
||||
//APP_blood_loop();
|
||||
APP_IDcard_loop();
|
||||
//APP_IDcard_loop();
|
||||
APP_morsecode_loop();
|
||||
|
||||
GEI_BUTTON_CODE(&k1,KEY1);
|
||||
GEI_BUTTON_CODE(&k2,KEY2);
|
||||
GEI_BUTTON_CODE(&k3,KEY3);
|
||||
UI_Server(ui);
|
||||
TP_Server();
|
||||
EEPROM_SLOWWRITE_SERVER();
|
||||
|
||||
Reference in New Issue
Block a user