refactoring & pro/max base guessing#8
Merged
Merged
Conversation
yuyuyureka
force-pushed
the
feature/guess-pro
branch
3 times, most recently
from
2567db5 to
38146f4
Compare
Signed-off-by: Yureka <yuka@yuka.dev>
yuyuyureka
force-pushed
the
feature/guess-pro
branch
2 times, most recently
from
a9d5f26 to
1fbd565
Compare
yuyuyureka
changed the title
yuyuyureka
force-pushed
the
feature/guess-pro
branch
4 times, most recently
from
94b9eb8 to
fe371d1
Compare
jannau
approved these changes
May 31, 2026
| let pam_ep = KisPortal::Pam.endpoint_id(self.device_version).ok_or( | ||
| DebugUsbError::MissingEndpoint(KisPortal::Pam, self.device_version), | ||
| )?; | ||
| let padding_bytes = (4 - (data.len() % 4)) % 4; |
Member
There was a problem hiding this comment.
following reads easier
let payload_len = data.len().next_multiple_of(4);
let padding_bytes = payload_len - data.len();
and then use payload_len instead of data.len() + padding_bytes below
| 2 => DATA_TX16, | ||
| 3 => DATA_TX24, | ||
| n if (n % 4) == 0 => DATA_TX32, | ||
| _ => return Err(DebugUsbError::Alignment), |
Member
There was a problem hiding this comment.
I would move the alignment error for data.len() > 4 && !is_multiple_of(4) at the beginning of the function
| dbgusb.capacity = dbgusb.uart_tx_free().await.map_err(std::io::Error::other)?; | ||
| } | ||
| let batch = b.split_to(std::cmp::min(payload_size, dbgusb.capacity) & !3); | ||
| dbgusb.capacity -= batch.len(); |
Member
There was a problem hiding this comment.
uart_tx could update dbgusb.capacity, that would be just a single line
| if dbgusb.capacity < payload_size { | ||
| dbgusb.capacity = dbgusb.uart_tx_free().await.map_err(std::io::Error::other)?; | ||
| } | ||
| let batch = b.split_to(std::cmp::min(payload_size, dbgusb.capacity) & !3); |
Member
There was a problem hiding this comment.
with the more complex function we coud do the following:
if dbgusb.capacity < 4 {
continue;
}
if payload_size <= 4 {
dbgusb.uart_tx(b).await.map_err(std::io::Error::other)?;
b.clear();
} else {
let batch = b.split_to(std::cmp::min(payload_size, dbgusb.capacity) & !3);
dbgusb.uart_tx(batch).await.map_err(std::io::Error::other)?;
}
and the while b.len() >= 4 can be changed to while !b.is_empty(). This would avoid the extra tail handling. I think I prefer my proposal slightly but feel free to disregard.
Collaborator
Author
There was a problem hiding this comment.
I implemented something similar to this, always using the split_to() path but conditionally aligning the payload size if it is larger than 4.
yuyuyureka
force-pushed
the
feature/guess-pro
branch
2 times, most recently
from
be2abc9 to
e4fc8d7
Compare
Signed-off-by: Yureka <yuka@yuka.dev>
Signed-off-by: Yureka <yuka@yuka.dev>
Left all devices as auto-detected = yes where the first attempted address is the correct one Changed the ones which were previously not detected to question mark Signed-off-by: Yureka <yuka@yuka.dev>
Signed-off-by: Yureka <yuka@yuka.dev>
Signed-off-by: Yureka <yuka@yuka.dev>
Signed-off-by: Yureka <yuka@yuka.dev>
yuyuyureka
force-pushed
the
feature/guess-pro
branch
from
e4fc8d7 to
5c9915a
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Base guessing tested on M3 Max:
The refactors focus on reliability and preventing data loss.