From ba02e965a07fa38c900d9b4ed9b2a64df485f2c7 Mon Sep 17 00:00:00 2001
From: Piv <m.pivato@hotmail.com>
Date: Wed, 2 Sep 2020 21:36:18 +0930
Subject: [PATCH] Fix visibility

---
 Sources/Swift2dCar/Vehicle.swift | 59 +++++---------------------------
 1 file changed, 8 insertions(+), 51 deletions(-)

diff --git a/Sources/Swift2dCar/Vehicle.swift b/Sources/Swift2dCar/Vehicle.swift
index a3cf981..fa05ec6 100644
--- a/Sources/Swift2dCar/Vehicle.swift
+++ b/Sources/Swift2dCar/Vehicle.swift
@@ -9,22 +9,22 @@ import Foundation
 import SwiftyGPIO
 
 
-protocol Vehicle2D{
+public protocol Vehicle2D{
     var throttle: Float {get set}
     var steering: Float {get set}
 }
 
 class MockVehicle: Vehicle2D {
-    var throttle: Float = 0
-    var steering: Float = 0
+    public var throttle: Float = 0
+    public var steering: Float = 0
 }
 
-public class RPiVehicle2D: Vehicle2D{
+open class RPiVehicle2D: Vehicle2D{
     
-    public var pwmThrottle: Servo
-    public var pwmSteering: Servo
+    var pwmThrottle: Servo
+    var pwmSteering: Servo
     
-    var throttle: Float{
+    public var throttle: Float{
         get{
             return pwmThrottle.value
         }
@@ -33,7 +33,7 @@ public class RPiVehicle2D: Vehicle2D{
         }
     }
     
-    var steering: Float{
+    public var steering: Float{
         get{
             return pwmSteering.value
         }
@@ -54,46 +54,3 @@ public 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
-    }
-}