iobroker.sprinklecontrol 1.0.8 → 1.0.9
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/README.md +5 -5
- package/admin/index_m.html +7 -7
- package/admin/index_m.js +1 -1
- package/io-package.json +14 -14
- package/lib/valveControl.js +2 -2
- package/main.js +23 -22
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -33,6 +33,9 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
|
|
|
33
33
|
Placeholder for the next version (at the beginning of the line):
|
|
34
34
|
### **WORK IN PROGRESS**
|
|
35
35
|
-->
|
|
36
|
+
### 1.0.9 (2026-07-01)
|
|
37
|
+
* (Dirk-Peter-md) Fixed error reading the soil moisture sensor
|
|
38
|
+
|
|
36
39
|
### 1.0.8 (2026-06-12)
|
|
37
40
|
* (Dirk-Peter-md) Fixed error in "Command without response"
|
|
38
41
|
* (Dirk-Peter-md) Water Pressure Control Revised
|
|
@@ -50,10 +53,7 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
|
|
|
50
53
|
* (Dirk-Peter-md) Second start time added
|
|
51
54
|
* (Dirk-Peter-md) bug fixed in sprinklerState
|
|
52
55
|
|
|
53
|
-
###
|
|
54
|
-
* (Dirk-Peter-md) GitHub error message #274
|
|
55
|
-
|
|
56
|
-
### CHANGELOG_OLD
|
|
56
|
+
### Older versions
|
|
57
57
|
[CHANGELOG_OLD.md](CHANGELOG_OLD.md)
|
|
58
58
|
|
|
59
59
|
*************************************************************************************************************************************
|
|
@@ -79,4 +79,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
79
79
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
80
80
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
81
81
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
82
|
-
SOFTWARE.
|
|
82
|
+
SOFTWARE.
|
package/admin/index_m.html
CHANGED
|
@@ -1050,31 +1050,31 @@
|
|
|
1050
1050
|
<div class="row visFixDaysWeek">
|
|
1051
1051
|
<div class="col s12 l12 input-field">
|
|
1052
1052
|
<legend class="translate">Tick the days of the week you want</legend>
|
|
1053
|
-
<div class="col s12
|
|
1053
|
+
<div class="col s12 m3 l2 input-field">
|
|
1054
1054
|
<input type="checkbox" class="form-control" id="sun">
|
|
1055
1055
|
<span for="sun" class="translate">Sunday</span>
|
|
1056
1056
|
</div>
|
|
1057
|
-
<div class="col s12
|
|
1057
|
+
<div class="col s12 m3 l2 input-field">
|
|
1058
1058
|
<input type="checkbox" class="form-control" id="mon">
|
|
1059
1059
|
<span for="mon" class="translate">Monday</span>
|
|
1060
1060
|
</div>
|
|
1061
|
-
<div class="col s12
|
|
1061
|
+
<div class="col s12 m3 l2 input-field">
|
|
1062
1062
|
<input type="checkbox" class="form-control" id="tue">
|
|
1063
1063
|
<span for="tue" class="translate">Tuesday</span>
|
|
1064
1064
|
</div>
|
|
1065
|
-
<div class="col s12
|
|
1065
|
+
<div class="col s12 m3 l2 input-field">
|
|
1066
1066
|
<input type="checkbox" class="form-control" id="wed">
|
|
1067
1067
|
<span for="wed" class="translate">Wednesday</span>
|
|
1068
1068
|
</div>
|
|
1069
|
-
<div class="col s12
|
|
1069
|
+
<div class="col s12 m3 l2 input-field">
|
|
1070
1070
|
<input type="checkbox" class="form-control" id="thur">
|
|
1071
1071
|
<span for="thur" class="translate">Thursday</span>
|
|
1072
1072
|
</div>
|
|
1073
|
-
<div class="col s12
|
|
1073
|
+
<div class="col s12 m3 l2 input-field">
|
|
1074
1074
|
<input type="checkbox" class="form-control" id="fri">
|
|
1075
1075
|
<span for="fri" class="translate">Friday</span>
|
|
1076
1076
|
</div>
|
|
1077
|
-
<div class="col s12
|
|
1077
|
+
<div class="col s12 m3 l2 input-field">
|
|
1078
1078
|
<input type="checkbox" class="form-control" id="sat">
|
|
1079
1079
|
<span for="sat" class="translate">Saturday</span>
|
|
1080
1080
|
</div>
|
package/admin/index_m.js
CHANGED
package/io-package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "sprinklecontrol",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.9",
|
|
5
5
|
"titleLang": {
|
|
6
6
|
"en": "Sprinkler Control",
|
|
7
7
|
"de": "Sprinklersteuerung",
|
|
@@ -19,6 +19,19 @@
|
|
|
19
19
|
"Dirk Peter <dirk.peter@freenet.de>"
|
|
20
20
|
],
|
|
21
21
|
"news": {
|
|
22
|
+
"1.0.9": {
|
|
23
|
+
"en": "Fixed error reading the soil moisture sensor",
|
|
24
|
+
"de": "Fehler beim Auslesen des Bodenfeuchtigkeitssensors behoben",
|
|
25
|
+
"ru": "Исправлена ошибка считывания показаний датчика влажности почвы.",
|
|
26
|
+
"pt": "Erro corrigido na leitura do sensor de umidade do solo",
|
|
27
|
+
"nl": "Fout bij het uitlezen van de bodemvochtigheidssensor gecorrigeerd.",
|
|
28
|
+
"fr": "Correction d'une erreur de lecture du capteur d'humidité du sol",
|
|
29
|
+
"it": "Risolto l'errore di lettura del sensore di umidità del suolo",
|
|
30
|
+
"es": "Se corrigió un error en la lectura del sensor de humedad del suelo.",
|
|
31
|
+
"pl": "Naprawiono błąd odczytu czujnika wilgotności gleby",
|
|
32
|
+
"uk": "Виправлена помилка зчитування даних датчика вологості ґрунту",
|
|
33
|
+
"zh-cn": "修复了读取土壤湿度传感器的错误"
|
|
34
|
+
},
|
|
22
35
|
"1.0.8": {
|
|
23
36
|
"en": "Fixed error in \"Command without response\"\nWater Pressure Control Revised\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] completed",
|
|
24
37
|
"de": "Fehler behoben in \"Befehl ohne Antwort\"\nWasserdruckregelung überarbeitet\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] abgeschlossen",
|
|
@@ -96,19 +109,6 @@
|
|
|
96
109
|
"pl": "Ciśnienie zaworu nadmiarowego dodane po nawadnianiu.",
|
|
97
110
|
"uk": "Клапан для зняття тиску додається після поливу.",
|
|
98
111
|
"zh-cn": "灌溉后增加了减压阀."
|
|
99
|
-
},
|
|
100
|
-
"1.0.2": {
|
|
101
|
-
"en": "Added times for the irrigation ban",
|
|
102
|
-
"de": "Zusätzliche Zeiten für das Bewässerungsverbot",
|
|
103
|
-
"ru": "Добавлено время для запрета ирригации",
|
|
104
|
-
"pt": "Tempos adicionais para a proibição da irrigação",
|
|
105
|
-
"nl": "Toegevoegde tijden voor het irrigatieverbod",
|
|
106
|
-
"fr": "Ajout de temps pour l'interdiction d'irrigation",
|
|
107
|
-
"it": "Aggiunti i tempi per il divieto di irrigazione",
|
|
108
|
-
"es": "Tiempos adicionales para la prohibición de riego",
|
|
109
|
-
"pl": "Dodano czasy zakazu nawadniania",
|
|
110
|
-
"uk": "Додані часи для поливу заборони",
|
|
111
|
-
"zh-cn": "灌溉禁令增加的时间"
|
|
112
112
|
}
|
|
113
113
|
},
|
|
114
114
|
"desc": {
|
package/lib/valveControl.js
CHANGED
|
@@ -960,7 +960,7 @@ const setActualPump = async () => {
|
|
|
960
960
|
}
|
|
961
961
|
/* Info aktualisieren */
|
|
962
962
|
await adapter.setStateAsync('info.cisternState', {
|
|
963
|
-
val: `${ (currentPumpUse.intBreak === true)
|
|
963
|
+
val: `${ (currentPumpUse.intBreak === true) ? `Cistern empty: ${ fillLevelCistern } % (${ adapter.config.triggerOnCisternLevel } %)` : `Cistern filled: ${ fillLevelCistern } % (${ adapter.config.triggerMinCisternLevel } %)` }`,
|
|
964
964
|
ack: true
|
|
965
965
|
});
|
|
966
966
|
break;
|
|
@@ -1037,7 +1037,7 @@ const setActualPump = async () => {
|
|
|
1037
1037
|
}
|
|
1038
1038
|
/* Info aktualisieren */
|
|
1039
1039
|
await adapter.setStateAsync('info.cisternState', {
|
|
1040
|
-
val: `${ (currentPumpUse.pumpCistern === false)
|
|
1040
|
+
val: `${ (currentPumpUse.pumpCistern === false) ? `Cistern empty: ${ fillLevelCistern } % (${ adapter.config.triggerOnCisternLevel } %)` : `Cistern filled: ${ fillLevelCistern } % (${ adapter.config.triggerMinCisternLevel } %)` }`,
|
|
1041
1041
|
ack: true
|
|
1042
1042
|
});
|
|
1043
1043
|
break;
|
package/main.js
CHANGED
|
@@ -157,6 +157,29 @@ function startAdapter(options) {
|
|
|
157
157
|
adapter.log.warn(`sensorRainfall => Wrong value: ${state.val}, Type: ${typeof state.val}`);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
|
+
|
|
161
|
+
// wenn in der config unter methodControlSM!== 'analog' oder 'bistable' eingegeben wurde, dann Bodenfeuchte-Sensor auslesen
|
|
162
|
+
if (myConfig.config) {
|
|
163
|
+
|
|
164
|
+
// @ts-ignore
|
|
165
|
+
function filterByID(obj){
|
|
166
|
+
return (((obj.methodControlSM === 'analog') || (obj.methodControlSM === 'bistable')) && (obj.triggerSM === id));
|
|
167
|
+
}
|
|
168
|
+
const filter = myConfig.config.filter(filterByID);
|
|
169
|
+
if (filter) {
|
|
170
|
+
for (const fil of filter) {
|
|
171
|
+
if (id === myConfig.config[fil.sprinkleID].triggerSM){
|
|
172
|
+
// analog
|
|
173
|
+
if (fil.methodControlSM === 'analog') {
|
|
174
|
+
myConfig.setSoilMoistPct(fil.sprinkleID, state.val);
|
|
175
|
+
} else if (fil.methodControlSM === 'bistable') { // bistable
|
|
176
|
+
myConfig.setSoilMoistBool(fil.sprinkleID, state.val);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
160
183
|
// Feiertagskalender
|
|
161
184
|
if (adapter.config.publicHolidays === true) {
|
|
162
185
|
if (id === `${adapter.config.publicHolInstance}.heute.boolean`) {
|
|
@@ -262,28 +285,6 @@ function startAdapter(options) {
|
|
|
262
285
|
}
|
|
263
286
|
}
|
|
264
287
|
}
|
|
265
|
-
// wenn in der config unter methodControlSM!== 'analog' oder 'bistable' eingegeben wurde, dann Bodenfeuchte-Sensor auslesen
|
|
266
|
-
if (myConfig.config) {
|
|
267
|
-
|
|
268
|
-
// @ts-ignore
|
|
269
|
-
function filterByID(obj){
|
|
270
|
-
return (((obj.methodControlSM === 'analog') || (obj.methodControlSM === 'bistable')) && (obj.triggerSM === id));
|
|
271
|
-
}
|
|
272
|
-
const filter = myConfig.config.filter(filterByID);
|
|
273
|
-
if (filter) {
|
|
274
|
-
for (const fil of filter) {
|
|
275
|
-
if (id === myConfig.config[fil.sprinkleID].triggerSM){
|
|
276
|
-
// analog
|
|
277
|
-
if (fil.methodControlSM === 'analog') {
|
|
278
|
-
myConfig.setSoilMoistPct(fil.sprinkleID, state.val);
|
|
279
|
-
} else if (fil.methodControlSM === 'bistable') { // bistable
|
|
280
|
-
myConfig.setSoilMoistBool(fil.sprinkleID, state.val);
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
}
|
|
285
|
-
}
|
|
286
|
-
|
|
287
288
|
const idSplit = id.split('.', 5);
|
|
288
289
|
const _found = myConfig.config.find((d) => d.objectName === idSplit[3]);
|
|
289
290
|
if (_found) {
|