Skip to content
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

Bug topic direct panel subscription #27

Merged
merged 7 commits into from
Sep 21, 2023
Merged

Bug topic direct panel subscription #27

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfee723
Merge branch 'master' of /~https://github.com/reinhard-brandstaedter/so…
reinhard-brandstaedter Sep 20, 2023
810456f
Dev (#22)
reinhard-brandstaedter Sep 21, 2023
94339c0
Merge branch 'master' of /~https://github.com/reinhard-brandstaedter/so…
reinhard-brandstaedter Sep 21, 2023
185e089
forgot to subscripe topics
reinhard-brandstaedter Sep 21, 2023
c52e2c5
proper parameters
reinhard-brandstaedter Sep 21, 2023
6079373
support multiple panels properly
reinhard-brandstaedter Sep 21, 2023
e198465
Merge branch 'dev' into bug--topic-direct-panel-subscription
reinhard-brandstaedter Sep 21, 2023
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
7 changes: 5 additions & 2 deletions src/solarflow-control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def on_inverter_update(msg):
inverter_values.pop(0)
inverter_values.append(float(msg))

def on_direct_panel(client,msg):
def on_direct_panel(msg):
global direct_panel_values
global direct_panel_power
payload = json.loads(msg.payload.decode())
Expand Down Expand Up @@ -219,7 +219,7 @@ def on_message(client, userdata, msg):
if msg.topic == topic_acinput:
on_inverter_update(msg.payload.decode())
if msg.topic in topics_direct_panel:
on_direct_panel(msg.payload.decode())
on_direct_panel(msg)
if msg.topic == topic_solarflow_solarinput:
on_solarflow_solarinput(msg.payload.decode())
if msg.topic == topic_solarflow_electriclevel:
Expand Down Expand Up @@ -258,6 +258,9 @@ def connect_mqtt() -> mqtt_client:
def subscribe(client: mqtt_client):
for th in topics_house:
client.subscribe(th)

for dp in topics_direct_panel:
client.subscribe(dp)

client.subscribe(topic_acinput)
client.subscribe(topic_solarflow_solarinput)
Expand Down