From: daniel watson Date: Sat, 18 Jul 2015 07:44:10 +0000 (-0700) Subject: put left motor speed pin on 10 for pwm X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=commitdiff_plain;h=34a3efe63ba555a19a9fb1346c3c8a5c50cfa7bc put left motor speed pin on 10 for pwm * update all the wiring diagrams * update all the code * move left motor forward and backward down by one to make room --- diff --git a/build-stages/a_serial/serial.fzz b/build-stages/a_serial/serial.fzz new file mode 100644 index 0000000..1d329e1 Binary files /dev/null and b/build-stages/a_serial/serial.fzz differ diff --git a/build-stages/b_left_sonar/left-sonar.fzz b/build-stages/b_left_sonar/left-sonar.fzz index 46130a7..490348d 100644 Binary files a/build-stages/b_left_sonar/left-sonar.fzz and b/build-stages/b_left_sonar/left-sonar.fzz differ diff --git a/build-stages/c_both_sonars/both-sonars.fzz b/build-stages/c_both_sonars/both-sonars.fzz index 9689ae6..5954edb 100644 Binary files a/build-stages/c_both_sonars/both-sonars.fzz and b/build-stages/c_both_sonars/both-sonars.fzz differ diff --git a/build-stages/d_left_motor/d_left_motor.ino b/build-stages/d_left_motor/d_left_motor.ino index e2d7a56..a19074c 100644 --- a/build-stages/d_left_motor/d_left_motor.ino +++ b/build-stages/d_left_motor/d_left_motor.ino @@ -14,9 +14,9 @@ */ // define which pins are connected to which components -int left_motor_speed_pin = 8; -int left_motor_forward_pin = 9; -int left_motor_backward_pin = 10; +int left_motor_forward_pin = 8; +int left_motor_backward_pin = 9; +int left_motor_speed_pin = 10; void setup(){ // the arduino will change the voltage on these pins diff --git a/build-stages/d_left_motor/left-motor.fzz b/build-stages/d_left_motor/left-motor.fzz index f9b181d..aeb825b 100644 Binary files a/build-stages/d_left_motor/left-motor.fzz and b/build-stages/d_left_motor/left-motor.fzz differ diff --git a/build-stages/e_both_motors/both-motors.fzz b/build-stages/e_both_motors/both-motors.fzz index 7c415e0..0d3368f 100644 Binary files a/build-stages/e_both_motors/both-motors.fzz and b/build-stages/e_both_motors/both-motors.fzz differ diff --git a/build-stages/e_both_motors/e_both_motors.ino b/build-stages/e_both_motors/e_both_motors.ino index b42c07c..1e55ac6 100644 --- a/build-stages/e_both_motors/e_both_motors.ino +++ b/build-stages/e_both_motors/e_both_motors.ino @@ -14,13 +14,13 @@ */ // define which pins are connected to which components -int right_motor_speed_pin = 3; -int right_motor_forward_pin = 4; -int right_motor_backward_pin = 5; +int right_motor_forward_pin = 3; +int right_motor_backward_pin = 4; +int right_motor_speed_pin = 5; -int left_motor_speed_pin = 8; -int left_motor_forward_pin = 9; -int left_motor_backward_pin = 10; +int left_motor_forward_pin = 8; +int left_motor_backward_pin = 9; +int left_motor_speed_pin = 10; void on(int pin){ digitalWrite(pin, HIGH);} diff --git a/build-stages/f_untethered/untethered.fzz b/build-stages/f_untethered/untethered.fzz index 49937c6..a4a7b7e 100644 Binary files a/build-stages/f_untethered/untethered.fzz and b/build-stages/f_untethered/untethered.fzz differ diff --git a/build-stages/g_follow/follow.fzz b/build-stages/g_follow/follow.fzz new file mode 100644 index 0000000..f7234cb Binary files /dev/null and b/build-stages/g_follow/follow.fzz differ diff --git a/build-stages/g_follow/g_follow.ino b/build-stages/g_follow/g_follow.ino index 54c7967..3c01a4d 100644 --- a/build-stages/g_follow/g_follow.ino +++ b/build-stages/g_follow/g_follow.ino @@ -14,16 +14,16 @@ */ // define which pins are connected to which components -int right_motor_speed_pin = 3; -int right_motor_forward_pin = 4; -int right_motor_backward_pin = 5; +int right_motor_forward_pin = 3; +int right_motor_backward_pin = 4; +int right_motor_speed_pin = 5; int right_echo_pin = 6; int right_trigger_pin = 7; -int left_motor_speed_pin = 8; -int left_motor_forward_pin = 9; -int left_motor_backward_pin = 10; +int left_motor_forward_pin = 8; +int left_motor_backward_pin = 9; +int left_motor_speed_pin = 10; int left_echo_pin = 11; int left_trigger_pin = 12; 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 07f7d17..40631b1 100644 --- a/build-stages/h_stay_on_table/h_stay_on_table.ino +++ b/build-stages/h_stay_on_table/h_stay_on_table.ino @@ -21,9 +21,9 @@ int right_motor_backward_pin = 5; int right_echo_pin = 6; int right_trigger_pin = 7; -int left_motor_speed_pin = 8; -int left_motor_forward_pin = 9; -int left_motor_backward_pin = 10; +int left_motor_forward_pin = 8; +int left_motor_backward_pin = 9; +int left_motor_speed_pin = 10; int left_echo_pin = 11; int left_trigger_pin = 12; diff --git a/build-stages/h_stay_on_table/stay-on-table.fzz b/build-stages/h_stay_on_table/stay-on-table.fzz new file mode 100644 index 0000000..b7069a8 Binary files /dev/null and b/build-stages/h_stay_on_table/stay-on-table.fzz differ diff --git a/build-stages/i_follow_on_table/i_follow_on_table.ino b/build-stages/i_follow_on_table/i_follow_on_table.ino index 1330633..b3978cb 100644 --- a/build-stages/i_follow_on_table/i_follow_on_table.ino +++ b/build-stages/i_follow_on_table/i_follow_on_table.ino @@ -14,16 +14,16 @@ */ // define which pins are connected to which components -int right_motor_speed_pin = 3; -int right_motor_forward_pin = 4; -int right_motor_backward_pin = 5; +int right_motor_forward_pin = 3; +int right_motor_backward_pin = 4; +int right_motor_speed_pin = 5; int follow_right_echo_pin = 6; int follow_right_trigger_pin = 7; -int left_motor_speed_pin = 8; -int left_motor_forward_pin = 9; -int left_motor_backward_pin = 10; +int left_motor_forward_pin = 8; +int left_motor_backward_pin = 9; +int left_motor_speed_pin = 10; int follow_left_echo_pin = 11; int follow_left_trigger_pin = 12;