Add model brand and friendly name
dblume commited on 2023-04-25 20:20:06
Showing 2 changed files, with 11 additions and 7 deletions.
- components/mytask.brs 33f6b02..8dc7733
- manifest d776b30..2fa6fc1
| ... | ... |
@@ -19,10 +19,10 @@ function getDeviceInfo(deviceInfo as object) as Object |
| 19 | 19 |
if elements.Count() > 0 |
| 20 | 20 |
aa["device ID"] = elements[0].GetText() |
| 21 | 21 |
end if |
| 22 |
- elements = root.GetNamedElements("model-number")
|
|
| 23 |
- if elements.Count() > 0 |
|
| 24 |
- aa.["model"] = elements[0].GetText() |
|
| 25 |
- end if |
|
| 22 |
+' elements = root.GetNamedElements("model-number")
|
|
| 23 |
+' if elements.Count() > 0 |
|
| 24 |
+' aa.["model"] = elements[0].GetText() |
|
| 25 |
+' end if |
|
| 26 | 26 |
elements = root.GetNamedElements("build-number")
|
| 27 | 27 |
if elements.Count() > 0 |
| 28 | 28 |
fv = elements[0].GetText() |
| ... | ... |
@@ -33,13 +33,17 @@ function getDeviceInfo(deviceInfo as object) as Object |
| 33 | 33 |
aa.["firmware version"] = fv |
| 34 | 34 |
end if |
| 35 | 35 |
end if |
| 36 |
+ aa["friendly name"] = deviceInfo.GetFriendlyName() |
|
| 37 |
+ deets = deviceInfo.GetModelDetails() |
|
| 38 |
+ aa["model"] = deviceInfo.GetModel() + " (" + deets["VendorName"] + " " ++ deets["ModelNumber"] + ")"
|
|
| 36 | 39 |
return aa |
| 37 | 40 |
end if |
| 38 | 41 |
' That did not work, so make a custom one. |
| 39 |
- aa["model"] = deviceInfo.GetModel() + " (" + deviceInfo.GetModelDetails()["ModelNumber"] + ")"
|
|
| 42 |
+ deets = deviceInfo.GetModelDetails() |
|
| 43 |
+ aa["model"] = deviceInfo.GetModel() + " (" + deets["VendorName"] + " " ++ deets["ModelNumber"] + ")"
|
|
| 40 | 44 |
mmrb = deviceInfo.GetOSVersion() ' major minor revision build |
| 41 | 45 |
aa["firmware version"] = mmrb["major"]+"."+mmrb["minor"] +"."+mmrb["revision"]+" build "+mmrb["build"] |
| 42 |
- |
|
| 46 |
+ aa["friendly name"] = deviceInfo.GetFriendlyName() |
|
| 43 | 47 |
return aa |
| 44 | 48 |
end function |
| 45 | 49 |
|