Skip to content

Unify the driveMode storage and fetching - from ControlsFragment.vehicle.driveMode, instead of ControlsFragment.currentDriveMode. #498

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unify the driveMode storage and fetching - from ControlsFragment.vehicle.driveMode, instead of ControlsFragment.currentDriveMode. #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ protected Model getModel() {

private void connectWebController() {
phoneController.connectWebServer();
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.GAME);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand Down Expand Up @@ -575,7 +575,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {

private void connectPhoneController() {
phoneController.connect(requireContext());
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.DUAL);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand Down
4 changes: 1 addition & 3 deletions android/robot/src/main/java/org/openbot/common/ControlsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ public abstract class ControlsFragment extends Fragment implements ServerListene
protected Animation startAnimation;
protected SharedPreferencesManager preferencesManager;
protected PhoneController phoneController;
protected Enums.DriveMode currentDriveMode = Enums.DriveMode.GAME;

protected AudioPlayer audioPlayer;

protected final String voice = "matthew";
Expand Down Expand Up @@ -282,7 +280,7 @@ private void handlePhoneControllerEvents() {
// That is why we are not calling phoneController.send() here directly.
BotToControllerEventBus.emitEvent(
ConnectionUtils.getStatus(
false, false, false, currentDriveMode.toString(), vehicle.getIndicator()));
false, false, false, vehicle.getDriveMode().toString(), vehicle.getIndicator()));
break;

case Constants.CMD_DISCONNECTED:
Expand Down
4 changes: 2 additions & 2 deletions android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {

private void connectPhoneController() {
phoneController.connect(requireContext());
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.DUAL);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand All @@ -595,7 +595,7 @@ private void connectPhoneController() {

private void connectWebController() {
phoneController.connectWebServer();
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.GAME);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand Down
4 changes: 2 additions & 2 deletions android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {

private void connectPhoneController() {
phoneController.connect(requireContext());
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.DUAL);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand All @@ -664,7 +664,7 @@ private void connectPhoneController() {

private void connectWebController() {
phoneController.connectWebServer();
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.GAME);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand Down
4 changes: 2 additions & 2 deletions android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ protected void setDriveMode(DriveMode driveMode) {

private void connectPhoneController() {
phoneController.connect(requireContext());
DriveMode oldDriveMode = currentDriveMode;
DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(DriveMode.DUAL);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand All @@ -272,7 +272,7 @@ private void connectPhoneController() {

private void connectWebController() {
phoneController.connectWebServer();
Enums.DriveMode oldDriveMode = currentDriveMode;
Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
// Currently only dual drive mode supported
setDriveMode(Enums.DriveMode.GAME);
binding.controllerContainer.driveMode.setAlpha(0.5f);
Expand Down