Skip to content

Fix demo mode #26

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

Merged
boadadf merged 1 commit into from
Jan 11, 2026
Merged

Fix demo mode #26

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
62 changes: 46 additions & 16 deletions src/openscada_lite/modules/communication/drivers/mqtt_tasmota_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ def initialize(self, config: dict) -> None:

async def connect(self) -> None:
if self._demo:
print("[MQTT Tasmota Driver] Running in DEMO mode: no real connection")
self._connected = True
if self._status_listener and self._loop:
if self._status_listener:
print("[MQTT Tasmota Driver] DEMO mode: reporting online status")
await self._status_listener(
DriverConnectStatus(
driver_name=self._server_name,
Expand Down Expand Up @@ -114,7 +116,7 @@ async def connect(self) -> None:
async def disconnect(self) -> None:
if self._demo:
self._connected = False
if self._status_listener and self._loop:
if self._status_listener:
await self._status_listener(
DriverConnectStatus(
driver_name=self._server_name,
Expand All @@ -137,7 +139,16 @@ def subscribe(self, datapoints: List[Datapoint]) -> None:

async def send_command(self, data: SendCommandMsg) -> None:
if self._demo:
# Simulate immediate feedback and status update
# Compute effective command value (handles TOGGLE and casing)
identifier = data.datapoint_identifier
dp_name = identifier.split("@", 1)[1] if "@" in identifier else identifier
relay_key = dp_name.replace("_CMD", "")

desired_value = self._resolve_effective_value(relay_key, data.value)
# Mutate DTO so feedback reflects effective value consistently
data.value = desired_value

# Simulate immediate feedback
if self._feedback_listener:
await self._feedback_listener(
CommandFeedbackMsg(
Expand All @@ -148,13 +159,17 @@ async def send_command(self, data: SendCommandMsg) -> None:
timestamp=datetime.datetime.now(),
)
)

# Simulate status update
relay_key = data.datapoint_identifier.split("@", 1)[1].replace("_CMD", "")

# Track last known status
if isinstance(desired_value, str):
self._relay_status[relay_key] = desired_value
if self._value_listener:
await self._value_listener(
RawTagUpdateMsg(
datapoint_identifier=f"{self._server_name}@{relay_key}_STATUS",
value=data.value,
value=desired_value,
timestamp=datetime.datetime.now(),
)
)
Expand All @@ -180,17 +195,8 @@ async def send_command(self, data: SendCommandMsg) -> None:
power=power,
)

# Handle TOGGLE: compute explicit ON/OFF based on current status
desired_value = data.value
if isinstance(desired_value, str) and desired_value.upper() == "TOGGLE":
print("Current relay status:", self._relay_status)
current = self._relay_status.get(relay_key)
if current == "ON":
desired_value = "OFF"
elif current == "OFF":
desired_value = "ON"
else:
desired_value = "ON"
# Handle TOGGLE and casing via helper
desired_value = self._resolve_effective_value(relay_key, data.value)

# Mutate the DTO so feedback reflects the effective value
data.value = desired_value
Expand All @@ -214,6 +220,30 @@ async def send_command(self, data: SendCommandMsg) -> None:

self._client.publish(topic, payload, qos=1)

# --------------------------------------------------
# Helpers
# --------------------------------------------------

def _resolve_effective_value(self, relay_key: str, requested_value):
"""Resolve the effective command value for a relay.

- If `requested_value` is "TOGGLE", compute ON/OFF based on last known status.
- If it's a string other than TOGGLE, return the uppercased value.
- Otherwise return the value unchanged (non-string payloads are passed through).
"""
if isinstance(requested_value, str):
val_upper = requested_value.upper()
if val_upper == "TOGGLE":
current = self._relay_status.get(relay_key)
if current == "ON":
return "OFF"
elif current == "OFF":
return "ON"
# Unknown -> default to ON
return "ON"
return val_upper
return requested_value

def register_value_listener(self, callback: Callable) -> None:
self._value_listener = callback

Expand Down