SEGAy/Arduino-Aime-Reader
1
0
Fork 0
mirror of synced 2025-02-17 11:08:36 +01:00
Code Releases Activity

支持ESP32。

Browse Source
This commit is contained in:
Sucareto 2022-04-28 12:28:31 +08:00
parent fad512dd66
commit 029e06eae9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd.h
View File

@ -18,6 +18,7 @@ CRGB leds[NUM_LEDS];
#pragma message "当前的开发板是 NodeMCU_32S" #pragma message "当前的开发板是 NodeMCU_32S"
#define SerialDevice Serial #define SerialDevice Serial
#define LED_PIN 13 #define LED_PIN 13
#define PN532_SPI_SS 5
#else #else
#error "未经测试的开发板，请检查串口和阵脚定义" #error "未经测试的开发板，请检查串口和阵脚定义"
@ -167,7 +168,7 @@ static void sg_res_init(uint8_t payload_len = 0) { //初始化模板
static void sg_nfc_cmd_reset() { //重置读卡器 static void sg_nfc_cmd_reset() { //重置读卡器
nfc.begin(); nfc.begin();
nfc.setPassiveActivationRetries(0x10); //设定等待次数,0xFF永远等待 nfc.setPassiveActivationRetries(0x01); //设定等待次数,0xFF永远等待
nfc.SAMConfig(); nfc.SAMConfig();
if (nfc.getFirmwareVersion()) { if (nfc.getFirmwareVersion()) {
nfc.SAMConfig(); nfc.SAMConfig();
@ -237,7 +238,7 @@ static void sg_nfc_cmd_poll() { //卡号发送
res.type = 0x10; res.type = 0x10;
return; return;
} }
else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 0x0F) == 1) {//< 0: error else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 200) == 1) {//< 0: error
sg_res_init(0x13); sg_res_init(0x13);
res.count = 1; res.count = 1;
res.type = 0x20; res.type = 0x20;
@ -285,7 +286,7 @@ static void sg_nfc_cmd_mifare_read_block() {//读取卡扇区数据
static void sg_nfc_cmd_felica_encap() { static void sg_nfc_cmd_felica_encap() {
uint16_t SystemCode; uint16_t SystemCode;
if (nfc.felica_Polling(0xFFFF, 0x01, res.encap_IDm, res.poll_PMm, &SystemCode, 0x0F) == 1) { if (nfc.felica_Polling(0xFFFF, 0x01, res.encap_IDm, res.poll_PMm, &SystemCode, 200) == 1) {
SystemCode = SystemCode >> 8 | SystemCode << 8;//SystemCode，大小端反转注意 SystemCode = SystemCode >> 8 | SystemCode << 8;//SystemCode，大小端反转注意
} }
else { else {