Makoto Kobayashi / Mbed 2 deprecated Kikaikougaku_Jikken_mecolab

機械工学実験1

Dependencies:   PID QEI mbed

Files at this revision

API Documentation at this revision

Revision 3:2a9a433d93c3, committed 2014-11-05

Comitter:
neoqased
Date:
Wed Nov 05 07:58:41 2014 +0000
Parent:
2:d5f964932fce
Commit message:
dsf;

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r d5f964932fce -r 2a9a433d93c3 main.cpp
--- a/main.cpp	Fri Oct 24 05:33:28 2014 +0000
+++ b/main.cpp	Wed Nov 05 07:58:41 2014 +0000
@@ -173,7 +173,7 @@
                     Buzzer(-1);
                     break;
                 }
-                fprintf(fp,", kp = %.6f  ki = %.6f  kd = %.6f\n", (float)KP, (float)TI, (float)TD);
+                fprintf(fp,", kp = %.6f  ti = %.6f  td = %.6f\n", (float)KP, (float)TI, (float)TD);
                 fprintf(fp,"Time , RPM\n");
                 for(int i = 0; i <= 15*1000/PID_RATE; i++){     //output results
                     fprintf(fp,"%f , %d\n", (float)exp[i].t / 1000.0, exp[i].rpm);