html/rfid.js

@@ -640,6 +640,8 @@ function writeNfcTag() {
 
     // Erstelle das NFC-Datenpaket mit korrekten Datentypen
     const nfcData = {
+        version: "2.0",
+        protocol: "openspool",
         color_hex: selectedSpool.filament.color_hex || "FFFFFF",
         type: selectedSpool.filament.material,
         min_temp: minTemp,

html/spoolman.js

@@ -97,10 +97,8 @@ function populateVendorDropdown(data, selectedSmId = null) {
         ? (weightInKg / 1000).toFixed(2) + " t" 
         : weightInKg.toFixed(2) + " kg";
 
-    // Dropdown mit gefilterten Herstellern befüllen - alphabetisch sortiert
+    // Dropdown mit gefilterten Herstellern befüllen
-    Object.entries(filteredVendors)
+    Object.entries(filteredVendors).forEach(([id, name]) => {
-        .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB)) // Sort vendors alphabetically by name
-        .forEach(([id, name]) => {
         const option = document.createElement("option");
         option.value = id;
         option.textContent = name;

src/nfc.cpp

@@ -44,6 +44,8 @@ void payloadToJson(uint8_t *data) {
       DeserializationError error = deserializeJson(doc, jsonString);
   
       if (!error) {
+        const char* version = doc["version"];
+        const char* protocol = doc["protocol"];
         const char* color_hex = doc["color_hex"];
         const char* type = doc["type"];
         int min_temp = doc["min_temp"];
@@ -53,6 +55,8 @@ void payloadToJson(uint8_t *data) {
         Serial.println();
         Serial.println("-----------------");
         Serial.println("JSON-Parsed Data:");
+        Serial.println(version);
+        Serial.println(protocol);
         Serial.println(color_hex);
         Serial.println(type);
         Serial.println(min_temp);
@@ -89,16 +93,8 @@ bool formatNdefTag() {
     return success;
   }
 
-uint16_t readTagSize()
-{
-  uint8_t buffer[4];
-  memset(buffer, 0, 4);
-  nfc.ntag2xx_ReadPage(3, buffer);
-  return buffer[2]*8;
-}
-
 uint8_t ntag2xx_WriteNDEF(const char *payload) {
-  uint16_t tagSize = readTagSize();
+  uint8_t tagSize = 240; // 144 bytes is maximum for NTAG213
   Serial.print("Tag Size: ");Serial.println(tagSize);
 
   uint8_t pageBuffer[4] = {0, 0, 0, 0};
@@ -140,8 +136,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
   if (combinedData == NULL) 
   {
     Serial.println("Fehler: Nicht genug Speicher vorhanden.");
-    oledShowMessage("Tag too small");
-    vTaskDelay(2000 / portTICK_PERIOD_MS);
     return 0;
   }
 
@@ -375,19 +369,21 @@ void scanRfidTask(void * parameter) {
 
         if (uidLength == 7)
         {
-          uint16_t tagSize = readTagSize();
+          uint8_t data[256];
-          if(tagSize > 0)
-          {
-            // Create a buffer depending on the size of the tag
-            uint8_t* data = (uint8_t*)malloc(tagSize);
-            memset(data, 0, tagSize);
 
           // We probably have an NTAG2xx card (though it could be Ultralight as well)
           Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
           
-            uint8_t numPages = readTagSize()/4;
+          for (uint8_t i = 0; i < 45; i++) {
-            for (uint8_t i = 4; i < 4+numPages; i++) {
+            /*
-              if (!nfc.ntag2xx_ReadPage(i, data+(i-4) * 4))
+            if (i < uidLength) {
+              uidString += String(uid[i], HEX);
+              if (i < uidLength - 1) {
+                  uidString += ":"; // Optional: Trennzeichen hinzufügen
+              }
+            }
+            */
+            if (!nfc.mifareclassic_ReadDataBlock(i, data + (i - 4) * 4)) 
             {
               break; // Stop if reading fails
             }
@@ -413,13 +409,6 @@ void scanRfidTask(void * parameter) {
             hasReadRfidTag = 1;
           }
          
-            free(data);
-          }
-          else
-          {
-            oledShowMessage("NFC-Tag read error");
-            hasReadRfidTag = 2;
-          }
         }
         else
         {