Skip to content

Commit

Permalink
Changed the chuck portion to support IDs.
Browse files Browse the repository at this point in the history
  • Loading branch information
Remy Porter committed Jun 29, 2015
1 parent 47ebff3 commit 0051ac4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 29 deletions.
52 changes: 24 additions & 28 deletions drone.ck
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ public class Drone {
2 => int z;
0 => int moving;

fun void startMoving(int dir) {
stopMoving();
now => moveStart[dir];
int id;
fun string makePath(string pathString) {
"/drone/ID" + id + pathString => string res;
return res;
}

int id;
fun void outdoorMode() {
"true" => outdoor;
"true" => noShell;
Expand All @@ -28,72 +28,68 @@ public class Drone {
6.0 => yawSpeed;
}

fun string path(pathString) {
return "/drone/ID" + id + pathString;
}

fun void connect(string host, int port, int droneId) {
(host, port) => osc.dest;
droneId => id;
}
fun void takeoff() {
osc.start(path("/takeoff")).send();
osc.start(makePath("/takeoff")).send();
}
fun void zero() {
osc.start(path("/zero")).send();
osc.start(makePath("/zero")).send();
}
fun void moveToZero() {
osc.start(path("/move/zero")).send();
osc.start(makePath("/move/zero")).send();
}
fun void land() {
osc.start(path("/land")).send();
osc.start(makePath("/land")).send();
}
fun void light(string pattern, float freq, float durInMills) {
osc.start(path("/light/" + pattern)).add(freq).add(durInMills).send();
osc.start(makePath("/light/" + pattern)).add(freq).add(durInMills).send();
}
fun void anim(string pattern, float durInMills) {
osc.start(path("/anim/" + pattern)).add(durInMills);
osc.start(makePath("/anim/" + pattern)).add(durInMills);
}
fun void forward(float speed) {
osc.start(path("/move/front")).add(speed).send();
osc.start(makePath("/move/front")).add(speed).send();
}
fun void up(float speed) {
osc.start(path("/move/up")).add(speed).send();
osc.start(makePath("/move/up")).add(speed).send();
}
fun void down(float speed) {
osc.start(path("/move/down")).add(speed).send();
osc.start(makePath("/move/down")).add(speed).send();
}
fun void backward(float speed) {
osc.start(path("/move/back")).add(speed).send();
osc.start(makePath("/move/back")).add(speed).send();
}
fun void left(float speed) {
osc.start(path("/move/left")).add(speed).send();
osc.start(makePath("/move/left")).add(speed).send();
}
fun void right(float speed) {
osc.start(path("/move/right")).add(speed).send();
osc.start(makePath("/move/right")).add(speed).send();
}
fun void clockwise(float speed) {
osc.start(path("/move/clockwise")).add(speed).send();
osc.start(makePath("/move/clockwise")).add(speed).send();
}
fun void counterClockwise(float speed) {
osc.start(path("/move/counterClockwise")).add(speed).send();
osc.start(makePath("/move/counterClockwise")).add(speed).send();
}
fun void stop() {
osc.start(path("/move/stop")).send();
osc.start(makePath("/move/stop")).send();
}
fun void verticalSpeed(float speed) {
osc.start(path("/config/vert_speed")).add(speed).send();
osc.start(makePath("/config/vert_speed")).add(speed).send();
}
fun void yawSpeed(float speed) {
osc.start(path("/config/yaw_speed")).add(speed).send();
osc.start(makePath("/config/yaw_speed")).add(speed).send();
}
fun void outdoor(string val) {
osc.start(path("/config/outdoor")).add(val).send();
osc.start(makePath("/config/outdoor")).add(val).send();
}
fun void noShell(string val) {
osc.start(path("/config/no_shell")).add(val).send();
osc.start(makePath("/config/no_shell")).add(val).send();
}
fun void reset() {
osc.start(path("/reset")).send();
osc.start(makePath("/reset")).send();
}
}
2 changes: 1 addition & 1 deletion osctest.ck
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Drone d;
("localhost", 8081) => d.connect;
("localhost", 8081, 0) => d.connect;
d.reset();
1::second => now;
d.takeoff();
Expand Down

0 comments on commit 0051ac4

Please sign in to comment.