From 0ffffadc8cb5a0267ca0938f02492ea966c49bae Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 5 Dec 2024 12:55:27 +0100 Subject: [PATCH] secureId: simplify code --- src/secureId.cpp | 3 +-- src/secureId.h | 14 +++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/secureId.cpp b/src/secureId.cpp index 4a74663..3604e51 100644 --- a/src/secureId.cpp +++ b/src/secureId.cpp @@ -9,7 +9,6 @@ */ #include "secureId.h" -#include bool secureId::begin() { return !!_se.begin(); @@ -24,7 +23,7 @@ bool secureId::get(uint8_t *in, uint32_t size) { if (size < CRYPTO_SN_SIZE) { return false; } - if (!THEXT::decode((_se.serialNumber()).substring(0, CRYPTO_SN_SIZE*2), in, size)) { + if (!_se.serialNumber(in, size)) { return false; } return true; diff --git a/src/secureId.h b/src/secureId.h index 8ed4d8b..35b8452 100644 --- a/src/secureId.h +++ b/src/secureId.h @@ -17,19 +17,15 @@ defined(ARDUINO_SAMD_MKRWAN1300) || \ defined(ARDUINO_SAMD_MKRWAN1310) || \ defined(ARDUINO_SAMD_MKRNB1500) || \ - defined(ARDUINO_SAMD_MKR1000) || \ defined(ARDUINO_PORTENTA_H7_M7) || \ + defined(ARDUINO_SAMD_MKR1000) || \ + defined(ARDUINO_PORTENTA_C33) || \ + defined(ARDUINO_NICLA_VISION) || \ + defined(ARDUINO_UNOR4_WIFI) || \ defined(ARDUINO_OPTA) || \ defined(ARDUINO_GIGA) #include - #define CRYPTO_SN_SIZE 9 -#elif defined(ARDUINO_PORTENTA_C33) || \ - defined(ARDUINO_NICLA_VISION) - #include - #define CRYPTO_SN_SIZE 18 -#elif defined(ARDUINO_UNOR4_WIFI) - #include - #define CRYPTO_SN_SIZE 6 + #define CRYPTO_SN_SIZE SE_SN_LENGTH #else #define CRYPTO_SN_SIZE 0 #endif