From 84effb379d2a563e72068bad8be8c46bc88d2fb3 Mon Sep 17 00:00:00 2001 From: Mathis et Yohan Date: Fri, 12 Nov 2021 18:34:14 +0100 Subject: [PATCH] Add file upgrade --- RLS_V1.0/.DS_Store | Bin 12292 -> 12292 bytes RLS_V1.0/R2Home_SOFTWARE_V1.01/.DS_Store | Bin 0 -> 6148 bytes .../R2Home_SERVO.ino} | 3 +++ 3 files changed, 3 insertions(+) create mode 100644 RLS_V1.0/R2Home_SOFTWARE_V1.01/.DS_Store rename RLS_V1.0/R2Home_SOFTWARE_V1.01/{R2Home_SERVO.step/R2Home_SERVO.step.ino => R2Home_SERVO/R2Home_SERVO.ino} (92%) diff --git a/RLS_V1.0/.DS_Store b/RLS_V1.0/.DS_Store index 1d5c59bbe4f8eeefef7b587fcf06f61f48bc1514..a56568c96ea3039969dabf7c1a8da4d4938357c2 100644 GIT binary patch delta 1419 zcmdT@TWl0n82&$Y3unRz$9B8zwq15%DK5=gcWG%M%Ej7>rbHUIv_&B8Om}JrwmWNQ zb~kNV8U=3&#LGYk#Ka3|sxP1`FAyObArM1INCQz~e9^?1aPf&3qn^$zy!zl1=jFeA z|M|~jfr*7 z4~+rr?jF#GjZ9LX)aqX6mI8GU!!0 zKp)cA^bMV(^YjDF(l7KI-JyH*7yV8DfFPj~K2*bx5MpS?6NqCiy6`MEp$A*hj{$6h zikG2d7k0zKB=(?)y?7Jv;61z#8z10P%rxM0e1Q_a!}qv=i@1s(@e^+1SKPvF`&b}^ zyMq0M-B81DP$*EpP;UCa0yHh(Wp~v^rvr8M4Z%pTk?~86v)Q>&js}|~ewuMOVK5qO zW{l5su|%*%64Y~#i?zvXm>`)~xagDeI!VaDy)L>@?qGs#KHo*Vf}13vHK)k^7Z$Of zYGl*We~^ETZqgrg4<0ZqLKW%}#!4j6j;96H&!HQe@q$D5OW2N`7%5YpMh@naSrG4ts}%0T(@T`L%895g5LwO_t0{p zxqy!usm@f+8YcSr)PrPpG?5%O#)l5X(dF|zFXw%KKhE;Z^31g;T3$?S zHews2=C)EVT`{pYu8_&FWn^ovoovm8N?KA+eKsCPnjNt?3OAX)+y8Xla@fh3cXH z0U}KmwbOY$o1tU%a?cQvrjyy(SuIn@JJ8K*>TotmL1{#w?}cNjctJZ5&ljROEu*E% z?3bmTEwSDT$-$1RVaO97di|ji+!NPKT+Uxent$szJ zl{X6IN^DRSLN~aNO6XGgX5@?P_IOE;5)ip6YN|%1j|>Q03boYMK{6zAZPZ*__mZH% z?NDp=Ln9%DZ8_X^Q&sv9o)q|+{Yt4#uGfnGi=}`USSij@eUvH318UPwwi#?Zem{BZZK5;6WQ}unDW?- fwAz<$dWz=j=YNzMd_Ef+rmlZrV`rqLVL@}Lj7BxTUJfoJ7e4R%6DgC3>X8(z}^{P z&lVXRE1ES1i~(byVL<*5o+_9|tQEtrgC-mSh<&<)a2)nDL@y3v8nITShvGDqsHrX< zF`TB;?_*pVu~yV{xOn(*@y#xtP+Z(mIUmB|Qbn`IfHBZ!;6N{j(*MWX&;RWtyD|oh zfq%t->t}g3;*?@ literal 0 HcmV?d00001 diff --git a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO.step/R2Home_SERVO.step.ino b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO/R2Home_SERVO.ino similarity index 92% rename from RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO.step/R2Home_SERVO.step.ino rename to RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO/R2Home_SERVO.ino index 659d7ea..4374a98 100644 --- a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO.step/R2Home_SERVO.step.ino +++ b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_SERVO/R2Home_SERVO.ino @@ -49,6 +49,7 @@ if ((millis()-tread)>=(1000/a)) { tread = millis(); parallax_steer = inputCmd.getPulse(); + parallax_steer = constrain(parallax_steer, 1050, 1950); parallax_steer = map(parallax_steer,1000, 2000, 1050, 1950); Serial.print(parallax_steer); Serial.print(","); Serial.print(feedback_value); Serial.print(","); Serial.print(error); Serial.print(","); Serial.println(PIDsum); @@ -72,6 +73,8 @@ void updatecmd(int a) { raterror = (error-lasterror); PIDsum = (Kp*error)+(Kd*raterror); cmd = 1500 + PIDsum; + if (cmd >1500) {cmd = cmd+20;} + if (cmd <1500) {cmd = cmd-20;} constrain(cmd, 1000, 2000);