continue dev mgmt commanding helper

This commit is contained in:
2025-01-31 15:18:07 +01:00
parent 68939d3699
commit 23841a14dc
2 changed files with 59 additions and 67 deletions

View File

@ -552,17 +552,10 @@ impl MgmAssembly {
self.mode_reply_mock.handle_mode_reply(&reply_and_id);
match self.commanding_helper.handle_mode_reply(&reply_and_id) {
Ok(result) => {
match result {
DevManagerHelperResult::Idle => todo!(),
DevManagerHelperResult::Busy => todo!(),
DevManagerHelperResult::ModeCommandingDone => {
if self.commanding_helper.target_mode().is_some() {
// Complete the mode command.
self.mode_and_submode =
self.commanding_helper.target_mode().unwrap();
self.handle_mode_reached(self.mode_requestor_info)?;
}
}
if let DevManagerHelperResult::ModeCommandingDone(context) = result {
// Complete the mode command.
self.mode_and_submode = context.target_mode;
self.handle_mode_reached(self.mode_requestor_info)?;
}
}
Err(err) => match err {
@ -742,12 +735,10 @@ impl DeviceManager {
match result {
DevManagerHelperResult::Idle => todo!(),
DevManagerHelperResult::Busy => todo!(),
DevManagerHelperResult::ModeCommandingDone => {
if self.commanding_helper.target_mode().is_some() {
// Complete the mode command.
self.handle_mode_reached(self.mode_requestor_info)?;
self.mode_and_submode = self.commanding_helper.target_mode().unwrap();
}
DevManagerHelperResult::ModeCommandingDone(context) => {
// Complete the mode command.
self.handle_mode_reached(self.mode_requestor_info)?;
self.mode_and_submode = context.target_mode;
}
}
}
@ -932,6 +923,9 @@ impl ModeRequestHandler for CommonDevice {
mode_and_submode: ModeAndSubmode,
forced: bool,
) -> Result<(), ModeError> {
if self.id() == TestComponentId::MagnetorquerDevice as u64 {
println!("test");
}
self.mode_and_submode = mode_and_submode;
self.handle_mode_reached(Some(requestor))?;
self.mode_req_mock