This commit is contained in:
Andreas Billmeier 2020-06-20 18:46:22 +02:00 committed by Andreas Billmeier
parent 28beb40bf4
commit ee8a3ec9b8
Signed by: onkelbeh
GPG Key ID: E6DB12C8C550F3C0
4 changed files with 54 additions and 8 deletions

View File

@ -17,6 +17,7 @@
* fix typo in axis-3[1,2] ebuilds
* update pycognito-0.1.3
* remove python-jose dep from pycognito due to fileconflicts with python-jose-cryptodome
* repaired the old maxcube_hack again for https://github.com/home-assistant/core/pull/30420
2020-06-18
* throw out more old Python 3.6 stuff from README.md

View File

@ -3,6 +3,7 @@ AUX homeassistant.conf.d 289 BLAKE2B f4a85e5a451a254a8ef39ae481275eb93b52df645d5
AUX homeassistant.init.d 922 BLAKE2B 0ff290187ca08f0a2afe011e9284f91c25722f4d2a97e4d26cf6cf06b56f66caa30c777bf1b4f7a32ebdde644a3d8b2e5c625bd86f70601548d886deb54c9a50 SHA512 78328ec822f43c04b614e63b27625c0fff75419203080b651c881ea91ea00dc32eb62273c23e3e150a5c22c952bcd86a929b10e92a0e3b24540d2ae66909216d
AUX homeassistant.logrotate 186 BLAKE2B 260c2260bffc1bd164499beb2d63168c1d7bf838c586f1dbd782e9d6d88ee641f187ff0ea38b587db2f8de986a0f3cf75ee170779ac218e890fb6daf520f482d SHA512 917a4a33747c195e9d7477846f846a79d56b5cce37aa0bfb417d1d9acd24a2c106d9f2d348e1f779e3ef4e778fc5fdcbea26b56c91a0d84615ea7d7f55fc2f56
AUX homeassistant.service 261 BLAKE2B 54819aa30aa5564aca693fa2dd70ad4a9831929a33f1042542e2555fa1ec2cb5cefd746b6abc308bc970f627803279dc3caf5fbf3de5c94b3fd73760e1343a38 SHA512 83f6ba1782f844c290f349ff50bdea8d8d88d41e2f39f3f7d5a015a0f463a4c8f7328acbd3838380cf6ca78090b39ebdbeb5e3f39607b5e307c0e53ff55ee697
AUX maxcube_TypeError_01114_dirty_hack.patch 2264 BLAKE2B d4287d558066962e331e91839ac9008bdaa3b41bfccd634d79479b3d35716e2defedfa311d06143fd2d97a253965dd3b78a9b8097d9ed961a0616fbebbc3761c SHA512 3b7264dd59df521bcc2b3a3e449960d59eb85c9a91fafbe022d63f5e5c3308a17e3f171a33dcef116bf9fe0ccd4302a5357e5bf92a72870ceddd1f306c2be29c
AUX maxcube_TypeError_dirty_hack.patch 1460 BLAKE2B 08570971bb3ce4c120086a32ec2048796d705dd3958cf89b28e744089a51531c967c5c54f3deb9c0a39ba68d93e062550c0af44eedf464922ee55435cb01ceac SHA512 1c7a2c45a7eefe6e6cb1b9354e94a0fe0afcfa09f519f6d6237359f67545a438cccf53121850ebf5258519d0adeb3e653159d41f5aea398e5c8f7a8ed07081a5
AUX recorder.yaml 114 BLAKE2B af04840805aa13124208584e7f1d40335905a083ee7deead5c0e4324c969f2a231c801c23e42075782950aba7535496d92747bf03efd73a80b0d07e8492d18f6 SHA512 cb4e353e54fb6dc7034569b8d62ddcdca92680c23c2c4e1ce707d21cf95e93f41a0c44521d8c3ee90b68c830f6b8e65dab82ae64bfa09727ae384550f7de0c94
AUX socat-zwave.init.d 637 BLAKE2B d61c1024a6fe3ce8d322e62ac1ec15e00d08f5c5a63feabc8603ecc51ec16e0a4775e0c7da83d12d1ef0c9815c9ebf8ec8a86a678bb4a3b40decb04adc887f26 SHA512 2b13cd4175427853d5a4169cc7d441d62618e8136e4f5d9fd24d08a47f6916953ebd1e747ea9c7a0907b00766c7b2108ba3b8917178fd9a795da23e6525a0faf
@ -32,6 +33,6 @@ EBUILD homeassistant-0.111.0.ebuild 15113 BLAKE2B a904e6f037b3cae5c989dfa8a7a876
EBUILD homeassistant-0.111.1.ebuild 15113 BLAKE2B 18e2f83fd456d2c3795bb237d7c24030c2950ece5bf103edff1e4b2bb8aa914aaa761cba4b7e73ef1ae4699eb692205dab3ab49dc3bb6855176ad37611aaf832 SHA512 1c36e893a7b0c0ffcd19870a2ed64b4cc51176dac4d011e55e7ab3c2b4b98cd224ea766e10e86a50c947e26819d184e408e283ae173f1f4c6b4dad7d8515599e
EBUILD homeassistant-0.111.2.ebuild 15113 BLAKE2B ca5fc59714b652700f89007fe69fe7bf27ea6bed7fbc4997f82c164b40850f49fbbeb6fee9dc22b2e20f29e997e536deeb496201d56274bcc379732d3e1492bc SHA512 629d6206d6543504f882377a88924e1ae974db6d84a29a6a3c3255e0b7dc467040846e6342b7fb02a0050d7b645af7aa278bd351d25d816208e04cd9c5cbf1a7
EBUILD homeassistant-0.111.3.ebuild 15148 BLAKE2B dd0554c2ba4000d39f41a42591c806593175d9735a339e94eb232a99695c45745e9bce12a8893e161f26b834155c2733c3c57858e08e3eafb6f9241be0d87f41 SHA512 ab16546bfde4850502181fe6c5a44cbb6a03e3678aafe2f19f06ab3fbdfed3fab96352c9a6940114c66eb7c319eb47fdcd02cf30f4095fd378161ab43652acf9
EBUILD homeassistant-0.111.4.ebuild 15210 BLAKE2B 670b3972835e6ab1258c723271402a298674b7e7309f232cccb0a3ad2b3f65051d84de51c66478809d9225699830e89a074aeb1f1b40391386e66616bf099d21 SHA512 58e7d619828659e59f6b7fc0f0f0583918f61b71423d8ea6ebe73f2e79a1b9ff6baec6ee8c194340b8d6aacba2ca25c5394f9c69a25d84536172924354ed63cd
EBUILD homeassistant-0.111.4.ebuild 14911 BLAKE2B 16f7f23138382a7bd2b150ccb2f2fff39b10e07f13c7f19ac1d7b35c07f5abedf8f6eae15eafb0247f94bc300a991ab0b4e2bdc0a4efd81e609e058c59230911 SHA512 cfc0d6580af8161ac935a28d20ed6baa933fc5627866ee4eff2da1982b1d50fec9039ef39790d313fdfa6e3f55667f9b50dd8ff46baf0ffd89dcc23a80ddf6d8
MISC homeassistant-9999.off 59945 BLAKE2B 9c278c87a006c376d37de747899c8172d12c0171e3534e7a27a63815535c4e5051d2d60600a3a14f92f76f56d89f013af7e08b8dd092a23a22d6d54bd2f7d1eb SHA512 41453d5f81529ec9fcf1e1514a11b9b42cd01b52eb1d998f4685aac09c0899e8e44b5cfc66da52ae221f2fff71ce80ffb4b8b68e19ed7f1741bb05669862cb5a
MISC metadata.xml 8971 BLAKE2B 3670cacefe172eafadca20d14e426cfa2d1d3797efb02bdaba35f4aaa12dfc206e0d8285dfbe4b5e06d3d2e11ae137123671d7c3f6bb67b47cc5225ea77ee2a8 SHA512 3929d05b2d5800b8dbbcf7ef6057cdbf6cf4d71b2e85c4e8afb0536ca111a844efd23cd93b3c1acf86fc466ec68d91c101367f4bd921a86580e1fc12620ea39f

View File

@ -0,0 +1,50 @@
diff --git a/homeassistant/components/maxcube/binary_sensor.py b/homeassistant/components/maxcube/binary_sensor.py
index b42c96f..6433f8f 100644
--- a/homeassistant/components/maxcube/binary_sensor.py
+++ b/homeassistant/components/maxcube/binary_sensor.py
@@ -17,7 +17,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
name = f"{cube.room_by_id(device.room_id).name} {device.name}"
# Only add Window Shutters
- if cube.is_windowshutter(device):
+ if device.type == 4:
devices.append(MaxCubeShutter(handler, name, device.rf_address))
if devices:
diff --git a/homeassistant/components/maxcube/climate.py b/homeassistant/components/maxcube/climate.py
index 69d9177..c846e91 100644
--- a/homeassistant/components/maxcube/climate.py
+++ b/homeassistant/components/maxcube/climate.py
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
for device in cube.devices:
name = f"{cube.room_by_id(device.room_id).name} {device.name}"
- if cube.is_thermostat(device) or cube.is_wallthermostat(device):
+ if device.type == 1 or device.type == 3:
devices.append(MaxCubeClimate(handler, name, device.rf_address))
if devices:
@@ -173,11 +173,11 @@ class MaxCubeClimate(ClimateEntity):
device = cube.device_by_rf(self._rf_address)
valve = 0
- if cube.is_thermostat(device):
+ if device.type == 1:
valve = device.valve_position
- elif cube.is_wallthermostat(device):
+ elif device.type == 3:
for device in cube.devices_by_room(cube.room_by_id(device.room_id)):
- if cube.is_thermostat(device) and device.valve_position > 0:
+ if device.type == 1 and device.valve_position > 0:
valve = device.valve_position
break
else:
@@ -275,7 +275,7 @@ class MaxCubeClimate(ClimateEntity):
device = cube.device_by_rf(self._rf_address)
attributes = {}
- if cube.is_thermostat(device):
+ if device.type == 1:
attributes[ATTR_VALVE_POSITION] = device.valve_position
return attributes

View File

@ -274,13 +274,7 @@ DOCS="README.rst"
src_prepare() {
# https://github.com/home-assistant/home-assistant/issues/28811
if use maxcube_hack ; then
eapply "${FILESDIR}/maxcube_TypeError_dirty_hack.patch"
#sed -e 's;if cube.is_windowshutter(device);if device.type == 4;' \
# -i components/maxcube/binary_sensor.py \
# || die
#sed -e 's;if cube.is_thermostat(device) or cube.is_wallthermostat(device);if device.type == 3 or device.type == 1;' \
# -i components/maxcube/climate.py \
# || die
eapply "${FILESDIR}/maxcube_TypeError_01114_dirty_hack.patch"
fi
eapply_user
}