Skip to content

Fix for the new version of enocean-mqtt #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix for the new version of enocean-mqtt #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ RUN apk add --no-cache git && \
python3 -m pip install --upgrade pip && \
pip3 install pyyaml==6.0.1 && \
pip3 install tinydb==4.7.1 && \
pip3 install paho-mqtt==1.6.1 && \
pip3 install git+https://github.com/mak-gitdev/enocean.git && \
git clone -b master --single-branch --depth 1 https://github.com/embyt/enocean-mqtt.git && \
cd enocean-mqtt && python3 setup.py develop && cd .. && \
Expand Down
8 changes: 4 additions & 4 deletions enoceanmqtt/overlays/homeassistant/ha_communicator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ def __init__(self, config, sensors):
#=============================================================================================
# MQTT CLIENT
#=============================================================================================
def _on_connect(self, mqtt_client, _userdata, _flags, return_code):
def _on_connect(self, mqtt_client, _userdata, _flags, reason_code, properties):
'''callback for when the client receives a CONNACK response from the MQTT server.'''
if return_code == 0:
if reason_code == 0:
logging.info("Succesfully connected to MQTT broker.")
# listen to enocean send requests
for cur_sensor in self.sensors:
Expand Down Expand Up @@ -140,8 +140,8 @@ def _on_connect(self, mqtt_client, _userdata, _flags, return_code):
self._first_mqtt_connect = False
else:
logging.error("Error connecting to MQTT broker: %s",
self.CONNECTION_RETURN_CODE[return_code]
if return_code < len(self.CONNECTION_RETURN_CODE) else return_code)
self.CONNECTION_RETURN_CODE[reason_code]
if reason_code < len(self.CONNECTION_RETURN_CODE) else reason_code)

def _on_mqtt_message(self, _mqtt_client, _userdata, msg):
'''the callback for when a PUBLISH message is received from the MQTT server.'''
Expand Down
2 changes: 0 additions & 2 deletions standalone/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ pip3 install --user --force-reinstall git+https://github.com/mak-gitdev/enocean.
printf "\n==================================================\n"
printf "Install enocean-mqtt\n\n"
rm -rf enocean-mqtt
# Quick Fix issue for issue mak-gitdev/HA_enoceanmqtt#122 (Force use of 1.6.1 as >=2.0.0 break enoceanmqtt)
package_install paho-mqtt==1.6.1
git clone -b master --single-branch --depth 1 https://github.com/embyt/enocean-mqtt.git
cd enocean-mqtt && pip3 install --user -e . && cd ..

Expand Down