Expose custom name for DVCC STS temperature sensors if available

Contributes to issue #1754
victronenergy · Feb 18, 2025 · 3df3d57 · 3df3d57
1 parent 308dd1e
commit 3df3d57
Showing 1 changed file with 41 additions and 1 deletion.
diff --git a/pages/settings/PageSettingsDvcc.qml b/pages/settings/PageSettingsDvcc.qml
@@ -83,19 +83,59 @@ Page {
 				preferredVisible: commonSettings.dvccActive && sharedTempSense.checked
 
 				VeQuickItem {
+					id: available
 					uid: Global.system.serviceUid + "/AvailableTemperatureServices"
 					onValueChanged: {
 						if (value === undefined) {
 							return
 						}
 						const modelArray = Utils.jsonSettingsToModel(value)
 						if (modelArray) {
-							temperatureServiceRadioButtons.optionModel = modelArray
+							temperatureServiceInstantiator.displays = modelArray.map(function(d) { return d.display; })
+							temperatureServiceInstantiator.values = modelArray.map(function(d) { return d.value; })
+							temperatureServiceInstantiator.model = modelArray.length
 						} else {
 							console.warn("Unable to parse data from", uid)
 						}
 					}
 				}
+
+				// For each available temperature service, return its custom name (if given)
+				// otherwise fall back to its product name, i.e. return Device.name
+				Instantiator {
+					id: temperatureServiceInstantiator
+					property list<string> values
+					property list<string> displays
+					property var outputModel: []
+					function updateOptionModel() {
+						Qt.callLater(function() {
+							temperatureServiceRadioButtons.optionModel = outputModel
+						})
+					}
+					delegate: QtObject {
+						id: tempSensorData
+						required property int index
+						property string value: temperatureServiceInstantiator.values[index]
+						property string display: temperatureServiceInstantiator.displays[index]
+						property Device tempSensor: Device {
+							property int firstIndexOfSlash: tempSensorData.value.indexOf('/')
+							property int secondIndexOfSlash: tempSensorData.value.indexOf('/', firstIndexOfSlash)
+							property string deviceInstanceSubstring: tempSensorData.value.substr(firstIndexOfSlash, secondIndexOfSlash - firstIndexOfSlash + 1)
+							serviceUid: tempSensorData.value.indexOf("com.victronenergy") < 0 ? ""
+								: BackendConnection.serviceUidFromName(tempSensorData.value, deviceInstanceSubstring)
+						}
+
+						Component.onCompleted: {
+							Qt.callLater(function() {
+								temperatureServiceInstantiator.outputModel.push({
+									display: tempSensorData.tempSensor.name.length ? tempSensorData.tempSensor.name : tempSensorData.display,
+									value: tempSensorData.value
+								})
+								temperatureServiceInstantiator.updateOptionModel()
+							})
+						}
+					}
+				}
 			}
 
 			ListText {