changeset 247:caf5ac88d09c main

bus speed is now 500k rather than 250k new motor wiring reversed the previously-reversed rear motor connections
author Bob Cook <bob@bobcookdev.com>
date Sat, 22 Aug 2015 13:48:35 -0700
parents 603e27d44005
children 1fd327ac6ad8
files main/robots/odr-motion/motorctl.cpp main/robots/odr-motion/project_defs.h
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/main/robots/odr-motion/motorctl.cpp	Thu Aug 06 21:56:27 2015 -0700
+++ b/main/robots/odr-motion/motorctl.cpp	Sat Aug 22 13:48:35 2015 -0700
@@ -226,15 +226,13 @@
         return;
     }
 
-    // yes, the motor leads are backwards thus forward == reverse
-    
     if ( speed < 0 )
     {
-        pololu_qik2s12v10_m0_forward( -speed );
+        pololu_qik2s12v10_m0_reverse( -speed );
     }
     else
     {
-        pololu_qik2s12v10_m0_reverse( speed );
+        pololu_qik2s12v10_m0_forward( speed );
     }
 }
 
--- a/main/robots/odr-motion/project_defs.h	Thu Aug 06 21:56:27 2015 -0700
+++ b/main/robots/odr-motion/project_defs.h	Sat Aug 22 13:48:35 2015 -0700
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------------------
 //
-//  Copyright (C) 2013-2014 Bob Cook
+//  Copyright (C) 2013-2015 Bob Cook
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@
 //  packages/avr/can
 
 #define PRJ_M1CAN_ENABLE
-#define PRJ_M1CAN_CANBUS_250_KHZ
+#define PRJ_M1CAN_CANBUS_500_KHZ
 #define PRJ_M1CAN_TX_BUFFER_SIZE  16
 
 // ----------------------------------------------------------------------------------------