Revision 35:b47330f0dec2, committed 2018-11-03

Comitter:

aoikoizumi

Date:

Sat Nov 03 23:09:50 2018 +0000

Parent:

34:b34dc495b3c8

Commit message:

?????

Changed in this revision

diff -r b34dc495b3c8 -r b47330f0dec2 SpeedController.cpp
--- a/SpeedController.cpp	Thu Jul 05 01:23:58 2018 +0000
+++ b/SpeedController.cpp	Sat Nov 03 23:09:50 2018 +0000
@@ -18,13 +18,13 @@
 void SpeedControl::Sc(double target_omega){       //スカンジウムじゃないよ
     now_omega=omega;
     now_time_=timer.read();
-    diff= target_omega-now_omega;
+     diff= (target_omega-now_omega)/C;
     out_duty=Kv_p*diff+Kv_d*(diff-diff_old)/(now_time_-old_time_);
     diff_old=diff;
     if(out_duty>0.1)out_duty=0.1;
     if(out_duty<-0.1)out_duty=-0.1;
-    if((duty>=-0.95)&&(duty<=0.95)) out+=out_duty;
-    duty=0.00002*out+target_omega/C;
+    if((duty>=-0.95)&&(duty<=0.95)) duty=duty+out_duty;
+    //duty=target_omega/C;
     if(duty<-0.95)duty=-0.95;
     else if(duty>0.95)duty=0.95;
     old_time_=now_time_;