Merge pull request #133 from Grizzelbee/Development

Development
Grizzelbee · Apr 21, 2021 · 31bd90e · 31bd90e
2 parents eccd5d0 + 7b6df31
commit 31bd90e
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ Here is a list of what these raw values stand for:
 
  | Raw value | State|
  |----------|-------|
-|1| OFF|
+ |1|   OFF|
  |2|   STAND_BY|
  |3|   PROGRAMMED|
  |4|   PROGRAMMED_WAITING_TO_START|
@@ -136,34 +136,47 @@ Here is a list of what these raw values stand for:
  |5 |   Hand iron level 2|
  |6 |   Machine iron|
 
-### ProgramBezeichnung
-
-| Raw value | State| avaliable for |
-|----------|-------|---------------|
-|  1 | "Baumwolle" / "Cotton"  | Washing Machine |
-| 23 | "Oberhemden" /  | Washing Machine |
-| 27 | "Imprägnieren"  /     | Washing Machine |
-| 48 | "Flusen ausspülen"| Washer Dryer |
-| 50 | "Dunkle Wäsche" / | Washer Dryer |
-| 122 | "Express 20" / | Washer Dryer |
-| 123 | "Dunkles / Jeans"  |   Washing Machine |
+### Programmbezeichnung
+
+| Raw value | State                   | available for   |
+|-----------|-------------------------|-----------------|
+|         1 | "Baumwolle" / "Cotton"  | Washing Machine |
+|         3 | "Pflegeleicht"          | Washing Machine |
+|         4 | "Feinwäsche"            | Washing Machine |
+|         8 | "Wolle"                 | Washing Machine |
+|         9 | "Seide"                 | Washing Machine |
+|        21 | "Pumpen/Schleudern"     | Washing Machine |
+|        23 | "Oberhemden"            | Washing Machine |
+|        27 | "Imprägnieren"          | Washing Machine |
+|        29 | "Sportwäsche"           | Washing Machine |
+|        31 | "Automatic plus"        | Washing Machine |
+|        37 | "Outdoor"               | Washing Machine |
+|        48 | "Flusen ausspülen"      | Washer Dryer    |
+|        50 | "Dunkle Wäsche"         | Washer Dryer    |
+|        52 | "Nur Spülen/Stärken"    | Washing Machine |
+|       122 | "Express 20"            | Washer Dryer    |
+|       123 | "Dunkles/Jeans"         | Washing Machine |
 
 ### ProgramPhase
 
-| Raw value | State| avaliable for |
+| Raw value | State| available for |
 |----------|-------|---------------|
 |260 | "Waschen" / "Washing"  | Washing Machine |
 |261 | "Spülen"  / "Rinse"    | Washing Machine |
-|266 | "Schleudern" / "Spinning"| Washing Machine |
-|267 | "Knitterschutz" / ""| Washing Machine |
-|268 |  "Ende" / "End"| Most devices |
+|265 | "Pumpen" | Washing Machine |
+|266 | "Schleudern" / "Spinning" | Washing Machine |
+|267 | "Knitterschutz" / "" | Washing Machine |
+|268 | "Ende" / "End" | Most devices |
 |256 | "Vorbügeln" | Washing Machine |
 |514 | "Trocknen" | Washer Dryer |
 |519 | "Abkühlen" | Washer Dryer |
 |532 | "Flusen ausspülen" | Washer Dryer |
 
 ## Changelog
 
+### V4.0.16 (2021-04-21) (Black Orchid)
+*  (grizzelbee) Fix: Units for EcoFeedback will be shown now, even machine is not running during setup
+
 ### V4.0.15 (2021-04-19) (Moonglow)
 *  (grizzelbee) Fix: [130](https://github.com/Grizzelbee/ioBroker.mielecloudservice/issues/130) targetTemp for fridges and freezers will now correctly been updated in action section with current values
 

diff --git a/io-package.json b/io-package.json
@@ -1,19 +1,19 @@
 {
     "common": {
         "name": "mielecloudservice",
-        "version": "4.0.15",
+        "version": "4.0.16",
         "news": {
-            "4.0.15": {
-                "en": "Bugfix Release - see changelog for details!",
-                "de": "Bugfix Release - Details siehe Changelog!",
-                "ru": "Выпуск исправления ошибок - подробности см. В журнале изменений!",
-                "pt": "Versão de correção de bug - veja o changelog para detalhes!",
-                "nl": "Bugfix Release - zie changelog voor details!",
-                "fr": "Bugfix Release - voir le journal des modifications pour plus de détails!",
-                "it": "Bugfix Release - vedi changelog per i dettagli!",
-                "es": "Versión de corrección de errores: consulte el registro de cambios para obtener más detalles.",
-                "pl": "Wydanie poprawek - szczegóły w dzienniku zmian!",
-                "zh-cn": "错误修正版本-有关详细信息，请参见更改日志！"
+            "4.0.16": {
+                "en": "Bugfix Release - see full changelog since your last version for details!",
+                "de": "Bugfix Release - Bitte sehen Sie sich das vollständige Änderungsprotokoll seit Ihrer aktuell eingesetzten Version an!",
+                "ru": "Выпуск Bugfix - подробности смотрите в полном журнале изменений с момента выхода последней версии!",
+                "pt": "Versão de correção de bug - veja o changelog completo desde sua última versão para detalhes!",
+                "nl": "Bugfix Release - zie het volledige log met wijzigingen sinds uw laatste versie voor details!",
+                "fr": "Bugfix Release - voir le journal des modifications complet depuis votre dernière version pour plus de détails!",
+                "it": "Rilascio bugfix: guarda il log delle modifiche completo dall'ultima versione per i dettagli!",
+                "es": "Versión de corrección de errores: consulte el registro de cambios completo desde su última versión para obtener más detalles.",
+                "pl": "Wydanie poprawek - zobacz pełną listę zmian od ostatniej wersji, aby uzyskać szczegółowe informacje!",
+                "zh-cn": "错误修正版本-自上一版本以来，查看完整的变更日志以获取详细信息！"
             },
             "4.0.0": {
                 "en": "Major Release - Update with care and read the change log!",

diff --git a/miele-Tools.js b/miele-Tools.js
@@ -1530,7 +1530,7 @@ module.exports.createStateEcoFeedbackWater = function(adapter, setup, path, ecoF
                       path + '.EcoFeedback.currentWaterConsumption',
                  'The amount of water used by the current running program up to the present moment.',
                             (ecoFeedback===null? 0: ecoFeedback.currentWaterConsumption.value.valueOf()*1),
-                            (ecoFeedback===null? 0: ecoFeedback.currentWaterConsumption.unit.valueOf()),
+                            ecoFeedback===null? 'l': ecoFeedback.currentWaterConsumption.unit,
                       'value');
     mieleTools.createNumber(adapter,
                             setup,
@@ -1560,7 +1560,7 @@ module.exports.createStateEcoFeedbackEnergy = function(adapter, setup, path, eco
         path + '.EcoFeedback.currentEnergyConsumption',
         'The amount of energy used by the current running program up to the present moment.',
         (ecoFeedback===null? 0: ecoFeedback.currentEnergyConsumption.value.valueOf()*1),
-        (ecoFeedback===null? 0: ecoFeedback.currentEnergyConsumption.unit.valueOf()),
+        ecoFeedback===null? 'kWh': ecoFeedback.currentEnergyConsumption.unit,
         'value.power.consumption'
     );
     mieleTools.createNumber(adapter,

diff --git a/package-lock.json b/package-lock.json