FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final update commit (backlog 1)

Browse Source
This commit is contained in:
cs-powell
2024-11-24 15:57:19 -05:00
parent 3579efea5d
commit 1ea3927d71
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Java/ProjectModels/CognitiveModel/ModelFiles/Model.java
View File

@@ -67,7 +67,7 @@ public class Model {
return q.queueLength();
}
public void createAction(ActionType actionType,int delay,String target) {
public void createAction(ActionType actionType, MotorType motorType, int delay,String target) {
Action newAction = null;
switch(actionType) {
case VISION:
@@ -75,7 +75,7 @@ public class Model {
this.push(newAction);
break;
case MOTOR:
newAction = new Motor(delay,target);
newAction = new Motor(motorType,delay,target);
this.push(newAction);
break;
@@ -129,25 +129,36 @@ public class Model {
Motor tempM = (Motor) temp;
MotorType motorType = tempM.getMotorType();
float[] currentControls = null;
try {
currentControls = xpc.getCTRL(0);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
try {
switch(motorType){
case PITCHUP:
float[] pitchUp = {currentControls[0] + 0.01f};
if(storedVision[0] > 90) {
if(currentControls[0] < 0.1f) {
if(storedVision[0] > 80) {
if(currentControls[0] < 0.2f) {
System.out.println("Pitching Up");
xpc.sendCTRL(pitchUp);
}
}
System.out.println("Pitching Up");
break;
case PITCHDOWN:
float[] pitchDown = {currentControls[0] - 0.01f};
if(storedVision[0] < 50) {
if(currentControls[0] > 0.1f) {
if(storedVision[0] < 80) {
if(currentControls[0] > -0.2f) {
// System.out.println("Sending Pitch Down");
System.out.println("Pitching Down");
xpc.sendCTRL(pitchDown);
}
}
System.out.println("Pitching Down");
break;
}
} catch (IOException e) {

12
Java/ProjectModels/CognitiveModel/ModelFiles/Motor.java
View File

@@ -7,17 +7,19 @@ public class Motor extends Action {
float[] control;
MotorType motorType;
public Motor() {
public Motor(MotorType motorType) {
super(ActionType.MOTOR,1000);
this.motorType = motorType;
}
public Motor(int delay) {
super(ActionType.MOTOR,delay);
}
// public Motor(int delay) {
// super(ActionType.MOTOR,delay);
// }
public Motor(int delay, String target) {
public Motor(MotorType motorType,int delay, String target) {
super(ActionType.MOTOR,delay,target);
this.motorType = motorType;
}