Changed examples to correspond to new classes, method names and invocation metaphors.

Cefn Hoile · Cefn Hoile · commit ddda99d2e90d · 2013-04-01T13:44:18.000+01:00
diff --git a/rtttl/examples/ProgmemSong/ProgmemSong.ino b/rtttl/examples/ProgmemSong/ProgmemSong.ino
@@ -11,7 +11,7 @@ const char song_P[] PROGMEM = "Tetris:d=4,o=5,b=200:e6,8b,8c6,8d6,16e6,16d6,8c6,
 unsigned long printedTime = -1;
 unsigned long printedPeriod = 500;
 
-ProgmemSong player(13);
+ProgmemPlayer player(13);
 
 void setup(void)
 {
@@ -21,22 +21,29 @@ void setup(void)
 
 void loop(void)
 {
-  
-  //play the tune
-  while(player.tick()){
-    tryPrint("First Play");
+    
+  Serial.println("First Play");
+
+  //play the song for the first time
+  player.finishSong();
+
+  Serial.println("Song rewound automatically");  
+
+  //play the tune again, this time blocking per note
+  while(player.stepSong()){
+    Serial.println("Second Play");
   }
 
   Serial.println("Song rewound automatically");
 
-  //play the tune again
-  while(player.tick()){
-    tryPrint("Second Play");
+  //play the tune with no blocking
+  while(player.pollSong()){
+    tryPrint("Third Play");
   }
 
   Serial.println("Play has ended");    
   while(true){
-    //do nothing
+    //keep the thread in this loop - circuit now silent
   }
   
 }
diff --git a/rtttl/examples/RamSong/RamSong.ino b/rtttl/examples/RamSong/RamSong.ino
@@ -6,7 +6,7 @@ const char song[] = "AxelF:d=4,o=5,b=125:32p,8g,8p,16a#.,8p,16g,16p,16g,8c6,8g,8
 unsigned long printedTime = -1;
 unsigned long printedPeriod = 500;
 
-RamSong player(13);
+RamPlayer player(13);
 
 void setup(void)
 {
@@ -17,21 +17,28 @@ void setup(void)
 void loop(void)
 {
   
-  //play the tune
-  while(player.tick()){
-    tryPrint("First Play");
+  Serial.println("First Play");
+
+  //play the song for the first time
+  player.finishSong();
+
+  Serial.println("Song rewound automatically");  
+
+  //play the tune again, this time blocking per note
+  while(player.stepSong()){
+    Serial.println("Second Play");
   }
 
-  Serial.println("Song auto-rewound");
+  Serial.println("Song rewound automatically");
 
-  //play the tune again
-  while(player.tick()){
-    tryPrint("Second Play");
+  //play the tune with no blocking
+  while(player.pollSong()){
+    tryPrint("Third Play");
   }
 
   Serial.println("Play has ended");    
   while(true){
-    //do nothing
+    //keep the thread in this loop - circuit now silent
   }
   
 }
diff --git a/rtttl/examples/ToneSong/ToneSong.ino b/rtttl/examples/ToneSong/ToneSong.ino
@@ -9,7 +9,7 @@ const char song_P[] PROGMEM = "PacMan:b=160:32b,32p,32b6,32p,32f#6,32p,32d#6,32p
 unsigned long printedTime = -1;
 unsigned long printedPeriod = 500;
 
-ProgmemSong player(13);
+ProgmemPlayer player(13);
 
 void setup(void)
 {
@@ -20,21 +20,28 @@ void setup(void)
 void loop(void)
 {
   
-  //play the tune
-  while(player.tick()){
-    tryPrint("First Play");
+  Serial.println("First Play");
+
+  //play the song for the first time
+  player.finishSong();
+
+  Serial.println("Song rewound automatically");  
+
+  //play the tune again, this time blocking per note
+  while(player.stepSong()){
+    Serial.println("Second Play");
   }
 
   Serial.println("Song rewound automatically");
 
-  //play the tune again
-  while(player.tick()){
-    tryPrint("Second Play");
+  //play the tune with no blocking
+  while(player.pollSong()){
+    tryPrint("Third Play");
   }
 
   Serial.println("Play has ended");    
   while(true){
-    //do nothing
+    //keep the thread in this loop - circuit now silent
   }
   
 }
