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