忘记push了,添加了RC522驱动
This commit is contained in:
+13
-4
@@ -12,6 +12,7 @@
|
||||
|
||||
|
||||
#include "APP_blood.h"
|
||||
#include "APP_IDcard.h"
|
||||
|
||||
extern touch_device t0;
|
||||
|
||||
@@ -23,14 +24,21 @@ void main_app()
|
||||
LCDx_Init();
|
||||
EPPROM_SLOWWRITE_INIT();
|
||||
|
||||
TP_adjustment();
|
||||
if(HAL_GPIO_ReadPin(KEY3_GPIO_Port, KEY3_Pin)==0)
|
||||
{
|
||||
TP_adjustment(1);
|
||||
}else
|
||||
{
|
||||
TP_adjustment(0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
UI *ui=UI_Init(BLACK);
|
||||
|
||||
APP_blood_init(New_Window(ui,10,10,128,128,WHITE,"MAX30102"));
|
||||
//APP_blood_init(New_Window(ui,10,10,128,128,WHITE,"MAX30102"));
|
||||
|
||||
//New_Window(ui,25,30,150,100,GREEN,"GREEN");
|
||||
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");
|
||||
|
||||
@@ -51,7 +59,8 @@ void main_app()
|
||||
*/
|
||||
|
||||
// 交叉编译测试
|
||||
APP_blood_loop();
|
||||
//APP_blood_loop();
|
||||
APP_IDcard_loop();
|
||||
|
||||
UI_Server(ui);
|
||||
TP_Server();
|
||||
|
||||
Reference in New Issue
Block a user