Skip to content

add mapping.toml support#16

Merged
raffael0 merged 20 commits into
mainfrom
feat/mapping
Jun 21, 2026
Merged

add mapping.toml support#16
raffael0 merged 20 commits into
mainfrom
feat/mapping

Conversation

@miDeb

@miDeb miDeb commented May 4, 2026

Copy link
Copy Markdown
Member

Supports specifying:

  • a unique name for fields
  • a slope + offset conversion for a "mapped value"
  • a range-based conversion for a "logical value", that also includes a color code for the frontend

NodeManager now supports reading raw, mapped, and logical values by mapping name, requesting mapped fields from nodes, and writing mapped parameter values back as raw CAN values.

I also added some validation rules for the mapping.

Depends on #14 because I read the path to the mapping from the config.

Please take a look at tests/mapping/example1.toml to see how a mapping file would look like. There are two ways to specify a mapping in there, which are only syntactically different, as toml has multiple ways to specify nested tables (=objects in json). The second example uses inline tables to a greater extent, and of course there are even more syntactically correct ways to write the same thing in toml.

I'll open this as a draft until we agree on the format of the mapping.

@raffael0 raffael0 mentioned this pull request May 4, 2026
Comment thread tests/mapping/example1.toml Outdated
raffael0 and others added 3 commits May 7, 2026 02:58
Supports specifying:
- a unique name for fields
- a slope + offset conversion for a "mapped value"
- a range-based conversion for a "logical value", that also includes a color code for the frontend

The NodeManager now supports reading raw, mapped, and logical values by mapping name, requesting mapped fields from nodes, and writing mapped parameter values back as raw CAN values.
- load mappings from a directory
- change mapping to be grouped by node
- simplify some code
@miDeb miDeb marked this pull request as ready for review June 1, 2026 10:29
@miDeb miDeb mentioned this pull request Jun 1, 2026
@raffael0

raffael0 commented Jun 1, 2026

Copy link
Copy Markdown
Member

Hi,
I added quite a few tests. Just as a disclaimer: The second commit was pretty vibe coded. I looked over the tests though and they look fine to me.

Also I noticed that the only way right now to request a new value is through the request_value method, which requires the mapped name. This means that there is no way right now to request a value without a mapping. I think it would make more sense for request_value to first look if the name is a raw value(and then request that) and only if that fails then look at the mapped names.

As a consequence values could be accessed via mapped/raw names interchangeably. This behaviour would make more sense to me. What do you think?

@miDeb

miDeb commented Jun 1, 2026

Copy link
Copy Markdown
Member Author

In #21 I cleaned this up a bit by adding request_field_by_mapped and request_field_by_raw, but I guess it could also make sense to have one function that checks first for a potential mapping, and if that does not exist, uses the name as a raw name. However it would have to take the node name (or id) as well because raw names are not necessarily unique across all nodes.

Comment thread src/nodes/mapping.rs
Comment thread src/nodes/node_manager.rs
@raffael0 raffael0 linked an issue Jun 7, 2026 that may be closed by this pull request
sequence_result.unwrap_err(),
SequenceRunError::Aborted
));
assert!(sequence_result.is_ok());

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fweichselbaum I updated the test expectation here because currently after running the abort sequence, run_sequence returns with success (unless the abort sequence itself is aborted, I guess). I'm not sure what we will do with the return value of run_sequence anyway, so idk what the correct behavior should be. Just fyi since it's a test you wrote.

@miDeb

miDeb commented Jun 8, 2026

Copy link
Copy Markdown
Member Author

@raffael0 pls have a look at my latest changes and feel free to merge if you're happy :)

@raffael0 raffael0 merged commit 4891ad5 into main Jun 21, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mapping Support

2 participants