更新内容：
添加 SpiceTools 模式； 改为使用已修改的 PN532 和 SpiceAPI 库； 移除实现不正确的 USB 连接状态显示； 重新排布 OLED 的显示文字和图标位置； 修改 SW 开关定义，移除没能实现的 BLE 刷卡功能； 删除冗余代码。
This commit is contained in:
Sucareto
+77
-90
@@ -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(SW2, INPUT_PULLUP);
|
||||
pinMode(SW3, INPUT_PULLUP);
|
||||
pinMode(SW4, INPUT_PULLUP);
|
||||
pinMode(SW1, INPUT_PULLUP); // Switch to Spice mode
|
||||
pinMode(SW2, INPUT_PULLUP); // Enable OTA
|
||||
pinMode(SW3, INPUT_PULLUP); // LED brightness
|
||||
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();
|
||||
packet_write();
|
||||
if (ConnectStatus & millis() - ConnectTime > 5000) {
|
||||
u8g2.drawXBM(0, 0, 16, 16, usb_disconnect);
|
||||
u8g2.sendBuffer();
|
||||
ConnectStatus = false;
|
||||
}
|
||||
ReaderMain();
|
||||
}
|
||||
|
||||
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) {
|
||||
ConnectStatus = true;
|
||||
ConnectTime = millis();
|
||||
return req.cmd;
|
||||
}
|
||||
checksum += r;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
void SpiceToolsReader() { // Spice mode
|
||||
uint16_t SystemCode;
|
||||
char card_id[17];
|
||||
if (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, res.mifare_uid, &res.id_len)
|
||||
&& nfc.mifareclassic_AuthenticateBlock(res.mifare_uid, res.id_len, 1, 0, MifareKey)
|
||||
&& nfc.mifareclassic_ReadDataBlock(1, res.block)) {
|
||||
sprintf(card_id, "%02X%02X%02X%02X%02X%02X%02X%02X",
|
||||
res.block[0], res.block[1], res.block[2], res.block[3],
|
||||
res.block[4], res.block[5], res.block[6], res.block[7]);
|
||||
|
||||
static void packet_write() {
|
||||
uint8_t checksum = 0, len = 0;
|
||||
if (res.cmd == 0) {
|
||||
} else if (nfc.felica_Polling(0xFFFF, 0x00, res.IDm, res.PMm, &SystemCode, 200) == 1) {
|
||||
sprintf(card_id, "%02X%02X%02X%02X%02X%02X%02X%02X",
|
||||
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);
|
||||
while (len <= res.frame_len) {
|
||||
uint8_t w;
|
||||
if (len == res.frame_len) {
|
||||
w = checksum;
|
||||
} else {
|
||||
w = res.bytes[len];
|
||||
checksum += w;
|
||||
u8g2.drawXBM(113, 0, 16, 16, card);
|
||||
u8g2.sendBuffer();
|
||||
spiceapi::InfoAvs avs_info{};
|
||||
if (spiceapi::info_avs(CON, avs_info)) {
|
||||
FWSW = digitalRead(SW4);
|
||||
spiceapi::card_insert(CON, !FWSW, card_id);
|
||||
u8g2.drawStr(0, 30, card_id);
|
||||
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) {
|
||||
SerialDevice.write(0xD0);
|
||||
SerialDevice.write(--w);
|
||||
} else {
|
||||
SerialDevice.write(w);
|
||||
}
|
||||
len++;
|
||||
FastLED.show();
|
||||
}
|
||||
res.cmd = 0;
|
||||
u8g2.drawXBM(113, 0, 16, 16, blank);
|
||||
u8g2.drawStr(0, 30, " ");
|
||||
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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user