Digi
/
dey-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connectcore-demo-example: generalize code to read platform ID 

Signed-off-by: David Escalona <david.escalona@digi.com>
This commit is contained in:
David Escalona 2024-09-02 17:39:42 +02:00
parent a1ecbfb119
commit b71aa2e72b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
connectcore-demo-example/demoserver.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/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 # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # 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") log.debug("Get device info")
info = { info = {
"device_type": read_proc_file("/proc/device-tree/digi,machine,name") "device_type": get_platform_id()
} }
# Send the JSON value. # Send the JSON value.
@ -169,7 +169,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler):
platform.machine()), platform.machine()),
"dey_version": "DEY-%s-%s" % (get_dey_version(), read_file("/etc/version")), "dey_version": "DEY-%s-%s" % (get_dey_version(), read_file("/etc/version")),
"serial_number": get_serial_number(), "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"), "module_variant": read_proc_file("/proc/device-tree/digi,hwid,variant"),
"board_variant": read_proc_file("/proc/device-tree/digi,carrierboard,version"), "board_variant": read_proc_file("/proc/device-tree/digi,carrierboard,version"),
"board_id": read_proc_file("/proc/device-tree/digi,carrierboard,id"), "board_id": read_proc_file("/proc/device-tree/digi,carrierboard,id"),
@ -842,7 +842,7 @@ class BluetoothService:
elif setting_name == "dey_version": elif setting_name == "dey_version":
setting_value = f"DEY-{get_dey_version()}-{read_file('/etc/version')}" setting_value = f"DEY-{get_dey_version()}-{read_file('/etc/version')}"
elif setting_name == "device_type": 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": elif setting_name == "ethernet0_mac":
setting_value = get_ethernet_mac() setting_value = get_ethernet_mac()
elif setting_name == "n_eth": elif setting_name == "n_eth":
@ -1507,7 +1507,7 @@ def set_audio_volume(value):
String: Error string if fails. String: Error string if fails.
""" """
cmd = f"amixer set 'Speaker' {value}% && amixer set 'Headphone' {value}%"\ 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}%" else f"amixer set 'Master' {value}%"
res = exec_cmd(cmd) res = exec_cmd(cmd)
if res[0] != 0: if res[0] != 0:
@ -1766,6 +1766,16 @@ def set_bluetooth_device_configuration(device, config_data):
return 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): def mac_to_human_string(mac, num_bytes=6):
""" """
Transforms the given MAC address into a human readable string. Transforms the given MAC address into a human readable string.