From b26205e706b786a9fd1942d6c23f1f366fe556d6 Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Wed, 26 Dec 2012 16:14:22 -0700 Subject: [PATCH] All white space changes. Moved hardware versions to header file. I corrected all the /* style comments to // comments to fit with SparkFun style guides. Now works using the Arduino auto-format function. --- Firmware/Simon_Says/Simon_Says.ino | 615 +++++++++--------------- Firmware/Simon_Says/hardware_versions.h | 124 +++++ 2 files changed, 362 insertions(+), 377 deletions(-) create mode 100644 Firmware/Simon_Says/hardware_versions.h diff --git a/Firmware/Simon_Says/Simon_Says.ino b/Firmware/Simon_Says/Simon_Says.ino index eb71093..5f5f0e3 100644 --- a/Firmware/Simon_Says/Simon_Says.ino +++ b/Firmware/Simon_Says/Simon_Says.ino @@ -2,11 +2,11 @@ Started: 6-19-2007 Spark Fun Electronics Nathan Seidle - + Simon Says is a memory game. Start the game by pressing one of the four buttons. When a button lights up, press the button, repeating the sequence. The sequence will get longer and longer. The game is won after 13 rounds. - + This code is public domain but you buy me a beer if you use this and we meet someday (Beerware license). Simon Says game originally written in C for the PIC16F88. @@ -18,14 +18,14 @@ Simon tones from Wikipedia - A (red, upper left) - 440Hz - 2.272ms - 1.136ms pulse - a (green, upper right, an octave higher than A) - 880Hz - 1.136ms, - 0.568ms pulse + 0.568ms pulse - D (blue, lower left, a perfect fourth higher than the upper left) - 587.33Hz - 1.702ms - 0.851ms pulse + 587.33Hz - 1.702ms - 0.851ms pulse - G (yellow, lower right, a perfect fourth higher than the lower left) - - 784Hz - 1.276ms - 0.638ms pulse + 784Hz - 1.276ms - 0.638ms pulse The tones are close, but probably off a bit, but they sound all right. - + The old version of SparkFun simon used an ATmega8. An ATmega8 ships with a default internal 1MHz oscillator. You will need to set the internal fuses to operate at the correct external 16MHz oscillator. @@ -39,148 +39,16 @@ The current version of Simon uses the ATmega328. The external osciallator was removed to reduce component count. This version of simon relies on the internal default 1MHz osciallator. Do not set the external fuses. -*/ + */ -#include -#include - -/* Uncomment one of the following, corresponding to the board you have. */ -//#define BOARD_REV_6_25_08 -// #define BOARD_REV_4_9_2009 - #define BOARD_REV_PTH - -#ifdef BOARD_REV_PTH - -#define CHIP_ATMEGA168 - -#define LED_RED (1 << 0) -#define LED_GREEN (1 << 1) -#define LED_BLUE (1 << 2) -#define LED_YELLOW (1 << 3) - -/* LED pin definitions */ -#define LED_RED_PIN 2 -#define LED_RED_PORT PORTB -#define LED_GREEN_PIN 3 -#define LED_GREEN_PORT PORTD -#define LED_BLUE_PIN 5 -#define LED_BLUE_PORT PORTB -#define LED_YELLOW_PIN 5 -#define LED_YELLOW_PORT PORTD - -/* Button pin definitions */ -#define BUTTON_RED_PIN 1 -#define BUTTON_RED_PORT PINB -#define BUTTON_GREEN_PIN 2 -#define BUTTON_GREEN_PORT PIND -#define BUTTON_BLUE_PIN 4 -#define BUTTON_BLUE_PORT PINB -#define BUTTON_YELLOW_PIN 6 -#define BUTTON_YELLOW_PORT PIND - -/* Buzzer pin definitions */ -#define BUZZER1 4 -#define BUZZER1_PORT PORTD -#define BUZZER2 7 -#define BUZZER2_PORT PORTD - -#endif /* BOARD_REV_PTH */ - -#ifdef BOARD_REV_6_25_08 - -#define CHIP_ATMEGA168 - -#define LED_RED (1 << 0) -#define LED_GREEN (1 << 1) -#define LED_BLUE (1 << 2) -#define LED_YELLOW (1 << 3) - -/* LED pin definitions */ -#define LED_RED_PIN 3 -#define LED_RED_PORT PORTC -#define LED_GREEN_PIN 2 -#define LED_GREEN_PORT PORTD -#define LED_BLUE_PIN 0 -#define LED_BLUE_PORT PORTC -#define LED_YELLOW_PIN 5 -#define LED_YELLOW_PORT PORTD - -/* Button pin definitions */ -#define BUTTON_RED_PIN 2 -#define BUTTON_RED_PORT PINC -#define BUTTON_GREEN_PIN 5 -#define BUTTON_GREEN_PORT PINC -#define BUTTON_BLUE_PIN 1 -#define BUTTON_BLUE_PORT PINC -#define BUTTON_YELLOW_PIN 6 -#define BUTTON_YELLOW_PORT PIND - -/* Buzzer pin definitions */ -#define BUZZER1 3 -#define BUZZER1_PORT PORTD -#define BUZZER2 4 -#define BUZZER2_PORT PORTD - -#endif /* BOARD_REV_6_25_08 */ - -#ifdef BOARD_REV_4_9_2009 - -#define LED_RED (1 << 0) -#define LED_GREEN (1 << 1) -#define LED_BLUE (1 << 2) -#define LED_YELLOW (1 << 3) - -#define CHIP_ATMEGA168 - -/* LED pin definitions */ -#define LED_BLUE_PIN 5 -#define LED_BLUE_PORT PORTB -#define LED_YELLOW_PIN 5 -#define LED_YELLOW_PORT PORTD -#define LED_RED_PIN 2 -#define LED_RED_PORT PORTB -#define LED_GREEN_PIN 2 -#define LED_GREEN_PORT PORTD - -/* Button pin definitions */ -#define BUTTON_RED_PIN 0 -#define BUTTON_RED_PORT PINB -#define BUTTON_GREEN_PIN 1 -#define BUTTON_GREEN_PORT PINB -#define BUTTON_BLUE_PIN 7 -#define BUTTON_BLUE_PORT PIND -#define BUTTON_YELLOW_PIN 6 -#define BUTTON_YELLOW_PORT PIND - -/* Buzzer pin definitions */ -#define BUZZER1 3 -#define BUZZER1_PORT PORTD -#define BUZZER2 4 -#define BUZZER2_PORT PORTD - -#endif /* BOARD_REV_4_9_2009 */ - -/* Define game parameters */ +#include "hardware_versions.h" +// Define game parameters #define MOVES_TO_WIN 13 -#define TIME_LIMIT 3000 /* 3000ms = 3 sec */ +#define TIME_LIMIT 3000 //3000ms = 3 sec -#define sbi(port_name, pin_number) (port_name |= 1< 256) { - TIFR0 = (1< 0) { delay_us(1000); } } -/* Light the given set of LEDs */ -void -set_leds(uint8_t leds) +//Light the given set of LEDs +void set_leds(uint8_t leds) { if ((leds & LED_RED) != 0) { sbi(LED_RED_PORT, LED_RED_PIN); @@ -272,70 +132,67 @@ set_leds(uint8_t leds) #ifdef BOARD_REV_6_25_08 -void -init_gpio(void) +void init_gpio(void) { - /* 1 = output, 0 = input */ + // 1 = output, 0 = input DDRB = 0b11111111; - DDRC = 0b00001001; /* LEDs and Buttons */ - DDRD = 0b00111110; /* LEDs, buttons, buzzer, TX/RX */ + DDRC = 0b00001001; // LEDs and Buttons + DDRD = 0b00111110; // LEDs, buttons, buzzer, TX/RX - PORTC = 0b00100110; /* Enable pull-ups on buttons 0,2,3 */ - PORTD = 0b01000000; /* Enable pull-up on button 1 */ + PORTC = 0b00100110; // Enable pull-ups on buttons 0, 2, 3 + PORTD = 0b01000000; // Enable pull-up on button 1 } -#endif /* BOARD_REV_6_25_08 */ +#endif // End BOARD_REV_6_25_08 + #ifdef BOARD_REV_4_9_2009 -void -init_gpio(void) +void init_gpio(void) { - /* 1 = output, 0 = input */ - DDRB = 0b11111100; /* button 2,3 on PB0,1 */ - DDRD = 0b00111110; /* LEDs, buttons, buzzer, TX/RX */ + // 1 = output, 0 = input + DDRB = 0b11111100; // Button 2,3 on PB0,1 + DDRD = 0b00111110; // LEDs, buttons, buzzer, TX/RX - PORTB = 0b00000011; /* Enable pull-ups on buttons 2,3 */ - PORTD = 0b11000000; /* Enable pull-up on button 0,1 */ + PORTB = 0b00000011; // Enable pull-ups on buttons 2, 3 + PORTD = 0b11000000; // Enable pull-up on button 0, 1 } -#endif /* BOARD_REV_4_9_2009 */ +#endif // End BOARD_REV_4_9_2009 #ifdef BOARD_REV_PTH -void -init_gpio(void) +void init_gpio(void) { - /* 1 = output, 0 = input */ - DDRB = 0b11101101; /* LEDs and Buttons */ - DDRC = 0b11111111; /* LEDs and Buttons */ - DDRD = 0b10111011; /* LEDs, buttons, buzzer, TX/RX */ + // 1 = output, 0 = input + DDRB = 0b11101101; // LEDs and Buttons + DDRC = 0b11111111; // LEDs and Buttons + DDRD = 0b10111011; // LEDs, buttons, buzzer, TX/RX - PORTB = 0b00010010; /* Enable pull-ups on buttons 1,4 */ - //PORTC = 0b00100110; /* Enable pull-ups on buttons 0,2,3 */ - PORTD = 0b01000100; /* Enable pull-up on button 1 */ + PORTB = 0b00010010; // Enable pull-ups on buttons 1, 4 + //PORTC = 0b00100110; // Enable pull-ups on buttons 0, 2, 3 + PORTD = 0b01000100; // Enable pull-up on button 1 } #endif -void -ioinit(void) +void ioinit(void) { init_gpio(); - //Set Timer 0 Registers to Default Setting to over-ride the timer initialization made in the init() function of the Arduino Wiring libary (Wiring.c in the hardware/core/arduino folder) + //Set Timer 0 Registers to Default Setting to over-ride the timer initialization made in the init() function of the \ + //Arduino Wiring library (Wiring.c in the hardware/core/arduino folder) TCCR0A = 0; TIMSK0 = 0; - /* Init timer 0 for delay_us timing (1,000,000 / 1 = 1,000,000) */ - //TCCR0B = (1< 70; x--) { for (y = 0; y < 3; y++) { sbi(BUZZER2_PORT, BUZZER2); @@ -390,7 +245,7 @@ winner_sound(void) } } -/* Play the winner sound and lights */ +// Play the winner sound and lights void play_winner(void) { set_leds(LED_GREEN|LED_BLUE); @@ -403,7 +258,7 @@ void play_winner(void) winner_sound(); } -/* Plays the current contents of the game moves */ +// Plays the current contents of the game moves void play_moves(void) { uint8_t move; @@ -414,31 +269,31 @@ void play_moves(void) } } -/* Adds a new random button to the game sequence, by sampling the timer */ +// Adds a new random button to the game sequence, by sampling the timer void add_to_moves(void) { uint8_t new_button; - /* Use the lower 2 bits of the timer for the random value */ + // Use the lower 2 bits of the timer for the random value new_button = 1 << (TCNT2 & 0x3); moves[nmoves++] = new_button; } -/* Adds a user defined button to the game sequence, by waiting for their input */ +// Adds a user defined button to the game sequence, by waiting for their input void add_to_moves_battle(void) { uint8_t new_button; - /* wait for user to input next move */ + // wait for user to input next move new_button = wait_for_button(); - + toner(new_button, 150); moves[nmoves++] = new_button; } -/* Toggle buzzer every buzz_delay_us, for a duration of buzz_length_ms. */ +// Toggle buzzer every buzz_delay_us, for a duration of buzz_length_ms. void buzz_sound(uint16_t buzz_length_ms, uint16_t buzz_delay_us) { uint32_t buzz_length_us; @@ -447,7 +302,7 @@ void buzz_sound(uint16_t buzz_length_ms, uint16_t buzz_delay_us) while (buzz_length_us > buzz_delay_us*2) { buzz_length_us -= buzz_delay_us*2; - /* toggle the buzzer at various speeds */ + // Toggle the buzzer at various speeds cbi(BUZZER1_PORT, BUZZER1); sbi(BUZZER2_PORT, BUZZER2); delay_us(buzz_delay_us); @@ -459,12 +314,11 @@ void buzz_sound(uint16_t buzz_length_ms, uint16_t buzz_delay_us) } /* - * Light an LED and play tone - * - * red, upper left: 440Hz - 2.272ms - 1.136ms pulse - * green, upper right: 880Hz - 1.136ms - 0.568ms pulse - * blue, lower left: 587.33Hz - 1.702ms - 0.851ms pulse - * yellow, lower right: 784Hz - 1.276ms - 0.638ms pulse + Light an LED and play tone + red, upper left: 440Hz - 2.272ms - 1.136ms pulse + green, upper right: 880Hz - 1.136ms - 0.568ms pulse + blue, lower left: 587.33Hz - 1.702ms - 0.851ms pulse + yellow, lower right: 784Hz - 1.276ms - 0.638ms pulse */ void toner(uint8_t which, uint16_t buzz_length_ms) { @@ -487,11 +341,11 @@ void toner(uint8_t which, uint16_t buzz_length_ms) break; } - /* Turn off all LEDs */ + // Turn off all LEDs set_leds(0); } -/* Show an "attract mode" display while waiting for user to press button. */ +// Show an "attract mode" display while waiting for user to press button. void attract_mode(void) { while (1) { @@ -517,9 +371,8 @@ void attract_mode(void) } } - -/* Wait for a button to be pressed. Returns one of led colors (LED_RED, etc.) - * if successful, 0 if timed out */ +// Wait for a button to be pressed. +// Returns one of led colors (LED_RED, etc.) if successful, 0 if timed out uint8_t wait_for_button(void) { uint16_t time_limit = TIME_LIMIT; @@ -529,18 +382,15 @@ uint8_t wait_for_button(void) while (time_limit > 0) { uint8_t button; - /* Implement a small bit of debouncing */ + // Implement a small bit of debouncing old_button = button; button = check_button(); - /* - * Make sure we've seen the previous button - * released before accepting new buttons - */ + // Make sure we've seen the previous button released before accepting new buttons if (button == 0) released = 1; if (button == old_button && released == 1) { - /* Make sure just one button is pressed */ + // Make sure just one button is pressed if (button == LED_RED || button == LED_BLUE || button == LED_GREEN || @@ -553,49 +403,60 @@ uint8_t wait_for_button(void) time_limit--; } - return 0; /* Timed out */ + return 0; //Timed out } - - -/* Play the game. Returns 0 if player loses, or 1 if player wins. */ +// Play the game. Returns 0 if player loses, or 1 if player wins. int game_mode(void) { nmoves = 0; int moves_to_win_var = MOVES_TO_WIN; // If in normal mode, then allow the user to win after a #define varialb up top (default is 13). + if(battle) moves_to_win_var = 1000; // If in battle mode, allow the users to go up to 1000 moves! Like anyone could possibly do that :) - while (nmoves < moves_to_win_var) { + + while (nmoves < moves_to_win_var) + { uint8_t move; - /* Add a button to the current moves, then play them back */ - if(battle) add_to_moves_battle(); // If in battle mode, then listen for user input to choose the next step - else add_to_moves(); - - if(battle) ; // If in battle mode, then don't play back the pattern, it's up the the users to remember it - then add on a move. - else play_moves(); + // Add a button to the current moves, then play them back + if(battle) + add_to_moves_battle(); // If in battle mode, then listen for user input to choose the next step + else + add_to_moves(); - /* Then require the player to repeat the sequence. */ + if(battle) + ; // If in battle mode, then don't play back the pattern, it's up the the users to remember it - then add on a move. + else + play_moves(); + + // Then require the player to repeat the sequence. for (move = 0; move < nmoves; move++) { uint8_t choice = wait_for_button(); - /* If wait timed out, player loses. */ + // If wait timed out, player loses. if (choice == 0) return 0; toner(choice, 150); - /* If the choice is incorect, player loses. */ + // If the choice is incorect, player loses. if (choice != moves[move]) { return 0; } } - /* Player was correct, delay before playing moves */ - if(battle) delay_ms(100); // reduced wait time, because we want to allow the battle to go very fast! plus, if you use the delay(1000), then it may miss capturing the users next input. - else delay_ms(1000); + // Player was correct, delay before playing moves + if(battle) + { + //reduced wait time, because we want to allow the battle to go very fast! + //plus, if you use the delay(1000), then it may miss capturing the users next input. + delay_ms(100); + } + else + delay_ms(1000); } - /* player wins */ + // Player wins! return 1; } @@ -607,193 +468,193 @@ void setup() void loop() { - /* Setup IO pins and defaults */ + // Setup IO pins and defaults ioinit(); - - /* Check to see if LOWER LEFT BUTTON is pressed */ + + // Check to see if LOWER LEFT BUTTON is pressed if (check_button() == LED_YELLOW){ while(1){ buzz(5); delay_ms(750); - if (check_button() == 0x00){ - while (1) beegees_loop(); - } + if (check_button() == 0x00){ + while (1) beegees_loop(); + } } - } - - /* Check to see if LOWER RIGHT BUTTON is pressed */ + } + + // Check to see if LOWER RIGHT BUTTON is pressed if (check_button() == LED_GREEN){ while(1){ buzz(5); delay_ms(750); - if (check_button() == 0x00){ + if (check_button() == 0x00){ battle = 1; break; - } + } } - } - - + } + + play_winner(); - /* Main loop */ + // Main loop while (1) { - /* Wait for user to start game */ + // Wait for user to start game attract_mode(); - /* Indicate the start of game play */ + // Indicate the start of game play set_leds(LED_RED|LED_GREEN|LED_BLUE|LED_YELLOW); delay_ms(1000); set_leds(0); delay_ms(250); - /* Play game and handle result */ + // Play game and handle result if (game_mode() != 0) { - /* Player won, play winner tones */ + // Player won, play winner tones play_winner(); } else { - /* Player lost, play loser tones */ + // Player lost, play loser tones play_loser(); } } } - - -////////////////////////////////////////////////////////////////////////////////////// -void beegees_loop(){ -buzz(3); -delay(400); -buzz(4); -rest(1); -delay(600); -buzz(5); -rest(1); -rest(1); -delay(400); -buzz(3); -rest(1); -rest(1); -rest(1); -buzz(2); -rest(1); -buzz(1); -buzz(2); -buzz(3); -rest(1); -buzz(1); -buzz(2); -rest(1); -buzz(3); -rest(1); -rest(1); -buzz(1); -rest(1); -buzz(2); -rest(1); -buzz(3); -rest(1); -buzz(4); -rest(1); -buzz(5); -rest(1); -delay(700); +// +void beegees_loop() +{ + buzz(3); + delay(400); + buzz(4); + rest(1); + delay(600); + buzz(5); + rest(1); + rest(1); + delay(400); + buzz(3); + rest(1); + rest(1); + rest(1); + buzz(2); + rest(1); + buzz(1); + buzz(2); + buzz(3); + rest(1); + buzz(1); + buzz(2); + rest(1); + buzz(3); + rest(1); + rest(1); + buzz(1); + rest(1); + buzz(2); + rest(1); + buzz(3); + rest(1); + buzz(4); + rest(1); + buzz(5); + rest(1); + delay(700); } -////////////////////////////////////////////////////////////////////////////////////// +// void buzz(int tone){ - - ///declare an integer, "freq", for frequency of the note to be played. + + //Declare an integer, "freq", for frequency of the note to be played. int freq; - - ///5 different tones to select. Each tone is a different frequency. + + //5 different tones to select. Each tone is a different frequency. if(tone == 1){ - freq = 2000; + freq = 2000; } if(tone == 2){ - freq = 1800; + freq = 1800; } if(tone == 3){ - freq = 1500; + freq = 1500; } if(tone == 4){ - freq = 1350; + freq = 1350; } if(tone == 5){ - freq = 1110; + freq = 1110; } - + //freq = (freq/2); - - /// Because frequency is determined by the wavelength (the time HIGH and the time LOW), - /// you need to have "count" in order to keep a note the same length in time. - /// "count" is the number of times this function will repeat the HIGH/LOW pattern - to create the sound of the note. - + + // Because frequency is determined by the wavelength (the time HIGH and the time LOW), + // you need to have "count" in order to keep a note the same length in time. + // "count" is the number of times this function will repeat the HIGH/LOW pattern - to create the sound of the note. + count = 40; - - /// In order to keep all 5 notes the same length in time, you must compare them to the longest note (tonic) - aka the "1" note. + + // In order to keep all 5 notes the same length in time, you must compare them to the longest note (tonic) - aka the "1" note. count = count*(2000/freq); - - /// this next function simply changes the next LED to turn on. + + // this next function simply changes the next LED to turn on. change_led(); - - /// this next for loop actually makes the buzzer pin move. - /// it uses the "count" variable to know how many times to play the frequency. - /// -this keeps the timing correct. + + // this next for loop actually makes the buzzer pin move. + // it uses the "count" variable to know how many times to play the frequency. + // -this keeps the timing correct. for(int i = 0; i < count; i++){ - digitalWrite(BUZZER1, HIGH); - digitalWrite(BUZZER2, LOW); - delayMicroseconds(freq); - digitalWrite(BUZZER1, LOW); - digitalWrite(BUZZER2, HIGH); - delayMicroseconds(freq); + digitalWrite(BUZZER1, HIGH); + digitalWrite(BUZZER2, LOW); + delayMicroseconds(freq); + digitalWrite(BUZZER1, LOW); + digitalWrite(BUZZER2, HIGH); + delayMicroseconds(freq); } delay(60); } -////////////////////////////////////////////////////////////////////////////////////// - void rest(int tone){ +// +void rest(int tone){ int freq; - if(tone == 1){ + if(tone == 1){ freq = 2000; - } - if(tone == 2){ + } + if(tone == 2){ freq = 1800; - } - if(tone == 3){ + } + if(tone == 3){ freq = 1500; - } - if(tone == 4){ + } + if(tone == 4){ freq = 1350; - } - if(tone == 5){ + } + if(tone == 5){ freq = 1110; - } - //freq = (freq/2); - count = 40; - count = count*(2000/freq); -//change_led(); - for(int i = 0; i < count; i++){ - digitalWrite(BUZZER1, LOW); - delayMicroseconds(freq); - digitalWrite(BUZZER1, LOW); - delayMicroseconds(freq); - } + } + //freq = (freq/2); + count = 40; + count = count*(2000/freq); + //change_led(); + + for(int i = 0 ; i < count ; i++) + { + digitalWrite(BUZZER1, LOW); + delayMicroseconds(freq); + digitalWrite(BUZZER1, LOW); + delayMicroseconds(freq); + } delay(75); } -////////////////////////////////////////////////////////////////////////////////////// -void change_led(){ - if(counter > 3){ - counter = 0; - } - set_leds(1 << counter); - counter += 1; +// +void change_led() +{ + if(counter > 3) + { + counter = 0; + } + set_leds(1 << counter); + counter += 1; } - - - diff --git a/Firmware/Simon_Says/hardware_versions.h b/Firmware/Simon_Says/hardware_versions.h new file mode 100644 index 0000000..f36262b --- /dev/null +++ b/Firmware/Simon_Says/hardware_versions.h @@ -0,0 +1,124 @@ +/* + Started: 12-26-2012 + Spark Fun Electronics + + The SparkFun Simon Says game has been through dozens of revisions over the years. This header + file attempts to map and support all the different hardware versions. +*/ + +// Uncomment one of the following, corresponding to the board you have. +//#define BOARD_REV_6_25_08 +//#define BOARD_REV_4_9_2009 +#define BOARD_REV_PTH + +#ifdef BOARD_REV_PTH + +#define CHIP_ATMEGA168 + +#define LED_RED (1 << 0) +#define LED_GREEN (1 << 1) +#define LED_BLUE (1 << 2) +#define LED_YELLOW (1 << 3) + +/* LED pin definitions */ +#define LED_RED_PIN 2 +#define LED_RED_PORT PORTB +#define LED_GREEN_PIN 3 +#define LED_GREEN_PORT PORTD +#define LED_BLUE_PIN 5 +#define LED_BLUE_PORT PORTB +#define LED_YELLOW_PIN 5 +#define LED_YELLOW_PORT PORTD + +/* Button pin definitions */ +#define BUTTON_RED_PIN 1 +#define BUTTON_RED_PORT PINB +#define BUTTON_GREEN_PIN 2 +#define BUTTON_GREEN_PORT PIND +#define BUTTON_BLUE_PIN 4 +#define BUTTON_BLUE_PORT PINB +#define BUTTON_YELLOW_PIN 6 +#define BUTTON_YELLOW_PORT PIND + +/* Buzzer pin definitions */ +#define BUZZER1 4 +#define BUZZER1_PORT PORTD +#define BUZZER2 7 +#define BUZZER2_PORT PORTD + +#endif /* BOARD_REV_PTH */ + +#ifdef BOARD_REV_6_25_08 + +#define CHIP_ATMEGA168 + +#define LED_RED (1 << 0) +#define LED_GREEN (1 << 1) +#define LED_BLUE (1 << 2) +#define LED_YELLOW (1 << 3) + +/* LED pin definitions */ +#define LED_RED_PIN 3 +#define LED_RED_PORT PORTC +#define LED_GREEN_PIN 2 +#define LED_GREEN_PORT PORTD +#define LED_BLUE_PIN 0 +#define LED_BLUE_PORT PORTC +#define LED_YELLOW_PIN 5 +#define LED_YELLOW_PORT PORTD + +/* Button pin definitions */ +#define BUTTON_RED_PIN 2 +#define BUTTON_RED_PORT PINC +#define BUTTON_GREEN_PIN 5 +#define BUTTON_GREEN_PORT PINC +#define BUTTON_BLUE_PIN 1 +#define BUTTON_BLUE_PORT PINC +#define BUTTON_YELLOW_PIN 6 +#define BUTTON_YELLOW_PORT PIND + +/* Buzzer pin definitions */ +#define BUZZER1 3 +#define BUZZER1_PORT PORTD +#define BUZZER2 4 +#define BUZZER2_PORT PORTD + +#endif /* BOARD_REV_6_25_08 */ + +#ifdef BOARD_REV_4_9_2009 + +#define LED_RED (1 << 0) +#define LED_GREEN (1 << 1) +#define LED_BLUE (1 << 2) +#define LED_YELLOW (1 << 3) + +#define CHIP_ATMEGA168 + +/* LED pin definitions */ +#define LED_BLUE_PIN 5 +#define LED_BLUE_PORT PORTB +#define LED_YELLOW_PIN 5 +#define LED_YELLOW_PORT PORTD +#define LED_RED_PIN 2 +#define LED_RED_PORT PORTB +#define LED_GREEN_PIN 2 +#define LED_GREEN_PORT PORTD + +/* Button pin definitions */ +#define BUTTON_RED_PIN 0 +#define BUTTON_RED_PORT PINB +#define BUTTON_GREEN_PIN 1 +#define BUTTON_GREEN_PORT PINB +#define BUTTON_BLUE_PIN 7 +#define BUTTON_BLUE_PORT PIND +#define BUTTON_YELLOW_PIN 6 +#define BUTTON_YELLOW_PORT PIND + +/* Buzzer pin definitions */ +#define BUZZER1 3 +#define BUZZER1_PORT PORTD +#define BUZZER2 4 +#define BUZZER2_PORT PORTD + +#endif /* BOARD_REV_4_9_2009 */ +