OneWire.cpp: if UID bytes 5 and later are zero, assume 4 byte UID

SmartEVSE · Dec 27, 2024 · 3e512fb · 3e512fb
1 parent b235c16
commit 3e512fb
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/SmartEVSE-3/src/OneWire.cpp b/SmartEVSE-3/src/OneWire.cpp
@@ -258,10 +258,18 @@ void CheckRFID(void) {
             if (OcppMode && RFIDReader == 6) {                                      // Remote authorization via OCPP?
                 // Use OCPP
                 if (!RFIDstatus) {
-                    if (RFID[0] == 0x01) {
-                        ocppUpdateRfidReading(RFID + 1, 6); // UID starts at RFID+1; Pad / truncate UID to 6-bytes for now
-                    } else {
-                        ocppUpdateRfidReading(RFID, 7); // UID starts at RFID; 7 byte UID
+                    if (RFID[0] == 0x01) {                                      // old 6 byte reader
+                        if (RFID[5] == 0 && RFID[6] == 0) {                     // so we have 4 byte UID
+                            ocppUpdateRfidReading(RFID + 1, 4); // UID starts at RFID+1; Pad / truncate UID to 4 bytes
+                        } else {                                                // 7 byte UID
+                            ocppUpdateRfidReading(RFID + 1, 6); // UID starts at RFID+1; Pad / truncate UID to 6 bytes for now since 7th byte is missing
+                        }
+                    } else {                                                    // new 7 byte reader
+                        if (RFID[4] == 0 && RFID[5] == 0 && RFID[6] == 0) {     // so we have 4 byte UID
+                            ocppUpdateRfidReading(RFID, 4); // UID starts at RFID; 4 byte UID
+                        } else {                                                // 7 byte UID
+                            ocppUpdateRfidReading(RFID, 7); // UID starts at RFID; 7 byte UID
+                        }
                     }
                 }
                 RFIDstatus = 1;