[BFW-6775] beautify: get_dwarf_nr -> dwarf_index #4471
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CZDanol
reviewed
Feb 10, 2025
| assert(dwarf.get_dwarf_nr() > 0); | ||
| const PrusaToolInfo &info = tool_info[dwarf.get_dwarf_nr() - 1]; | ||
| assert(dwarf.get_dwarf_nr() < tool_info.size()); | ||
| assert(dwarf.get_dwarf_nr() >= 0); |
There was a problem hiding this comment.
This will be always true, dwarf_nr is uint8_t
| assert(dwarf.get_dwarf_nr() <= tool_info.size()); | ||
| assert(dwarf.get_dwarf_nr() > 0); | ||
| assert(dwarf.get_dwarf_nr() < tool_info.size()); | ||
| assert(dwarf.get_dwarf_nr() >= 0); |
bkerler
force-pushed
the
dwarf_nr_cleanup
branch
4 times, most recently
from
b9f7334 to
09d5b77
Compare
CZDanol
reviewed
Feb 10, 2025
| @@ -295,7 +295,7 @@ void ToolsMappingBody::windowEvent([[maybe_unused]] window_t *sender, GUI_event_ | |||
| uint16_t get_heatbreak_fan_pwr(); | |||
|
|
|||
| inline uint8_t get_dwarf_nr() const { | |||
| return dwarf_nr; | |||
| return dwarf_nr - 1; | |||
There was a problem hiding this comment.
Disrepance between the public getter and private member is even worse than the current state. If we wanna do this, we will need to go even further
There was a problem hiding this comment.
Alternatively, we could rename get_dwarf_nr to dwarf_index
bkerler
force-pushed
the
dwarf_nr_cleanup
branch
from
09d5b77 to
17784c8
Compare
CZDanol
approved these changes
Feb 14, 2025
CZDanol
changed the title
CZDanol
changed the title
|
Internal ticket: BFW-6775 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
get_dwarf_nr() - 1for internal/logging use vsget_dwarf_nr()for Marlin/Buddy usage might cause issues, so cleaning it up might help