iobroker-ucl 1.0.61 → 1.0.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/!!!_INSTRUCTIONS_!!!.ts +7 -4
  2. package/homematicFunctions.js +9 -9
  3. package/homematicFunctions.ts +9 -9
  4. package/main.js +2 -1
  5. package/main.ts +2 -2
  6. package/package.json +1 -1
  7. package/zigbeeFunctions.js +223 -202
  8. package/zigbeeFunctions.ts +224 -200
package/!!!_INSTRUCTIONS_!!!.ts CHANGED
@@ -1,20 +1,23 @@
1
+ // Current Version: 1.0.63
2
+
1
3
  // ===================================================================================================
2
4
  // WORKFLOW nach Änderungen hier in einer TS-Datei:
3
5
  // ===================================================================================================
4
6
 
5
7
  // 1.) "Aus TS Dateien JS Dateien machen: (unten im TERMINAL-Fenster)
6
- tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts zigbeeFunctions.ts
8
+ tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts zigbeeFunctions.ts INSTRUCTIONS.ts
7
9
 
8
10
  // 2.) In package.json eine Nummer hochzählen bei der Version
9
11
 
10
- // 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster)
12
+ // 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster) --> https://www.npmjs.com/package/iobroker-ucl
11
13
  npm publish
12
14
 
13
15
  // 4.) In docker iobroker Container rein: (PUTTY)
14
16
  docker exec -it iobroker bash
15
17
 
16
18
  // 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
17
- npm update iobroker-ucl
18
- npm ls --depth=0 (um sicher zu gehen, dass richtige Version auch gezogen wurde)
19
+ npm update iobroker-ucl
20
+ npm ls --depth=0 (um sicher zu gehen, dass richtige Version auch gezogen wurde)
21
+ npm uninstall iobroker-ucl Danach: npm install iobroker-ucl (Manchmal wird in iobroekr die Version incht gezogen warum auch immer)
19
22
 
20
23
  // 6.) In iobroker Weboberfläche die Javascript Instance restarten
package/homematicFunctions.js CHANGED
@@ -11,16 +11,16 @@ var attributeCategory = "category";
11
11
  var attributeTypeNumber = "number";
12
12
  var attributeTypeString = "string";
13
13
  function createHomematicDevice(adapter, rawId, baseState, etage, raum, device, category) {
14
- createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
15
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
16
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
17
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage);
18
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum);
19
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
14
+ createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
15
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
16
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState, category);
17
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage, category);
18
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum, category);
19
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
20
20
  }
21
21
  exports.createHomematicDevice = createHomematicDevice;
22
- function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeName, attributeValue) {
23
- var stateDatenpunkt = "0_userdata.0.devices.homematic." + deviceRawId + "." + attributeName;
22
+ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeName, attributeValue, category) {
23
+ var stateDatenpunkt = "0_userdata.0.devices.homematic." + category + "." + deviceRawId + "." + attributeName;
24
24
  adapter.createState(stateDatenpunkt, null, {
25
25
  name: stateDatenpunkt,
26
26
  desc: stateDatenpunkt,
@@ -33,7 +33,7 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
33
33
  function getHomematicDevices(adapter, filterCategory) {
34
34
  var homematicArray = [];
35
35
  //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
36
- adapter.$('state[id=0_userdata.0.devices.homematic.*.category]').each(function (datenpunktKey) {
36
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
37
37
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
38
38
  if (adapter.getState(datenpunktKey).val == filterCategory) {
39
39
  if (filterCategory == deviceHomematicWandthermostat) {
package/homematicFunctions.ts CHANGED
@@ -11,16 +11,16 @@ const attributeTypeNumber = "number";
11
11
  const attributeTypeString = "string";
12
12
 
13
13
  export function createHomematicDevice(adapter: any, rawId: number, baseState: string, etage: string, raum: string, device: string, category: string) {
14
- createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
15
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
16
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
17
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage);
18
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum);
19
- createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
14
+ createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
15
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
16
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState, category);
17
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage, category);
18
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum, category);
19
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
20
20
  }
21
21
 
22
- function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attributeName, attributeValue) {
23
- var stateDatenpunkt = "0_userdata.0.devices.homematic." + deviceRawId + "." + attributeName;
22
+ function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attributeName, attributeValue, category) {
23
+ var stateDatenpunkt = "0_userdata.0.devices.homematic." + category + "." + deviceRawId + "." + attributeName;
24
24
  adapter.createState(stateDatenpunkt, null, {
25
25
  name: stateDatenpunkt,
26
26
  desc: stateDatenpunkt,
@@ -35,7 +35,7 @@ export function getHomematicDevices(adapter: any, filterCategory: string) {
35
35
  var homematicArray = [];
36
36
  //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
37
37
 
38
- adapter.$('state[id=0_userdata.0.devices.homematic.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
38
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
39
39
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
40
40
  if (adapter.getState(datenpunktKey).val == filterCategory) {
41
41
  if (filterCategory == deviceHomematicWandthermostat) {
package/main.js CHANGED
@@ -4,7 +4,7 @@ var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _
4
4
  var _b = require('./homematicClasses.js'), HomematicWindow = _b.HomematicWindow, HomematicSteckdose = _b.HomematicSteckdose, HomematicHeizkoerper = _b.HomematicHeizkoerper, HomematicDimmer = _b.HomematicDimmer, HomematicWandthermostat = _b.HomematicWandthermostat, HomematicFussbodenheizung = _b.HomematicFussbodenheizung, HomematicWandschalter = _b.HomematicWandschalter, HomematicDoor = _b.HomematicDoor, HomematicWetterstation = _b.HomematicWetterstation, HomematicAccessPoint = _b.HomematicAccessPoint, HomematicRollladen = _b.HomematicRollladen, HomematicWandtaster = _b.HomematicWandtaster, HomematicTemperatursensor = _b.HomematicTemperatursensor, HomematicRauchmelder = _b.HomematicRauchmelder, HomematicPraesenzmelder = _b.HomematicPraesenzmelder, AbstractHomematic = _b.AbstractHomematic, HomematicFunkschaltaktor = _b.HomematicFunkschaltaktor, deviceHomematicWandthermostat = _b.deviceHomematicWandthermostat, deviceHomematicPraesenzmelder = _b.deviceHomematicPraesenzmelder, deviceHomematicWetterstation = _b.deviceHomematicWetterstation, deviceHomematicDoor = _b.deviceHomematicDoor, deviceHomematicRollladen = _b.deviceHomematicRollladen, deviceHomematicWandschalter = _b.deviceHomematicWandschalter, deviceHomematicFussbodenheizung = _b.deviceHomematicFussbodenheizung, deviceHomematicWandtaster = _b.deviceHomematicWandtaster, deviceHomematicAccessPoint = _b.deviceHomematicAccessPoint, deviceHomematicTemperatursensor = _b.deviceHomematicTemperatursensor, deviceHomematicRauchmelder = _b.deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor = _b.deviceHomematicFunkSchaltaktor, deviceHomematicWindow = _b.deviceHomematicWindow, deviceHomematicSteckdose = _b.deviceHomematicSteckdose, deviceHomematicHeizkoerper = _b.deviceHomematicHeizkoerper, deviceHomematicDimmer = _b.deviceHomematicDimmer;
5
5
  var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, getHomematicDevices = _c.getHomematicDevices, getHomematicDevicesAll = _c.getHomematicDevicesAll;
6
6
  var _d = require('./zigbeeClasses.js'), AbstractZigbee = _d.AbstractZigbee, ColorScheme = _d.ColorScheme, RGBColorScheme = _d.RGBColorScheme, WhiteColorScheme = _d.WhiteColorScheme, ZigbeeLampeRGB = _d.ZigbeeLampeRGB, LampeWeissTasterScheme = _d.LampeWeissTasterScheme, LampeWeissAlexaScheme = _d.LampeWeissAlexaScheme, ZigbeeLampeWeiss = _d.ZigbeeLampeWeiss, ZigbeeSteckdose = _d.ZigbeeSteckdose, ZigbeeSchalter = _d.ZigbeeSchalter, ZigbeeRepeater = _d.ZigbeeRepeater, ZigbeeFenstersensor = _d.ZigbeeFenstersensor, ZigbeeRauchmelder = _d.ZigbeeRauchmelder, ZigbeeBewegungsmelder = _d.ZigbeeBewegungsmelder, ZigbeeWandtaster = _d.ZigbeeWandtaster, ZigbeeDosenrelais = _d.ZigbeeDosenrelais, AlexaInputConverter = _d.AlexaInputConverter, deviceZigbeeSteckdose = _d.deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder = _d.deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB = _d.deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss = _d.deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder = _d.deviceZigbeeRauchmelder, deviceZigbeeWandtaster = _d.deviceZigbeeWandtaster, deviceZigbeeDosenrelais = _d.deviceZigbeeDosenrelais, deviceZigbeeSchalter = _d.deviceZigbeeSchalter, deviceZigbeeRepeater = _d.deviceZigbeeRepeater, deviceZigbeeFenstersensor = _d.deviceZigbeeFenstersensor;
7
- var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createLampeWeiss = _e.createLampeWeiss, createSteckdose = _e.createSteckdose, getZigbeeDevices = _e.getZigbeeDevices, getZigbeeDevicesAll = _e.getZigbeeDevicesAll;
7
+ var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createDosenrelaisDevice = _e.createDosenrelaisDevice, createLampeWeiss = _e.createLampeWeiss, createSteckdose = _e.createSteckdose, getZigbeeDevices = _e.getZigbeeDevices, getZigbeeDevicesAll = _e.getZigbeeDevicesAll;
8
8
  module.exports = {
9
9
  // date.ts:
10
10
  DateHelper: DateHelper,
@@ -84,6 +84,7 @@ module.exports = {
84
84
  deviceZigbeeFenstersensor: deviceZigbeeFenstersensor,
85
85
  // zigbeeFunctions.ts
86
86
  createZigbeeDevice: createZigbeeDevice,
87
+ createDosenrelaisDevice: createDosenrelaisDevice,
87
88
  createLampeWeiss: createLampeWeiss,
88
89
  createSteckdose: createSteckdose,
89
90
  getZigbeeDevices: getZigbeeDevices,
package/main.ts CHANGED
@@ -5,7 +5,7 @@ const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStanda
5
5
  const { HomematicWindow, HomematicSteckdose, HomematicHeizkoerper, HomematicDimmer, HomematicWandthermostat, HomematicFussbodenheizung, HomematicWandschalter, HomematicDoor, HomematicWetterstation, HomematicAccessPoint, HomematicRollladen, HomematicWandtaster, HomematicTemperatursensor, HomematicRauchmelder, HomematicPraesenzmelder, AbstractHomematic, HomematicFunkschaltaktor, deviceHomematicWandthermostat, deviceHomematicPraesenzmelder, deviceHomematicWetterstation, deviceHomematicDoor, deviceHomematicRollladen, deviceHomematicWandschalter, deviceHomematicFussbodenheizung, deviceHomematicWandtaster, deviceHomematicAccessPoint, deviceHomematicTemperatursensor, deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor, deviceHomematicWindow, deviceHomematicSteckdose, deviceHomematicHeizkoerper, deviceHomematicDimmer} = require('./homematicClasses.js');
6
6
  const { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll } = require('./homematicFunctions.js');
7
7
  const { AbstractZigbee, ColorScheme, RGBColorScheme, WhiteColorScheme, ZigbeeLampeRGB, LampeWeissTasterScheme, LampeWeissAlexaScheme, ZigbeeLampeWeiss, ZigbeeSteckdose, ZigbeeSchalter, ZigbeeRepeater, ZigbeeFenstersensor, ZigbeeRauchmelder, ZigbeeBewegungsmelder, ZigbeeWandtaster, ZigbeeDosenrelais,AlexaInputConverter, deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor } = require('./zigbeeClasses.js');
8
- const { createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll } = require('./zigbeeFunctions.js');
8
+ const { createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll } = require('./zigbeeFunctions.js');
9
9
 
10
10
  module.exports = {
11
11
 
@@ -30,5 +30,5 @@ module.exports = {
30
30
  deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor,
31
31
 
32
32
  // zigbeeFunctions.ts
33
- createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
33
+ createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
34
34
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.0.61",
3
+ "version": "1.0.64",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",