忘记push了,添加了RC522驱动

This commit is contained in:
2021-09-06 12:50:44 +08:00
parent d21f33baf2
commit a53edf3c01
59 changed files with 24192 additions and 17208 deletions
+21
View File
@@ -0,0 +1,21 @@
/*
* APP_IDcard.c
*
* Created on: Sep 6, 2021
* Author: wuwenfeng
*/
#include "APP_IDcard.h"
window *idcard_window;
void APP_IDcard_init(window *a_window)
{
idcard_window=a_window;
RC522_Init();
}
void APP_IDcard_loop()
{
}
+17
View File
@@ -0,0 +1,17 @@
/*
* APP_IDcard.h
*
* Created on: Sep 6, 2021
* Author: wuwenfeng
*/
#ifndef APP_IDCARD_H_
#define APP_IDCARD_H_
#include "main.h"
#include "windows.h"
#include "rs522.h"
void APP_IDcard_init(window *a_window);
void APP_IDcard_loop();
#endif /* APP_IDCARD_H_ */
+13 -4
View File
@@ -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();