Skip to content

Commit

Permalink
Add STR and DRV buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@syouji
syouji committed Mar 3, 2017
1 parent 8681341 commit 3aa2505
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 38 deletions.
Binary file modified ui/tablet/AutowareRider/AutowareRider.apk
View file
Binary file not shown.
125 changes: 87 additions & 38 deletions ui/tablet/AutowareRider/src/com/ghostagent/SoundManagementActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,10 @@ void refresh() {
}

class DriveButton extends RadioButton {
static final int AUTO = 1;
static final int NORMAL = 0;
static final int STR_AUTO = 1;
static final int DRV_AUTO = 2;
static final int AUTO = 3;
static final int PURSUIT = 2;

ImageButton auto;
Expand Down Expand Up @@ -202,7 +204,6 @@ class ApplicationButton extends RadioButton {

refresh();
}

@Override
void refresh() {
navigation.setImageResource(R.drawable.app_navi);
Expand Down Expand Up @@ -1268,70 +1269,106 @@ public void run() {
}
});
}
if (s1Button.getMode() == S1Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s1Button.updateMode(S1Button.NG);
}
});
}
if (s2Button.getMode() == S2Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s2Button.updateMode(S2Button.NG);
}
});
}
drawLeftView.setColor(COLOR_RED);
drawRightView.setColor(COLOR_RED);
drawCenterView.setColor(COLOR_RED);
break;
case DriveButton.AUTO:
case DriveButton.STR_AUTO:
if (driveButton.getMode() != DriveButton.AUTO) {
buttonHandler.post(new Runnable() {
public void run() {
driveButton.updateMode(DriveButton.AUTO);
}
});
}
if (s1Button.getMode() != S1Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s1Button.updateMode(S1Button.NG);
}
});
}
if (s2Button.getMode() == S2Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s2Button.updateMode(S2Button.NG);
}
});
}
drawLeftView.setColor(COLOR_BLUE);
drawRightView.setColor(COLOR_BLUE);
drawCenterView.setColor(COLOR_BLUE);
break;
default:
drawLeftView.setColor(COLOR_YELLOW);
drawRightView.setColor(COLOR_YELLOW);
drawCenterView.setColor(COLOR_YELLOW);
break;
}
break;
case InformationClient.NDT:
switch (data[1]) {
case 0:
if (s1Button.getMode() == S1Button.OK) {
case DriveButton.DRV_AUTO:
if (driveButton.getMode() != DriveButton.AUTO) {
buttonHandler.post(new Runnable() {
public void run() {
s1Button.updateMode(S1Button.NG);
driveButton.updateMode(DriveButton.AUTO);
}
});
}
break;
case 1:
if (s1Button.getMode() == S1Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s1Button.updateMode(S1Button.OK);
s1Button.updateMode(S1Button.NG);
}
});
}
break;
}
break;
case InformationClient.LF:
switch (data[1]) {
case 0:
if (s2Button.getMode() == S2Button.OK) {
if (s2Button.getMode() != S2Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s2Button.updateMode(S2Button.NG);
}
});
}
drawLeftView.setColor(COLOR_BLUE);
drawRightView.setColor(COLOR_BLUE);
drawCenterView.setColor(COLOR_BLUE);
break;
case 1:
if (s2Button.getMode() == S2Button.NG) {
case DriveButton.AUTO:
if (driveButton.getMode() != DriveButton.AUTO) {
buttonHandler.post(new Runnable() {
public void run() {
driveButton.updateMode(DriveButton.AUTO);
}
});
}
if (s1Button.getMode() != S1Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s1Button.updateMode(S1Button.NG);
}
});
}
if (s2Button.getMode() != S2Button.NG) {
buttonHandler.post(new Runnable() {
public void run() {
s2Button.updateMode(S2Button.OK);
s2Button.updateMode(S2Button.NG);
}
});
}
drawLeftView.setColor(COLOR_BLUE);
drawRightView.setColor(COLOR_BLUE);
drawCenterView.setColor(COLOR_BLUE);
break;
default:
drawLeftView.setColor(COLOR_YELLOW);
drawRightView.setColor(COLOR_YELLOW);
drawCenterView.setColor(COLOR_YELLOW);
break;
}
break;
Expand Down Expand Up @@ -1478,17 +1515,29 @@ public void onClick(View v) {
}
data = 0;
} else if (v == s1Button.s1) {
if (s1Button.getMode() == S1Button.OK)
s1Button.updateMode(S1Button.OK);
else
s1Button.updateMode(S1Button.NG);
data = commandClient.send(CommandClient.S1, s1Button.getMode());
if (s1Button.getMode() != S1Button.NG) {
if (s2Button.getMode() != S2Button.NG)
data = commandClient.send(CommandClient.MODE, DriveButton.STR_AUTO);
else
data = commandClient.send(CommandClient.MODE, DriveButton.AUTO);
} else {
if (s2Button.getMode() != S2Button.NG)
data = commandClient.send(CommandClient.MODE, DriveButton.NORMAL);
else
data = commandClient.send(CommandClient.MODE, DriveButton.DRV_AUTO);
}
} else if (v == s2Button.s2) {
if (s2Button.getMode() == S2Button.OK)
s2Button.updateMode(S2Button.OK);
else
s2Button.updateMode(S2Button.NG);
data = commandClient.send(CommandClient.S2, s2Button.getMode());
if (s2Button.getMode() != S2Button.NG) {
if (s1Button.getMode() != S1Button.NG)
data = commandClient.send(CommandClient.MODE, DriveButton.DRV_AUTO);
else
data = commandClient.send(CommandClient.MODE, DriveButton.AUTO);
} else {
if (s1Button.getMode() != S1Button.NG)
data = commandClient.send(CommandClient.MODE, DriveButton.NORMAL);
else
data = commandClient.send(CommandClient.MODE, DriveButton.STR_AUTO);
}
}

if (data < 0)
Expand Down

0 comments on commit 3aa2505

Please sign in to comment.