Fix up visibility, move more complex car movements into subclass.
This commit is contained in:
@@ -12,19 +12,15 @@ import SwiftyGPIO
|
||||
protocol Vehicle2D{
|
||||
var throttle: Float {get set}
|
||||
var steering: Float {get set}
|
||||
mutating func move2D(magnitude: Float, angle: Float)
|
||||
}
|
||||
|
||||
class MockVehicle: Vehicle2D {
|
||||
var throttle: Float = 0
|
||||
var steering: Float = 0
|
||||
|
||||
func move2D(magnitude: Float, angle: Float) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class RPiVehicle2D: Vehicle2D{
|
||||
public class RPiVehicle2D: Vehicle2D{
|
||||
|
||||
public var pwmThrottle: Servo
|
||||
public var pwmSteering: Servo
|
||||
|
||||
@@ -51,13 +47,6 @@ class RPiVehicle2D: Vehicle2D{
|
||||
pwmSteering = withSteeringPin
|
||||
}
|
||||
|
||||
func calibrate(){
|
||||
// Define a function that indicates how the throttle/steering should be set for given magnitude/angle to move.
|
||||
}
|
||||
|
||||
func move2D(magnitude: Float, angle: Float) {
|
||||
|
||||
}
|
||||
|
||||
func stop(){
|
||||
pwmThrottle.detach()
|
||||
@@ -65,3 +54,46 @@ class RPiVehicle2D: Vehicle2D{
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public typealias ThrottleHandler = (_ magnitude: Float) -> Float
|
||||
public typealias SteeringHandler = (_ angle: Float) -> Float
|
||||
|
||||
|
||||
public class IntelligentPiCar : RPiVehicle2D {
|
||||
|
||||
private var vehicleLength: Float?
|
||||
private var throttleFunc: ThrottleHandler?
|
||||
private var steeringFunc: SteeringHandler?
|
||||
|
||||
/**:
|
||||
Calibration function for how the car moves (acoording to a bicycle model) for a given throttle/steering angle. This sets the way the
|
||||
- Parameters
|
||||
- carLength
|
||||
*/
|
||||
func calibrate(vehicleLength: Float, throttleFunc: @escaping ThrottleHandler, steeringFunc: @escaping SteeringHandler){
|
||||
// Define a function that indicates how the throttle/steering should be set for given magnitude/angle to move.
|
||||
self.vehicleLength = vehicleLength
|
||||
self.throttleFunc = throttleFunc
|
||||
self.steeringFunc = steeringFunc
|
||||
}
|
||||
|
||||
/**
|
||||
Move the car by the given magnitude and angle, depending on how the is known to move with apriori throttle/steering.
|
||||
*/
|
||||
func move2D(magnitude: Float, angle: Float) {
|
||||
if let throttleFunc = self.throttleFunc {
|
||||
self.pwmThrottle.value = throttleFunc(magnitude)
|
||||
}
|
||||
|
||||
if let steeringFunc = steeringFunc {
|
||||
self.pwmSteering.value = steeringFunc(angle)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Move to the coordinates relative to the car. You must first calibrate the car. A bicycle model is assumed.
|
||||
*/
|
||||
func moveRelativeTo2D(x: Float, y: Float) {
|
||||
// TODO: This function, has a lot of edge cases. Also is really
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user