From 50b4fc07fa518d8d55ca20e1f5f5a3f6dcab4e7f Mon Sep 17 00:00:00 2001
From: Karel Goderis <karel.goderis@me.com>
Date: Thu, 23 Nov 2017 20:19:01 +0100
Subject: [PATCH] [Tesla] Fix 2 channels wrongly tagged as properties + remove
 obsolete channels (#2856)

Signed-off-by: Karel Goderis <karel.goderis@me.com>
---
 .../ESH-INF/thing/models.xml                  | 232 ++----------------
 1 file changed, 17 insertions(+), 215 deletions(-)

diff --git a/addons/binding/org.openhab.binding.tesla/ESH-INF/thing/models.xml b/addons/binding/org.openhab.binding.tesla/ESH-INF/thing/models.xml
index a30d548cb119c..cc7322a3f4560 100644
--- a/addons/binding/org.openhab.binding.tesla/ESH-INF/thing/models.xml
+++ b/addons/binding/org.openhab.binding.tesla/ESH-INF/thing/models.xml
@@ -11,16 +11,12 @@
 
 		<channels>
 			<channel id="autoconditioning" typeId="autoconditioning" />
-<!-- 			<channel id="api" typeId="api" />
- -->
- 			<channel id="batterycurrent" typeId="batterycurrent" />
+			<channel id="batterycurrent" typeId="batterycurrent" />
 			<channel id="batteryheater" typeId="batteryheater" />
 			<channel id="batterylevel" typeId="batterylevel" />
 			<channel id="batteryrange" typeId="batteryrange" />
-<!-- 			<channel id="version" typeId="version" />
- -->			<channel id="calendarenabled" typeId="calendarenabled" />
-<!-- 			<channel id="calendarsupported" typeId="calendarsupported" />
- -->			<channel id="centerdisplay" typeId="centerdisplay" />
+    		    <channel id="calendarenabled" typeId="calendarenabled" />
+		    <channel id="centerdisplay" typeId="centerdisplay" />
 			<channel id="charge" typeId="charge" />
 			<channel id="chargeenablerequest" typeId="chargeenablerequest" />
 			<channel id="chargeenergyadded" typeId="chargeenergyadded" />
@@ -42,60 +38,39 @@
 			<channel id="chargermaxcurrent" typeId="chargermaxcurrent" />
 			<channel id="chargerpower" typeId="chargerpower" />
 			<channel id="chargervoltage" typeId="chargervoltage" />
-<!-- 			<channel id="color" typeId="color" />
-				<channel id="darkrims" typeId="darkrims" />
-				<channel id="name" typeId="name" />
- -->			<channel id="driverfrontdoor" typeId="driverfrontdoor" />
+      		<channel id="driverfrontdoor" typeId="driverfrontdoor" />
 			<channel id="doorlock" typeId="doorlock" />
 			<channel id="driverreardoor" typeId="driverreardoor" />
 			<channel id="drivertemp" typeId="drivertemp" />
-<!-- 			<channel id="elevation" typeId="elevation" />
- -->			<channel id="estimatedbatteryrange" typeId="estimatedbatteryrange" />
+     		<channel id="estimatedbatteryrange" typeId="estimatedbatteryrange" />
 			<channel id="headingestimation" typeId="headingestimation" />
 			<channel id="estimatedrange" typeId="estimatedrange" />
-<!-- 			<channel id="european" typeId="european" />
-				<channel id="fan" typeId="fan" />
- 				<channel id="fastcharger" typeId="fastcharger" />
-				<channel id="fastchargertype" typeId="fastchargertype" />
- -->			<channel id="flashlights" typeId="flashlights" />
+			<channel id="fan" typeId="fan" />
+			<channel id="flashlights" typeId="flashlights" />
 			<channel id="frontdefroster" typeId="frontdefroster" />
 			<channel id="fronttrunk" typeId="fronttrunk" />
 			<channel id="gpstimestamp" typeId="gpstimestamp" />
-<!-- 			<channel id="distanceunits" typeId="distanceunits" />
-			<channel id="temperatureunits" typeId="temperatureunits" />
-			<channel id="chargerateunits" typeId="chargerateunits" />
-			<channel id="24hourtime" typeId="24hourtime" />
-			<channel id="rangedisplay" typeId="rangedisplay" />
-			<channel id="spoiler" typeId="spoiler" /> -->
 			<channel id="heading" typeId="heading" />
 			<channel id="honkhorn" typeId="honkhorn" />
 			<channel id="idealbatteryrange" typeId="idealbatteryrange" />
 			<channel id="insidetemp" typeId="insidetemp" />
 			<channel id="location" typeId="location" />
-<!-- 			<channel id="latitude" typeId="latitude" />
-			<channel id="longitude" typeId="longitude" /> -->
 			<channel id="mobileenabled" typeId="mobileenabled" />
-<!-- 			<channel id="motorizedchargeport" typeId="motorizedchargeport" />
- -->			<channel id="notenoughpower" typeId="notenoughpower" />
+      		<channel id="notenoughpower" typeId="notenoughpower" />
 			<channel id="notificationsenabled" typeId="notificationsenabled" />
 			<channel id="notificationssupported" typeId="notificationssupported" />
 			<channel id="odometer" typeId="odometer" />
-<!-- 			<channel id="options" typeId="options" />
- -->			<channel id="outsidetemp" typeId="outsidetemp" />
+     		<channel id="outsidetemp" typeId="outsidetemp" />
 			<channel id="passengertemp" typeId="passengertemp" />
-<!-- 			<channel id="configuration" typeId="configuration" />
- -->			<channel id="parsedcalendar" typeId="parsedcalendar" />
+     		<channel id="parsedcalendar" typeId="parsedcalendar" />
 			<channel id="passengerfrontdoor" typeId="passengerfrontdoor" />
 			<channel id="power" typeId="power" />
 			<channel id="passengerreardoor" typeId="passengerreardoor" />
 			<channel id="range" typeId="range" />
 			<channel id="reardefroster" typeId="reardefroster" />
 			<channel id="remotestartenabled" typeId="remotestartenabled" />
-<!-- 			<channel id="rhd" typeId="rhd" />
-				<channel id="roof" typeId="roof" />
-				<channel id="reartrunk" typeId="reartrunk" />
-				<channel id="rearseatheaters" typeId="rearseatheaters" />
- -->			<channel id="remotestart" typeId="remotestart" />
+    			<channel id="reartrunk" typeId="reartrunk" />
+     		<channel id="remotestart" typeId="remotestart" />
 			<channel id="remotestartsupported" typeId="remotestartsupported" />
 			<channel id="leftseatheater" typeId="leftseatheater" />	
 			<channel id="rightseatheater" typeId="rightseatheater" />
@@ -106,14 +81,12 @@
 			<channel id="leftrearbackseatheater" typeId="leftrearbackseatheater" />			
 			<channel id="scheduledchargingpending" typeId="scheduledchargingpending" />
 			<channel id="scheduledchargingstart" typeId="scheduledchargingstart" />
-<!-- 			<channel id="seattype" typeId="seattype" />			
- -->			<channel id="shiftstate" typeId="shiftstate" />
+			<channel id="shiftstate" typeId="shiftstate" />
 			<channel id="smartpreconditioning" typeId="smartpreconditioning" />
 			<channel id="soc" typeId="soc" />
 			<channel id="speed" typeId="speed" />
 			<channel id="state" typeId="state" />
-<!-- 			<channel id="sunroofinstalled" typeId="sunroofinstalled" />
- -->			<channel id="sunroofstate" typeId="sunroofstate" />
+			<channel id="sunroofstate" typeId="sunroofstate" />
 			<channel id="sunroof" typeId="sunroof" />
 			<channel id="temperature" typeId="temperature" />
 			<channel id="timetofullcharge" typeId="timetofullcharge" />
@@ -121,12 +94,10 @@
 			<channel id="tripcharging" typeId="tripcharging" />
 			<channel id="usablebatterylevel" typeId="usablebatterylevel" />
 			<channel id="userchargeenablerequest" typeId="userchargeenablerequest" />
-<!-- 			<channel id="vin" typeId="vin" />
- -->			<channel id="valetmode" typeId="valetmode" />
+			<channel id="valetmode" typeId="valetmode" />
 			<channel id="valetpin" typeId="valetpin" />
 			<channel id="wakeup" typeId="wakeup" />
-<!-- 			<channel id="wheeltype" typeId="wheeltype" />
- -->		</channels>
+		</channels>
 
 		<config-description>
 			<parameter name="username" type="text" required="false">
@@ -152,12 +123,6 @@
 		<description>Indicates if the auto conditioning (A/C only) is switched on</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!--  	<channel-type id="api" advanced="true">
-		<item-type>Number</item-type>
-		<label>API Version</label>
-		<description>API version used by the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type>	 -->
 	<channel-type id="batterycurrent" advanced="true">
 		<item-type>Number</item-type>
 		<label>Battery Current</label>
@@ -182,24 +147,12 @@
 		<description>Range, in km or miles, of the battery</description>
 		<state pattern="%d km|miles" readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="version" advanced="true">
-		<item-type>String</item-type>
-		<label>Version</label>
-		<description>Version number of the firmware installed on the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="calendarenabled" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Calendar Enabled</label>
 		<description>Indicates if access to a remote calendar is enabled</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="calendarsupported" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Calendar Supported</label>
-		<description>Indicates if access to a remote calendar is supported</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="centerdisplay" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Central Display State</label>
@@ -330,24 +283,6 @@
 		<description>Voltage (V) actually presented by the charger</description>
 		<state pattern="%.1f V" readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="color" advanced="true">
-		<item-type>String</item-type>
-		<label>Color</label>
-		<description>Color of the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="darkrims" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Dark Rims</label>
-		<description>Indicats if the vehicle has dark rims or not</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="name">
-		<item-type>String</item-type>
-		<label>Name</label>
-		<description>Vehicle name, as set in the Tesla mobile app</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="driverfrontdoor" advanced="true">
 		<item-type>Contact</item-type>
 		<label>Driver Front Door</label>
@@ -371,12 +306,6 @@
 		<description>Indicates the auto conditioning temperature set at the driver's side in Celsius or Fahrenheit</description>
 		<state pattern="%.1f°" readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="elevation" advanced="true">
-		<item-type>Number</item-type>
-		<label>Elevation</label>
-		<description>Indicates the elevation of the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="estimatedbatteryrange" advanced="true">
 		<item-type>Number</item-type>
 		<label>Estimated Battery Range</label>
@@ -395,30 +324,12 @@
 		<description>Estimated range of the vehicle</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="european" advanced="true">
-		<item-type>Switch</item-type>
-		<label>European</label>
-		<description>Indicates if the vehicle is a non-US build</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="fan" advanced="true">
 		<item-type>Number</item-type>
 		<label>Fan</label>
 		<description>Indicates the speed (0-7) of the fan</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="fastcharger" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Fast Charger</label>
-		<description>Indicates if a fast charger is present</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="fastchargertype" advanced="true">
-		<item-type>String</item-type>
-		<label>Fast Charger Type</label>
-		<description>Indicates the type of fast charger present</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="flashlights">
 		<item-type>Switch</item-type>
 		<label>Flash Lights</label>
@@ -442,42 +353,6 @@
 		<description>Time stamp of the most recent GPS location of the vehicle</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="distanceunits" advanced="true">
-		<item-type>String</item-type>
-		<label>Distance Units</label>
-		<description>Indicates the distance units (km/hr or miles/hr) used by the vehicle's displays. This indicator will be used to convert miles to km for the relevant channels</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="temperatureunits" advanced="true">
-		<item-type>String</item-type>
-		<label>Temperature Units</label>
-		<description>Indicates the temperature units (F or C) used by the vehicle's display</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="chargerateunits" advanced="true">
-		<item-type>String</item-type>
-		<label>Charge Rate Units</label>
-		<description>Indicates the charging units used by the vehicle's display</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="24hourtime" advanced="true">
-		<item-type>String</item-type>
-		<label>24 Hour Time</label>
-		<description>Indicates the time format used by the vehicle's display</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="rangedisplay" advanced="true">
-		<item-type>String</item-type>
-		<label>Range Display</label>
-		<description>Indicates the type of range (Ideal or Rated) that is used by the vehicle's display</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="spoiler" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Spoiler</label>
-		<description>Indicates if the car is equipped with a rear spoiler</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="heading" advanced="true">
 		<item-type>Number</item-type>
 		<label>Heading</label>
@@ -507,30 +382,12 @@
 		<description>The actual position of the vehicle</description>
 		<state readOnly="true"></state>
 	</channel-type>	
-<!-- 	<channel-type id="latitude" advanced="true">
-		<item-type>Number</item-type>
-		<label>Latitude</label>
-		<description>Latitude of the actual position of the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type>
-	<channel-type id="longitude" advanced="true">
-		<item-type>Number</item-type>
-		<label>Longitutde</label>
-		<description>Longitude of the actual position of the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="mobileenabled" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Mobile Enabled</label>
 		<description>Indicates whether the vehicle can be remotely controlled</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="motorizedchargeport" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Moterized Charge Port</label>
-		<description>Indicates if the vehicle is equipped with a motorized charge port</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="notenoughpower" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Not Enought Power </label>
@@ -555,12 +412,6 @@
 		<description>Odometer of the vehicle, in km or miles</description>
 		<state pattern="%.1f km|miles" readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="options" advanced="true">
-		<item-type>String</item-type>
-		<label>Option Codes</label>
-		<description>A list of codified options the vehicle is equipped with, e.g. ""MS04,REEU,AD04,AD06,AD07,AD08,ADPC2,AU01,BC0R..."</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="outsidetemp" advanced="true">
 		<item-type>Number</item-type>
 		<label>Outside Temperature</label>
@@ -579,12 +430,6 @@
 		<description>Indicates the auto conditioning temperature set at the passenger's side</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="configuration" advanced="true">
-		<item-type>String</item-type>
-		<label>Configuration</label>
-		<description>“Base”, “Sport”</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="passengerfrontdoor" advanced="true">
 		<item-type>Contact</item-type>
 		<label>Passenger Front Door</label>
@@ -621,30 +466,12 @@
 		<description>Not documented / To be defined</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="rhd" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Right Hand Drive</label>
-		<description>Indicates if the vehicle is a right hand drive type vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-<!-- 	<channel-type id="roof" advanced="true">
-		<item-type>String</item-type>
-		<label>Roof Color</label>
-		<description>Vehicle roof color (“Colored”, “None”, ”Black”)</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="reartrunk" advanced="true">
 		<item-type>Contact</item-type>
 		<label>Rear Trunk</label>
 		<description>Indicates if the rear trunk is opened</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="rearseatheaters" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Rear Seat Heaters</label>
-		<description>Indicates if the vehicle is equiped with rear seat heaters</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="remotestart" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Remote Start</label>
@@ -711,13 +538,7 @@
 		<description>Indicates when the scheduled charging session will start, in yyyy-MM-dd'T'HH:mm:ss format</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="seattype" advanced="true">
-		<item-type>Number</item-type>
-		<label>Seat Type</label>
-		<description>Indicates the type of seats installed in the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-		<channel-type id="shiftstate" advanced="true">
+	<channel-type id="shiftstate" advanced="true">
 		<item-type>String</item-type>
 		<label>Shift State</label>
 		<description>Indicates the state of the transmission, “P”, “D”, “R”, or “N”</description>
@@ -747,12 +568,6 @@
 		<description>“online”, “asleep”, “waking”</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="sunroofinstalled" advanced="true">
-		<item-type>Switch</item-type>
-		<label>Sunroof Installed</label>
-		<description>Indicates if the vehicle is equipped with a sunroof</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="sunroofstate" advanced="true">
 		<item-type>String</item-type>
 		<label>Sunroof State</label>
@@ -813,22 +628,9 @@
 		<description>Indicates if a PIN code is required to disable valet mode</description>
 		<state readOnly="true"></state>
 	</channel-type>
-<!-- 	<channel-type id="vin">
-		<item-type>String</item-type>
-		<label>Vehicle Identification Number</label>
-		<description>The VIN of the vehicle. This uniquely identifies the vehicle</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
 	<channel-type id="wakeup" advanced="true">
 		<item-type>Switch</item-type>
 		<label>Wake Up</label>
 		<description>Wake up the vehicle from a (deep) sleep</description>
 	</channel-type>
-<!-- 	<channel-type id="wheeltype" advanced="true">
-		<item-type>String</item-type>
-		<label>Wheel Type</label>
-		<description>Indicates the wheel type of the vehicle, “Base19”, “Silver21”, “Charcoal21”</description>
-		<state readOnly="true"></state>
-	</channel-type> -->
-
 </thing:thing-descriptions>