10 Commits
2.0.0 ... 2.1.0

Author SHA1 Message Date
6d8c5c25db publish cache
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:34:52 +01:00
ca08059e13 add car feedback 6
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:26:52 +01:00
6796bdd905 add car feedback 5
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:24:12 +01:00
6c208e32bf add car feedback 4
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:22:49 +01:00
d2ee8a80c2 add car feedback 3
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:20:13 +01:00
5e0127b571 add car feedback 2
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:17:25 +01:00
311d4cf555 add car feedback
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-06 14:15:03 +01:00
ad043b5921 add raw output 3
Some checks failed
ci/woodpecker/tag/woodpecker Pipeline failed
2025-12-05 15:00:22 +01:00
7c90962de1 add raw output 2
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-05 14:58:46 +01:00
3a4cd499a5 add raw output
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-12-05 14:44:24 +01:00
4 changed files with 34 additions and 7 deletions

View File

@@ -123,10 +123,11 @@ output:
- name: pv_control
publish_topic: IoT/PV/Control/State
scan_rate: 1
raw_output: true # use only for output device with only one register, name this register 'output'
slave_id: 1
registers:
- address: 0x0001
attribute: state
attribute: output
name: State
unit: "-"
register_type: holding
@@ -136,10 +137,11 @@ output:
enabled: true
publish_topic: IoT/Car/Control/State
scan_rate: 1
raw_output: true # use only for output device with only one register, name this register 'output'
slave_id: 5
registers:
- address: 0x0001
attribute: state
attribute: output
name: State
unit: "-"
register_type: holding
@@ -228,3 +230,17 @@ output:
register_type: input
data_type: float32
adaptor: floatAdaptor
- name: car_feedback
enabled: true
publish_topic: IoT/Car/Feedback/State
scan_rate: 1
raw_output: true # use only for output device with only one register, name this register 'output'
slave_id: 7
registers:
- address: 0x0010
attribute: output
name: State
unit: "-"
register_type: holding
data_type: int32
adaptor: onOffAdaptor

View File

@@ -9,7 +9,7 @@ def floatAdaptor(i):
return float(f"{i:0.2f}") if i else 0.0
def onOffAdaptor(i):
return bool(i)
return 'on' if bool(i) else 'off'
@@ -49,12 +49,13 @@ class FromDevices(AbstractMqttPublisher):
payload[registers.attribute] = value
payload['status'] = "Ok"
payload['cnt'] = cnt
payloadStr = json.dumps(payload) if not device.raw_output else str(payload['output'])
self.publish_with_cache(device.publish_topic, payloadStr)
logger.debug(f"mqtt message sent: {device.publish_topic} -> {payloadStr}")
except Exception as e:
logger.error(f"Caught exception: {str(e)}")
payload['cnt'] = cnt
payloadStr = json.dumps(payload)
self.client.publish(device.publish_topic, payloadStr)
logger.debug(f"mqtt message sent: {device.publish_topic} -> {payloadStr}")
self.killEvent.wait(timeout=float(self.config.global_.scan_interval))

View File

@@ -25,6 +25,8 @@ class AbstractMqttPublisher(threading.Thread):
logger.info(f"mqtt client id: {client_id}")
self.client = mqtt.Client(client_id=client_id, userdata=self)
self.cache = {}
# consider this flag in the localLoop
self.killBill = False
self.killEvent = threading.Event()
@@ -62,3 +64,10 @@ class AbstractMqttPublisher(threading.Thread):
def onMessage(self, topic, payload):
logger.warning("mqtt unexpected message received: {} -> {}".format(topic, str(payload)))
def publish_with_cache(self, topic, payload):
if topic in self.cache and self.cache[topic] == payload:
logger.debug(f"mqtt message unchanged, not publishing: {topic} -> {payload}")
return
self.cache[topic] = payload
self.client.publish(topic, payload)

View File

@@ -24,6 +24,7 @@ class OutputConfig(BaseModel):
enabled: bool = Field(default=True)
scan_rate: Optional[int] = Field(default=60)
publish_topic: str
raw_output: Optional[bool] = Field(default=False)
slave_id: int
registers: List[RegisterConfig]