projects
/
challenge-bot
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ced8210
)
indicate wire colors in comments
author
daniel watson
<ozzloy@gmail.com>
Sat, 5 Dec 2015 04:11:24 +0000
(20:11 -0800)
committer
daniel watson
<ozzloy@gmail.com>
Sat, 5 Dec 2015 04:11:24 +0000
(20:11 -0800)
build-stages/b_left_sonar/b_left_sonar.ino
patch
|
blob
|
blame
|
history
build-stages/c_both_sonars/c_both_sonars.ino
patch
|
blob
|
blame
|
history
build-stages/d_left_motor/d_left_motor.ino
patch
|
blob
|
blame
|
history
build-stages/e_both_motors/e_both_motors.ino
patch
|
blob
|
blame
|
history
build-stages/g_follow/g_follow.ino
patch
|
blob
|
blame
|
history
build-stages/h_stay_on_table/h_stay_on_table.ino
patch
|
blob
|
blame
|
history
diff --git
a/build-stages/b_left_sonar/b_left_sonar.ino
b/build-stages/b_left_sonar/b_left_sonar.ino
index 4b648b238c8131902b27c1a4f11b6fbe284b103a..9c323e9f0769b706cd384362448b2ba7afae75a7 100644
(file)
--- a/
build-stages/b_left_sonar/b_left_sonar.ino
+++ b/
build-stages/b_left_sonar/b_left_sonar.ino
@@
-12,7
+12,9
@@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+// yellow wire
int left_echo_pin = 11;
int left_echo_pin = 11;
+// blue wire
int left_trigger_pin = 12;
int ping_microseconds = 0;
int left_trigger_pin = 12;
int ping_microseconds = 0;
diff --git
a/build-stages/c_both_sonars/c_both_sonars.ino
b/build-stages/c_both_sonars/c_both_sonars.ino
index ed81af469543efcbd9066fd6958f2e95e0037731..e39c0c4c20e3e2cc06ad3bc7dec6446452a7d4a8 100644
(file)
--- a/
build-stages/c_both_sonars/c_both_sonars.ino
+++ b/
build-stages/c_both_sonars/c_both_sonars.ino
@@
-12,10
+12,14
@@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+// yellow wire
int right_echo_pin = 6;
int right_echo_pin = 6;
+// blue wire
int right_trigger_pin = 7;
int right_trigger_pin = 7;
+// yellow wire
int left_echo_pin = 11;
int left_echo_pin = 11;
+// blue wire
int left_trigger_pin = 12;
int count = 0;
int left_trigger_pin = 12;
int count = 0;
diff --git
a/build-stages/d_left_motor/d_left_motor.ino
b/build-stages/d_left_motor/d_left_motor.ino
index a19074c3b67cd3281764dfa315477a198312974d..7a78954195f417482ed3065f93b128c0ab6def46 100644
(file)
--- a/
build-stages/d_left_motor/d_left_motor.ino
+++ b/
build-stages/d_left_motor/d_left_motor.ino
@@
-14,8
+14,11
@@
*/
// define which pins are connected to which components
*/
// define which pins are connected to which components
+// blue wire
int left_motor_forward_pin = 8;
int left_motor_forward_pin = 8;
+// orange wire
int left_motor_backward_pin = 9;
int left_motor_backward_pin = 9;
+// white wire
int left_motor_speed_pin = 10;
void setup(){
int left_motor_speed_pin = 10;
void setup(){
diff --git
a/build-stages/e_both_motors/e_both_motors.ino
b/build-stages/e_both_motors/e_both_motors.ino
index 1e55ac6a122207b81ca5922841ec16941fe4b7e9..136c4ae95b1d5b519a2c0fe800d52274d3d1892a 100644
(file)
--- a/
build-stages/e_both_motors/e_both_motors.ino
+++ b/
build-stages/e_both_motors/e_both_motors.ino
@@
-14,12
+14,18
@@
*/
// define which pins are connected to which components
*/
// define which pins are connected to which components
+// blue wire
int right_motor_forward_pin = 3;
int right_motor_forward_pin = 3;
+// orange wire
int right_motor_backward_pin = 4;
int right_motor_backward_pin = 4;
+// white wire
int right_motor_speed_pin = 5;
int right_motor_speed_pin = 5;
+// blue wire
int left_motor_forward_pin = 8;
int left_motor_forward_pin = 8;
+// orange wire
int left_motor_backward_pin = 9;
int left_motor_backward_pin = 9;
+// white wire
int left_motor_speed_pin = 10;
void on(int pin){
int left_motor_speed_pin = 10;
void on(int pin){
diff --git
a/build-stages/g_follow/g_follow.ino
b/build-stages/g_follow/g_follow.ino
index 6588dd6ef19702fa0b22ae04d0f4fa0a5841a5fb..f0ba76c8cbf3869697c86a68671b4898706e8bd7 100644
(file)
--- a/
build-stages/g_follow/g_follow.ino
+++ b/
build-stages/g_follow/g_follow.ino
@@
-14,18
+14,29
@@
*/
// define which pins are connected to which components
*/
// define which pins are connected to which components
+// blue wire
int right_motor_forward_pin = 3;
int right_motor_forward_pin = 3;
+// orange wire
int right_motor_backward_pin = 4;
int right_motor_backward_pin = 4;
+// white wire
int right_motor_speed_pin = 5;
int right_motor_speed_pin = 5;
+// yellow wire
int right_echo_pin = 6;
int right_echo_pin = 6;
+// blue wire
int right_trigger_pin = 7;
int right_trigger_pin = 7;
+
+// blue wire
int left_motor_forward_pin = 8;
int left_motor_forward_pin = 8;
+// orange wire
int left_motor_backward_pin = 9;
int left_motor_backward_pin = 9;
+// white wire
int left_motor_speed_pin = 10;
int left_motor_speed_pin = 10;
+// yellow wire
int left_echo_pin = 11;
int left_echo_pin = 11;
+// blue wire
int left_trigger_pin = 12;
void on(int pin){
int left_trigger_pin = 12;
void on(int pin){
diff --git
a/build-stages/h_stay_on_table/h_stay_on_table.ino
b/build-stages/h_stay_on_table/h_stay_on_table.ino
index 26ecf2c40a6f072dd6a459cad7a92626890105ed..e2838f5536af086fecbe2dea168cc0b68983c4e2 100644
(file)
--- a/
build-stages/h_stay_on_table/h_stay_on_table.ino
+++ b/
build-stages/h_stay_on_table/h_stay_on_table.ino
@@
-14,18
+14,28
@@
*/
// define which pins are connected to which components
*/
// define which pins are connected to which components
+// blue wire
int right_motor_forward_pin = 3;
int right_motor_forward_pin = 3;
+// orange wire
int right_motor_backward_pin = 4;
int right_motor_backward_pin = 4;
+// white wire
int right_motor_speed_pin = 5;
int right_motor_speed_pin = 5;
+// yellow wire
int right_echo_pin = 6;
int right_echo_pin = 6;
+// blue wire
int right_trigger_pin = 7;
int right_trigger_pin = 7;
+// blue wire
int left_motor_forward_pin = 8;
int left_motor_forward_pin = 8;
+// orange wire
int left_motor_backward_pin = 9;
int left_motor_backward_pin = 9;
+// white wire
int left_motor_speed_pin = 10;
int left_motor_speed_pin = 10;
+// yellow wire
int left_echo_pin = 11;
int left_echo_pin = 11;
+// blue wire
int left_trigger_pin = 12;
void on(int pin){
int left_trigger_pin = 12;
void on(int pin){