iobroker.alarm 3.4.3 → 3.5.0

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 (7) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +4 -4
  3. package/admin/index_m.html +14 -0
  4. package/admin/words.js +37 -12
  5. package/io-package.json +16 -14
  6. package/main.js +7 -0
  7. package/package.json +9 -9
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (c) 2019-2023 misanorot <audi16v@gmx.de>
3
+ Copyright (c) 2019-2024 misanorot <audi16v@gmx.de>
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
package/README.md CHANGED
@@ -29,6 +29,9 @@
29
29
  Placeholder for the next version (at the beginning of the line):
30
30
  ### **WORK IN PROGRESS**
31
31
  -->
32
+ ### 3.5.0 (2024-01-05)
33
+ * (misanorot) added activation aborted speech output
34
+
32
35
  ### 3.4.3 (2023-11-05)
33
36
  * (misanorot) added silent_alarm (state list) to shortcuts
34
37
 
@@ -43,10 +46,7 @@
43
46
 
44
47
  **[older changelogs](CHANGELOG_OLD.md)**
45
48
 
46
- ### 3.3.7 (2023-01-02)
47
- * (misanorot) fixed issues at presence light trigger
48
-
49
49
  ## License
50
50
  MIT License
51
51
 
52
- Copyright (c) 2019-2023 misanorot <audi16v@gmx.de>
52
+ Copyright (c) 2019-2024 misanorot <audi16v@gmx.de>
package/admin/index_m.html CHANGED
@@ -207,6 +207,7 @@
207
207
  });
208
208
  $('#sayit .values-input[data-name="opt_say_one"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
209
209
  $('#sayit .values-input[data-name="opt_say_two"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
210
+ $('#sayit .values-input[data-name="opt_say_aborted"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
210
211
  $('#sayit .values-input[data-name="opt_say_three"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
211
212
  $('#sayit .values-input[data-name="opt_say_four"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
212
213
  $('#sayit .values-input[data-name="opt_say_five"][data-index="' + id_say + '"]').prop("checked", true).trigger('change');
@@ -1216,6 +1217,9 @@
1216
1217
  </th>
1217
1218
  <th data-name="opt_say_two" style="background: #174475; width: 40px" data-type="checkbox" class="">2
1218
1219
  </th>
1220
+ <th data-name="opt_say_aborted" style="background: #174475; width: 40px" data-type="checkbox"
1221
+ class="">
1222
+ x</th>
1219
1223
  <th data-name="opt_say_three" style="background: #174475; width: 40px" data-type="checkbox"
1220
1224
  class="">3
1221
1225
  </th>
@@ -1263,6 +1267,11 @@
1263
1267
  <textarea id="text_deactivated" class="materialize-textarea value"></textarea>
1264
1268
  <label for="text_deactivated" class="translate">text_deactivated</label>
1265
1269
  </div>
1270
+ <div class="input-field col s12">
1271
+ <i class="material-icons prefix">highlight_off</i>
1272
+ <textarea id="text_aborted" class="materialize-textarea value"></textarea>
1273
+ <label for="text_aborted" class="translate">text_aborted</label>
1274
+ </div>
1266
1275
  <div class="input-field col s12">
1267
1276
  <i class="material-icons prefix">filter_3</i>
1268
1277
  <textarea id="text_failed" class="materialize-textarea value"></textarea>
@@ -1459,6 +1468,11 @@
1459
1468
  <textarea id="log_deact" class="materialize-textarea value"></textarea>
1460
1469
  <label for="log_deact" class="translate">log_deact</label>
1461
1470
  </div>
1471
+ <div class="input-field col s12">
1472
+ <i class="material-icons prefix">edit</i>
1473
+ <textarea id="log_aborted" class="materialize-textarea value"></textarea>
1474
+ <label for="log_aborted" class="translate">log_aborted</label>
1475
+ </div>
1462
1476
  <div class="input-field col s12">
1463
1477
  <i class="material-icons prefix">edit</i>
1464
1478
  <textarea id="log_warn_act" class="materialize-textarea value"></textarea>
package/admin/words.js CHANGED
@@ -49,18 +49,6 @@ systemDictionary = {
49
49
  'pl': 'cichy alarm ostry w środku',
50
50
  'zh-cn': '静音报警尖锐内部'
51
51
  },
52
- 'speech_delay': {
53
- 'en': 'delay (sec)',
54
- 'de': 'Verzögerung (Sek.)',
55
- 'ru': 'задержка (сек)',
56
- 'pt': 'atraso (s)',
57
- 'nl': 'vertraging (sec)',
58
- 'fr': 'délai (sec)',
59
- 'it': 'ritardo (sec)',
60
- 'es': 'retraso (seg)',
61
- 'pl': 'opóźnienie (sek)',
62
- 'zh-cn': '延迟（秒）'
63
- },
64
52
  'disabled': { 'en': 'disabled', 'de': 'deaktiviert', 'ru': 'отключен', 'pt': 'Desativado', 'nl': 'invalide', 'fr': 'désactivée', 'it': 'Disabilitato', 'es': 'discapacitado', 'pl': 'wyłączone', 'zh-cn': '残' },
65
53
  'donat': {
66
54
  'en': "I'm not a professional developer and this is a private project, the development takes place in my spare time, if you want to support this you can thank me with a donation under PayPal. You are also welcome to send me feature requests for future versions of the adapter.",
@@ -104,6 +92,18 @@ systemDictionary = {
104
92
  'pl': 'Zostawić',
105
93
  'zh-cn': '离开'
106
94
  },
95
+ 'log_aborted': {'en': 'Activation aborted',
96
+ 'de': 'Aktivierung abgebrochen',
97
+ 'ru': 'Активация прервана',
98
+ 'pt': 'Ativação abortada',
99
+ 'nl': 'Activering afgebroken',
100
+ 'fr': 'Activation interrompue',
101
+ 'it': 'Attivazione annullata',
102
+ 'es': 'Activación abortada',
103
+ 'pl': 'Przerwana aktywacja',
104
+ 'uk': 'Активація',
105
+ 'zh-cn': '激活中止'
106
+ },
107
107
  'log_act': { 'en': 'Activated', 'de': 'Aktiviert', 'ru': 'активированная', 'pt': 'ativado', 'nl': 'Geactiveerd', 'fr': 'Activé', 'it': 'attivato', 'es': 'Activado', 'pl': 'Aktywowany', 'zh-cn': '活性' },
108
108
  'log_act_not': { 'en': 'Can not activate', 'de': 'Kann nicht aktiviert werden', 'ru': 'Не может активировать', 'pt': 'Não é possível ativar', 'nl': 'Kan niet activeren', 'fr': "Impossible d'activer", 'it': 'Impossibile attivare', 'es': 'No se puede activar', 'pl': 'Nie można aktywować', 'zh-cn': '无法激活' },
109
109
  'log_act_warn': { 'en': 'Activated with warnings', 'de': 'Mit Warnungen aktiviert', 'ru': 'Активируется с предупреждениями', 'pt': 'Ativado com avisos', 'nl': 'Geactiveerd met waarschuwingen', 'fr': 'Activé avec des avertissements', 'it': 'Attivato con avvisi', 'es': 'Activado con advertencias', 'pl': 'Aktywowany z ostrzeżeniami', 'zh-cn': '警告激活' },
@@ -346,7 +346,32 @@ systemDictionary = {
346
346
  'pl': 'częstotliwość światła błyskowego przy cichym alarmie',
347
347
  'zh-cn': '静音时出现闪光灯频率'
348
348
  },
349
+ 'speech_delay': {
350
+ 'en': 'delay',
351
+ 'de': 'verzögerung',
352
+ 'ru': 'отсрочка',
353
+ 'pt': 'atraso',
354
+ 'nl': 'vertraging',
355
+ 'fr': 'retard',
356
+ 'it': 'ritardo',
357
+ 'es': 'demora',
358
+ 'pl': 'opóźnienie',
359
+ 'uk': 'затримка',
360
+ 'zh-cn': '延迟'
361
+ },
349
362
  'states': { 'en': 'monitoring', 'de': 'Überwachung', 'ru': 'состояния', 'pt': 'Estados', 'nl': 'Staten', 'fr': 'États', 'it': 'stati', 'es': 'Estados', 'pl': 'Stany Zjednoczone', 'zh-cn': '状态' },
363
+ 'text_aborted': {'en': 'Activation aborted',
364
+ 'de': 'Aktivierung abgebrochen',
365
+ 'ru': 'Активация прервана',
366
+ 'pt': 'Ativação abortada',
367
+ 'nl': 'Activering afgebroken',
368
+ 'fr': 'Activation interrompue',
369
+ 'it': 'Attivazione annullata',
370
+ 'es': 'Activación abortada',
371
+ 'pl': 'Przerwana aktywacja',
372
+ 'uk': 'Активація',
373
+ 'zh-cn': '激活中止'
374
+ },
350
375
  'text_activated': { 'en': 'Phrase after activation', 'de': 'Satz nach Aktivierung', 'ru': 'Фраза после активации', 'pt': 'Frase após ativação', 'nl': 'Zin na activering', 'fr': 'Phrase après activation', 'it': "Frase dopo l'attivazione", 'es': 'Frase después de la activación', 'pl': 'Zdanie po aktywacji', 'zh-cn': '激活后的短语' },
351
376
  'text_alarm': { 'en': 'Phrase at burgle', 'de': 'Satz bei Einbruch', 'ru': 'Фраза в бургле', 'pt': 'Frase no burgle', 'nl': 'Zin in inbraak', 'fr': 'Phrase à burgle', 'it': 'Frase al burgle', 'es': 'Frase en Burgle', 'pl': 'Zdanie w burgle', 'zh-cn': '在burgle的短语' },
352
377
  'text_alarm_pause': {
package/io-package.json CHANGED
@@ -1,8 +1,21 @@
1
1
  {
2
2
  "common": {
3
3
  "name": "alarm",
4
- "version": "3.4.3",
4
+ "version": "3.5.0",
5
5
  "news": {
6
+ "3.5.0": {
7
+ "en": "added activation aborted speech output",
8
+ "de": "zusätzliche aktivierung abgebrochene sprachausgabe",
9
+ "ru": "добавленная активация прерванный выход речи",
10
+ "pt": "adicionada ativação abortada saída de fala",
11
+ "nl": "toegevoegde activering afgebroken spraakuitvoer",
12
+ "fr": "ajout d'une sortie vocale avortée d'activation",
13
+ "it": "attivazione aggiunta abortire uscita del discorso",
14
+ "es": "añadida activación abortada discurso salida",
15
+ "pl": "dodana aktywacja przerwane wyjście mowy",
16
+ "uk": "додана активація прискореного виходу мови",
17
+ "zh-cn": "添加激活中止的语音输出"
18
+ },
6
19
  "3.4.3": {
7
20
  "en": "added silent_alarm (state list) to shortcuts",
8
21
  "de": "stumm_alarm (stateliste) zu shortcuts hinzugefügt",
@@ -80,19 +93,6 @@
80
93
  "pl": "zbieramy wybrane popupy i mało problemów na stronach",
81
94
  "uk": "виправлений вибір спливаючого спливаючого та маленького питання щодо налаштування сторінок",
82
95
  "zh-cn": "b. 固定选择的居民人数和很少的问题"
83
- },
84
- "3.3.11": {
85
- "en": "fixed issue at night rest",
86
- "de": "festes problem bei nachtruhe",
87
- "ru": "фиксированная проблема в ночной отдых",
88
- "pt": "problema fixo no descanso noturno",
89
- "nl": "'s nachts rust",
90
- "fr": "problème fixe au repos nocturne",
91
- "it": "problema fisso al riposo notturno",
92
- "es": "tema fijo en el descanso nocturno",
93
- "pl": "trwały problem w nocy",
94
- "uk": "виправлено проблему в нічному режимі",
95
- "zh-cn": "夜间固定问题休息"
96
96
  }
97
97
  },
98
98
  "title": "Alarm",
@@ -225,6 +225,7 @@
225
225
  "text_countdown": "Sekunden bis zur Aktivierung",
226
226
  "text_one": "Alarmanlage meldet einen Feueralarm:",
227
227
  "text_two": "Alarmanlage meldet einen Wasseralarm:",
228
+ "text_aborted": "Aktivierung abgebrochen",
228
229
  "password": "",
229
230
  "sendTo": "",
230
231
  "alarm": "",
@@ -250,6 +251,7 @@
250
251
  "log_nights_b_w": "Nachtruhe beginnt mit Warnungen:",
251
252
  "log_one": "Alarmanlage meldet einen Feueralarm:",
252
253
  "log_two": "Alarmanlage meldet einen Wasseralarm:",
254
+ "log_aborted": "Aktivierung abgebrochen",
253
255
  "one_name": "Feueralarm",
254
256
  "two_name": "Wasseralarm",
255
257
  "log_zone_one": "Veränderungen in Zone eins",
package/main.js CHANGED
@@ -1059,6 +1059,11 @@ class Alarm extends utils.Adapter {
1059
1059
  this.speechOutput(ele.name_id, message, ele.speech_delay);
1060
1060
  }
1061
1061
  break;
1062
+ case 14:
1063
+ if (ele.opt_say_aborted) {
1064
+ this.speechOutput(ele.name_id, message, ele.speech_delay);
1065
+ }
1066
+ break;
1062
1067
  default:
1063
1068
  this.log.debug(`no speech output!`);
1064
1069
  }
@@ -1652,6 +1657,8 @@ class Alarm extends utils.Adapter {
1652
1657
  this.setState('status.activation_countdown', null, true);
1653
1658
  this.setState('status.gets_activated', false, true);
1654
1659
  this.setState('status.state_list', 7, true);
1660
+ this.sayit(this.config.text_aborted, 14);
1661
+ if (log) this.log.info(`${this.config.log_aborted}`);
1655
1662
  }
1656
1663
  this.disableSystem();
1657
1664
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker.alarm",
3
- "version": "3.4.3",
3
+ "version": "3.5.0",
4
4
  "description": "Your own lttle alarm system",
5
5
  "author": {
6
6
  "name": "misanorot",
@@ -26,28 +26,28 @@
26
26
  "suncalc2": "^1.8.1"
27
27
  },
28
28
  "devDependencies": {
29
- "@alcalzone/release-script": "^3.6.0",
29
+ "@alcalzone/release-script": "^3.7.0",
30
30
  "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
31
- "@alcalzone/release-script-plugin-license": "^3.5.9",
32
- "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
31
+ "@alcalzone/release-script-plugin-license": "^3.7.0",
32
+ "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
33
33
  "@iobroker/adapter-dev": "^1.2.0",
34
34
  "@iobroker/testing": "^4.1.0",
35
35
  "@tsconfig/node16": "^16.1.1",
36
36
  "@types/chai": "^4.3.6",
37
37
  "@types/chai-as-promised": "^7.1.7",
38
38
  "@types/mocha": "^10.0.1",
39
- "@types/node": "^20.8.10",
40
- "@types/proxyquire": "^1.3.30",
39
+ "@types/node": "^20.10.6",
40
+ "@types/proxyquire": "^1.3.31",
41
41
  "@types/sinon": "^10.0.15",
42
- "@types/sinon-chai": "^3.2.11",
42
+ "@types/sinon-chai": "^3.2.12",
43
43
  "chai": "^4.3.10",
44
44
  "chai-as-promised": "^7.1.1",
45
- "eslint": "^8.50.0",
45
+ "eslint": "^8.56.0",
46
46
  "mocha": "^10.2.0",
47
47
  "proxyquire": "^2.1.3",
48
48
  "sinon": "^15.2.0",
49
49
  "sinon-chai": "^3.7.0",
50
- "typescript": "~5.2.2"
50
+ "typescript": "~5.3.3"
51
51
  },
52
52
  "main": "main.js",
53
53
  "files": [