Merge pull request #2 from jcarranz97/example/with-pico_tone

Modify example to use pico/tone.h library

Author: jcarranz97

CMakeLists.txt

@@ -56,3 +56,4 @@ add_subdirectory(timer)
 add_subdirectory(uart)
 add_subdirectory(usb)
 add_subdirectory(watchdog)
+add_subdirectory(tone)

README.md

@@ -244,7 +244,6 @@ App|Description
 [hello_pwm](pwm/hello_pwm) | Minimal example of driving PWM output on GPIOs.
 [led_fade](pwm/led_fade) | Fade an LED between low and high brightness. An interrupt handler updates the PWM slice's output level each time the counter wraps.
 [measure_duty_cycle](pwm/measure_duty_cycle) | Drives a PWM output at a range of duty cycles, and uses another PWM slice in input mode to measure the duty cycle.
-[pico_tone](pwm/pico_tone) | Play a christmas melody :notes::christmas_tree: by generating square waves with PWM and a Buzzer :speaker:.
 
 ### Reset
 
@@ -369,3 +368,9 @@ At the time of writing, there is only one dual example available:
 App|Description
 ---|---
 [hello_watchdog](watchdog/hello_watchdog) | Set the watchdog timer, and let it expire. Detect the reboot, and halt.
+
+### Tone
+
+App|Description
+---|---
+[christmas_melody](tone/christmas_melody) | Play a christmas melody :notes::christmas_tree: with a Buzzer :speaker:.

pwm/CMakeLists.txt

@@ -2,5 +2,4 @@ if (NOT PICO_NO_HARDWARE)
     add_subdirectory(hello_pwm)
     add_subdirectory(led_fade)
     add_subdirectory(measure_duty_cycle)
-    add_subdirectory(pico_tone)
 endif ()

pwm/pico_tone/CMakeLists.txt

@@ -0,0 +1,3 @@
+if (NOT PICO_NO_HARDWARE)
+    add_subdirectory(christmas_melody)
+endif ()

pwm/pico_tone/pico_tone.c

@@ -0,0 +1,12 @@
+add_executable(christmas_melody
+    christmas_melody.c
+)
+
+# Add pico_stdlib library which aggregates commonly used features
+target_link_libraries(christmas_melody pico_stdlib pico_tone)
+
+# Create map/bin/hex/uf2 file in addition to ELF.
+pico_add_extra_outputs(christmas_melody)
+
+# add url via pico_set_program_url
+example_auto_set_url(christmas_melody)

tone/CMakeLists.txt

@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "pico/stdlib.h"
+#include "pico/tone.h"
+
+/**  Example code to generate tones with Buzzer using pico-sdk.
+ *
+ *   The melody is the Christmas song "Noche de Paz" (Silent Night).
+ *
+ *   .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.
+ *   .                                                     .
+ *   .        *        Song: Noche de Paz (Silent Night)   .
+ *   .       /.\       Instrument: Buzzer                  .
+ *   .      /..'\      Interpreter: Raspberry Pi Pico      .
+ *   .      /'.'\                                 _        .
+ *   .     /.''.'\                              _[ ]_      .
+ *   .     /.'.'.\         Merry Christmas!      (")       .
+ *   .    /'.''.'.\          Feliz Navidad!  `__( : )--'   .
+ *   .    ^^^[_]^^^                            (  :  )     .
+ *   .                                       ""`-...-'""   .  
+ *   .                                                     .
+ *   .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.
+ *       
+ */
+#define BUZZER_PIN 3
+
+// Notes' frequencies used for the melody in Hz.
+#define NOTE_C4 262
+#define NOTE_D4 294
+#define NOTE_E4 330
+#define NOTE_F4 349
+#define NOTE_G4 392
+#define NOTE_A4 440
+#define NOTE_B4 494
+#define NOTE_C5 523
+#define NOTE_D5 587
+#define NOTE_E5 659
+#define NOTE_F5 698
+
+#define SPEED  400U  // Speed of each note in ms
+#define SILENCE 10U  // 10 ms of silence after each note
+
+uint slice_num;  // Variable to save the PWM slice number
+
+int main() {
+    // Configure tone generation on BUZZER_PIN
+    tone_init(BUZZER_PIN);
+    while (1) {
+        // 1
+        tone(BUZZER_PIN, NOTE_G4, 1.5f);
+        tone(BUZZER_PIN, NOTE_A4, .5f);
+        tone(BUZZER_PIN, NOTE_G4, 1.f);
+
+        // 2
+        tone(BUZZER_PIN, NOTE_E4, 3.f);
+
+        // 3
+        tone(BUZZER_PIN, NOTE_G4, 1.5f);
+        tone(BUZZER_PIN, NOTE_A4, .5f);
+        tone(BUZZER_PIN, NOTE_G4, 1.f);
+
+        // 4
+        tone(BUZZER_PIN, NOTE_E4, 3.f);
+
+        // 5
+        tone(BUZZER_PIN, NOTE_D5, 2.f);
+        tone(BUZZER_PIN, NOTE_D5, 1.f);
+
+        // 6
+        tone(BUZZER_PIN, NOTE_B4, 3.f);
+
+        // 7
+        tone(BUZZER_PIN, NOTE_C5, 2.f);
+        tone(BUZZER_PIN, NOTE_C5, 1.f);
+
+        // 8
+        tone(BUZZER_PIN, NOTE_G4, 3.f);
+
+        // 9
+        tone(BUZZER_PIN, NOTE_A4, 2.f);
+        tone(BUZZER_PIN, NOTE_A4, 1.f);
+
+        // 10 
+        tone(BUZZER_PIN, NOTE_C5, 1.5f);
+        tone(BUZZER_PIN, NOTE_B4, .5f);
+        tone(BUZZER_PIN, NOTE_A4, 1.f);
+
+        // 11 
+        tone(BUZZER_PIN, NOTE_G4, 1.5f);
+        tone(BUZZER_PIN, NOTE_A4, .5f);
+        tone(BUZZER_PIN, NOTE_G4, 1.f);
+
+        // 12 
+        tone(BUZZER_PIN, NOTE_E4, 3.f);
+
+        // 13
+        tone(BUZZER_PIN, NOTE_A4, 2.f);
+        tone(BUZZER_PIN, NOTE_A4, 1.f);
+
+        // 14
+        tone(BUZZER_PIN, NOTE_C5, 1.5f);
+        tone(BUZZER_PIN, NOTE_B4, .5f);
+        tone(BUZZER_PIN, NOTE_A4, 1.f);
+
+        // 15
+        tone(BUZZER_PIN, NOTE_G4, 1.5f);
+        tone(BUZZER_PIN, NOTE_A4, .5f);
+        tone(BUZZER_PIN, NOTE_G4, 1.f);
+
+        // 16
+        tone(BUZZER_PIN, NOTE_E4, 3.f);
+
+        // 17
+        tone(BUZZER_PIN, NOTE_D5, 2.f);
+        tone(BUZZER_PIN, NOTE_D5, 1.f);
+
+        // 18
+        tone(BUZZER_PIN, NOTE_F5, 1.5f);
+        tone(BUZZER_PIN, NOTE_D5, .5f);
+        tone(BUZZER_PIN, NOTE_B4, 1.f);
+
+        // 19
+        tone(BUZZER_PIN, NOTE_C5, 3.f);
+
+        // 20
+        tone(BUZZER_PIN, NOTE_E5, 3.f);
+
+        // 21
+        tone(BUZZER_PIN, NOTE_C5, 1.5f);
+        tone(BUZZER_PIN, NOTE_G4, .5f);
+        tone(BUZZER_PIN, NOTE_E4, 1.f);
+
+        // 22
+        tone(BUZZER_PIN, NOTE_G4, 1.5f);
+        tone(BUZZER_PIN, NOTE_F4, .5f);
+        tone(BUZZER_PIN, NOTE_D4, 1.f);
+
+        // 23 & 24
+        tone(BUZZER_PIN, NOTE_C4, 5.f);
+        // tone(BUZZER_PIN, <Silencio>, 2.f);
+        // Fin
+  }
+}