idfk
This commit is contained in:
parent
9d6e8a366b
commit
1d60e13792
@ -1,7 +1,6 @@
|
||||
package kernel.gps;
|
||||
|
||||
import lib.SinglePromise;
|
||||
import kernel.log.Log;
|
||||
import kernel.turtle.Turtle;
|
||||
import lib.WorldPos;
|
||||
|
||||
@ -71,6 +70,9 @@ class INS {
|
||||
}
|
||||
|
||||
private static function move(dir:Null<WorldPos>) {
|
||||
if (alignPromise.isRunning()) {
|
||||
return;
|
||||
}
|
||||
var pos = GPS.getPosition();
|
||||
if (pos == null || dir == null)
|
||||
return;
|
||||
@ -86,40 +88,34 @@ class INS {
|
||||
return alignPromise.request();
|
||||
}
|
||||
|
||||
public static function startAlign():Promise<Noise> {
|
||||
return new Promise<Noise>((resolve, reject) -> {
|
||||
public static function startAlign():Void {
|
||||
if (Turtle.getFuelLevel() < 2) {
|
||||
Log.warn("Not enough fuel to align");
|
||||
reject(new Error("Not enough fuel to align"));
|
||||
return null;
|
||||
alignPromise.reject(new Error("Not enough fuel to align"));
|
||||
return;
|
||||
}
|
||||
|
||||
GPS.locate().handle((result) -> {
|
||||
switch result {
|
||||
case Failure(err):
|
||||
Log.warn("GPS not available for 1st position");
|
||||
reject(new Error("GPS not available"));
|
||||
alignPromise.reject(new Error("Failed to locate 1st positon: " + err));
|
||||
return;
|
||||
case Success(pos1):
|
||||
var moved = tryMoving();
|
||||
|
||||
if (moved == -1) {
|
||||
Log.warn("Can't move");
|
||||
reject(new Error("Can't move"));
|
||||
alignPromise.reject(new Error("Can't move"));
|
||||
return;
|
||||
}
|
||||
|
||||
GPS.locate().handle((result) -> {
|
||||
switch result {
|
||||
GPS.locate().handle((result2) -> {
|
||||
switch result2 {
|
||||
case Failure(err):
|
||||
Log.warn("GPS not available for 2nd position");
|
||||
reject(new Error("GPS not available for 2nd position"));
|
||||
alignPromise.reject(new Error("GPS not available for 2nd position: " + err));
|
||||
return;
|
||||
case Success(pos2):
|
||||
var cHeading = calcHeading(pos1, pos2, moved);
|
||||
if (cHeading == null) {
|
||||
Log.error("Can't calculate heading");
|
||||
reject(new Error("Can't calculate heading"));
|
||||
alignPromise.reject(new Error("Can't calculate heading"));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -127,13 +123,11 @@ class INS {
|
||||
moveBack(moved);
|
||||
GPS.setINSPosition(pos1);
|
||||
|
||||
resolve(Noise);
|
||||
alignPromise.resolve(Noise);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
// -1 = not moved, 0 = back, 1 = forward, 2 = left, 3 = right
|
||||
@ -172,20 +166,14 @@ class INS {
|
||||
private static function moveBack(moved:Int) {
|
||||
if (moved == 0) {
|
||||
Turtle.forward();
|
||||
// cc.Turtle.forward();
|
||||
} else if (moved == 1) {
|
||||
Turtle.back();
|
||||
// cc.Turtle.back();
|
||||
} else if (moved == 2) {
|
||||
Turtle.back();
|
||||
// cc.Turtle.back();
|
||||
Turtle.turnRight();
|
||||
// cc.Turtle.turnRight();
|
||||
} else if (moved == 3) {
|
||||
Turtle.forward();
|
||||
// cc.Turtle.forward();
|
||||
Turtle.turnRight();
|
||||
// cc.Turtle.turnRight();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user