From cb2dc7aa9b08f1da8f915b88afb22ddc449a77a9 Mon Sep 17 00:00:00 2001
From: "Zachary J. Fields" <zachary_fields@yahoo.com>
Date: Fri, 28 Feb 2025 15:16:42 -0600
Subject: [PATCH] chore: refactor device id handling

- Migrate from `sn` to `_arduino_device_id`
---
 src/NotecardConnectionHandler.cpp | 10 +++++++---
 src/NotecardConnectionHandler.h   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/NotecardConnectionHandler.cpp b/src/NotecardConnectionHandler.cpp
index b254c79..9917fce 100644
--- a/src/NotecardConnectionHandler.cpp
+++ b/src/NotecardConnectionHandler.cpp
@@ -774,9 +774,13 @@ bool NotecardConnectionHandler::updateUidCache (void)
       result = false;
     } else {
       _notecard_uid = JGetString(rsp, "device");
-      _device_id = JGetString(rsp, "sn");
-      _device_id = (_device_id.length() ? _device_id : "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-      Debug.print(DBG_DEBUG, F("NotecardConnectionHandler::%s updated cache with Notecard UID: <%s> and Arduino Device ID: <%s>"), __FUNCTION__, _notecard_uid.c_str(), _device_id.c_str());
+      char device_id[] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
+      if (NoteGetEnv("_arduino_device_id", device_id, device_id, sizeof(device_id))) {
+        _device_id = device_id;
+      } else {
+        Debug.print(DBG_DEBUG, F("NotecardConnectionHandler::%s Arduino Device ID not cached on Notecard, using default value: <%s>"), __FUNCTION__, _device_id.c_str());
+      }
+      Debug.print(DBG_DEBUG, F("NotecardConnectionHandler::%s updated local cache with Notecard UID: <%s> and Arduino Device ID: <%s>"), __FUNCTION__, _notecard_uid.c_str(), _device_id.c_str());
       result = true;
     }
     JDelete(rsp);
diff --git a/src/NotecardConnectionHandler.h b/src/NotecardConnectionHandler.h
index 2b3a873..4278c14 100644
--- a/src/NotecardConnectionHandler.h
+++ b/src/NotecardConnectionHandler.h
@@ -28,7 +28,7 @@
  ******************************************************************************/
 
 #define NOTECARD_CONNECTION_HANDLER_VERSION_MAJOR 1
-#define NOTECARD_CONNECTION_HANDLER_VERSION_MINOR 0
+#define NOTECARD_CONNECTION_HANDLER_VERSION_MINOR 1
 #define NOTECARD_CONNECTION_HANDLER_VERSION_PATCH 1
 
 #define NOTECARD_CONNECTION_HANDLER_VERSION NOTE_C_STRINGIZE(NOTECARD_CONNECTION_HANDLER_VERSION_MAJOR) "." NOTE_C_STRINGIZE(NOTECARD_CONNECTION_HANDLER_VERSION_MINOR) "." NOTE_C_STRINGIZE(NOTECARD_CONNECTION_HANDLER_VERSION_PATCH)