Updated external content (Jenkins build 694)

_addons_automation/jsscripting/readme.md

@@ -45,7 +45,7 @@ to common openHAB functionality within rules including items, things, actions, l
 
 This add-on includes by default the [openhab-js](https://github.com/openhab/openhab-js/) NPM library and exports it's namespaces onto the global namespace. This allows the use of `items`, `actions`, `cache` and other objects without the need to explicitly import using `require()`.  This functionality can be disabled for users who prefer to manage their own imports via the add-on configuration options. 
 
-![OpenHAB Rule Configuration](./docs/settings.png)
+![openHAB Rule Configuration](./doc/settings.png)
 
 ## UI Based Rules
 
@@ -57,17 +57,17 @@ Advanced users, or users migrating scripts from existing systems may want to use
 
 Using the openHAB UI, first create a new rule and set a trigger condition
 
-![OpenHAB Rule Configuration](./docs/rule-config.png)
+![openHAB Rule Configuration](./doc/rule-config.png)
 
 ### Adding Actions
 
 Select "Add Action" and then select "ECMAScript 262 Edition 11".  Its important this is "Edition 11" or higher, earlier versions will not work. This will bring up a empty script editor where you can enter your javascript.
 
-![OpenHAB Rule Engines](./docs/rule-engines.png)
+![openHAB Rule Engines](./doc/rule-engines.png)
 
 You can now write rules using standard ES6 Javascript along with the included openHAB [standard library](#standard-library).
 
-![OpenHAB Rule Script](./docs/rule-script.png)
+![openHAB Rule Script](./doc/rule-script.png)
 
 For example, turning a light on:
 ```javascript
@@ -594,7 +594,7 @@ Additionally all the above triggers have the following functions:
 //Basic rule, when the BedroomLight1 is changed, run a custom function
 rules.when().item('BedroomLight1').changed().then(e => {
     console.log("BedroomLight1 state", e.newState)
-}.build();
+}).build();
 
 //turn on the kitchen light at SUNSET
 rules.when().timeOfDay("SUNSET").then().sendOn().toItem("KitchenLight").build("Sunset Rule","turn on the kitchen light

_thing_types/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/thing/KP405.xml

@@ -10,7 +10,7 @@
 		<category>PowerOutlet</category>
 
 		<channels>
-			<channel id="switch" typeId="system.power"/>
+			<channel id="brightness" typeId="system.brightness"/>
 			<channel id="led" typeId="led"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>

_thing_types/org.openhab.binding.ventaair/src/main/resources/OH-INF/thing/channels.xml

@@ -103,6 +103,13 @@
 		<state pattern="%.1f %unit%" readOnly="true"/>
 	</channel-type>
 
+	<channel-type id="pm25">
+		<item-type>Number:Density</item-type>
+		<label>Air Quality</label>
+		<description>Current Air Quality measured in PM 2.5</description>
+		<state pattern="%.1f %unit%" readOnly="true"/>
+	</channel-type>
+
 	<channel-type id="waterLevel">
 		<item-type>Number</item-type>
 		<label>Water Level</label>
@@ -113,6 +120,7 @@
 				<option value="1">Refill tank</option>
 				<option value="2">OK</option>
 				<option value="3">Full</option>
+				<option value="4">Max</option>
 			</options>
 		</state>
 	</channel-type>
@@ -152,4 +160,11 @@
 		<state pattern="%d" readOnly="true"/>
 	</channel-type>
 
+	<channel-type id="serviceTime">
+		<item-type>Number:Time</item-type>
+		<label>Service Time</label>
+		<description>Service time in minutes</description>
+		<state pattern="%d" readOnly="true"/>
+	</channel-type>
+
 </thing:thing-descriptions>

_thing_types/org.openhab.binding.ventaair/src/main/resources/OH-INF/thing/thing-types.xml

@@ -49,6 +49,7 @@
 			<channel id="automatic" typeId="automatic"/>
 			<channel id="temperature" typeId="temperature"/>
 			<channel id="humidity" typeId="humidity"/>
+			<channel id="pm25" typeId="pm25"/>
 			<channel id="waterLevel" typeId="waterLevel"/>
 			<channel id="fanRPM" typeId="fanRPM"/>
 			<channel id="cleanMode" typeId="cleanMode"/>
@@ -56,6 +57,7 @@
 			<channel id="operationTime" typeId="operationTime"/>
 			<channel id="discReplaceTime" typeId="discReplaceTime"/>
 			<channel id="cleaningTime" typeId="cleaningTime"/>
+			<channel id="serviceTime" typeId="serviceTime"/>
 		</channels>
 
 		<representation-property>macAddress</representation-property>