Fix ioBroker#653

ioBroker#652
daniel-finger · Dec 27, 2024 · b76622d · b76622d
1 parent 8e44edb
commit b76622d
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/googleHome.js b/lib/googleHome.js
@@ -1774,7 +1774,7 @@ class GoogleHome {
                     } catch (error) {}
                 });
 
-                if (!smartName.ghAttributes && traitEnum[smartName.ghTraits[0]].defaultAttributes) {
+                if ((!(smartName.ghAttributes)) && (traitEnum[smartName.ghTraits[0]].defaultAttributes)) {
                     const defaultAttributes = traitEnum[smartName.ghTraits[0]].defaultAttributes;
                     result[id].attributes = JSON.parse(defaultAttributes);
                     const obj = await this.adapter.getForeignObjectAsync(id);
@@ -1793,7 +1793,9 @@ class GoogleHome {
                         });
                     }
                 } else {
-                    result[id].attributes = {};
+                    if (!smartName.ghAttributes) {
+                        result[id].attributes = {};
+                    }
                 }
             }
 
@@ -2904,11 +2906,8 @@ class GoogleHome {
                                 );
                             }
                             //Workaround for no thermostat mode available
-                            if (responseDev[dev.id].thermostatTemperatureSetpoint) {
-                                if (
-                                    responseDev[dev.id].thermostatTemperatureAmbient >
-                                    responseDev[dev.id].thermostatTemperatureSetpoint
-                                ) {
+                            if (responseDev[dev.id].thermostatTemperatureSetpoint && responseDev[dev.id].thermostatMode === undefined) {
+                                if (responseDev[dev.id].thermostatTemperatureAmbient > responseDev[dev.id].thermostatTemperatureSetpoint) {
                                     responseDev[dev.id].thermostatMode = 'cool';
                                 } else {
                                     responseDev[dev.id].thermostatMode = 'heat';