Skip to content

Commit

Permalink
Cosmetic changes.
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Gustafsson <[email protected]>
  • Loading branch information
@jannegpriv
jannegpriv committed Sep 19, 2020
1 parent dec91c3 commit 1b89e77
Show file tree
Hide file tree
Showing 12 changed files with 85 additions and 94 deletions.
13 changes: 7 additions & 6 deletions bundles/org.openhab.binding.vwweconnect/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
<version>2.5.7-SNAPSHOT</version>
<version>2.5.9-SNAPSHOT</version>
</parent>

<artifactId>org.openhab.binding.vwweconnect</artifactId>

<name>openHAB Add-ons :: Bundles :: VW We Connect Binding</name>

<properties>
<bnd.importpackage>!org.apache.tapestry5.json.*,!org.codehaus.jettison.json.*,!org.json.*,!com.fasterxml.jackson.*</bnd.importpackage>
</properties>

<dependencies>
<dependency>
<groupId>org.jsoup</groupId>
Expand All @@ -30,7 +31,7 @@
<version>2.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.4</version>
Expand All @@ -49,6 +50,6 @@
<scope>compile</scope>
</dependency>
</dependencies>


</project>
22 changes: 11 additions & 11 deletions bundles/org.openhab.binding.vwweconnect/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<features name="org.openhab.binding.vwweconnect-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>

<feature name="openhab-binding-vwweconnect" description="VW We Connect Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-serial</feature>
<bundle dependency="true">mvn:org.jsoup/jsoup/1.8.3</bundle>
<bundle dependency="true">mvn:com.jayway.jsonpath/json-path/2.4.0</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm/5.0.4</bundle>
<bundle dependency="true">mvn:net.minidev/accessors-smart/1.2</bundle>
<bundle dependency="true">mvn:net.minidev/json-smart/2.3</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.vwweconnect/${project.version}</bundle>
</feature>
<feature name="openhab-binding-vwweconnect" description="VW We Connect Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-serial</feature>
<bundle dependency="true">mvn:org.jsoup/jsoup/1.8.3</bundle>
<bundle dependency="true">mvn:com.jayway.jsonpath/json-path/2.4.0</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm/5.0.4</bundle>
<bundle dependency="true">mvn:net.minidev/accessors-smart/1.2</bundle>
<bundle dependency="true">mvn:net.minidev/json-smart/2.3</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.vwweconnect/${project.version}</bundle>
</feature>

</features>
1 change: 0 additions & 1 deletion ...econnect/src/main/java/org/openhab/binding/vwweconnect/internal/DeviceStatusListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,4 @@ public interface DeviceStatusListener {
* The thing which is added.
*/
void onDeviceAdded(BaseVehicle thing);

}
1 change: 0 additions & 1 deletion ...ect/src/main/java/org/openhab/binding/vwweconnect/internal/VWWeConnectHandlerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,4 @@ public VWWeConnectHandlerFactory() {
}
return thingHandler;
}

}
1 change: 0 additions & 1 deletion ...econnect/src/main/java/org/openhab/binding/vwweconnect/internal/VehicleConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@
@NonNullByDefault
public class VehicleConfiguration {
public @Nullable String vin;

}
1 change: 0 additions & 1 deletion ...ect/src/main/java/org/openhab/binding/vwweconnect/internal/action/VWWeConnectActions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,5 +287,4 @@ public static void honkBlinkCommand(@Nullable ThingActions actions, Boolean honk
throw new IllegalArgumentException("Instance is not an VWWeConnectActionsService class.");
}
}

}
2 changes: 0 additions & 2 deletions ...onnect/src/main/java/org/openhab/binding/vwweconnect/internal/handler/VehicleHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ public ActionResultController(String vin, String requestStatusUrl, VWWeConnectSe
this.vin = vin;
this.requestStatusUrl = requestStatusUrl;
this.session = session;

}

@Override
Expand Down Expand Up @@ -896,5 +895,4 @@ public void actionWindowHeat(Boolean start) {
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singletonList(VWWeConnectActions.class);
}

}
2 changes: 0 additions & 2 deletions ...nect/src/main/java/org/openhab/binding/vwweconnect/internal/model/ActionNotification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,5 @@ public boolean equals(@Nullable Object other) {
.append(actionType, rhs.actionType).append(errorTitle, rhs.errorTitle)
.append(actionState, rhs.actionState).isEquals();
}

}

}
1 change: 0 additions & 1 deletion ...ding.vwweconnect/src/main/java/org/openhab/binding/vwweconnect/internal/model/Status.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ public boolean equals(@Nullable Object other) {
.append(rightFront, rhs.rightFront).append(leftBack, rhs.leftBack).append(trunk, rhs.trunk)
.isEquals();
}

}

public class Doors {
Expand Down
5 changes: 2 additions & 3 deletions bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/binding/binding.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<binding:binding id="vwweconnect"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<binding:binding id="vwweconnect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd">

<name>VW We Connect Binding</name>
<description>This is the binding for VW We Connect Portal.</description>
<author>Jan Gustafsson</author>
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/bridge.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
<description>This bridge represents the gateway to the VW We Connect Portal.</description>

<channels>
<channel id="status" typeId="status" />
<channel id="status" typeId="status"/>
</channels>

<properties>
<property name="vendor">Volkswagen</property>
</properties>

<config-description-ref uri="thing-type:vwweconnect:vwweconnectapi" />
<config-description-ref uri="thing-type:vwweconnect:vwweconnectapi"/>

</bridge-type>

<channel-type id="status">
<item-type>String</item-type>
<label>Refresh Status</label>
<description>Can be used to manually refresh status</description>
<state readOnly="true" />
<state readOnly="true"/>
</channel-type>

</thing:thing-descriptions>
124 changes: 62 additions & 62 deletions bundles/org.openhab.binding.vwweconnect/src/main/resources/ESH-INF/thing/vehicle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@

<thing-type id="vehicle">
<supported-bridge-type-refs>
<bridge-type-ref id="vwweconnectapi" />
<bridge-type-ref id="vwweconnectapi"/>
</supported-bridge-type-refs>

<label>VW Vehicle</label>
<description>A VW Vehicle.</description>

<channel-groups>
<channel-group typeId="details" id="details" />
<channel-group typeId="odometer" id="odometer" />
<channel-group typeId="fuel" id="fuel" />
<channel-group typeId="electric" id="electric" />
<channel-group typeId="doors" id="doors" />
<channel-group typeId="windows" id="windows" />
<channel-group typeId="position" id="position" />
<channel-group typeId="lasttrip" id="lasttrip" />
<channel-group typeId="action" id="action" />
<channel-group typeId="details" id="details"/>
<channel-group typeId="odometer" id="odometer"/>
<channel-group typeId="fuel" id="fuel"/>
<channel-group typeId="electric" id="electric"/>
<channel-group typeId="doors" id="doors"/>
<channel-group typeId="windows" id="windows"/>
<channel-group typeId="position" id="position"/>
<channel-group typeId="lasttrip" id="lasttrip"/>
<channel-group typeId="action" id="action"/>
</channel-groups>

<properties>
Expand All @@ -41,13 +41,13 @@
<channel-group-type id="action">
<label>Actions and status</label>
<channels>
<channel id="remoteHeater" typeId="remoteHeater" />
<channel id="remoteVentilation" typeId="remoteVentilation" />
<channel id="temperature" typeId="temperature" />
<channel id="remainingTime" typeId="remainingTime" />
<channel id="emanagerCharge" typeId="emanagerCharge" />
<channel id="emanagerClimate" typeId="emanagerClimate" />
<channel id="emanagerWindowHeat" typeId="emanagerWindowHeat" />
<channel id="remoteHeater" typeId="remoteHeater"/>
<channel id="remoteVentilation" typeId="remoteVentilation"/>
<channel id="temperature" typeId="temperature"/>
<channel id="remainingTime" typeId="remainingTime"/>
<channel id="emanagerCharge" typeId="emanagerCharge"/>
<channel id="emanagerClimate" typeId="emanagerClimate"/>
<channel id="emanagerWindowHeat" typeId="emanagerWindowHeat"/>
</channels>
</channel-group-type>

Expand Down Expand Up @@ -108,7 +108,7 @@
<label>End Time</label>
<description>Trip end time</description>
</channel>
<channel id="tripDuration" typeId="tripDuration" />
<channel id="tripDuration" typeId="tripDuration"/>
</channels>
</channel-group-type>

Expand All @@ -133,8 +133,8 @@
<channel id="hood" typeId="door">
<label>Hood</label>
</channel>
<channel id="doorsLocked" typeId="doorsLocked" />
<channel id="trunkLocked" typeId="trunkLocked" />
<channel id="doorsLocked" typeId="doorsLocked"/>
<channel id="trunkLocked" typeId="trunkLocked"/>
</channels>
</channel-group-type>

Expand Down Expand Up @@ -165,9 +165,9 @@
<channel-group-type id="fuel">
<label>Fuel Info</label>
<channels>
<channel id="fuelLevel" typeId="fuelLevel" />
<channel id="fuelConsumption" typeId="fuelConsumption" />
<channel id="fuelAlert" typeId="fuelAlert" />
<channel id="fuelLevel" typeId="fuelLevel"/>
<channel id="fuelConsumption" typeId="fuelConsumption"/>
<channel id="fuelAlert" typeId="fuelAlert"/>
<channel id="fuelRange" typeId="odometer">
<label>Distance Left</label>
<description>Distance left with given quantity of fuel</description>
Expand All @@ -178,9 +178,9 @@
<channel-group-type id="cng">
<label>Compressed Natural Gas Info</label>
<channels>
<channel id="cngLevel" typeId="cngLevel" />
<channel id="cngConsumption" typeId="cngConsumption" />
<channel id="cngAlert" typeId="fuelAlert" />
<channel id="cngLevel" typeId="cngLevel"/>
<channel id="cngConsumption" typeId="cngConsumption"/>
<channel id="cngAlert" typeId="fuelAlert"/>
<channel id="cngRange" typeId="odometer">
<label>Distance Left</label>
<description>Distance left with given quantity of CNG</description>
Expand All @@ -191,28 +191,28 @@
<channel-group-type id="electric">
<label>Electric/Hybrid Info</label>
<channels>
<channel id="batteryLevel" typeId="batteryLevel" />
<channel id="electricConsumption" typeId="electricConsumption" />
<channel id="batteryAlert" typeId="batteryAlert" />
<channel id="batteryLevel" typeId="batteryLevel"/>
<channel id="electricConsumption" typeId="electricConsumption"/>
<channel id="batteryAlert" typeId="batteryAlert"/>
<channel id="batteryRange" typeId="odometer">
<label>Distance Left</label>
<description>Distance left with given battery level</description>
</channel>
<channel id="chargingState" typeId="chargingState" />
<channel id="chargingRemainingHour" typeId="chargingRemainingHour" />
<channel id="chargingRemainingMinute" typeId="chargingRemainingMinute" />
<channel id="chargingReason" typeId="chargingReason" />
<channel id="pluginState" typeId="pluginState" />
<channel id="lockState" typeId="lockState" />
<channel id="extPowerSupplyState" typeId="extPowerSupplyState" />
<channel id="chargerMaxCurrent" typeId="chargerMaxCurrent" />
<channel id="maxAmpere" typeId="maxAmpere" />
<channel id="maxCurrentReduced" typeId="maxCurrentReduced" />
<channel id="climatisationState" typeId="climatisationState" />
<channel id="climatisationRemainingTime" typeId="climatisationRemainingTime" />
<channel id="climatisationReason" typeId="climatisationReason" />
<channel id="windowHeatingStateFront" typeId="windowHeatingStateFront" />
<channel id="windowHeatingStateRear" typeId="windowHeatingStateRear" />
<channel id="chargingState" typeId="chargingState"/>
<channel id="chargingRemainingHour" typeId="chargingRemainingHour"/>
<channel id="chargingRemainingMinute" typeId="chargingRemainingMinute"/>
<channel id="chargingReason" typeId="chargingReason"/>
<channel id="pluginState" typeId="pluginState"/>
<channel id="lockState" typeId="lockState"/>
<channel id="extPowerSupplyState" typeId="extPowerSupplyState"/>
<channel id="chargerMaxCurrent" typeId="chargerMaxCurrent"/>
<channel id="maxAmpere" typeId="maxAmpere"/>
<channel id="maxCurrentReduced" typeId="maxCurrentReduced"/>
<channel id="climatisationState" typeId="climatisationState"/>
<channel id="climatisationRemainingTime" typeId="climatisationRemainingTime"/>
<channel id="climatisationReason" typeId="climatisationReason"/>
<channel id="windowHeatingStateFront" typeId="windowHeatingStateFront"/>
<channel id="windowHeatingStateRear" typeId="windowHeatingStateRear"/>
</channels>
</channel-group-type>

Expand All @@ -229,20 +229,20 @@
<channel-group-type id="details">
<label>Vehicle Details</label>
<channels>
<channel id="name" typeId="name" />
<channel id="model" typeId="model" />
<channel id="modelCode" typeId="modelCode" />
<channel id="modelYear" typeId="modelYear" />
<channel id="enrollmentDate" typeId="enrollmentDate" />
<channel id="dashboardURL" typeId="dashboardURL" />
<channel id="imageURL" typeId="imageURL" />
<channel id="engineTypeCombustian" typeId="engineTypeCombustian" />
<channel id="engineTypeElectric" typeId="engineTypeElectric" />
<channel id="engineTypeHybridOCU1" typeId="engineTypeHybridOCU1" />
<channel id="engineTypeHybridOCU2" typeId="engineTypeHybridOCU2" />
<channel id="engineTypeCNG" typeId="engineTypeCNG" />
<channel id="serviceInspectionStatus" typeId="serviceInspectionStatus" />
<channel id="oilInspectionStatus" typeId="oilInspectionStatus" />
<channel id="name" typeId="name"/>
<channel id="model" typeId="model"/>
<channel id="modelCode" typeId="modelCode"/>
<channel id="modelYear" typeId="modelYear"/>
<channel id="enrollmentDate" typeId="enrollmentDate"/>
<channel id="dashboardURL" typeId="dashboardURL"/>
<channel id="imageURL" typeId="imageURL"/>
<channel id="engineTypeCombustian" typeId="engineTypeCombustian"/>
<channel id="engineTypeElectric" typeId="engineTypeElectric"/>
<channel id="engineTypeHybridOCU1" typeId="engineTypeHybridOCU1"/>
<channel id="engineTypeHybridOCU2" typeId="engineTypeHybridOCU2"/>
<channel id="engineTypeCNG" typeId="engineTypeCNG"/>
<channel id="serviceInspectionStatus" typeId="serviceInspectionStatus"/>
<channel id="oilInspectionStatus" typeId="oilInspectionStatus"/>
</channels>
</channel-group-type>

Expand Down Expand Up @@ -452,7 +452,7 @@
<item-type>DateTime</item-type>
<label>Timestamp</label>
<description>Data timestamp</description>
<state readOnly="true" />
<state readOnly="true"/>
</channel-type>

<channel-type id="doorsLocked">
Expand Down Expand Up @@ -515,14 +515,14 @@
<item-type>Switch</item-type>
<label>Fuel Alarm</label>
<description>set to 'ON' when the tank level is low</description>
<state readOnly="true" />
<state readOnly="true"/>
</channel-type>

<channel-type id="batteryAlert">
<item-type>Switch</item-type>
<label>Battery Alarm</label>
<description>set to 'ON' when the battery level is low</description>
<state readOnly="true" />
<state readOnly="true"/>
</channel-type>

<channel-type id="name">
Expand Down Expand Up @@ -621,7 +621,7 @@
<label>Temperature</label>
<description>Current temperature.</description>
<category>Temperature</category>
<state pattern="%.1f °C" readOnly="true" />
<state pattern="%.1f °C" readOnly="true"/>
</channel-type>

</thing:thing-descriptions>

0 comments on commit 1b89e77

Please sign in to comment.