2.6.3

- Added code for water out thermometer
hjuhlin · Jul 22, 2024 · dd70a03 · dd70a03
1 parent 4ca2eb7
commit dd70a03
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,9 @@ This is a plugin for Aqua Temp pool heater.
 2.6.2
 - Added code for finding devices in shared lists. 
 
+2.6.3
+- Added code for water out thermometer
+
 # Default config
 
 ```json
@@ -64,6 +67,7 @@ This is a plugin for Aqua Temp pool heater.
         "Password": "[Password]",
         "UpdateTime": 60,
         "ViewWaterThermometer": false,
+        "ViewWaterOutThermometer": false,
         "ViewElectricPowerUsage": false,
         "PowerConsumptionLimit": 0,
         "Debug": false,

diff --git a/config.schema.json b/config.schema.json
@@ -30,11 +30,17 @@
         "default": 60
       } ,
       "ViewWaterThermometer": {
-        "title": "Extra thermometer for water temperature",
+        "title": "Extra thermometer for water IN temperature",
         "type": "boolean",
         "required": false,
         "default": false
-      },    
+      },   
+      "ViewWaterOutThermometer": {
+        "title": "Extra thermometer for water OUT temperature",
+        "type": "boolean",
+        "required": false,
+        "default": false
+      },           
       "ViewElectricPowerUsage": {
         "title": "View electric power usage (only works in Eve app)",
         "type": "boolean",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "private": false,
   "displayName": "Aqua Temp Plugin",
   "name": "homebridge-aqua-temp",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "This is a plugin for Aqua Temp pool heater.",
   "license": "Apache-2.0",
   "repository": {

diff --git a/src/platform.ts b/src/platform.ts
@@ -98,24 +98,41 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
               device.deviceNickName = deviceNickName;
 
               if (codeData.code ==='T02') {
-                if (this.config['Debug'] as boolean) {
-                  this.log.info('Update temperature for ' + device.deviceNickName + ': '+codeData.value);
-                }
+                if (this.config['ViewWaterThermometer'] as boolean === true) {
+                  if (this.config['Debug'] as boolean) {
+                    this.log.info('Update water IN temperature for ' + device.deviceNickName + ': '+codeData.value);
+                  }
 
-                if (codeData.value!==null) {
-                  currentTemp = parseFloat(codeData.value);
+                  if (codeData.value!==null) {
+                    currentTemp = parseFloat(codeData.value);
 
-                  thermostatService.updateCharacteristic(this.Characteristic.CurrentTemperature, codeData.value);
+                    thermostatService.updateCharacteristic(this.Characteristic.CurrentTemperature, codeData.value);
 
-                  if (this.config['ViewWaterThermometer'] as boolean === true) {
                     const thermometerObjectWater = this.getAccessory(device, 'thermometerwater');
                     const thermometerServiceWater = thermometerObjectWater.accessory.getService(this.Service.TemperatureSensor);
 
                     if (thermometerServiceWater!==undefined) {
-                      if (this.config['Debug'] as boolean) {
-                        this.log.info('Update water temperature for ' + device.deviceNickName + ': '+codeData.value);
-                      }
+                      thermometerServiceWater.updateCharacteristic(this.Characteristic.CurrentTemperature, codeData.value);
+                    }
+                  }
+                }
+              }
 
+              if (codeData.code ==='T03') {
+                if (this.config['ViewWaterOutThermometer'] as boolean === true) {
+                  if (this.config['Debug'] as boolean) {
+                    this.log.info('Update water OUT temperature for ' + device.deviceNickName + ': '+codeData.value);
+                  }
+
+                  if (codeData.value!==null) {
+                    currentTemp = parseFloat(codeData.value);
+
+                    thermostatService.updateCharacteristic(this.Characteristic.CurrentTemperature, codeData.value);
+
+                    const thermometerObjectWater = this.getAccessory(device, 'thermometerwaterout');
+                    const thermometerServiceWater = thermometerObjectWater.accessory.getService(this.Service.TemperatureSensor);
+
+                    if (thermometerServiceWater!==undefined) {
                       thermometerServiceWater.updateCharacteristic(this.Characteristic.CurrentTemperature, codeData.value);
                     }
                   }
@@ -262,6 +279,9 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
           this.log.error(deviceResult.error_code);
           this.log.error(deviceResult.error_msg_code);
         }
+      }).catch((error) => {
+        this.log.error('GetDeviceStatus', 'Caught error');
+        this.log.error(error);
       });
     }
 
@@ -304,7 +324,9 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
         } else {
           this.log.error('Error login in!');
         }
-
+      }).catch((error) => {
+        this.log.error('Login', 'Caught error');
+        this.log.error(error);
       });
     }
 
@@ -386,6 +408,12 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
         this.addOrRestorAccessory(waterObject.accessory, device.deviceNickName, 'thermometerwater', waterObject.exists);
       }
 
+      if (this.config['ViewWaterOutThermometer'] as boolean === true) {
+        const waterObject = this.getAccessory(device, 'thermometerwaterout');
+        new ThermometerAccessory(this, waterObject.accessory, device, this.config, this.log, 'waterout');
+        this.addOrRestorAccessory(waterObject.accessory, device.deviceNickName, 'thermometerwaterout', waterObject.exists);
+      }
+
       const thermostatObject = this.getAccessory(device, 'thermostat');
       if (this.config['EveLoging'] as boolean === true) {
         const fakeGatoService = new this.FakeGatoHistoryService('custom', thermostatObject.accessory,
@@ -404,7 +432,8 @@ export class AquaTempHomebridgePlatform implements DynamicPlatformPlugin {
       for (const device of deviceList) {
         if (accessory.UUID === this.localIdForType(device, 'thermostat') ||
             accessory.UUID === this.localIdForType(device, 'thermometer') ||
-            accessory.UUID === this.localIdForType(device, 'thermometerwater')) {
+            accessory.UUID === this.localIdForType(device, 'thermometerwater') ||
+            accessory.UUID === this.localIdForType(device, 'thermometerwaterout')) {
           found = true;
         }
       }

diff --git a/src/utils/httprequest.ts b/src/utils/httprequest.ts
@@ -123,7 +123,7 @@ export class HttpRequest {
           body: {
             device_code: deviceCode,
             appId: '14',
-            protocal_codes: ['T02', 'T05', 'T12', 'R02', 'power', 'Manual-mute'],
+            protocal_codes: ['T02', 'T03', 'T05', 'T12', 'R02', 'power', 'Manual-mute'],
           },
           json: true,
         }, (error, response, body) => {