Project

General

Profile

Revision 979

Added by Chris Mar about 15 years ago

minor changes to remote control / mapping code...wireless control works with libwireless reverted to rev. 887. code in odometry interrupt conflicts with motors, not allowing the robot to move motors in response to commands.

View differences:

odometry.c
5 5
#include <avr/interrupt.h>
6 6
#include <dragonfly_lib.h>
7 7

  
8
void modify_velocity(void);
9

  
10

  
8 11
long lround(double d);
9 12

  
10 13
char control_velocity = 0;
......
148 151
}
149 152

  
150 153
void modify_velocity(){
151
	int diff = target_velocity - velocity;
154
	usb_puts("modify_velocity\n");
155
    int diff = target_velocity - velocity;
152 156
	if(diff > 0){
153 157
		move_speed++;
154 158
		move(move_speed,move_angle);
......
160 164
}
161 165

  
162 166
ISR(TIMER2_COMP_vect){
163
	odometry_run(); 
167
	//odometry_run(); 
164 168
}
165 169

  
166 170
long lround(double d){

Also available in: Unified diff