WIP TCC refactor; remove low frequency notes

diff --git a/watch-library/watch/watch_buzzer.c b/watch-library/watch/watch_buzzer.c
index 047464163059682c9419a8ce32fb3911946fc067..72771508d023c940ee7081d0366b5df275efb741 100644 (file)
--- a/watch-library/watch/watch_buzzer.c
+++ b/watch-library/watch/watch_buzzer.c
@@ -38,7 +38,7 @@ inline void watch_set_buzzer_off() {
        pwm_disable(&PWM_1);
 }
 
-const uint16_t NotePeriods[108] = {31047, 29301, 27649, 26079, 24617, 23224, 21923, 20683, 19515, 18418, 17377, 16399, 15477, 14603, 13780, 13004, 12272, 11580, 10926, 10311, 9730, 9181, 8664, 8175, 7714, 7280, 6869, 6483, 6117, 5772, 5447, 5140, 4850, 4577, 4319, 4076, 3846, 3629, 3425, 3232, 3050, 2878, 2715, 2562, 2418, 2282, 2153, 2032, 1917, 1809, 1707, 1611, 1520, 1435, 1354, 1277, 1205, 1137, 1073, 1013, 956, 902, 851, 803, 758, 715, 675, 637, 601, 567, 535, 505, 476, 450, 424, 400, 378, 357, 336, 317, 300, 283, 267, 252, 238, 224, 212, 200, 188, 178, 168, 158, 149, 141, 133, 125, 118, 112, 105, 99, 94, 89, 84, 79, 74, 70, 66, 63};
+const uint16_t NotePeriods[108] = {18182,17161,16197,15288,14430,13620,12857,12134,11453,10811,10204,9631,9091,8581,8099,7645,7216,6811,6428,6068,5727,5405,5102,4816,4545,4290,4050,3822,3608,3405,3214,3034,2863,2703,2551,2408,2273,2145,2025,1911,1804,1703,1607,1517,1432,1351,1276,1204,1136,1073,1012,956,902,851,804,758,716,676,638,602,568,536,506,478,451,426,402,379,358,338,319,301,284,268,253,239,225,213,201,190,179,169,159,150,142,134,127};
 
 void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) {
     if (note == BUZZER_NOTE_REST) {

diff --git a/watch-library/watch/watch_buzzer.h b/watch-library/watch/watch_buzzer.h
index 75b30a791e1d22b9851ce3bd1f5bf4f114d39af3..38b40f6ea312fd2d24168a2dc43149c8c3a52a0c 100644 (file)
--- a/watch-library/watch/watch_buzzer.h
+++ b/watch-library/watch/watch_buzzer.h
@@ -47,29 +47,8 @@ void watch_set_buzzer_on();
   */
 void watch_set_buzzer_off();
 
-/// @brief 108 notes for use with watch_buzzer_play_note
+/// @brief 87 notes for use with watch_buzzer_play_note
 typedef enum BuzzerNote {
-    BUZZER_NOTE_C0 = 0,          ///< 16.35 Hz
-    BUZZER_NOTE_C0SHARP_D0FLAT,  ///< 17.32 Hz
-    BUZZER_NOTE_D0,              ///< 18.35 Hz
-    BUZZER_NOTE_D0SHARP_E0FLAT,  ///< 19.45 Hz
-    BUZZER_NOTE_E0,              ///< 20.60 Hz
-    BUZZER_NOTE_F0,              ///< 21.83 Hz
-    BUZZER_NOTE_F0SHARP_G0FLAT,  ///< 23.12 Hz
-    BUZZER_NOTE_G0,              ///< 24.50 Hz
-    BUZZER_NOTE_G0SHARP_A0FLAT,  ///< 25.96 Hz
-    BUZZER_NOTE_A0,              ///< 27.50 Hz
-    BUZZER_NOTE_A0SHARP_B0FLAT,  ///< 29.14 Hz
-    BUZZER_NOTE_B0,              ///< 30.87 Hz
-    BUZZER_NOTE_C1,              ///< 32.70 Hz
-    BUZZER_NOTE_C1SHARP_D1FLAT,  ///< 34.65 Hz
-    BUZZER_NOTE_D1,              ///< 36.71 Hz
-    BUZZER_NOTE_D1SHARP_E1FLAT,  ///< 38.89 Hz
-    BUZZER_NOTE_E1,              ///< 41.20 Hz
-    BUZZER_NOTE_F1,              ///< 43.65 Hz
-    BUZZER_NOTE_F1SHARP_G1FLAT,  ///< 46.25 Hz
-    BUZZER_NOTE_G1,              ///< 49.00 Hz
-    BUZZER_NOTE_G1SHARP_A1FLAT,  ///< 51.91 Hz
     BUZZER_NOTE_A1,              ///< 55.00 Hz
     BUZZER_NOTE_A1SHARP_B1FLAT,  ///< 58.27 Hz
     BUZZER_NOTE_B1,              ///< 61.74 Hz