Commit 999f364a authored by mattdr's avatar mattdr
Browse files

merge conflict

parents 74412b09 b734d568
......@@ -20,7 +20,7 @@ int Zoffset = 0;
// This is the difference in encoder tics from the Z index to
// the electrical encoder zero (which is found by powering the
// AB block and waiting for the motor to settle)
int hard_coded_offset = -1051;
int hard_coded_offset = 321;
// how long in microsec (us) to delay between phases while calibrating
// the wheel
......
......@@ -33,7 +33,7 @@ void motor_butt_control_precalculated(void);
void motor_setup(void) {
// put your setup code here, to run once:
float freq = 8000.00;//8000;
float freq = 8000.00; //8000;
pinMode(L1, OUTPUT);
pinMode(L2, OUTPUT);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment