iobroker-ucl 1.2.93 → 1.2.95
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.
- package/homematicFunctions.js +21 -1
- package/homematicFunctions.ts +23 -1
- package/main.js +7 -5
- package/main.ts +6 -8
- package/package.json +1 -1
- package/shellyFunctions.js +11 -3
- package/shellyFunctions.ts +12 -3
- package/zigbeeFunctions.js +15 -1
- package/zigbeeFunctions.ts +16 -1
package/homematicFunctions.js
CHANGED
@@ -817,6 +817,26 @@ function toStringArray(databaseValue) {
|
|
817
817
|
return databaseValue.split('|');
|
818
818
|
}
|
819
819
|
}
|
820
|
+
function clearHomematicCaches(adapter) {
|
821
|
+
homematicAllArray = null;
|
822
|
+
cacheDimmerArray = null;
|
823
|
+
cacheHeizkoerperArray = null;
|
824
|
+
cacheSteckdosenArray = null;
|
825
|
+
cacheWindowsArray = null;
|
826
|
+
cacheFunkschaltaktorenArray = null;
|
827
|
+
cacheRauchmelderArray = null;
|
828
|
+
cacheTemperatursensorenArray = null;
|
829
|
+
cacheAccessPointsArray = null;
|
830
|
+
cacheWandtasterArray = null;
|
831
|
+
cacheFussbodenheizungenArray = null;
|
832
|
+
cacheWandschalterArray = null;
|
833
|
+
cacheDoorsArray = null;
|
834
|
+
cacheWetterstationenArray = null;
|
835
|
+
cachePraesenzmelderArray = null;
|
836
|
+
cacheWandthermostateArray = null;
|
837
|
+
cacheRollladenArray = null;
|
838
|
+
adapter.log(">>> Homematic cache cleared!! <<<");
|
839
|
+
}
|
820
840
|
function sortArray(inputArray) {
|
821
841
|
inputArray.sort(function (a, b) {
|
822
842
|
var elementA = a;
|
@@ -863,4 +883,4 @@ function getEtageSortIndex(etage) {
|
|
863
883
|
return "d";
|
864
884
|
}
|
865
885
|
}
|
866
|
-
module.exports = { createHomematicDevice: createHomematicDevice, createHomeaticDimmer: createHomeaticDimmer, createHomeaticWandschalter: createHomeaticWandschalter, loadHomematicWandthermostate: loadHomematicWandthermostate, loadHomematicPraesenzmelder: loadHomematicPraesenzmelder, loadHomematicWetterstationen: loadHomematicWetterstationen, loadHomematicDoors: loadHomematicDoors, loadHomematicRollladen: loadHomematicRollladen, loadHomematicWandschalter: loadHomematicWandschalter, loadHomematicFussbodenheizungen: loadHomematicFussbodenheizungen, loadHomematicWandtaster: loadHomematicWandtaster, loadHomematicAccessPoints: loadHomematicAccessPoints, loadHomematicTemperatursensoren: loadHomematicTemperatursensoren, loadHomematicRauchmelder: loadHomematicRauchmelder, loadHomematicFunktschaltaktoren: loadHomematicFunktschaltaktoren, loadHomematicWindows: loadHomematicWindows, loadHomematicSteckdosen: loadHomematicSteckdosen, loadHomematicHeizkoerper: loadHomematicHeizkoerper, loadHomematicDimmer: loadHomematicDimmer, loadHomematicDevicesAll: loadHomematicDevicesAll };
|
886
|
+
module.exports = { createHomematicDevice: createHomematicDevice, createHomeaticDimmer: createHomeaticDimmer, createHomeaticWandschalter: createHomeaticWandschalter, loadHomematicWandthermostate: loadHomematicWandthermostate, loadHomematicPraesenzmelder: loadHomematicPraesenzmelder, loadHomematicWetterstationen: loadHomematicWetterstationen, loadHomematicDoors: loadHomematicDoors, loadHomematicRollladen: loadHomematicRollladen, loadHomematicWandschalter: loadHomematicWandschalter, loadHomematicFussbodenheizungen: loadHomematicFussbodenheizungen, loadHomematicWandtaster: loadHomematicWandtaster, loadHomematicAccessPoints: loadHomematicAccessPoints, loadHomematicTemperatursensoren: loadHomematicTemperatursensoren, loadHomematicRauchmelder: loadHomematicRauchmelder, loadHomematicFunktschaltaktoren: loadHomematicFunktschaltaktoren, loadHomematicWindows: loadHomematicWindows, loadHomematicSteckdosen: loadHomematicSteckdosen, loadHomematicHeizkoerper: loadHomematicHeizkoerper, loadHomematicDimmer: loadHomematicDimmer, loadHomematicDevicesAll: loadHomematicDevicesAll, clearHomematicCaches: clearHomematicCaches };
|
package/homematicFunctions.ts
CHANGED
@@ -894,6 +894,26 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
|
|
894
894
|
}
|
895
895
|
}
|
896
896
|
|
897
|
+
function clearHomematicCaches(adapter: any) {
|
898
|
+
homematicAllArray = null;
|
899
|
+
cacheDimmerArray = null;
|
900
|
+
cacheHeizkoerperArray = null;
|
901
|
+
cacheSteckdosenArray = null;
|
902
|
+
cacheWindowsArray = null;
|
903
|
+
cacheFunkschaltaktorenArray = null;
|
904
|
+
cacheRauchmelderArray = null;
|
905
|
+
cacheTemperatursensorenArray = null;
|
906
|
+
cacheAccessPointsArray = null;
|
907
|
+
cacheWandtasterArray = null;
|
908
|
+
cacheFussbodenheizungenArray = null;
|
909
|
+
cacheWandschalterArray = null;
|
910
|
+
cacheDoorsArray = null;
|
911
|
+
cacheWetterstationenArray = null;
|
912
|
+
cachePraesenzmelderArray = null;
|
913
|
+
cacheWandthermostateArray = null;
|
914
|
+
cacheRollladenArray = null; adapter.log(">>> Homematic cache cleared!! <<<");
|
915
|
+
}
|
916
|
+
|
897
917
|
function sortArray(inputArray) {
|
898
918
|
inputArray.sort((a,b) => {
|
899
919
|
var elementA = a;
|
@@ -946,4 +966,6 @@ function getEtageSortIndex(etage: string) {
|
|
946
966
|
}
|
947
967
|
|
948
968
|
|
949
|
-
|
969
|
+
|
970
|
+
|
971
|
+
module.exports = { createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll, clearHomematicCaches };
|
package/main.js
CHANGED
@@ -2,14 +2,13 @@ var DateHelper = require('./date.js').DateHelper;
|
|
2
2
|
var DateCalendarTest = require('./test.js').DateCalendarTest;
|
3
3
|
var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _a.HtmlTable, HtmlCreator = _a.HtmlCreator, StaticIconColumn = _a.StaticIconColumn, AbstractStandardTextColumn = _a.AbstractStandardTextColumn;
|
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, DimmerAlexaScheme = _b.DimmerAlexaScheme, DimmerTasterScheme = _b.DimmerTasterScheme;
|
5
|
-
var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, createHomeaticDimmer = _c.createHomeaticDimmer, createHomeaticWandschalter = _c.createHomeaticWandschalter, loadHomematicWandthermostate = _c.loadHomematicWandthermostate, loadHomematicPraesenzmelder = _c.loadHomematicPraesenzmelder, loadHomematicWetterstationen = _c.loadHomematicWetterstationen, loadHomematicDoors = _c.loadHomematicDoors, loadHomematicRollladen = _c.loadHomematicRollladen, loadHomematicWandschalter = _c.loadHomematicWandschalter, loadHomematicFussbodenheizungen = _c.loadHomematicFussbodenheizungen, loadHomematicWandtaster = _c.loadHomematicWandtaster, loadHomematicAccessPoints = _c.loadHomematicAccessPoints, loadHomematicTemperatursensoren = _c.loadHomematicTemperatursensoren, loadHomematicRauchmelder = _c.loadHomematicRauchmelder, loadHomematicFunktschaltaktoren = _c.loadHomematicFunktschaltaktoren, loadHomematicWindows = _c.loadHomematicWindows, loadHomematicSteckdosen = _c.loadHomematicSteckdosen, loadHomematicHeizkoerper = _c.loadHomematicHeizkoerper, loadHomematicDimmer = _c.loadHomematicDimmer, loadHomematicDevicesAll = _c.loadHomematicDevicesAll;
|
5
|
+
var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, createHomeaticDimmer = _c.createHomeaticDimmer, createHomeaticWandschalter = _c.createHomeaticWandschalter, loadHomematicWandthermostate = _c.loadHomematicWandthermostate, loadHomematicPraesenzmelder = _c.loadHomematicPraesenzmelder, loadHomematicWetterstationen = _c.loadHomematicWetterstationen, loadHomematicDoors = _c.loadHomematicDoors, loadHomematicRollladen = _c.loadHomematicRollladen, loadHomematicWandschalter = _c.loadHomematicWandschalter, loadHomematicFussbodenheizungen = _c.loadHomematicFussbodenheizungen, loadHomematicWandtaster = _c.loadHomematicWandtaster, loadHomematicAccessPoints = _c.loadHomematicAccessPoints, loadHomematicTemperatursensoren = _c.loadHomematicTemperatursensoren, loadHomematicRauchmelder = _c.loadHomematicRauchmelder, loadHomematicFunktschaltaktoren = _c.loadHomematicFunktschaltaktoren, loadHomematicWindows = _c.loadHomematicWindows, loadHomematicSteckdosen = _c.loadHomematicSteckdosen, loadHomematicHeizkoerper = _c.loadHomematicHeizkoerper, loadHomematicDimmer = _c.loadHomematicDimmer, loadHomematicDevicesAll = _c.loadHomematicDevicesAll, clearHomematicCaches = _c.clearHomematicCaches;
|
6
6
|
var _d = require('./zigbeeClasses.js'), AbstractZigbee = _d.AbstractZigbee, ColorConverter = _d.ColorConverter, 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, 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, createZigbeeDosenrelais = _e.createZigbeeDosenrelais, createZigbeeLampeRGB = _e.createZigbeeLampeRGB, createZigbeeLampeWeiss = _e.createZigbeeLampeWeiss, createZigbeeSteckdose = _e.createZigbeeSteckdose, loadZigbeeSteckdosen = _e.loadZigbeeSteckdosen, loadZigbeeBewegungsmelder = _e.loadZigbeeBewegungsmelder, loadZigbeeLampenRGB = _e.loadZigbeeLampenRGB, loadZigbeeLampenWeiss = _e.loadZigbeeLampenWeiss, loadZigbeeRauchmelder = _e.loadZigbeeRauchmelder, loadZigbeeWandtaster = _e.loadZigbeeWandtaster, loadZigbeeDosenrelais = _e.loadZigbeeDosenrelais, loadZigbeeSchalter = _e.loadZigbeeSchalter, loadZigbeeRepeater = _e.loadZigbeeRepeater, loadZigbeeFenstersensor = _e.loadZigbeeFenstersensor, loadZigbeeDevicesAll = _e.loadZigbeeDevicesAll;
|
7
|
+
var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createZigbeeDosenrelais = _e.createZigbeeDosenrelais, createZigbeeLampeRGB = _e.createZigbeeLampeRGB, createZigbeeLampeWeiss = _e.createZigbeeLampeWeiss, createZigbeeSteckdose = _e.createZigbeeSteckdose, loadZigbeeSteckdosen = _e.loadZigbeeSteckdosen, loadZigbeeBewegungsmelder = _e.loadZigbeeBewegungsmelder, loadZigbeeLampenRGB = _e.loadZigbeeLampenRGB, loadZigbeeLampenWeiss = _e.loadZigbeeLampenWeiss, loadZigbeeRauchmelder = _e.loadZigbeeRauchmelder, loadZigbeeWandtaster = _e.loadZigbeeWandtaster, loadZigbeeDosenrelais = _e.loadZigbeeDosenrelais, loadZigbeeSchalter = _e.loadZigbeeSchalter, loadZigbeeRepeater = _e.loadZigbeeRepeater, loadZigbeeFenstersensor = _e.loadZigbeeFenstersensor, loadZigbeeDevicesAll = _e.loadZigbeeDevicesAll, clearZigbeeCaches = _e.clearZigbeeCaches;
|
8
8
|
var _f = require('./camera.js'), sendToPictureGartenToTelegram = _f.sendToPictureGartenToTelegram, sendToPictureSeiteToTelegram = _f.sendToPictureSeiteToTelegram, sendToPictureHaustuereToTelegram = _f.sendToPictureHaustuereToTelegram, sendToPictureDoorbellToTelegram = _f.sendToPictureDoorbellToTelegram, sendToPictureGarageToTelegram = _f.sendToPictureGarageToTelegram;
|
9
9
|
var AlexaInputConverter = require('./alexa.js').AlexaInputConverter;
|
10
10
|
var _g = require('./shellyClasses.js'), AbstractShelly = _g.AbstractShelly, ShellyLampeWeiss = _g.ShellyLampeWeiss, ShellyDimmerAlexaScheme = _g.ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme = _g.ShellyDimmerTasterScheme, ShellyDimmer = _g.ShellyDimmer, ShellyRGBAlexaScheme = _g.ShellyRGBAlexaScheme, ShellyRGBTasterScheme = _g.ShellyRGBTasterScheme, ShellyLampeRGB = _g.ShellyLampeRGB, ShellySteckdose = _g.ShellySteckdose, ShellyRollladen = _g.ShellyRollladen, ShellySensor = _g.ShellySensor, deviceShellyLampeWeiss = _g.deviceShellyLampeWeiss, deviceShellyDimmer = _g.deviceShellyDimmer, deviceShellyLampeRGB = _g.deviceShellyLampeRGB, deviceShellySteckdose = _g.deviceShellySteckdose, deviceShellyRollladen = _g.deviceShellyRollladen, deviceShellySensor = _g.deviceShellySensor;
|
11
|
-
var _h = require('./shellyFunctions.js'), createShellyDevice = _h.createShellyDevice, createShellySensor = _h.createShellySensor, createShellyLampeRGB = _h.createShellyLampeRGB, createShellyRollladen = _h.createShellyRollladen, createShellyDimmer = _h.createShellyDimmer, createShellyLampe = _h.createShellyLampe, createShellySteckdose = _h.createShellySteckdose, loadShellyRollladen = _h.loadShellyRollladen, loadShellySensoren = _h.loadShellySensoren, loadShellyDimmer = _h.loadShellyDimmer, loadShellyLampenWeiss = _h.loadShellyLampenWeiss, loadShellySteckdosen = _h.loadShellySteckdosen, loadShellyDevicesAll = _h.loadShellyDevicesAll;
|
12
|
-
console.log("ddd33333333d");
|
11
|
+
var _h = require('./shellyFunctions.js'), createShellyDevice = _h.createShellyDevice, createShellySensor = _h.createShellySensor, createShellyLampeRGB = _h.createShellyLampeRGB, createShellyRollladen = _h.createShellyRollladen, createShellyDimmer = _h.createShellyDimmer, createShellyLampe = _h.createShellyLampe, createShellySteckdose = _h.createShellySteckdose, loadShellyRollladen = _h.loadShellyRollladen, loadShellySensoren = _h.loadShellySensoren, loadShellyDimmer = _h.loadShellyDimmer, loadShellyLampenWeiss = _h.loadShellyLampenWeiss, loadShellySteckdosen = _h.loadShellySteckdosen, loadShellyDevicesAll = _h.loadShellyDevicesAll, clearShellyCaches = _h.clearShellyCaches;
|
13
12
|
module.exports = {
|
14
13
|
// date.ts:
|
15
14
|
DateHelper: DateHelper,
|
@@ -78,6 +77,7 @@ module.exports = {
|
|
78
77
|
loadHomematicHeizkoerper: loadHomematicHeizkoerper,
|
79
78
|
loadHomematicDimmer: loadHomematicDimmer,
|
80
79
|
loadHomematicDevicesAll: loadHomematicDevicesAll,
|
80
|
+
clearHomematicCaches: clearHomematicCaches,
|
81
81
|
// zigbeeClasses.ts
|
82
82
|
AbstractZigbee: AbstractZigbee,
|
83
83
|
ColorConverter: ColorConverter,
|
@@ -123,6 +123,7 @@ module.exports = {
|
|
123
123
|
loadZigbeeRepeater: loadZigbeeRepeater,
|
124
124
|
loadZigbeeFenstersensor: loadZigbeeFenstersensor,
|
125
125
|
loadZigbeeDevicesAll: loadZigbeeDevicesAll,
|
126
|
+
clearZigbeeCaches: clearZigbeeCaches,
|
126
127
|
// camera.ts
|
127
128
|
sendToPictureGartenToTelegram: sendToPictureGartenToTelegram,
|
128
129
|
sendToPictureSeiteToTelegram: sendToPictureSeiteToTelegram,
|
@@ -162,5 +163,6 @@ module.exports = {
|
|
162
163
|
loadShellyDimmer: loadShellyDimmer,
|
163
164
|
loadShellyLampenWeiss: loadShellyLampenWeiss,
|
164
165
|
loadShellySteckdosen: loadShellySteckdosen,
|
165
|
-
loadShellyDevicesAll: loadShellyDevicesAll
|
166
|
+
loadShellyDevicesAll: loadShellyDevicesAll,
|
167
|
+
clearShellyCaches: clearShellyCaches
|
166
168
|
};
|
package/main.ts
CHANGED
@@ -3,15 +3,13 @@ const { DateHelper } = require('./date.js');
|
|
3
3
|
const { DateCalendarTest } = require('./test.js');
|
4
4
|
const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStandardTextColumn } = require('./html.js');
|
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,DimmerAlexaScheme, DimmerTasterScheme} = require('./homematicClasses.js');
|
6
|
-
const { createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll } = require('./homematicFunctions.js');
|
6
|
+
const { createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll, clearHomematicCaches } = require('./homematicFunctions.js');
|
7
7
|
const { AbstractZigbee, ColorConverter, ColorScheme, RGBColorScheme, WhiteColorScheme, ZigbeeLampeRGB, LampeWeissTasterScheme, LampeWeissAlexaScheme, ZigbeeLampeWeiss, ZigbeeSteckdose, ZigbeeSchalter, ZigbeeRepeater, ZigbeeFenstersensor, ZigbeeRauchmelder, ZigbeeBewegungsmelder, ZigbeeWandtaster, ZigbeeDosenrelais, deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor } = require('./zigbeeClasses.js');
|
8
|
-
const { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll } = require('./zigbeeFunctions.js');
|
8
|
+
const { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll, clearZigbeeCaches } = require('./zigbeeFunctions.js');
|
9
9
|
const { sendToPictureGartenToTelegram, sendToPictureSeiteToTelegram, sendToPictureHaustuereToTelegram, sendToPictureDoorbellToTelegram, sendToPictureGarageToTelegram } = require('./camera.js');
|
10
10
|
const { AlexaInputConverter } = require('./alexa.js');
|
11
11
|
const { AbstractShelly, ShellyLampeWeiss, ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme, ShellyDimmer, ShellyRGBAlexaScheme, ShellyRGBTasterScheme, ShellyLampeRGB, ShellySteckdose, ShellyRollladen,ShellySensor, deviceShellyLampeWeiss, deviceShellyDimmer, deviceShellyLampeRGB, deviceShellySteckdose, deviceShellyRollladen, deviceShellySensor } = require('./shellyClasses.js');
|
12
|
-
const { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll } = require('./shellyFunctions.js');
|
13
|
-
|
14
|
-
console.log("ddd33333333d");
|
12
|
+
const { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll, clearShellyCaches } = require('./shellyFunctions.js');
|
15
13
|
|
16
14
|
module.exports = {
|
17
15
|
|
@@ -29,14 +27,14 @@ module.exports = {
|
|
29
27
|
deviceHomematicWandthermostat, deviceHomematicPraesenzmelder, deviceHomematicWetterstation, deviceHomematicDoor, deviceHomematicRollladen, deviceHomematicWandschalter, deviceHomematicFussbodenheizung, deviceHomematicWandtaster, deviceHomematicAccessPoint, deviceHomematicTemperatursensor, deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor, deviceHomematicWindow, deviceHomematicSteckdose, deviceHomematicHeizkoerper, deviceHomematicDimmer,
|
30
28
|
|
31
29
|
// homematicFunctions.ts
|
32
|
-
createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll,
|
30
|
+
createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll, clearHomematicCaches,
|
33
31
|
|
34
32
|
// zigbeeClasses.ts
|
35
33
|
AbstractZigbee, ColorConverter, ColorScheme, RGBColorScheme, WhiteColorScheme, ZigbeeLampeRGB, LampeWeissTasterScheme, LampeWeissAlexaScheme, ZigbeeLampeWeiss, ZigbeeSteckdose, ZigbeeSchalter, ZigbeeRepeater, ZigbeeFenstersensor, ZigbeeRauchmelder, ZigbeeBewegungsmelder, ZigbeeWandtaster, ZigbeeDosenrelais,
|
36
34
|
deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor,
|
37
35
|
|
38
36
|
// zigbeeFunctions.ts
|
39
|
-
createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll,
|
37
|
+
createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll, clearZigbeeCaches,
|
40
38
|
|
41
39
|
// camera.ts
|
42
40
|
sendToPictureGartenToTelegram, sendToPictureSeiteToTelegram, sendToPictureHaustuereToTelegram, sendToPictureDoorbellToTelegram, sendToPictureGarageToTelegram,
|
@@ -48,5 +46,5 @@ module.exports = {
|
|
48
46
|
AbstractShelly, ShellyLampeWeiss, ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme, ShellyDimmer, ShellyRGBAlexaScheme, ShellyRGBTasterScheme, ShellyLampeRGB, ShellySteckdose, ShellyRollladen,ShellySensor, deviceShellyLampeWeiss, deviceShellyDimmer, deviceShellyLampeRGB, deviceShellySteckdose, deviceShellyRollladen, deviceShellySensor ,
|
49
47
|
|
50
48
|
// ShellyFunctions.ts
|
51
|
-
createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll
|
49
|
+
createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll, clearShellyCaches
|
52
50
|
};
|
package/package.json
CHANGED
package/shellyFunctions.js
CHANGED
@@ -355,7 +355,7 @@ function createShellySteckdose(adapter, rawId, etage, raum, device, baseState, c
|
|
355
355
|
// Allgemein:
|
356
356
|
createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
|
357
357
|
// attributeChannel
|
358
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeChannel, channel,
|
358
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeChannel, channel, deviceShellySteckdose);
|
359
359
|
// alexaSmartNamesForOn:string[]
|
360
360
|
var db_alexaSmartNamesForOn = null;
|
361
361
|
alexaSmartNamesForOn.forEach(function (value) {
|
@@ -488,7 +488,6 @@ function loadShellySensoren(adapter) {
|
|
488
488
|
return cacheSensorenArray;
|
489
489
|
}
|
490
490
|
exports.loadShellySensoren = loadShellySensoren;
|
491
|
-
console.log("test");
|
492
491
|
/*var cacheLampenRGBArray = null;
|
493
492
|
export function loadShellyLampenRGB(adapter: any) {
|
494
493
|
if (cacheLampenRGBArray != null) {
|
@@ -711,6 +710,15 @@ function toStringArray(databaseValue) {
|
|
711
710
|
return databaseValue.split('|');
|
712
711
|
}
|
713
712
|
}
|
713
|
+
function clearShellyCaches(adapter) {
|
714
|
+
shellyAllArray = null;
|
715
|
+
cacheSteckdosenArray = null;
|
716
|
+
cacheLampenWeissArray = null;
|
717
|
+
cacheDimmerArray = null;
|
718
|
+
cacheSensorenArray = null;
|
719
|
+
cacheRollladenArray = null;
|
720
|
+
adapter.log(">>> Shelly cache cleared!! <<<");
|
721
|
+
}
|
714
722
|
function sortArray(inputArray) {
|
715
723
|
inputArray.sort(function (a, b) {
|
716
724
|
var elementA = a;
|
@@ -757,4 +765,4 @@ function getEtageSortIndex(etage) {
|
|
757
765
|
return "d";
|
758
766
|
}
|
759
767
|
}
|
760
|
-
module.exports = { createShellyDevice: createShellyDevice, createShellySensor: createShellySensor, createShellyLampeRGB: createShellyLampeRGB, createShellyRollladen: createShellyRollladen, createShellyDimmer: createShellyDimmer, createShellyLampe: createShellyLampe, createShellySteckdose: createShellySteckdose, loadShellyRollladen: loadShellyRollladen, loadShellySensoren: loadShellySensoren, loadShellyDimmer: loadShellyDimmer, loadShellyLampenWeiss: loadShellyLampenWeiss, loadShellySteckdosen: loadShellySteckdosen, loadShellyDevicesAll: loadShellyDevicesAll };
|
768
|
+
module.exports = { createShellyDevice: createShellyDevice, createShellySensor: createShellySensor, createShellyLampeRGB: createShellyLampeRGB, createShellyRollladen: createShellyRollladen, createShellyDimmer: createShellyDimmer, createShellyLampe: createShellyLampe, createShellySteckdose: createShellySteckdose, loadShellyRollladen: loadShellyRollladen, loadShellySensoren: loadShellySensoren, loadShellyDimmer: loadShellyDimmer, loadShellyLampenWeiss: loadShellyLampenWeiss, loadShellySteckdosen: loadShellySteckdosen, loadShellyDevicesAll: loadShellyDevicesAll, clearShellyCaches: clearShellyCaches };
|
package/shellyFunctions.ts
CHANGED
@@ -393,7 +393,7 @@ export function createShellySteckdose(adapter:any, rawId: number, etage: string,
|
|
393
393
|
createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
|
394
394
|
|
395
395
|
// attributeChannel
|
396
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeChannel, channel,
|
396
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeChannel, channel, deviceShellySteckdose);
|
397
397
|
|
398
398
|
// alexaSmartNamesForOn:string[]
|
399
399
|
var db_alexaSmartNamesForOn = null;
|
@@ -529,7 +529,6 @@ export function loadShellySensoren(adapter: any) {
|
|
529
529
|
return cacheSensorenArray;
|
530
530
|
}
|
531
531
|
|
532
|
-
console.log("test");
|
533
532
|
|
534
533
|
/*var cacheLampenRGBArray = null;
|
535
534
|
export function loadShellyLampenRGB(adapter: any) {
|
@@ -803,6 +802,16 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
|
|
803
802
|
}
|
804
803
|
}
|
805
804
|
|
805
|
+
function clearShellyCaches(adapter: any) {
|
806
|
+
shellyAllArray = null;
|
807
|
+
cacheSteckdosenArray = null;
|
808
|
+
cacheLampenWeissArray = null;
|
809
|
+
cacheDimmerArray = null;
|
810
|
+
cacheSensorenArray = null;
|
811
|
+
cacheRollladenArray = null;
|
812
|
+
adapter.log(">>> Shelly cache cleared!! <<<");
|
813
|
+
}
|
814
|
+
|
806
815
|
function sortArray(inputArray) {
|
807
816
|
inputArray.sort((a,b) => {
|
808
817
|
var elementA = a;
|
@@ -855,4 +864,4 @@ function getEtageSortIndex(etage: string) {
|
|
855
864
|
}
|
856
865
|
|
857
866
|
|
858
|
-
module.exports = { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll };
|
867
|
+
module.exports = { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll, clearShellyCaches };
|
package/zigbeeFunctions.js
CHANGED
@@ -1101,6 +1101,20 @@ function loadZigbeeDevicesAll(adapter) {
|
|
1101
1101
|
return zigbeeAllArray;
|
1102
1102
|
}
|
1103
1103
|
exports.loadZigbeeDevicesAll = loadZigbeeDevicesAll;
|
1104
|
+
function clearZigbeeCaches(adapter) {
|
1105
|
+
zigbeeAllArray = null;
|
1106
|
+
cacheFenstersensorenArray = null;
|
1107
|
+
cacheRepeaterArray = null;
|
1108
|
+
cacheSchalterArray = null;
|
1109
|
+
cacheDosenrelaisArray = null;
|
1110
|
+
cacheWandtasterArray = null;
|
1111
|
+
cacheRauchmelderArray = null;
|
1112
|
+
cacheLampenWeissArray = null;
|
1113
|
+
cacheLampenRGBArray = null;
|
1114
|
+
cacheBewegungsmelderArray = null;
|
1115
|
+
cacheSteckdosenArray = null;
|
1116
|
+
adapter.log(">>> Zigbee cache cleared!! <<<");
|
1117
|
+
}
|
1104
1118
|
function sortArray(inputArray) {
|
1105
1119
|
inputArray.sort(function (a, b) {
|
1106
1120
|
var elementA = a;
|
@@ -1147,4 +1161,4 @@ function getEtageSortIndex(etage) {
|
|
1147
1161
|
return "d";
|
1148
1162
|
}
|
1149
1163
|
}
|
1150
|
-
module.exports = { createZigbeeDevice: createZigbeeDevice, createZigbeeDosenrelais: createZigbeeDosenrelais, createZigbeeLampeRGB: createZigbeeLampeRGB, createZigbeeLampeWeiss: createZigbeeLampeWeiss, createZigbeeSteckdose: createZigbeeSteckdose, loadZigbeeSteckdosen: loadZigbeeSteckdosen, loadZigbeeBewegungsmelder: loadZigbeeBewegungsmelder, loadZigbeeLampenRGB: loadZigbeeLampenRGB, loadZigbeeLampenWeiss: loadZigbeeLampenWeiss, loadZigbeeRauchmelder: loadZigbeeRauchmelder, loadZigbeeWandtaster: loadZigbeeWandtaster, loadZigbeeDosenrelais: loadZigbeeDosenrelais, loadZigbeeSchalter: loadZigbeeSchalter, loadZigbeeRepeater: loadZigbeeRepeater, loadZigbeeFenstersensor: loadZigbeeFenstersensor, loadZigbeeDevicesAll: loadZigbeeDevicesAll };
|
1164
|
+
module.exports = { createZigbeeDevice: createZigbeeDevice, createZigbeeDosenrelais: createZigbeeDosenrelais, createZigbeeLampeRGB: createZigbeeLampeRGB, createZigbeeLampeWeiss: createZigbeeLampeWeiss, createZigbeeSteckdose: createZigbeeSteckdose, loadZigbeeSteckdosen: loadZigbeeSteckdosen, loadZigbeeBewegungsmelder: loadZigbeeBewegungsmelder, loadZigbeeLampenRGB: loadZigbeeLampenRGB, loadZigbeeLampenWeiss: loadZigbeeLampenWeiss, loadZigbeeRauchmelder: loadZigbeeRauchmelder, loadZigbeeWandtaster: loadZigbeeWandtaster, loadZigbeeDosenrelais: loadZigbeeDosenrelais, loadZigbeeSchalter: loadZigbeeSchalter, loadZigbeeRepeater: loadZigbeeRepeater, loadZigbeeFenstersensor: loadZigbeeFenstersensor, loadZigbeeDevicesAll: loadZigbeeDevicesAll, clearZigbeeCaches: clearZigbeeCaches };
|
package/zigbeeFunctions.ts
CHANGED
@@ -1257,6 +1257,21 @@ export function loadZigbeeDevicesAll(adapter: any) {
|
|
1257
1257
|
return zigbeeAllArray;
|
1258
1258
|
}
|
1259
1259
|
|
1260
|
+
function clearZigbeeCaches(adapter: any) {
|
1261
|
+
zigbeeAllArray = null;
|
1262
|
+
cacheFenstersensorenArray = null;
|
1263
|
+
cacheRepeaterArray = null;
|
1264
|
+
cacheSchalterArray = null;
|
1265
|
+
cacheDosenrelaisArray = null;
|
1266
|
+
cacheWandtasterArray = null;
|
1267
|
+
cacheRauchmelderArray = null;
|
1268
|
+
cacheLampenWeissArray = null;
|
1269
|
+
cacheLampenRGBArray = null;
|
1270
|
+
cacheBewegungsmelderArray = null;
|
1271
|
+
cacheSteckdosenArray = null;
|
1272
|
+
adapter.log(">>> Zigbee cache cleared!! <<<");
|
1273
|
+
}
|
1274
|
+
|
1260
1275
|
function sortArray(inputArray) {
|
1261
1276
|
inputArray.sort((a,b) => {
|
1262
1277
|
var elementA = a;
|
@@ -1310,4 +1325,4 @@ function getEtageSortIndex(etage: string) {
|
|
1310
1325
|
|
1311
1326
|
|
1312
1327
|
|
1313
|
-
module.exports = { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll };
|
1328
|
+
module.exports = { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll, clearZigbeeCaches };
|