Commit f431421b authored by Kotaro Terada's avatar Kotaro Terada

Update a project file

parent f74540c7
...@@ -2,8 +2,10 @@ import com.shigeodayo.ardrone.processing.*; ...@@ -2,8 +2,10 @@ import com.shigeodayo.ardrone.processing.*;
ARDroneForP5 ardrone; ARDroneForP5 ardrone;
char state='n';
void setup() { void setup() {
size(320, 240); size(640, 360);
ardrone=new ARDroneForP5("192.168.1.1"); ardrone=new ARDroneForP5("192.168.1.1");
// connect to the AR.Drone // connect to the AR.Drone
...@@ -20,7 +22,7 @@ void draw() { ...@@ -20,7 +22,7 @@ void draw() {
background(204); background(204);
// getting image from AR.Drone // getting image from AR.Drone
// true: resizeing image automatically // true: resizeing image automatically;
// false: not resizing // false: not resizing
PImage img = ardrone.getVideoImage(false); PImage img = ardrone.getVideoImage(false);
if (img == null) if (img == null)
...@@ -37,6 +39,8 @@ void draw() { ...@@ -37,6 +39,8 @@ void draw() {
float altitude = ardrone.getAltitude(); float altitude = ardrone.getAltitude();
float[] velocity = ardrone.getVelocity(); float[] velocity = ardrone.getVelocity();
int battery = ardrone.getBatteryPercentage(); int battery = ardrone.getBatteryPercentage();
float vx = velocity[0], vy = velocity[1];
String attitude = "pitch:" + pitch + "\nroll:" + roll + "\nyaw:" + yaw + "\naltitude:" + altitude; String attitude = "pitch:" + pitch + "\nroll:" + roll + "\nyaw:" + yaw + "\naltitude:" + altitude;
text(attitude, 20, 85); text(attitude, 20, 85);
...@@ -46,20 +50,25 @@ void draw() { ...@@ -46,20 +50,25 @@ void draw() {
text(bat, 20, 170); text(bat, 20, 170);
} }
//PCのキーに応じてAR.Droneを操作できる. //PC AR.Drone
// controlling AR.Drone through key input // controlling AR.Drone through key input
void keyPressed() { void keyPressed() {
if (key == CODED) { if (key == CODED) {
if (keyCode == UP) { if (keyCode == UP) {
state='f';
ardrone.forward(); // go forward ardrone.forward(); // go forward
} }
else if (keyCode == DOWN) { else if (keyCode == DOWN) {
state='b';
ardrone.backward(); // go backward ardrone.backward(); // go backward
} }
else if (keyCode == LEFT) { else if (keyCode == LEFT) {
state='l';
ardrone.goLeft(); // go left ardrone.goLeft(); // go left
} }
else if (keyCode == RIGHT) { else if (keyCode == RIGHT) {
state='r';
ardrone.goRight(); // go right ardrone.goRight(); // go right
} }
else if (keyCode == SHIFT) { else if (keyCode == SHIFT) {
...@@ -69,10 +78,36 @@ void keyPressed() { ...@@ -69,10 +78,36 @@ void keyPressed() {
ardrone.landing(); ardrone.landing();
// landing // landing
} }
} }
else { else {
if (key == 's') { if (key == 's') {
ardrone.stop(); // hovering if(vx > 30){
ardrone.parallel(,);
}
//switch(state){
// case 'f': //if current move is forward
// ardrone.backward();
// delay(1500);
// break;
// case 'b': //if current move is backword
// ardrone.forward();
// delay(1500);
// break;
// case 'l': //if current move is right
// ardrone.goRight();
// delay(1500);
// break;
// case 'r': //if current move is left
// ardrone.goLeft();
// delay(1500);
// break;
// default:break;
// }
//ardrone.stop(); // hovering
} }
else if (key == 'r') { else if (key == 'r') {
ardrone.spinRight(); // spin right ardrone.spinRight(); // spin right
...@@ -101,6 +136,8 @@ void keyPressed() { ...@@ -101,6 +136,8 @@ void keyPressed() {
else if (key == '5') { else if (key == '5') {
ardrone.toggleCamera(); // set next camera setting ardrone.toggleCamera(); // set next camera setting
} }
else if (key == 'e'){
ardrone.parallel(-5,5);
}
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment