Bayley Wang / Mbed 2 deprecated priustroller_3

temp repo

Dependencies:   mbed

Fork of priustroller_2 by N K

Diff: meta/pidcontroller.cpp

Revision:
24:f1ff9c7256b5
Parent:
21:da41c08e51bc
Child:
25:0003b824dd7d
diff -r 7366022ea0ab -r f1ff9c7256b5 meta/pidcontroller.cpp
--- a/meta/pidcontroller.cpp	Mon Mar 09 08:28:22 2015 +0000
+++ b/meta/pidcontroller.cpp	Mon Mar 09 11:33:14 2015 +0000
@@ -12,7 +12,6 @@
 }
 
 float PidController::Update(float ref, float in) {
-    /*
     float error = ref - in;
     _integral += error;
     if (_integral * _ki > _out_max) _integral = _out_max / _ki;
@@ -23,6 +22,4 @@
     if (tmp > _out_max) tmp = _out_max;
     if (tmp < _out_min) tmp = _out_min;
     return tmp;
-    */
-    return 0.0f;
 }
\ No newline at end of file