WallyHackenslacker/NxtAR-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Flipped motor buttons on tablet iface. Added NO_DELAY to robot control.

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-03-13 16:12:53 -04:30
parent 8ed8be0a29
commit 28be9c8a81
2 changed files with 22 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ve/ucv/ciens/ccg/nxtar/network/RobotControlThread.java
View File

@@ -96,6 +96,7 @@ public class RobotControlThread extends Thread {
try{ try{
client = server.accept(); client = server.accept();
client.setTcpNoDelay(true);
if(netListener != null) netListener.networkStreamConnected(THREAD_NAME); if(netListener != null) netListener.networkStreamConnected(THREAD_NAME);
os = new ObjectOutputStream(client.getOutputStream()); os = new ObjectOutputStream(client.getOutputStream());
is = new ObjectInputStream(client.getInputStream()); is = new ObjectInputStream(client.getInputStream());

105
src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java
View File

@@ -341,7 +341,7 @@ public class InGameState extends BaseState{
motorButtonsPointers[0] = pointer; motorButtonsPointers[0] = pointer;
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)100); event.setPower((byte)100);
queue.addEvent(event); queue.addEvent(event);
@@ -353,7 +353,7 @@ public class InGameState extends BaseState{
motorButtonsPointers[1] = pointer; motorButtonsPointers[1] = pointer;
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)-100); event.setPower((byte)-100);
queue.addEvent(event); queue.addEvent(event);
@@ -364,7 +364,7 @@ public class InGameState extends BaseState{
motorButtonsPointers[2] = pointer; motorButtonsPointers[2] = pointer;
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)-100); event.setPower((byte)-100);
queue.addEvent(event); queue.addEvent(event);
@@ -375,7 +375,7 @@ public class InGameState extends BaseState{
motorButtonsPointers[3] = pointer; motorButtonsPointers[3] = pointer;
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)100); event.setPower((byte)100);
queue.addEvent(event); queue.addEvent(event);
@@ -427,7 +427,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[1]){ if(!motorButtonsTouched[1]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -441,7 +441,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[0]){ if(!motorButtonsTouched[0]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -455,7 +455,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[3]){ if(!motorButtonsTouched[3]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -469,7 +469,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[2]){ if(!motorButtonsTouched[2]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -525,7 +525,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[1]){ if(!motorButtonsTouched[1]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -539,7 +539,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[0]){ if(!motorButtonsTouched[0]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -553,7 +553,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[3]){ if(!motorButtonsTouched[3]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -567,7 +567,7 @@ public class InGameState extends BaseState{
// Enqueue the event corresponding to releasing this button if the opposing button is not pressed already. // Enqueue the event corresponding to releasing this button if the opposing button is not pressed already.
if(!motorButtonsTouched[2]){ if(!motorButtonsTouched[2]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte) 0); event.setPower((byte) 0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -631,7 +631,7 @@ public class InGameState extends BaseState{
if(!motorGamepadButtonPressed[1]){ if(!motorGamepadButtonPressed[1]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_B); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)100); event.setPower((byte)100);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -641,7 +641,7 @@ public class InGameState extends BaseState{
if(!motorGamepadButtonPressed[0]){ if(!motorGamepadButtonPressed[0]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_B); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)-100); event.setPower((byte)-100);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -666,7 +666,7 @@ public class InGameState extends BaseState{
if(!motorGamepadButtonPressed[1]){ if(!motorGamepadButtonPressed[1]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_B); event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)0); event.setPower((byte)0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -676,7 +676,7 @@ public class InGameState extends BaseState{
if(!motorGamepadButtonPressed[0]){ if(!motorGamepadButtonPressed[0]){
event = new MotorEvent(); event = new MotorEvent();
event.setMotor(motor_t.MOTOR_B); event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)0); event.setPower((byte)0);
queue.addEvent(event); queue.addEvent(event);
} }
@@ -691,59 +691,7 @@ public class InGameState extends BaseState{
@Override @Override
public boolean axisMoved(Controller controller, int axisCode, float value){ public boolean axisMoved(Controller controller, int axisCode, float value){
MotorEvent event; return false;
if(stateActive && Ouya.runningOnOuya){
if(Math.abs(value) >= Ouya.STICK_DEADZONE * 3.0f){
if(axisCode == Ouya.AXIS_LEFT_Y){
Gdx.app.log(TAG, CLASS_NAME + ".axisMoved() :: LEFT Y moved: "+ Float.toString(value));
axisStopSent[0] = false;
event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)(100.0f * -value));
queue.addEvent(event);
}else if(axisCode == Ouya.AXIS_RIGHT_Y){
Gdx.app.log(TAG, CLASS_NAME + ".axisMoved() :: RIGHT Y moved: "+ Float.toString(value));
axisStopSent[1] = false;
event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)(100.0f * -value));
queue.addEvent(event);
}
}else{
if(axisCode == Ouya.AXIS_LEFT_Y && !axisStopSent[0]){
axisStopSent[0] = true;
event = new MotorEvent();
event.setMotor(motor_t.MOTOR_A);
event.setPower((byte)0);
queue.addEvent(event);
}else if(axisCode == Ouya.AXIS_RIGHT_Y && !axisStopSent[1]){
axisStopSent[1] = true;
event = new MotorEvent();
event.setMotor(motor_t.MOTOR_C);
event.setPower((byte)0);
queue.addEvent(event);
}
}
return true;
}else{
return false;
}
} }
@Override @Override
@@ -763,47 +711,36 @@ public class InGameState extends BaseState{
@Override @Override
public boolean keyUp(int keycode){ public boolean keyUp(int keycode){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean keyTyped(char character){ public boolean keyTyped(char character){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean povMoved(Controller controller, int povCode, public boolean povMoved(Controller controller, int povCode, PovDirection value){
PovDirection value){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean xSliderMoved(Controller controller, int sliderCode, public boolean xSliderMoved(Controller controller, int sliderCode, boolean value){
boolean value){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean ySliderMoved(Controller controller, int sliderCode, public boolean ySliderMoved(Controller controller, int sliderCode, boolean value){
boolean value){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean accelerometerMoved(Controller controller, public boolean accelerometerMoved(Controller controller, int accelerometerCode, Vector3 value){
int accelerometerCode, Vector3 value){
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean scrolled(int amount){ public boolean scrolled(int amount){
// TODO Auto-generated method stub
return false; return false;
} }
} }