ARES / RoboClaw

oklm

Dependents:   RoboClaw TestMyPathFind Robot2016_2-0_STATIC Stressed ... more

Files at this revision

API Documentation at this revision

Revision 10:f82bc24e3bd4, committed 2016-05-04

Comitter:
sype
Date:
Wed May 04 16:14:57 2016 +0000
Parent:
9:0fc5514faed9
Commit message:
Je ne sais pas ce qui a chang? ici

Changed in this revision

RoboClaw.cpp Show annotated file Show diff for this revision Revisions of this file
RoboClaw.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 0fc5514faed9 -r f82bc24e3bd4 RoboClaw.cpp
--- a/RoboClaw.cpp	Thu Apr 28 08:22:13 2016 +0000
+++ b/RoboClaw.cpp	Wed May 04 16:14:57 2016 +0000
@@ -218,8 +218,8 @@
     write_n(10,address,M2SPEEDACCEL,SetDWORDval(accel),SetDWORDval(speed));
 }
 
-void RoboClaw::SpeedAccelM1M2(int32_t accel1, int32_t speed1, int32_t accel2, int32_t speed2){
-    write_n(10,address,M2SPEEDACCEL,SetDWORDval(accel1),SetDWORDval(speed1),SetDWORDval(accel2),SetDWORDval(speed2));
+void RoboClaw::SpeedAccelM1M2(int32_t accel, int32_t speed1, int32_t speed2){
+    write_n(14,address,MIXEDSPEEDACCEL,SetDWORDval(accel),SetDWORDval(speed1),SetDWORDval(speed2));
 }
 
 void RoboClaw::SpeedDistanceM1(int32_t speed, uint32_t distance, uint8_t buffer){

diff -r 0fc5514faed9 -r f82bc24e3bd4 RoboClaw.h
--- a/RoboClaw.h	Thu Apr 28 08:22:13 2016 +0000
+++ b/RoboClaw.h	Wed May 04 16:14:57 2016 +0000
@@ -75,7 +75,7 @@
     void SpeedM2(int32_t speed);
     void SpeedAccelM1(int32_t accel, int32_t speed);
     void SpeedAccelM2(int32_t accel, int32_t speed);
-    void SpeedAccelM1M2(int32_t accel1, int32_t speed1, int32_t accel2, int32_t speed2);
+    void SpeedAccelM1M2(int32_t accel, int32_t speed1, int32_t speed2);
     void SpeedDistanceM1(int32_t speed, uint32_t distance, uint8_t buffer);
     void SpeedDistanceM2(int32_t speed, uint32_t distance, uint8_t buffer);
     void SpeedAccelDistanceM1(int32_t accel, int32_t speed, uint32_t distance, uint8_t buffer);