Tristan Vlogman / Mbed 2 deprecated locomotion_pid_action_refactor_EMG

Dependencies:   FastPWM HIDScope MODSERIAL QEI Matrix biquadFilter controller errorFetch mbed motorConfig refGen MatrixMath inverseKinematics

Fork of Minor_test_serial by First Last

Files at this revision

API Documentation at this revision

Comitter:
tvlogman
Date:
Sun Oct 22 08:07:06 2017 +0000
Parent:
34:1a70aa045c8f
Child:
36:f3f3327d1d5a
Commit message:
Now seperating getting the reference and filtering the reference for clarity.

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
refGen.lib Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Sun Oct 22 08:01:59 2017 +0000
+++ b/main.cpp	Sun Oct 22 08:07:06 2017 +0000
@@ -105,7 +105,9 @@
 void measureAndControl(){
     m1counts = Encoder1.getPulses();
     m2counts = Encoder2.getPulses();
-    float r1 = ref1.getFilteredReference;
+    float r1 = ref1.getReference();
+    r1 = HPbqc.applyFilter(r1);
+    r1 = LPbqc.applyFilter(r1);
     e1.fetchError(m1counts, r1);
     float motorValue = motorController1.control(e1.e_pos, e1.e_int, e1.e_der);
     float r1_unfiltered = ref1.getReference();
--- a/refGen.lib	Sun Oct 22 08:01:59 2017 +0000
+++ b/refGen.lib	Sun Oct 22 08:07:06 2017 +0000
@@ -1,1 +1,1 @@
-refGen#38af2aa14a3f
+refGen#7186da6f562f