Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: rvc app docked and charging state remain true #29257

Merged
merged 12 commits into from
Sep 29, 2023
Merged

Bugfix: rvc app docked and charging state remain true #29257

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dc31787
Enabled the RvcClean StartUpMode attribute in the zap and mettar files.
hicklin Sep 14, 2023
b329ad5
Merge branch 'project-chip:master' into rvc_app_enable_rvc_clean_star…
hicklin Sep 14, 2023
ae6129d
Updated the PICS files to note that this device supports testing the …
hicklin Sep 14, 2023
dcdb39d
Refactored the run_all_yaml script.
hicklin Sep 14, 2023
cfdcc3b
Updated the testing section of the readme to include the test case re…
hicklin Sep 14, 2023
fcfe0c5
Restyled by prettier-markdown
restyled-commits Sep 14, 2023
a32b736
Restyled by shfmt
restyled-commits Sep 14, 2023
90aa318
Fixed bug that was causing the charging and docked states to remain t…
hicklin Sep 14, 2023
fb8696f
Restyled by clang-format
restyled-commits Sep 14, 2023
9183a4a
Merge branch 'master' into bugfix/RVC_app_docked_and_charging_state_r…
hicklin Sep 25, 2023
2c5b9bd
Merge branch 'master' into bugfix/RVC_app_docked_and_charging_state_r…
hicklin Sep 26, 2023
2771dfb
Merge branch 'master' into bugfix/RVC_app_docked_and_charging_state_r…
hicklin Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/rvc-app/rvc-common/src/rvc-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ void RvcDevice::SetDeviceToIdleState()
{
if (mCharging)
{
mDocked = true;
mOperationalStateInstance.SetOperationalState(to_underlying(RvcOperationalState::OperationalStateEnum::kCharging));
}
else if (mDocked)
Expand Down Expand Up @@ -44,6 +45,8 @@ void RvcDevice::HandleRvcRunChangeToMode(uint8_t newMode, ModeBase::Commands::Ch
return;
}

mCharging = false;
mDocked = false;
mRunModeInstance.UpdateCurrentMode(newMode);
mOperationalStateInstance.SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning));
response.status = to_underlying(ModeBase::StatusCode::kSuccess);
Expand Down
Loading