Merge branch 'master' into 'MotorMovement'
# Conflicts: # Robot/Communication/uart.c # Robot/Communication/uart.h # Robot/main.c
Branches MotorMovement
No related tags found
Showing
- Robot/.project 0 additions, 27 deletionsRobot/.project
- Robot/Actuators/servo.c 79 additions, 79 deletionsRobot/Actuators/servo.c
- Robot/Actuators/servo.h 14 additions, 13 deletionsRobot/Actuators/servo.h
- Robot/Communication/uart.c 150 additions, 120 deletionsRobot/Communication/uart.c
- Robot/Communication/uart.h 35 additions, 36 deletionsRobot/Communication/uart.h
- Robot/Sensor/cliff_sensor.c 65 additions, 0 deletionsRobot/Sensor/cliff_sensor.c
- Robot/Sensor/cliff_sensor.h 62 additions, 0 deletionsRobot/Sensor/cliff_sensor.h
- Robot/Sensor/ir.c 90 additions, 58 deletionsRobot/Sensor/ir.c
- Robot/Sensor/ir.h 18 additions, 10 deletionsRobot/Sensor/ir.h
- Robot/Sensor/sonic.c 139 additions, 131 deletionsRobot/Sensor/sonic.c
- Robot/Sensor/sonic.h 30 additions, 26 deletionsRobot/Sensor/sonic.h
- Robot/Sensor/sweep_sensor.c 418 additions, 0 deletionsRobot/Sensor/sweep_sensor.c
- Robot/Sensor/sweep_sensor.h 155 additions, 0 deletionsRobot/Sensor/sweep_sensor.h
- Robot/Utils/timer4.c 53 additions, 0 deletionsRobot/Utils/timer4.c
- Robot/Utils/timer4.h 24 additions, 0 deletionsRobot/Utils/timer4.h
Loading
Please register or sign in to comment