projects
/
challenge-bot
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a941f5d
)
standardize phase3 more
author
daniel watson
<ozzloy@gmail.com>
Sun, 3 Nov 2013 05:54:06 +0000
(22:54 -0700)
committer
daniel watson
<ozzloy@gmail.com>
Sun, 3 Nov 2013 05:54:06 +0000
(22:54 -0700)
phase3/phase3.ino
patch
|
blob
|
blame
|
history
diff --git
a/phase3/phase3.ino
b/phase3/phase3.ino
index a2631b9ebc22d3a572a63f2c432179866ed8a447..c660c6ec677eec0aed8c7a4e7287c6fcdb30f683 100644
(file)
--- a/
phase3/phase3.ino
+++ b/
phase3/phase3.ino
@@
-55,7
+55,7
@@
void setup() {
if (debug) {
// 115200 is the fastest "standard" baud rate for debugging.
// Be sure to set the baud Tools=>Serial Monitor to 115200:
if (debug) {
// 115200 is the fastest "standard" baud rate for debugging.
// Be sure to set the baud Tools=>Serial Monitor to 115200:
- Serial.begin(
1152
00);
+ Serial.begin(
96
00);
}
// Set LED output pin:
}
// Set LED output pin:
@@
-89,7
+89,7
@@
void setup() {
digitalWrite(right_sonar_trigger, LOW);
}
digitalWrite(right_sonar_trigger, LOW);
}
-void motors
R
un(int left, int right, int ms_delay) {
+void motors
_r
un(int left, int right, int ms_delay) {
// Set left motor direction:
if (left > 0) {
// Set left motor to go forward:
// Set left motor direction:
if (left > 0) {
// Set left motor to go forward:
@@
-149,8
+149,9
@@
int ping(int sonar_trigger, int sonar_echo, int timeout) {
// We timed out, so return *timeout*:
result = timeout;
}
// We timed out, so return *timeout*:
result = timeout;
}
- } // else *sonar_echo* is still high from the previous trigger;
- // return *timeout* when this occurs.
+ }
+ // else *sonar_echo* is still high from the previous trigger;
+ // return *timeout* when this occurs.
return result;
}
return result;
}
@@
-182,5
+183,5
@@
void loop() {
}
// Set the motor speeds:
}
// Set the motor speeds:
- motors
R
un(left_speed, right_speed, 0);
+ motors
_r
un(left_speed, right_speed, 0);
}
}