FabInfra-Mirror/fabhardware.fabreader
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabhardware/fabreader.git synced 2025-03-13 15:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Test NFC Connection

Browse Source
This commit is contained in:
TheJoKlLa 2022-09-23 17:44:11 +02:00
parent 844f04ec6a
commit 72c052fc59
6 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/FabReader_v2/.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"files.associations": {
"random": "cpp"
}
}

22
src/FabReader_v2/src/NFC.cpp
View File

@ -13,23 +13,39 @@ NFC::NFC(int pin_ss, int pin_rst)
bool NFC::hasNewCard() bool NFC::hasNewCard()
{ {
return rfid->PICC_IsNewCardPresent() && rfid->PICC_ReadCardSerial() && rfid->uid.sak == 0x20; if(rfid->PICC_IsNewCardPresent() && rfid->PICC_ReadCardSerial() && rfid->uid.sak == 0x20)
{
byte atqaLen = sizeof(atqa);
MFRC522::StatusCode status = rfid->PICC_RequestA(atqa, &atqaLen);
Serial.printf("PICC_RequestA: 0x%02x\n", status);
if(atqa[0] == 0x44)
{
return true;
}
}
return false;
} }
void NFC::selectCard() void NFC::selectCard()
{ {
rfid->PICC_Select(&(rfid->uid)); MFRC522::StatusCode status = rfid->PICC_Select(&(rfid->uid));
Serial.printf("PICC_Select: 0x%02x\n", status);
uid = rfid->uid; uid = rfid->uid;
cardSelected = true; cardSelected = true;
Serial.println("Card Selected");
} }
void NFC::deselectCard() void NFC::deselectCard()
{ {
rfid->PICC_HaltA(); MFRC522::StatusCode status = rfid->PICC_HaltA();
Serial.printf("PICC_HaltA: 0x%02x\n", status);
cardSelected = false; cardSelected = false;
} }
bool NFC::isCardLost() bool NFC::isCardLost()
{ {
Serial.println(rfid->PICC_ReadCardSerial());
Serial.println(rfid->PICC_ReadCardSerial());
Serial.println(rfid->PICC_ReadCardSerial());
return rfid->PICC_ReadCardSerial() && rfid->uid.uidByte != uid.uidByte; return rfid->PICC_ReadCardSerial() && rfid->uid.uidByte != uid.uidByte;
} }

4
src/FabReader_v2/src/NFC.h
View File

@ -7,11 +7,13 @@
class NFC class NFC
{ {
private: private:
MFRC522* rfid;
MFRC522::Uid uid; MFRC522::Uid uid;
bool cardSelected; bool cardSelected;
byte atqa[2];
public: public:
MFRC522* rfid;
NFC(int pin_ss, int pin_rst); NFC(int pin_ss, int pin_rst);
bool hasNewCard(); bool hasNewCard();
void selectCard(); void selectCard();

2
src/FabReader_v2/src/OTAProxy.cpp
View File

@ -21,7 +21,7 @@ void OTAProxy::startOTA()
char topic[] = "fabreader/00000/startOTA"; char topic[] = "fabreader/00000/startOTA";
sprintf(topic, "fabreader/%05d/startOTA", id); sprintf(topic, "fabreader/%05d/startOTA", id);
mqtt->publish(topic, ""); mqtt->publish(topic, 0);
} }
void OTAProxy::continueOTA(char* topic, byte* payload, unsigned int length) void OTAProxy::continueOTA(char* topic, byte* payload, unsigned int length)

2
src/FabReader_v2/src/OTAProxy.h
View File

@ -9,7 +9,7 @@
class OTAProxy class OTAProxy
{ {
private: private:
bool activeOTA; bool activeOTA = false;
PubSubClient* mqtt; PubSubClient* mqtt;
NFC* nfc; NFC* nfc;
int id; int id;

22
src/FabReader_v2/src/main.cpp
View File

@ -25,7 +25,7 @@ OTAProxy* ota;
void setup_wifi() void setup_wifi()
{ {
delay(10); delay(10);
Serial.println("Connecting Wifi"); Serial.println("Connecting Wifi ...");
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(config.WLAN_SSID, config.WLAN_Password); WiFi.begin(config.WLAN_SSID, config.WLAN_Password);
@ -45,17 +45,22 @@ void reconnect()
{ {
String clientId = "FabReader_"; String clientId = "FabReader_";
clientId += String(config.ID); clientId += String(config.ID);
Serial.println("Connecting MQTT ...");
if (mqtt->connect(clientId.c_str())) if (mqtt->connect(clientId.c_str()))
{ {
Serial.println("connected"); Serial.println("MQTT connected");
char id[6] = "00000"; char id[6] = "00000";
sprintf(id, "%05d", config.ID); sprintf(id, "%05d", config.ID);
mqtt->publish("fabreader", id); mqtt->publish("fabreader", id);
char topic[] = "fabreader/00000/#"; char topic_requestOTA[] = "fabreader/00000/requestOTA";
sprintf(topic, "fabreader/%05d/#", config.ID); sprintf(topic_requestOTA, "fabreader/%05d/requestOTA", config.ID);
mqtt->subscribe(topic_requestOTA);
mqtt->subscribe(topic); char topic_stopOTA[] = "fabreader/00000/stopOTA";
sprintf(topic_stopOTA, "fabreader/%05d/stopOTA", config.ID);
mqtt->subscribe(topic_stopOTA);
} else { } else {
Serial.print("failed, rc="); Serial.print("failed, rc=");
Serial.print(mqtt->state()); Serial.print(mqtt->state());
@ -67,8 +72,10 @@ void reconnect()
void callback(char* topic, byte* payload, unsigned int length) void callback(char* topic, byte* payload, unsigned int length)
{ {
Serial.println("Recive Message");
if(ota->hasActiveOTA()) if(ota->hasActiveOTA())
{ {
Serial.println("Continue OTA");
ota->continueOTA(topic, payload, length); ota->continueOTA(topic, payload, length);
} }
} }
@ -89,8 +96,9 @@ void setup()
pinMode(PIN_ETH_SPI_SS, OUTPUT); pinMode(PIN_ETH_SPI_SS, OUTPUT);
digitalWrite(PIN_ETH_SPI_SS, HIGH); digitalWrite(PIN_ETH_SPI_SS, HIGH);
Serial.println("NFC ..."); Serial.println("Connecting NFC ...");
nfc = new NFC(PIN_RFID_SPI_SS, PIN_RFID_RST); nfc = new NFC(PIN_RFID_SPI_SS, PIN_RFID_RST);
Serial.println("NFC connected");
setup_wifi(); setup_wifi();
@ -111,10 +119,12 @@ void loop()
if(!ota->hasActiveOTA() && nfc->hasNewCard()) if(!ota->hasActiveOTA() && nfc->hasNewCard())
{ {
Serial.println("Start OTA");
ota->startOTA(); ota->startOTA();
} }
if(ota->hasActiveOTA() && nfc->isCardLost()) if(ota->hasActiveOTA() && nfc->isCardLost())
{ {
Serial.println("Cancel OTA");
ota->cancelOTA(); ota->cancelOTA();
} }
} }