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

refactor/tank-enum-state #7

Closed
judge wants to merge 0 commits from refactor/tank-enum-state into develop
pull from: refactor/tank-enum-state
merge into: :develop
Conversation 3 Commits - Files Changed -
judge commented 2025-03-15 14:58:41 +01:00
Collaborator
Copy Link
Copy Source

So das ist jetzt in einem Zustand in dem es wieder kompiliert.

Ich habe auch die Struktur für das MQTT etwas ausgeweitet, das sollte jetzt etwas mehr informationen schicken.

Offener Punkt: Es gab hier noch serial logs von denen ich mir unsicher bin an welcher stelle man die wieder einführen könnte. Dazu müsste man sich mal noch gedanken machen, bevor es gemerged wird. Da gab es nämlich auch boad faults die aktiviert wurden!

@EmpirePhoenix Was denkst du zu dem neuen State hanlding mit Enums?

So das ist jetzt in einem Zustand in dem es wieder kompiliert. Ich habe auch die Struktur für das MQTT etwas ausgeweitet, das sollte jetzt etwas mehr informationen schicken. Offener Punkt: Es gab hier noch serial logs von denen ich mir unsicher bin an welcher stelle man die wieder einführen könnte. Dazu müsste man sich mal noch gedanken machen, bevor es gemerged wird. Da gab es nämlich auch boad faults die aktiviert wurden! @EmpirePhoenix Was denkst du zu dem neuen State hanlding mit Enums?
judge added 5 commits 2025-03-15 14:58:42 +01:00
WIP refactor tank state code 64665f7182
implement more functions for TankState 7f8aec789c
fix tank.rs errors after intial implementation e0dc3d21c7
use proper error handling 184c2b52cb
streamline mqtt state information handling bbbe6d846f
judge requested review from EmpirePhoenix 2025-03-15 14:58:43 +01:00
judge force-pushed refactor/tank-enum-state from bbbe6d846f to 5722fc18b2 2025-03-15 15:04:10 +01:00 Compare
judge commented 2025-03-15 15:08:45 +01:00
Author
Collaborator
Copy Link
Copy Source

This should fix #6 and is one improvement that is relevant to #3

This should fix #6 and is one improvement that is relevant to #3
judge force-pushed refactor/tank-enum-state from 5722fc18b2 to 267578ef0b 2025-03-15 15:16:51 +01:00 Compare
judge added 1 commit 2025-03-15 15:57:33 +01:00
suggestion for logging location 3a702cb84f
judge force-pushed refactor/tank-enum-state from 3a702cb84f to ead011ec0b 2025-03-15 16:00:35 +01:00 Compare
judge force-pushed refactor/tank-enum-state from ead011ec0b to fbf1a84e7d 2025-03-15 16:01:55 +01:00 Compare
EmpirePhoenix reviewed 2025-03-19 20:37:48 +01:00
rust/src/tank.rs Outdated
@@ -0,0 +102,4 @@
Err(err) => { tank_err = Some(err); None },
Ok(left_ml) => Some(left_ml),
};
let enough_water = self.enough_water(config).unwrap_or(false); //NOTE: is this correct if there is an error assume not enough water?
EmpirePhoenix commented 2025-03-19 20:37:48 +01:00
Owner
Copy Link
Copy Source

would depend on config if tank errors are allowed to be ignored

would depend on config if tank errors are allowed to be ignored
judge marked this conversation as resolved
EmpirePhoenix reviewed 2025-03-19 20:39:35 +01:00
rust/src/main.rs Outdated
@@ -751,0 +682,4 @@
match tank_state.enough_water(&config.tank) {
Err(_tank_err) => {
if !config.tank.tank_allow_pumping_if_sensor_error {
// ignore is ok
EmpirePhoenix commented 2025-03-19 20:39:35 +01:00
Owner
Copy Link
Copy Source

in the state based old code, this did not set state.water, so it was skipped, should probably set no_water to true

in the state based old code, this did not set state.water, so it was skipped, should probably set no_water to true
judge marked this conversation as resolved
judge added 1 commit 2025-03-20 22:07:10 +01:00
finalize tank state logging 038f74bca1
judge closed this pull request 2025-03-20 22:21:19 +01:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
EmpirePhoenix
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
EmpirePhoenix Ollo Souko (Souko) Stean acidburns judge llang
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: C3MA/PlantCtrl#7