Show canonical meter model instead of radio alias · f926300

Show canonical meter model instead of radio alias
Browse files

bogdan committed 2 weeks ago

deadend-backup-2026-03-26 main

1 parent e57be50

commit f926300

Showing 2 changed files with 15 additions and 1 deletions

+4 -1

USB Meter/Model/Meter.swift

@@ -330,7 +330,10 @@ class Meter : NSObject, ObservableObject, Identifiable {
     }
 
     var deviceModelName: String {
-        reportedModelName.isEmpty ? modelString : reportedModelName
+        if !reportedModelName.isEmpty {
+            return reportedModelName
+        }
+        return model.canonicalName
     }
 
     var deviceModelSummary: String {


+11 -0

USB Meter/Model/MeterCapabilities.swift

View

@@ -130,6 +130,17 @@ extension Model {
         }
     }
 
+    var canonicalName: String {
+        switch self {
+        case .UM25C:
+            return "UM25C"
+        case .UM34C:
+            return "UM34C"
+        case .TC66C:
+            return "TC66C"
+        }
+    }
+
     var color: Color {
         switch self {
         case .UM25C:


	@@ -330,7 +330,10 @@ class Meter : NSObject, ObservableObject, Identifiable {
330	330	}
331	331
332	332	var deviceModelName: String {
333		- reportedModelName.isEmpty ? modelString : reportedModelName
	333	+ if !reportedModelName.isEmpty {
	334	+ return reportedModelName
	335	+ }
	336	+ return model.canonicalName
334	337	}
335	338
336	339	var deviceModelSummary: String {

	@@ -130,6 +130,17 @@ extension Model {
130	130	}
131	131	}
132	132
	133	+ var canonicalName: String {
	134	+ switch self {
	135	+ case .UM25C:
	136	+ return "UM25C"
	137	+ case .UM34C:
	138	+ return "UM34C"
	139	+ case .TC66C:
	140	+ return "TC66C"
	141	+ }
	142	+ }
	143	+
133	144	var color: Color {
134	145	switch self {
135	146	case .UM25C: