Add update instruction set; make channels of science model advanced; …

…tweak labels Signed-off-by: Fabian Wolter <github@fabian-wolter.de>
openhab · May 1, 2024 · ed5947a · ed5947a
1 parent d59550e
commit ed5947a
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 28 deletions.
diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties
@@ -44,17 +44,17 @@ channel-type.airq.WarmupPhase.label = Send data as in Warmup Phase
 channel-type.airq.Wifi.label = Use WLAN
 channel-type.airq.WifiInfo.label = Show WLAN Status with LED
 channel-type.airq.cloudUpload.label = Upload to air-Q Cloud
-channel-type.airq.cnt0_3.label = Fine Dust >0.3 μm
+channel-type.airq.cnt0_3.label = Fine Dust Count 0.3μm
 channel-type.airq.cnt0_3_maxerr.label = Max. Error Fine Dust >0,3μm
-channel-type.airq.cnt0_5.label = Fine Dust >0.5 μm
+channel-type.airq.cnt0_5.label = Fine Dust Count 0.5 μm
 channel-type.airq.cnt0_5_maxerr.label = Max. Error Fine Dust >0,5μm
-channel-type.airq.cnt1.label = Fine Dust >1 μm
-channel-type.airq.cnt10.label = Fine Dust >10 μm
+channel-type.airq.cnt1.label = Fine Dust Count 1μm
+channel-type.airq.cnt10.label = Fine Dust Count 10μm
 channel-type.airq.cnt10_maxerr.label = Max. Error Fine Dust >10μm
 channel-type.airq.cnt1_maxerr.label = Max. Error Fine Dust >1μm
-channel-type.airq.cnt2_5.label = Fine Dust >2.5 μm
+channel-type.airq.cnt2_5.label = Fine Dust Count 2.5μm
 channel-type.airq.cnt2_5_maxerr.label = Max. Error Fine Dust >2,5μm
-channel-type.airq.cnt5.label = Fine Dust >5 μm
+channel-type.airq.cnt5.label = Fine Dust Count 5μm
 channel-type.airq.cnt5_maxerr.label = Max. Error Fine Dust >5μm
 channel-type.airq.co.label = Carbon Monoxide (CO)
 channel-type.airq.co2.label = Carbon dioxide (CO₂)
@@ -91,11 +91,11 @@ channel-type.airq.oxygen_maxerr.label = Max. Error Oxygen Conc.
 channel-type.airq.pass.label = Device Password
 channel-type.airq.performance.label = Performance Index Raw
 channel-type.airq.performance_index.label = Performance Index
-channel-type.airq.pm1.label = Fine Dust Concentr. >1μm
-channel-type.airq.pm10.label = Fine Dust Concentr. >10μm
+channel-type.airq.pm1.label = Fine Dust 1μm
+channel-type.airq.pm10.label = Fine Dust 10μm
 channel-type.airq.pm10_maxerr.label = Max. Error Fine Dust Conc. >10μm
 channel-type.airq.pm1_maxerr.label = Max. Error Fine Dust Conc. >1μm
-channel-type.airq.pm2_5.label = Fine Dust Concentr. >2.5μm
+channel-type.airq.pm2_5.label = Fine Dust 2.5μm
 channel-type.airq.pm2_5_maxerr.label = Max. Error Fine Dust Conc. >2,5μm
 channel-type.airq.ppm_and_ppb.label = Values in Particles
 channel-type.airq.pressure.label = Barometric Pressure

diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml
@@ -119,7 +119,7 @@
 			<property name="sensorList">Unknown sensor list</property>
 			<property name="sensorInfo">No info about sensors</property>
 			<property name="industry">No industry info</property>
-			<property name="thingTypeVersion">1</property>
+			<property name="thingTypeVersion">2</property>
 		</properties>
 
 		<config-description>
@@ -149,39 +149,39 @@
 		<state readOnly="true" pattern="%.2f %unit%"></state>
 	</channel-type>
 
-	<channel-type id="cnt0_3" advanced="false">
+	<channel-type id="cnt0_3" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >0.3 μm</label>
+		<label>Fine Dust Count 0.3μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
-	<channel-type id="cnt0_5" advanced="false">
+	<channel-type id="cnt0_5" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >0.5 μm</label>
+		<label>Fine Dust Count 0.5 μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
-	<channel-type id="cnt1" advanced="false">
+	<channel-type id="cnt1" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >1 μm</label>
+		<label>Fine Dust Count 1μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
-	<channel-type id="cnt2_5" advanced="false">
+	<channel-type id="cnt2_5" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >2.5 μm</label>
+		<label>Fine Dust Count 2.5μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
-	<channel-type id="cnt5" advanced="false">
+	<channel-type id="cnt5" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >5 μm</label>
+		<label>Fine Dust Count 5μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
-	<channel-type id="cnt10" advanced="false">
+	<channel-type id="cnt10" advanced="true">
 		<item-type>Number:Dimensionless</item-type>
-		<label>Fine Dust >10 μm</label>
+		<label>Fine Dust Count 10μm</label>
 		<state readOnly="true" pattern="%.0f"></state>
 	</channel-type>
 
@@ -289,20 +289,20 @@
 
 	<channel-type id="pm1" advanced="false">
 		<item-type unitHint="μg/m³">Number:Density</item-type>
-		<label>Fine Dust Concentr. >1μm</label>
-		<state readOnly="true" pattern="%.2f %unit%"></state>
+		<label>Fine Dust 1μm</label>
+		<state readOnly="true" pattern="%.0f %unit%"></state>
 	</channel-type>
 
 	<channel-type id="pm10" advanced="false">
 		<item-type unitHint="μg/m³">Number:Density</item-type>
-		<label>Fine Dust Concentr. >10μm</label>
-		<state readOnly="true" pattern="%.2f %unit%"></state>
+		<label>Fine Dust 10μm</label>
+		<state readOnly="true" pattern="%.0f %unit%"></state>
 	</channel-type>
 
 	<channel-type id="pm2_5" advanced="false">
 		<item-type unitHint="μg/m³">Number:Density</item-type>
-		<label>Fine Dust Concentr. >2.5μm</label>
-		<state readOnly="true" pattern="%.2f %unit%"></state>
+		<label>Fine Dust 2.5μm</label>
+		<state readOnly="true" pattern="%.0f %unit%"></state>
 	</channel-type>
 
 	<channel-type id="pressure" advanced="false">

diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/update/update.xml b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/update/update.xml
@@ -14,6 +14,67 @@
 				<label>Max. Error H₂S Conc.</label>
 			</add-channel>
 		</instruction-set>
+		<instruction-set targetVersion="2">
+			<add-channel id="healthIndex">
+				<type>airq:health_index</type>
+				<label>Health Index</label>
+			</add-channel>
+			<add-channel id="performanceIndex">
+				<type>airq:performance_index</type>
+				<label>Performance Index</label>
+			</add-channel>
+
+			<update-channel id="co">
+				<type>airq:co</type>
+				<label>Carbon Monoxide (CO)</label>
+			</update-channel>
+			<update-channel id="no2">
+				<type>airq:no2</type>
+				<label>Nitrogen Dioxide (NO₂)</label>
+			</update-channel>
+			<update-channel id="o3">
+				<type>airq:o3</type>
+				<label>Ozone (O₃)</label>
+			</update-channel>
+
+			<update-channel id="fineDustConc01">
+				<type>airq:pm1</type>
+				<label>Fine Dust 1μm</label>
+			</update-channel>
+			<update-channel id="fineDustConc02_5">
+				<type>airq:pm2_5</type>
+				<label>Fine Dust 2.5μm</label>
+			</update-channel>
+			<update-channel id="fineDustConc10">
+				<type>airq:pm10</type>
+				<label>Fine Dust 10μm</label>
+			</update-channel>
+
+			<update-channel id="fineDustCnt00_3">
+				<type>airq:cnt0_3</type>
+				<label>Fine Dust Count 0.3μm</label>
+			</update-channel>
+			<update-channel id="fineDustCnt00_5">
+				<type>airq:cnt0_5</type>
+				<label>Fine Dust Count 0.5μm</label>
+			</update-channel>
+			<update-channel id="fineDustCnt01">
+				<type>airq:cnt1</type>
+				<label>Fine Dust Count 1μm</label>
+			</update-channel>
+			<update-channel id="fineDustCnt02_5">
+				<type>airq:cnt2_5</type>
+				<label>Fine Dust Count 2.5μm</label>
+			</update-channel>
+			<update-channel id="fineDustCnt05">
+				<type>airq:cnt5</type>
+				<label>Fine Dust Count 5μm</label>
+			</update-channel>
+			<update-channel id="fineDustCnt10">
+				<type>airq:cnt10</type>
+				<label>Fine Dust Count 10μm</label>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 </update:update-descriptions>