Diff: games/ShowBuzzer.cpp

Revision:

12:22e9ef610ea2

Parent:

11:50572814f73e

--- a/games/ShowBuzzer.cpp	Wed Dec 31 15:27:43 2014 +0000
+++ b/games/ShowBuzzer.cpp	Sat May 23 15:28:55 2015 +0000
@@ -5,13 +5,17 @@
 static const char* NAME = "ShowBuzzer";
 
 ShowBuzzer::ShowBuzzer(Board* board) : Game(board){
-    board->keyboard->attach(this,&ShowBuzzer::keyPressed);
-    board->keyboard->start();
-    board->leds->off(Leds::ALL);
+    keyboard->attach(this,&ShowBuzzer::keyPressed);
+    keyboard->start();
+    leds->off(Leds::ALL);
+}
+
+void ShowBuzzer::setup(){
+    //no setup required for this game    
 }
 
 void ShowBuzzer::run(){
-    board->lcd->printf("ShowBuzzer");   
+    lcd->printf("ShowBuzzer");   
     newRound();
     while(true){
         
@@ -33,20 +37,20 @@
 }
 
 void ShowBuzzer::newRound(){
-        board->buzzer->playNote(200,50);
-        board->leds->off(Leds::ALL);
-        board->lcd->cls();
-        board->lcd->printf("*** WAITING ***");  
+        buzzer->playNote(200,50);
+        leds->off(Leds::ALL);
+        lcd->cls();
+        lcd->printf("*** WAITING ***");  
 }
 
 ShowBuzzer::Team ShowBuzzer::waitForButtonPress(){
     Team team;
     while(true){
-       if(board->button->read() == 0){
+       if(button->read() == 0){
             team = TEAM_B;
             break;
         }
-        if(board->key->read() == 0){
+        if(key->read() == 0){
             team = TEAM_A;
             break;    
         }
@@ -57,10 +61,10 @@
 void ShowBuzzer::setLeds(Team team){
     switch(team){
         case TEAM_A:
-            board->leds->on(Leds::LEFT);
+            leds->on(Leds::LEFT);
             break;
         case TEAM_B:
-            board->leds->on(Leds::RIGHT);
+            leds->on(Leds::RIGHT);
             break;
         default:
             break;
@@ -68,14 +72,14 @@
 }
 
 void ShowBuzzer::setDisplay(Team team){
-    board->lcd->locate(0,0);
-    board->lcd->cls();
+    lcd->locate(0,0);
+    lcd->cls();
     switch(team){
         case TEAM_A:
-            board->lcd->printf("Team A");
+            lcd->printf("Team A");
             break;
         case TEAM_B:
-            board->lcd->printf("Team B");
+            lcd->printf("Team B");
             break;
         default:
             break;
@@ -83,27 +87,27 @@
 }
 
 void ShowBuzzer::playSound(){
-    board->buzzer->playNote(698, 50);
-    board->buzzer->playNote(783, 50);
-    board->buzzer->playNote(880, 50);
-    board->buzzer->playNote(987, 50);
-    board->buzzer->playNote(1108, 50);
-    board->buzzer->playNote(1244, 50);
-    board->buzzer->playNote(1396, 50);
-    board->buzzer->playNote(1567, 50);
-    board->buzzer->playNote(1760, 50);
-    board->buzzer->playNote(1975, 50);
+    buzzer->playNote(698, 50);
+    buzzer->playNote(783, 50);
+    buzzer->playNote(880, 50);
+    buzzer->playNote(987, 50);
+    buzzer->playNote(1108, 50);
+    buzzer->playNote(1244, 50);
+    buzzer->playNote(1396, 50);
+    buzzer->playNote(1567, 50);
+    buzzer->playNote(1760, 50);
+    buzzer->playNote(1975, 50);
 }
 
 void ShowBuzzer::playCorrect(){
-    board->buzzer->playNote(2093, 100);
-    board->buzzer->playNote(2637, 100);
-    board->buzzer->playNote(3165, 100);
-    board->buzzer->playNote(3951, 100);
+    buzzer->playNote(2093, 100);
+    buzzer->playNote(2637, 100);
+    buzzer->playNote(3165, 100);
+    buzzer->playNote(3951, 100);
 }
 
 void ShowBuzzer::playWrong(){
-    board->buzzer->playNote(440, 1000);    
+    buzzer->playNote(440, 1000);    
 }    
 
 uint32_t ShowBuzzer::keyPressed(uint32_t key){