Diff: speedlimiter.hpp

Revision:

13:47806f4dbfcd

Parent:

10:f0b382368614

--- a/speedlimiter.hpp	Sun Nov 18 03:30:57 2018 +0000
+++ b/speedlimiter.hpp	Thu Dec 13 19:18:39 2018 +0000
@@ -30,7 +30,7 @@
     SpeedLimiter(const PinName& pedalInHi, const PinName& pedalInLo, const PinName& pedalOutHi, const PinName& pedalOutLo);
     ~SpeedLimiter();
 
-    void ipControllerTransferFunction();
+    void controllerCallbackFunction();
 
     inline float getReferenceSpeed(bool increment = false) {
         //float retval = _referenceSpeed;
@@ -56,11 +56,9 @@
     inline void setParcours(Parcours* parcours) {
         _parcours = parcours;
     }
-
-    float ecoEnabledAlgorithm();
     
     inline float readAdcTest() {
-        AnalogIn adc(PF_3);
+        AnalogIn adc(PF_10);
         return adc.read();
     }
     
@@ -70,6 +68,9 @@
     void writeAdcPedalHi(const float voltage);
     void writeAdcPedalLo(const float voltage);
     float ecoDisabledAlgorithm();
+    float ecoEnabledAlgorithm();
+    double ipControlFunction(const double reference, const double measured, const bool reset = false);
+    double piControlFunction(const double reference, const double measured, const bool reset = false);
 
     float boundValue(float value, const float lowerBound, const float upperBound);
     float voltageToDecimal(const float decimal, const float reference);