Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JavierIH/Raider
Browse files Browse the repository at this point in the history
  • Loading branch information
JavierIH committed Sep 4, 2014
2 parents 006211b + 1f7315d commit 9904e93
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions programming/opencm/motion/motion.ino
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void setup() {

bool flag=0;

void loop() {
void loop() {

digitalWrite(BOARD_LED_PIN, HIGH);
if(digitalRead(STOP_BUTTON)){
Expand All @@ -47,5 +47,4 @@ void loop() {
Serial3.flush();
}
}

}
2 changes: 1 addition & 1 deletion programming/opencm/motion/raider_motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ void Robot::endLookUp(){


void Robot::run(int pasos){
int tilt=10;
int tilt=11;
float tiempo=0.07;
int altura_paso=20;
int avance=15;
Expand Down

0 comments on commit 9904e93

Please sign in to comment.