更新内容：

添加 SpiceTools 模式；
改为使用已修改的 PN532 和 SpiceAPI 库；
移除实现不正确的 USB 连接状态显示；
重新排布 OLED 的显示文字和图标位置；
修改 SW 开关定义，移除没能实现的 BLE 刷卡功能；
删除冗余代码。

ESP32-CardReader.ino

@@ -1,55 +1,54 @@
-#if defined(ARDUINO_NodeMCU_32S)
+#ifdef ARDUINO_NodeMCU_32S
 #pragma message "当前的开发板是 NodeMCU_32S"
 #define SerialDevice Serial
 #define LED_PIN 13
 #define PN532_SPI_SS 5
+// #define OTA_Enable
 
 #define SW1 33
 #define SW2 25
 #define SW3 26
 #define SW4 27
+bool ReaderMode, FWSW;
 
+#ifdef OTA_Enable
 #pragma message "已启用OTA更新"
-
 #define STASSID "ALL.Net Wi-Fi"
 #define STAPASS "SEGASEGASEGA"
 #define OTA_URL "http://esp-update.local/Sucareto/ESP32-Reader:2333/"
 #include <WiFi.h>
 #include <HTTPUpdate.h>
+#endif
 
 #else
 #error "开发板选错了！！！"
 #endif
 
-#include "Aime-Reader.h"
+#include "ReaderCmd.h"
+void (*ReaderMain)();
 
 void setup() {
-  pinMode(SW1, INPUT_PULLUP);
+  pinMode(SW1, INPUT_PULLUP);  // Switch to Spice mode
-  pinMode(SW2, INPUT_PULLUP);
+  pinMode(SW2, INPUT_PULLUP);  // Enable OTA
-  pinMode(SW3, INPUT_PULLUP);
+  pinMode(SW3, INPUT_PULLUP);  // LED brightness
-  pinMode(SW4, INPUT_PULLUP);
+  pinMode(SW4, INPUT_PULLUP);  // (Aime) Baudrate & fw/hw | (Spice) 1P 2P
 
-  bool high_baudrate = !digitalRead(SW1);
-  FWSW = !digitalRead(SW2);
   u8g2.begin();
   u8g2.setFont(u8g2_font_6x12_mf);
-  u8g2.drawXBM(0, 0, 16, 16, usb_disconnect);
-  u8g2.drawStr(48, 10, high_baudrate ? "HIGH" : "LOW");
-  u8g2.sendBuffer();
-
-  SerialDevice.begin(high_baudrate ? 115200 : 38400);
-
   FastLED.addLeds<WS2812B, LED_PIN, GRB>(leds, 8);
-  if (!digitalRead(SW3)) {
+  if (digitalRead(SW3)) {
     FastLED.setBrightness(20);
   }
   FastLED.showColor(0);
 
-  if (!digitalRead(SW4)) {
+#ifdef OTA_Enable
+  if (!digitalRead(SW1)) {  // OTA check
     WiFi.begin(STASSID, STAPASS);
     u8g2.drawStr(0, 28, "WiFi Connecting...");
     u8g2.sendBuffer();
-    while (WiFi.status() != WL_CONNECTED);
+    while (WiFi.status() != WL_CONNECTED) {
+      delay(100);
+    };
     u8g2.drawStr(0, 28, "WiFi connected.          ");
     u8g2.drawStr(0, 41, "Check update...          ");
     u8g2.sendBuffer();
@@ -65,105 +64,92 @@ void setup() {
         u8g2.drawStr(0, 41, "Already up to date.          ");
         break;
     }
-    u8g2.sendBuffer();
   }
+#endif
 
   nfc.begin();
   while (!nfc.getFirmwareVersion()) {
-    u8g2.drawXBM(20, 0, 16, 16, rf_off);
+    u8g2.drawXBM(95, 0, 16, 16, rf_off);
     u8g2.sendBuffer();
     FastLED.showColor(0xFF0000);
     delay(500);
     FastLED.showColor(0);
     delay(500);
   }
-  nfc.setPassiveActivationRetries(0x10);//设定等待次数
+  nfc.setPassiveActivationRetries(0x10);
   nfc.SAMConfig();
+  u8g2.clearBuffer();
 
+  ReaderMode = !digitalRead(SW1);
+  FWSW = digitalRead(SW4);
+  if (ReaderMode) {  // BEMANI mode
+    SerialDevice.begin(115200);
+    u8g2.drawStr(0, 14, "SpiceTools");
+    u8g2.drawStr(117, 64, FWSW ? "1P" : "2P");
+    FastLED.showColor(CRGB::Yellow);
+    ReaderMain = SpiceToolsReader;
+  } else {  // Aime mode
+    SerialDevice.begin(FWSW ? 38400 : 115200);
+    u8g2.drawStr(0, 16, "Aime Reader");
+    u8g2.drawStr(105, 64, FWSW ? "LOW" : "HIGH");
+    u8g2.drawStr(0, 64, FWSW ? "TN32MSEC003S" : "837-15396");
+    FastLED.showColor(FWSW ? CRGB::Green : CRGB::Blue);
+    ReaderMain = AimeCardReader;
+  }
   memset(&req, 0, sizeof(req.bytes));
   memset(&res, 0, sizeof(res.bytes));
-
-  u8g2.drawXBM(20, 0, 16, 16, blank);
-  u8g2.drawStr(0, 64, FWSW ? "TN32MSEC003S" : "837-15396");
   u8g2.sendBuffer();
-  FastLED.showColor(high_baudrate ? 0x0000FF : 0x00FF00);
-
 }
 
-unsigned long ConnectTime = 0;
-bool ConnectStatus = false;
 
 void loop() {
-  SerialCheck();
+  ReaderMain();
-  packet_write();
-  if (ConnectStatus & millis() - ConnectTime > 5000) {
-    u8g2.drawXBM(0, 0, 16, 16, usb_disconnect);
-    u8g2.sendBuffer();
-    ConnectStatus = false;
-  }
 }
 
-static uint8_t len, r, checksum;
-static bool escape = false;
 
-static uint8_t packet_read() {
+void SpiceToolsReader() {  // Spice mode
-  while (SerialDevice.available()) {
+  uint16_t SystemCode;
-    r = SerialDevice.read();
+  char card_id[17];
-    if (r == 0xE0) {
+  if (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, res.mifare_uid, &res.id_len)
-      req.frame_len = 0xFF;
+      && nfc.mifareclassic_AuthenticateBlock(res.mifare_uid, res.id_len, 1, 0, MifareKey)
-      continue;
+      && nfc.mifareclassic_ReadDataBlock(1, res.block)) {
-    }
+    sprintf(card_id, "%02X%02X%02X%02X%02X%02X%02X%02X",
-    if (req.frame_len == 0xFF) {
+            res.block[0], res.block[1], res.block[2], res.block[3],
-      req.frame_len = r;
+            res.block[4], res.block[5], res.block[6], res.block[7]);
-      len = 0;
-      checksum = r;
-      continue;
-    }
-    if (r == 0xD0) {
-      escape = true;
-      continue;
-    }
-    if (escape) {
-      r++;
-      escape = false;
-    }
-    req.bytes[++len] = r;
-    if (len == req.frame_len && checksum == r) {
-      ConnectStatus = true;
-      ConnectTime = millis();
-      return req.cmd;
-    }
-    checksum += r;
-  }
-  return 0;
-}
 
-static void packet_write() {
+  } else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 200) == 1) {
-  uint8_t checksum = 0, len = 0;
+    sprintf(card_id, "%02X%02X%02X%02X%02X%02X%02X%02X",
-  if (res.cmd == 0) {
+            res.IDm[0], res.IDm[1], res.IDm[2], res.IDm[3],
+            res.IDm[4], res.IDm[5], res.IDm[6], res.IDm[7]);
+  } else {
     return;
   }
-  SerialDevice.write(0xE0);
+  u8g2.drawXBM(113, 0, 16, 16, card);
-  while (len <= res.frame_len) {
+  u8g2.sendBuffer();
-    uint8_t w;
+  spiceapi::InfoAvs avs_info{};
-    if (len == res.frame_len) {
+  if (spiceapi::info_avs(CON, avs_info)) {
-      w = checksum;
+    FWSW = digitalRead(SW4);
-    } else {
+    spiceapi::card_insert(CON, !FWSW, card_id);
-      w = res.bytes[len];
+    u8g2.drawStr(0, 30, card_id);
-      checksum += w;
+    u8g2.drawStr(0, 64, (avs_info.model + ":" + avs_info.dest + avs_info.spec + avs_info.rev + ":" + avs_info.ext).c_str());
+    u8g2.drawStr(117, 64, FWSW ? "1P" : "2P");
+    u8g2.sendBuffer();
+    for (int i = 0; i < 8; i++) {
+      leds[i] = CRGB::Red;
+      leds[7 - i] = CRGB::Blue;
+      FastLED.delay(50);
+      leds[i] = CRGB::Black;
+      leds[7 - i] = CRGB::Black;
     }
-    if (w == 0xE0 || w == 0xD0) {
+    FastLED.show();
-      SerialDevice.write(0xD0);
-      SerialDevice.write(--w);
-    } else {
-      SerialDevice.write(w);
   }
-    len++;
+  u8g2.drawXBM(113, 0, 16, 16, blank);
-  }
+  u8g2.drawStr(0, 30, "                ");
-  res.cmd = 0;
+  u8g2.sendBuffer();
 }
 
-void SerialCheck() {
+
+void AimeCardReader() {  // Aime mode
   switch (packet_read()) {
     case SG_NFC_CMD_RESET:
       sg_nfc_cmd_reset();
@@ -190,7 +176,7 @@ void SerialCheck() {
       sg_nfc_cmd_bana_authenticate();
       break;
     case SG_NFC_CMD_MIFARE_SELECT_TAG:
-      sg_nfc_cmd_mifare_select_tag();
+      sg_res_init();
       break;
     case SG_NFC_CMD_MIFARE_SET_KEY_AIME:
       sg_nfc_cmd_mifare_set_key_aime();
@@ -214,8 +200,9 @@ void SerialCheck() {
       sg_led_cmd_set_color();
       break;
     case 0:
-      break;
+      return;
     default:
       sg_res_init();
   }
+  packet_write();
 }

README.md

@@ -1,9 +1,16 @@
 # ESP32-CardReader
 
-- 此项目为 [Arduino-Aime-Reader](https://github.com/Sucareto/Arduino-Aime-Reader) 的使用示例。
+- 此项目为 [Arduino-Aime-Reader](https://github.com/Sucareto/Arduino-Aime-Reader) 的使用示例，使用的主控模块是 NodeMCU-32S
-- 主控模块是 NodeMCU-32S，添加了 SSD1306 模块显示信息。
+- 添加了 SSD1306 模块展示状态
-- 可以使用拨码开关切换连接波特率和修改其他设置，也可以切换为 HSU 直通模式。
+- 添加了拨码开关用于切换读卡器模式和波特率，也可以切换为 HSU 直通模式
-- 直通模式可以给 Android 和 PC 连接作为 USB PN532 读卡器使用，例如使用 [MIFARE Classic Tool (MCT)](https://github.com/ikarus23/MifareClassicTool) 或 [MifareOneTool](https://github.com/xcicode/MifareOneTool) 之类的软件。
+  - 直通模式可以给 Android 或 PC 连接作为 USB PN532 读卡器使用，例如使用 [MIFARE Classic Tool (MCT)](https://github.com/ikarus23/MifareClassicTool) 或 [MifareOneTool](https://github.com/xcicode/MifareOneTool) 等读卡软件
+- 在原版 Aime 读卡器的基础上添加了 SpiceTools 模式，可以读取自定义的 MIFARE 卡和 FeliCa 卡
+  - MIFARE 读取 sector 0 block 1 的前半部分作为卡号发送（可以通过代码定义）
+  - FeliCa 读取 idm 作为卡号发送
+  - **仅用于分辨卡片和账号，读卡逻辑和卡号计算未正确实现**
+
+**本项目仅用于展示原项目 [Arduino-Aime-Reader](https://github.com/Sucareto/Arduino-Aime-Reader) 的使用示例，未曾开展或参与成品售卖，也不会向商业化制作提供任何支持。**
+
 
 ## 实物图：
 <details><summary>点击展开</summary>
@@ -18,18 +25,32 @@ https://user-images.githubusercontent.com/28331534/170975661-137f3474-f61a-4a4d-
 ## 使用说明：
 
 ### PCB 设计：
-因为不舍得花时间去画 PCB，所以 ESP32 和 PN532 就使用了模块直插的方式，或许以后有机会的话...
+- 该 PCB 方案仅用于我自己快速测试，并非最佳实现方案
+- 如果需要使用此 PCB 方案，请务必把 logo 删掉，然后根据需求认真审查 PCB 设计并作出修改后再进行制作
+
 
 ### 拨码开关：
-在 PCB 放置了两个 4P 拨码开关。
+在 PCB 放置了两个 4P 拨码开关：
 
-#### SW 1-4：（可修改代码自定义）
+#### SW 1-4：（用于更改读卡器功能，切换后需要重启）
-- SW1：切换波特率，对应`high_baudrate` 
+- SW1：切换读卡器模式
-- SW2：切换固件显示版本，`TN32MSEC003S` 或 `837-15396`
+  - ON：SpiceTools 模式，需要在 SpiceTools 添加启动参数 `-apiserial COM1 -apiserialbaud 115200`，"COM1" 改为实际的端口号
-- SW3：切换 BLE 连接（未实现）
+  - OFF：Aime 模式，和 [Arduino-Aime-Reader](https://github.com/Sucareto/Arduino-Aime-Reader) 使用方法一致
-- SW4：启用 OTA 更新
+- SW2：切换启动时的 OTA 开关
+  - ON：连接 WiFi 获取更新，如未能连接到 WiFi 则会持续到连接成功后才能启动
+  - OFF：跳过检查更新，直接启动
+- SW3：切换 LED 亮度
+  - ON：全亮度
+  - OFF：亮度降低到指定值
+- SW4：不同模式的功能切换
+  - Spice 模式（可在运行中切换）
+    - ON：卡号发送到 2P 槽位（需要游戏支持）
+    - OFF：卡号发送到 1P 槽位
+  - Aime 模式
+    - ON：使用 38400 波特率初始化，固件版本是 TN32MSEC003S
+    - OFF：使用 115200 波特率初始化，固件版本是 837-15396
 
-#### TTL：（用于切换至 “USB PN532 读卡器”模式）
+#### TTL：（用于切换至 “USB PN532 读卡器”模式，需要在断电情况下切换）
 - SW1：连接到 ESP32 的 `EN` 引脚，调为 `ON` 后会停用 ESP32，只使用 CH340 串口通信芯片
 - SW2：在目前版本（v2）为空置
 - SW3 & SW4：连接 CH340 和 PN532 的 `RX TX`引脚
@@ -48,8 +69,12 @@ https://user-images.githubusercontent.com/28331534/170975661-137f3474-f61a-4a4d-
 ## 感谢：
 
 - 原项目：[Arduino-Aime-Reader](https://github.com/Sucareto/Arduino-Aime-Reader)
+- 驱动 WS2812B：[FastLED](https://github.com/FastLED/FastLED)
 - 操作 SSD1306：[u8g2](https://github.com/olikraus/u8g2)
+- Spice 通信（已复制到本仓库并根据需要修改了部分代码）：[SpiceAPI](https://github.com/spicetools/spicetools/tree/master/api/resources/arduino) 
+- 驱动 PN532（已复制到本仓库并根据需要修改了部分代码）：[PN532](https://github.com/elechouse/PN532)
 - OLED 显示图案设计：PCtoLCD2002
 - AimePad 盖板设计：[CoolBreezeArcanine](https://github.com/CoolBreezeArcanine)
 - PCB 图案：[妖夢 - ぷりん](https://www.pixiv.net/artworks/87578487)
 - OTA 代码参考：[OTA Updates](https://arduino-esp8266.readthedocs.io/en/latest/ota_updates/readme.html#http-server)
+- Spice 通信参考：[PN5180-cardio SpiceAPI branch](https://github.com/CrazyRedMachine/PN5180-cardio/tree/SpiceAPI)

ReaderCmd.h

@@ -1,8 +1,7 @@
-#include <SPI.h>
+#include "src/PN532_SPI.h"
-#include <PN532_SPI.h>
 PN532_SPI pn532(SPI, PN532_SPI_SS);
 
-#include "PN532.h"
+#include "src/PN532.h"
 PN532 nfc(pn532);
 
 #include "FastLED.h"
@@ -11,15 +10,19 @@ CRGB leds[8];
 #include <U8g2lib.h>
 U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0);
 
-static unsigned char usb_disconnect[] = {
+#define SPICEAPI_INTERFACE Serial
-  0x00, 0x40, 0x00, 0xAE, 0x00, 0x51, 0x80, 0x20, 0x00, 0x41, 0x80, 0x42, 0x40, 0x44, 0x08, 0x28,
+#include "src/wrappers.h"
-  0x14, 0x14, 0x22, 0x02, 0x42, 0x00, 0x82, 0x00, 0x04, 0x01, 0x8A, 0x00, 0x75, 0x00, 0x02, 0x00
+spiceapi::Connection CON(512);
-};
 
-static unsigned char usb_connect[] = {
+
-  0x00, 0x40, 0x00, 0xA0, 0x00, 0x51, 0x80, 0x2A, 0x60, 0x14, 0x50, 0x08, 0xB0, 0x10, 0x48, 0x21,
+// static unsigned char usb_disconnect[] = {
-  0x84, 0x12, 0x08, 0x0D, 0x10, 0x0A, 0x28, 0x06, 0x54, 0x01, 0x8A, 0x00, 0x05, 0x00, 0x02, 0x00
+//   0x00, 0x40, 0x00, 0xAE, 0x00, 0x51, 0x80, 0x20, 0x00, 0x41, 0x80, 0x42, 0x40, 0x44, 0x08, 0x28,
-};
+//   0x14, 0x14, 0x22, 0x02, 0x42, 0x00, 0x82, 0x00, 0x04, 0x01, 0x8A, 0x00, 0x75, 0x00, 0x02, 0x00
+// };
+// static unsigned char usb_connect[] = {
+//   0x00, 0x40, 0x00, 0xA0, 0x00, 0x51, 0x80, 0x2A, 0x60, 0x14, 0x50, 0x08, 0xB0, 0x10, 0x48, 0x21,
+//   0x84, 0x12, 0x08, 0x0D, 0x10, 0x0A, 0x28, 0x06, 0x54, 0x01, 0x8A, 0x00, 0x05, 0x00, 0x02, 0x00
+// };
 static unsigned char rf_open[] = {
   0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0x02, 0x40, 0x02, 0x40, 0x11, 0x88, 0x91, 0x89, 0x49, 0x92,
   0x49, 0x92, 0x91, 0x89, 0x11, 0x88, 0x02, 0x40, 0x02, 0x40, 0x04, 0x20, 0x00, 0x00, 0x00, 0x00
@@ -39,7 +42,7 @@ static unsigned char blank [] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-uint8_t AimeKey[6], BanaKey[6];
+uint8_t AimeKey[6], BanaKey[6], MifareKey[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 //TN32MSEC003S
 char FW_TN32[] = { 'T', 'N', '3', '2', 'M', 'S', 'E', 'C', '0', '0', '3', 'S', ' ', 'F', '/', 'W', ' ', 'V', 'e', 'r', '1', '.', '2' };
@@ -51,7 +54,6 @@ char FW_837[] = {0x94};
 char HW_837[] = { '8', '3', '7', '-', '1', '5', '3', '9', '6' };
 char BOARD_837[] = { '0', '0', '0', '-', '0', '0', '0', '0', '0', 0xFF, 0x11, 0x40 };
 
-bool FWSW;
 enum {
   SG_NFC_CMD_GET_FW_VERSION = 0x30,
   SG_NFC_CMD_GET_HW_VERSION = 0x32,
@@ -167,6 +169,63 @@ typedef union packet_res {
 
 static packet_req_t req;
 static packet_res_t res;
+static uint8_t len, r, checksum;
+static bool escape = false;
+
+static uint8_t packet_read() {
+  while (SerialDevice.available()) {
+    r = SerialDevice.read();
+    if (r == 0xE0) {
+      req.frame_len = 0xFF;
+      continue;
+    }
+    if (req.frame_len == 0xFF) {
+      req.frame_len = r;
+      len = 0;
+      checksum = r;
+      continue;
+    }
+    if (r == 0xD0) {
+      escape = true;
+      continue;
+    }
+    if (escape) {
+      r++;
+      escape = false;
+    }
+    req.bytes[++len] = r;
+    if (len == req.frame_len && checksum == r) {
+      return req.cmd;
+    }
+    checksum += r;
+  }
+  return 0;
+}
+
+static void packet_write() {
+  uint8_t checksum = 0, len = 0;
+  if (res.cmd == 0) {
+    return;
+  }
+  SerialDevice.write(0xE0);
+  while (len <= res.frame_len) {
+    uint8_t w;
+    if (len == res.frame_len) {
+      w = checksum;
+    } else {
+      w = res.bytes[len];
+      checksum += w;
+    }
+    if (w == 0xE0 || w == 0xD0) {
+      SerialDevice.write(0xD0);
+      SerialDevice.write(--w);
+    } else {
+      SerialDevice.write(w);
+    }
+    len++;
+  }
+  res.cmd = 0;
+}
 
 static void sg_res_init(uint8_t payload_len = 0) {  //初始化模板
   res.frame_len = 6 + payload_len;
@@ -177,24 +236,19 @@ static void sg_res_init(uint8_t payload_len = 0) { //初始化模板
   res.payload_len = payload_len;
 }
 
-static void sg_nfc_cmd_reset() { //重置读卡器
+static void sg_nfc_cmd_reset() {
-  FWSW = !digitalRead(SW2);
-  nfc.begin();
-  nfc.setPassiveActivationRetries(0x10); //设定等待次数,0xFF永远等待
-  nfc.SAMConfig();
   if (nfc.getFirmwareVersion()) {
-    nfc.SAMConfig();
     sg_res_init();
     res.status = 3;
-    u8g2.drawXBM(0, 0, 16, 16, usb_connect);
+    u8g2.drawXBM(95, 0, 16, 16, blank);
-    u8g2.drawXBM(20, 0, 16, 16, blank);
+    u8g2.drawXBM(113, 0, 16, 16, blank);
-    u8g2.drawXBM(111, 0, 16, 16, blank);
     u8g2.sendBuffer();
     return;
   }
-  u8g2.drawXBM(20, 0, 16, 16, rf_off);
+  u8g2.drawXBM(95, 0, 16, 16, rf_off);
   u8g2.sendBuffer();
-  FastLED.showColor(0xFF0000);
+  FastLED.showColor(CRGB::Red);
+  while (true) {};
 }
 
 static void sg_nfc_cmd_get_fw_version() {
@@ -248,14 +302,14 @@ static void sg_led_cmd_set_color() {
 static void sg_nfc_cmd_radio_on() {
   sg_res_init();
   nfc.setRFField(0x00, 0x01);
-  u8g2.drawXBM(20, 0, 16, 16, rf_open);
+  u8g2.drawXBM(95, 0, 16, 16, rf_open);
   u8g2.sendBuffer();
 }
 
 static void sg_nfc_cmd_radio_off() {
   sg_res_init();
   nfc.setRFField(0x00, 0x00);
-  u8g2.drawXBM(20, 0, 16, 16, blank);
+  u8g2.drawXBM(95, 0, 16, 16, blank);
   u8g2.sendBuffer();
 }
 
@@ -265,28 +319,20 @@ static void sg_nfc_cmd_poll() { //卡号发送
     sg_res_init(0x07);
     res.count = 1;
     res.type = 0x10;
-    u8g2.drawXBM(111, 0, 16, 16, card);
+  } else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 200) == 1) {  //< 0: error
-    u8g2.sendBuffer();
-    return;
-  }
-  else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 200) == 1) {//< 0: error
     sg_res_init(0x13);
     res.count = 1;
     res.type = 0x20;
     res.id_len = 0x10;
-    u8g2.drawXBM(111, 0, 16, 16, card);
-    u8g2.sendBuffer();
-    return;
   } else {
     sg_res_init(1);
     res.count = 0;
-    u8g2.drawXBM(111, 0, 16, 16, blank);
+    u8g2.drawXBM(113, 0, 16, 16, blank);
     u8g2.sendBuffer();
+    return;
   }
-}
+  u8g2.drawXBM(113, 0, 16, 16, card);
-
+  u8g2.sendBuffer();
-static void sg_nfc_cmd_mifare_select_tag() {
-  sg_res_init();
 }
 
 static void sg_nfc_cmd_aime_authenticate() {
@@ -320,8 +366,7 @@ static void sg_nfc_cmd_felica_encap() {
   uint16_t SystemCode;
   if (nfc.felica_Polling(0xFFFF, 0x01, res.encap_IDm, res.poll_PMm, &SystemCode, 200) == 1) {
     SystemCode = SystemCode >> 8 | SystemCode << 8;  //SystemCode，大小端反转注意
-  }
+  } else {
-  else {
     sg_res_init();
     res.status = 1;
     return;