release v3.3.17

grzegorz914 · Sep 24, 2024 · 1e0bb2b · 1e0bb2b
1 parent 257b811
commit 1e0bb2b
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - do not configure it manually, always using Config UI X
   - required Homebridge v2.0.0 and above
 
+## [3.3.17] - (24.09.2024)
+
+## Changes
+
+- fix operation mode for ATA - Thermostat if device go to OFF
+- move some error to warn
+- cleanup    
+
 ## [3.3.16] - (23.09.2024)
 
 ## Changes

diff --git a/index.js b/index.js
@@ -146,7 +146,7 @@ class MelCloudPlatform {
 							await airConditioner.start();
 						};
 					} catch (error) {
-						log.error(`Account: ${accountName}, ATA did finish launching error: ${error.message ?? error}`);
+						log.error(`Account: ${accountName}, ATA did finish launching error: ${error}`);
 					}
 
 					//Heat Pump 1
@@ -191,7 +191,7 @@ class MelCloudPlatform {
 							await heatPump.start();
 						};
 					} catch (error) {
-						log.error(`Account: ${accountName}, ATW did finish launching error: ${error.message ?? error}`);
+						log.error(`Account: ${accountName}, ATW did finish launching error: ${error}`);
 					}
 
 					//Energy Recovery Ventilation 3
@@ -236,10 +236,10 @@ class MelCloudPlatform {
 							await energyRecoveryVentilation.start();
 						};
 					} catch (error) {
-						log.error(`Account: ${accountName}, ERV did finish launching error: ${error.message ?? error}`);
+						log.error(`Account: ${accountName}, ERV did finish launching error: ${error}`);
 					}
 				} catch (error) {
-					log.error(`Account: ${accountName}, did finish launching error: ${error.message ?? error}`);
+					log.error(`Account: ${accountName}, did finish launching error: ${error}`);
 				}
 			};
 		});

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.3.16",
+  "version": "3.3.17",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

diff --git a/src/deviceata.js b/src/deviceata.js
@@ -126,7 +126,7 @@ class DeviceAta extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('RESTFul', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `RESTFul set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -165,7 +165,7 @@ class DeviceAta extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('MQTT', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `MQTT set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -180,7 +180,7 @@ class DeviceAta extends EventEmitter {
                     }
 
                 } catch (error) {
-                    this.emit('warn', `External integration start error: ${error.message || error}.`);
+                    this.emit('warn', `External integration start error: ${error}.`);
                 };
             })
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
@@ -324,7 +324,7 @@ class DeviceAta extends EventEmitter {
                                     this.accessory.targetOperationMode = 2;
                                     break;
                                 default:
-                                    this.emit('warn', `Received unknown operating mode: ${operationMode}`);
+                                    this.emit('warn', `Unknown operating mode: ${operationMode}`);
                                     return
                             };
 
@@ -413,7 +413,8 @@ class DeviceAta extends EventEmitter {
                                     break;
                             };
 
-                            this.accessory.currentOperationMode = !power ? 0 : inStandbyMode ? 0 : this.accessory.currentOperationMode;
+                            this.accessory.currentOperationMode = !power ? 0 : this.accessory.currentOperationMode;
+                            this.accessory.targetOperationMode = !power ? 0 : this.accessory.targetOperationMode;
                             this.accessory.operationModeSetPropsMinValue = 0
                             this.accessory.operationModeSetPropsMaxValue = modelSupportsAuto && modelSupportsHeat ? 3 : !modelSupportsAuto && modelSupportsHeat ? 2 : modelSupportsAuto && !modelSupportsHeat ? 3 : 2;
                             this.accessory.operationModeSetPropsValidValues = modelSupportsAuto && modelSupportsHeat ? [0, 1, 2, 3] : !modelSupportsAuto && modelSupportsHeat ? [0, 1, 2] : modelSupportsAuto && !modelSupportsHeat ? [0, 2, 3] : [0, 2];
@@ -613,7 +614,7 @@ class DeviceAta extends EventEmitter {
                         this.emit('publishAccessory', accessory);
                         this.startPrepareAccessory = false;
                     } catch (error) {
-                        this.emit('error', `Prepare accessory error: ${error.message ?? error}`);
+                        this.emit('error', error);
                     };
                 })
                 .on('message', (message) => {
@@ -637,7 +638,7 @@ class DeviceAta extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Start error: ${error.message ?? error}`);
+            throw new Error(`Start error: ${error}`);
         };
     };
 
@@ -1392,7 +1393,7 @@ class DeviceAta extends EventEmitter {
 
             return accessory;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Prepare accessory error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/deviceatw.js b/src/deviceatw.js
@@ -130,7 +130,7 @@ class DeviceAtw extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('RESTFul', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `RESTFul set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -169,7 +169,7 @@ class DeviceAtw extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('MQTT', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `MQTT set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -183,7 +183,7 @@ class DeviceAtw extends EventEmitter {
                         const mqtt1 = this.mqttConnected ? this.mqtt1.emit('publish', `State`, deviceData.Device) : false;
                     }
                 } catch (error) {
-                    this.emit('warn', `External integration start error: ${error.message || error}.`);
+                    this.emit('warn', `External integration start error: ${error}.`);
                 };
             })
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, hasHotWaterTank, hasZone2) => {
@@ -781,7 +781,7 @@ class DeviceAtw extends EventEmitter {
                                     button.state = (prohibitZone2 === true);
                                     break;
                                 default: //Unknown button
-                                    this.emit('message', `Unknown button mode: ${mode} detected.`);
+                                    this.emit('warn', `Unknown button mode: ${mode} detected.`);
                                     break;
                             };
 
@@ -804,7 +804,7 @@ class DeviceAtw extends EventEmitter {
                         this.emit('publishAccessory', accessory);
                         this.startPrepareAccessory = false;
                     } catch (error) {
-                        this.emit('error', `Prepare accessory error: ${error}`);
+                        this.emit('error', error);
                     };
                 })
                 .on('message', (message) => {
@@ -828,7 +828,7 @@ class DeviceAtw extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`start error: ${error}`);
+            throw new Error(`Start error: ${error}`);
         };
     };
 
@@ -1934,7 +1934,7 @@ class DeviceAtw extends EventEmitter {
 
             return accessory;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Prepare accessory error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/deviceerv.js b/src/deviceerv.js
@@ -124,7 +124,7 @@ class DeviceErv extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('RESTFul', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `RESTFul set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -163,7 +163,7 @@ class DeviceErv extends EventEmitter {
                                     try {
                                         await this.setOverExternalIntegration('MQTT', deviceData, key, value);
                                     } catch (error) {
-                                        this.emit('warn', `MQTT set error: ${error}.`);
+                                        this.emit('warn', error);
                                     };
                                 })
                                 .on('debug', (debug) => {
@@ -177,7 +177,7 @@ class DeviceErv extends EventEmitter {
                         const mqtt1 = this.mqttConnected ? this.mqtt1.emit('publish', `State`, deviceData.Device) : false;
                     }
                 } catch (error) {
-                    this.emit('warn', `External integration start error: ${error.message || error}.`);
+                    this.emit('warn', `External integration start error: ${error}.`);
                 };
             })
                 .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
@@ -381,6 +381,9 @@ class DeviceErv extends EventEmitter {
                                     };
                                     this.accessory.targetOperationMode = 3;
                                     break;
+                                default:
+                                    this.emit('warn', `Unknown ventilation mode: ${ventilationMode}`);
+                                    break;
                             };
 
                             this.accessory.currentOperationMode = !power ? 0 : this.accessory.currentOperationMode;
@@ -512,7 +515,7 @@ class DeviceErv extends EventEmitter {
                                     button.state = (hideOutdoorTemperature === true);
                                     break;
                                 default: //Unknown button
-                                    this.emit('message', `Unknown button mode: ${mode} detected.`);
+                                    this.emit('warn', `Unknown button mode: ${mode} detected.`);
                                     break;
                             };
 
@@ -554,7 +557,7 @@ class DeviceErv extends EventEmitter {
                         this.emit('publishAccessory', accessory);
                         this.startPrepareAccessory = false;
                     } catch (error) {
-                        this.emit('error', `Prepare accessory error: ${error}`);
+                        this.emit('error', error);
                     };
                 })
                 .on('message', (message) => {
@@ -578,7 +581,7 @@ class DeviceErv extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`start error: ${error}`);
+            throw new Error(`Start error: ${error}`);
         };
     };
 
@@ -1251,7 +1254,7 @@ class DeviceErv extends EventEmitter {
 
             return accessory;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Prepare accessory error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/melcloud.js b/src/melcloud.js
@@ -36,7 +36,7 @@ class MelCloud extends EventEmitter {
                 try {
                     await this.chackDevicesList(this.contextKey);
                 } catch (error) {
-                    this.emit('error', `Check devices list: ${error}.`);
+                    this.emit('error', `Impulse generator error: ${error}.`);
                 };
             }).on('state', (state) => { });
         };
@@ -114,7 +114,7 @@ class MelCloud extends EventEmitter {
 
             return obj;
         } catch (error) {
-            throw new Error(`Connect to MELCloud error: ${error.message ?? error}.`);
+            throw new Error(`Connect to MELCloud error: ${error.message || error}.`);
         };
     }
 
@@ -179,7 +179,7 @@ class MelCloud extends EventEmitter {
 
             return devices;
         } catch (error) {
-            throw new Error(`Scanning for devices error: ${error.message ?? error}.`);
+            throw new Error(`Check devices list error: ${error.message || error}.`);
         };
     }
 
@@ -189,7 +189,7 @@ class MelCloud extends EventEmitter {
             const debug3 = this.enableDebugMode ? this.emit('debug', `Data saved to: ${path}.`) : false;
             return true;
         } catch (error) {
-            throw new Error(`Save data error: ${error.message ?? error}`);
+            throw new Error(`Save data error: ${error.message || error}`);
         }
     }
 
@@ -203,7 +203,7 @@ class MelCloud extends EventEmitter {
             await this.saveData(this.accountFile, accountInfo);
             return true;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Send data error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/melcloudata.js b/src/melcloudata.js
@@ -37,7 +37,7 @@ class MelCloudAta extends EventEmitter {
             try {
                 await this.checkState();
             } catch (error) {
-                this.emit('error', `Impulse generator check state error: ${error.message || error}.`);
+                this.emit('error', `Impulse generator error: ${error}.`);
             };
         }).on('state', (state) => { });
     };
@@ -363,7 +363,7 @@ class MelCloudAta extends EventEmitter {
             const data = savedData.length > 0 ? JSON.parse(savedData) : false;
             return data;
         } catch (error) {
-            throw new Error(`Read data error: ${error.message ?? error}`);
+            throw new Error(`Read data error: ${error.message || error}`);
         }
     }
 
@@ -432,7 +432,7 @@ class MelCloudAta extends EventEmitter {
             this.emit('deviceState', deviceData);
             return true;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Send data error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/melcloudatw.js b/src/melcloudatw.js
@@ -37,7 +37,7 @@ class MelCloudAtw extends EventEmitter {
             try {
                 await this.checkState();
             } catch (error) {
-                this.emit('error', `Impulse generator check state error: ${error.message || error}.`);
+                this.emit('error', `Impulse generator error: ${error}.`);
             };
         }).on('state', (state) => { });
     };
@@ -427,7 +427,7 @@ class MelCloudAtw extends EventEmitter {
             const data = savedData.length > 0 ? JSON.parse(savedData) : false;
             return data;
         } catch (error) {
-            throw new Error(`Read data error: ${error.message ?? error}`);
+            throw new Error(`Read data error: ${error.message || error}`);
         }
     }
 
@@ -483,7 +483,7 @@ class MelCloudAtw extends EventEmitter {
             this.emit('deviceState', deviceData);
             return true;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Send data error: ${error.message || error}`);
         };
     };
 };

diff --git a/src/melclouderv.js b/src/melclouderv.js
@@ -37,7 +37,7 @@ class MelCloudErv extends EventEmitter {
             try {
                 await this.checkState();
             } catch (error) {
-                this.emit('error', `Impulse generator check state error: ${error.message || error}.`);
+                this.emit('error', `Impulse generator error: ${error}.`);
             };
         }).on('state', (state) => { });
     };
@@ -351,9 +351,10 @@ class MelCloudErv extends EventEmitter {
             const data = savedData.length > 0 ? JSON.parse(savedData) : false;
             return data;;
         } catch (error) {
-            throw new Error(`Read data error: ${error.message ?? error}`);
+            throw new Error(`Read data error: ${error.message || error}`);
         }
     }
+
     async send(deviceData, displayMode) {
         try {
             //set target temp based on display mode and ventilation mode
@@ -404,7 +405,7 @@ class MelCloudErv extends EventEmitter {
             this.emit('deviceState', deviceData);
             return true;
         } catch (error) {
-            throw new Error(error.message ?? error);
+            throw new Error(`Send data error: ${error.message || error}`);
         };
     };
 };