From: daniel watson Date: Sat, 31 Aug 2013 16:33:44 +0000 (-0700) Subject: switch to camelCase to match arduino style X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=commitdiff_plain;h=c8ce646680046b05dcc7bc7b35f6ca923de4fb89 switch to camelCase to match arduino style --- diff --git a/phase0/phase0.ino b/phase0/phase0.ino index df7a9b4..523ca5f 100644 --- a/phase0/phase0.ino +++ b/phase0/phase0.ino @@ -29,53 +29,64 @@ void setup() { pinMode(green1, OUTPUT); } -void on(int led) { - digitalWrite(led, HIGH); +/* + on(pinNumber); + turn on pin 'pinNumber'. + digitalWrite(pinNumber, HIGH); turns the voltage on for that pin. + */ +void on(int pinToTurnOn) { + digitalWrite(pinToTurnOn, HIGH); } -void off(int led) { - digitalWrite(led, LOW); +/* + off(pinNumber); + turn off pin 'pinNumber'. + digitalWrite(pinNumber, LOW); turns the voltage off for that pin. +*/ +void off(int pinToTurnOff) { + digitalWrite(pinToTurnOff, LOW); } -void ons_offs(int* ons, int onsc, - int* offs, int offsc, - int delay_time) { - int ii; - for(ii = 0; ii < offsc; ii++) { - off(offs[ii]); +void onsOffs(int* pinsToTurnOn, int numberOfPinsToTurnOn, + int* pinsToTurnOff, int numberOfPinsToTurnOff){ + // generic index used for arrays of pins to turn on or off + int index; + // turn off pins in pinsToTurnOff + for(index = 0; index < numberOfPinsToTurnOff; index++) { + off(pinsToTurnOff[index]); } - for(ii = 0; ii < onsc; ii++) { - on(ons[ii]); + // turn on pins in pinsToTurnOn + for(index = 0; index < numberOfPinsToTurnOn; index++) { + on(pinsToTurnOn[index]); } - delay(delay_time); } void loop() { - int red_wait = 300; - int yellow_wait = 800; - int green_wait = 1600; + int redWait = 300; + int yellowWait = 800; + int greenWait = 1600; - ons_offs((int[]){red0, green1}, 2, - (int[]){yellow0, green0, red1, yellow1}, 4, - green_wait); + onsOffs((int[]){red0, green1}, 2, + (int[]){yellow0, green0, red1, yellow1}, 4); + delay(greenWait); - ons_offs((int[]){red0, yellow1}, 2, - (int[]){yellow0, green0, red1, green1}, 4, - yellow_wait); + onsOffs((int[]){red0, yellow1}, 2, + (int[]){yellow0, green0, red1, green1}, 4); + delay(yellowWait); - ons_offs((int[]){red0, red1}, 2, - (int[]){yellow0, green0, yellow1, green1}, 4, - red_wait); + onsOffs((int[]){red0, red1}, 2, + (int[]){yellow0, green0, yellow1, green1}, 4); + delay(redWait); - ons_offs((int[]){green0, red1}, 2, - (int[]){red0, yellow0, yellow1, green1}, 4, - green_wait); + onsOffs((int[]){green0, red1}, 2, + (int[]){red0, yellow0, yellow1, green1}, 4); + delay(greenWait); - ons_offs((int[]){yellow0, red1}, 2, - (int[]){red0, green0, yellow1, green1}, 4, - yellow_wait); + onsOffs((int[]){yellow0, red1}, 2, + (int[]){red0, green0, yellow1, green1}, 4); + delay(yellowWait); - ons_offs((int[]){red0, red1}, 2, - (int[]){yellow0, green0, yellow1, green1}, 4, - red_wait); + onsOffs((int[]){red0, red1}, 2, + (int[]){yellow0, green0, yellow1, green1}, 4); + delay(redWait); } diff --git a/phase1/phase1.ino b/phase1/phase1.ino index 9961a36..7c18373 100644 --- a/phase1/phase1.ino +++ b/phase1/phase1.ino @@ -13,73 +13,73 @@ along with this program. If not, see . */ -// Pin 13 has an LED connected on most Arduino boards. -// give it a name: +// use pin 13's LED to indicate intended travel direction. +// on == forward, off == backward int led = 13; -int motor1_enable = 10; -int motor1a = 9; -int motor1b = 8; -int motor2_enable = 3; -int motor2a = 4; -int motor2b = 5; + +int leftMotorEnable = 10; +int leftMotorA = 9; +int leftMotorB = 8; + +int rightMotorEnable = 3; +int rightMotorA = 4; +int rightMotorB = 5; + +void setupMotor(int motorEnable, int motorA, int motorB){ + pinMode(motorEnable, OUTPUT); + pinMode(motorA, OUTPUT); + pinMode(motorB, OUTPUT); + + digitalWrite(motorEnable, LOW); + digitalWrite(motorA, LOW); + digitalWrite(motorB, LOW); +} // the setup routine runs once when you press reset: void setup() { // initialize the digital pin as an output. - pinMode(led, OUTPUT); - pinMode(motor1_enable, OUTPUT); - pinMode(motor1a, OUTPUT); - pinMode(motor1b, OUTPUT); - pinMode(motor2_enable, OUTPUT); - pinMode(motor2a, OUTPUT); - pinMode(motor2b, OUTPUT); + setupMotor(leftMotorEnable, leftMotorA, leftMotorB); + setupMotor(rightMotorEnable, rightMotorA, rightMotorB); - digitalWrite(led, HIGH); - digitalWrite(motor1_enable, LOW); - digitalWrite(motor1a, LOW); - digitalWrite(motor1b, LOW); - digitalWrite(motor2_enable, LOW); - digitalWrite(motor2a, LOW); - digitalWrite(motor2b, LOW); + pinMode(led, OUTPUT); } -void motorsRun(int left, int right, int ms_delay) { +void motorsRun(int left, int right, int msDelay) { // Set left motor direction: if (left > 0) { // Set left motor to go forward: - digitalWrite(motor1a, HIGH); - digitalWrite(motor1b, LOW); + digitalWrite(leftMotorA, HIGH); + digitalWrite(leftMotorB, LOW); } else { // Set left motor to go backward: - digitalWrite(motor1a, LOW); - digitalWrite(motor1b, HIGH); + digitalWrite(leftMotorA, LOW); + digitalWrite(leftMotorB, HIGH); left = -left; // Make left a positive value: } - analogWrite(motor2_enable, left); // Start motor in right direction + analogWrite(rightMotorEnable, left); // Start motor in right direction // Set left motor direction: if (right > 0) { // Set right motor to go forward: - digitalWrite(motor2a, HIGH); - digitalWrite(motor2b, LOW); + digitalWrite(rightMotorA, HIGH); + digitalWrite(rightMotorB, LOW); } else { // Set right motor to go backward: - digitalWrite(motor2a, LOW); - digitalWrite(motor2b, HIGH); + digitalWrite(rightMotorA, LOW); + digitalWrite(rightMotorB, HIGH); right = -right; // Make right a positive value: } - analogWrite(motor1_enable, left); // Start motor in right direction + analogWrite(leftMotorEnable, left); // Start motor in right direction - delay(ms_delay); // Wait the specified amount of time + delay(msDelay); // Wait the specified amount of time // Stop both motors: - analogWrite(motor1_enable, 0); - analogWrite(motor2_enable, 0); + analogWrite(leftMotorEnable, 0); + analogWrite(rightMotorEnable, 0); } // the loop routine runs over and over again forever: void loop() { - digitalWrite(led, HIGH); // turn the LED on (HIGH is the voltage level) motorsRun(100, 100, 2000);// Run the robot forward digitalWrite(led, LOW); // turn the LED off by making the voltage LOW