Erina Yamaguchi / Mbed OS jumping_leg_clicky

Dependencies:   ExperimentServer MotorShield QEI_pmw

Files at this revision

API Documentation at this revision

Comitter:
elijahsj
Date:
Wed Aug 26 23:42:18 2020 +0000
Parent:
13:3a1f4e09789b
Child:
15:495333b2ccf1
Commit message:
Fully functional with high frequency loop

Changed in this revision

MotorShield.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/MotorShield.lib	Wed Aug 26 19:35:05 2020 +0000
+++ b/MotorShield.lib	Wed Aug 26 23:42:18 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/elijahsj/code/MotorShield/#417655779dc5
+https://os.mbed.com/users/elijahsj/code/MotorShield/#e3a2ade56b79
--- a/main.cpp	Wed Aug 26 19:35:05 2020 +0000
+++ b/main.cpp	Wed Aug 26 23:42:18 2020 +0000
@@ -60,7 +60,7 @@
                 output_data[0] = t.read();
                 output_data[1] = encoderA.getPulses(); 
                 output_data[2] = encoderA.getVelocity();
-                output_data[3] = readADC1(0);
+                output_data[3] = motorShield.readCurrentA();
                 
                 // Send data to MATLAB
                 server.sendData(output_data,NUM_OUTPUTS);