From b71aa2e72b83974c5323a326dfbec1dbd07b0d9f Mon Sep 17 00:00:00 2001
From: David Escalona <david.escalona@digi.com>
Date: Mon, 2 Sep 2024 17:39:42 +0200
Subject: [PATCH] connectcore-demo-example: generalize code to read platform ID

Signed-off-by: David Escalona <david.escalona@digi.com>
---
 connectcore-demo-example/demoserver.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/connectcore-demo-example/demoserver.py b/connectcore-demo-example/demoserver.py
index 0c9f3b2..554a0a7 100755
--- a/connectcore-demo-example/demoserver.py
+++ b/connectcore-demo-example/demoserver.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2022, 2023, Digi International, Inc.
+# Copyright (c) 2022-2024, Digi International, Inc.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -146,7 +146,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler):
             log.debug("Get device info")
 
             info = {
-                "device_type": read_proc_file("/proc/device-tree/digi,machine,name")
+                "device_type": get_platform_id()
             }
 
             # Send the JSON value.
@@ -169,7 +169,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler):
                                                                 platform.machine()),
                 "dey_version": "DEY-%s-%s" % (get_dey_version(), read_file("/etc/version")),
                 "serial_number": get_serial_number(),
-                "device_type": read_proc_file("/proc/device-tree/digi,machine,name"),
+                "device_type": get_platform_id(),
                 "module_variant": read_proc_file("/proc/device-tree/digi,hwid,variant"),
                 "board_variant": read_proc_file("/proc/device-tree/digi,carrierboard,version"),
                 "board_id": read_proc_file("/proc/device-tree/digi,carrierboard,id"),
@@ -842,7 +842,7 @@ class BluetoothService:
             elif setting_name == "dey_version":
                 setting_value = f"DEY-{get_dey_version()}-{read_file('/etc/version')}"
             elif setting_name == "device_type":
-                setting_value = read_proc_file("/proc/device-tree/digi,machine,name")
+                setting_value = get_platform_id()
             elif setting_name == "ethernet0_mac":
                 setting_value = get_ethernet_mac()
             elif setting_name == "n_eth":
@@ -1507,7 +1507,7 @@ def set_audio_volume(value):
         String: Error string if fails.
     """
     cmd = f"amixer set 'Speaker' {value}% && amixer set 'Headphone' {value}%"\
-        if read_proc_file("/proc/device-tree/digi,machine,name") not in ("ccimx6sbc", "ccimx6qpsbc")\
+        if get_platform_id() not in ("ccimx6sbc", "ccimx6qpsbc")\
         else f"amixer set 'Master' {value}%"
     res = exec_cmd(cmd)
     if res[0] != 0:
@@ -1766,6 +1766,16 @@ def set_bluetooth_device_configuration(device, config_data):
     return data
 
 
+def get_platform_id():
+    """
+    Returns the running platform ID.
+
+    Returns:
+        String: The running platform ID.
+    """
+    return read_proc_file("/proc/device-tree/digi,machine,name")
+
+
 def mac_to_human_string(mac, num_bytes=6):
     """
     Transforms the given MAC address into a human readable string.