C3MA/PlantCtrl
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

refactor/mqtt-data-serialization #23

Merged
EmpirePhoenix merged 5 commits from refactor/mqtt-data-serialization into develop 2026-05-25 19:42:15 +02:00
Conversation 1 Commits 5 Files Changed 5 +276 -197
judge commented 2026-05-24 18:34:47 +02:00
Collaborator
Copy Link

This PR changes the structure of most states send to mqtt. Previous iterations had some issues in terms of guaranteeing that relevant datapoints did not move across the structure depending on state. This MR introduces more consistent json structures.

This PR changes the structure of most states send to mqtt. Previous iterations had some issues in terms of guaranteeing that relevant datapoints did not move across the structure depending on state. This MR introduces more consistent json structures.
judge added 5 commits 2026-05-24 18:34:47 +02:00
fix: serialize firmware/state as JSON instead of Debug format 7866604a40
refactor: BatteryInfo structure (consistent layout) df3159aa16 
- use tagged enum serialization for BatteryError
- flatten BatteryInfo telemetry with consistent field names and typed error
refactor: PlantInfo structure (consistent layout) 6bf7a04024 
- fix: use tagged enum serialization for MoistureSensorError and PumpError
- fix: flatten PlantInfo sensors to SensorTelemetry with top-level moisture_pct
refctor: TankInfo structure (consistent layout) d4a4c1b573 
- fix: use tagged enum serialization for TankError
- fix: rename TankInfo fields for consistent naming (volume_ml, pct, water_temp_c)
- renamed some fields for better clarity on contained value
move all mqtt publishing functions to mqtt module 32256d0c91
judge requested review from EmpirePhoenix 2026-05-24 18:34:55 +02:00
EmpirePhoenix reviewed 2026-05-25 19:40:20 +02:00
Software/MainBoard/rust/src/main.rs
@@ -640,3 +640,3 @@
let deep_sleep_duration_minutes: u32 =
// if battery soc is unknown assume battery has enough change
if matches!(battery_state, BatteryState::Info(data) if data.state_of_charge < 10) {
if matches!(battery_state, BatteryState::Info(data) if data.soc_pct.is_some_and(|soc| soc < 10.)) {
EmpirePhoenix commented 2026-05-25 19:40:20 +02:00
Owner
Copy Link

TODO: check against config, if a battery is to be expected? Eg. with usb power module instead of solar?

TODO: check against config, if a battery is to be expected? Eg. with usb power module instead of solar?
EmpirePhoenix merged commit 7078af5713 into develop 2026-05-25 19:42:15 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
EmpirePhoenix
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
EmpirePhoenix Ollo Souko Stean acidburns judge llang
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: C3MA/PlantCtrl#23
Delete Branch "refactor/mqtt-data-serialization"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?