restore custom signal tunes to Second Movement

diff --git a/movement.c b/movement.c
index c4a10e316f1147c20a0245f84376ececf1af90a2..4327ff5e12868b8fa7b73f660ed36673a3468b0c 100644 (file)
--- a/movement.c
+++ b/movement.c
@@ -40,18 +40,10 @@
 #include "shell.h"
 #include "utz.h"
 
-/// FIXME: #SecondMovement needs to bring back the following include (and remove the default signal_tune)
-// #include "movement_custom_signal_tunes.h"
-int8_t signal_tune[] = {
-    BUZZER_NOTE_C8, 5,
-    BUZZER_NOTE_REST, 6,
-    BUZZER_NOTE_C8, 5,
-    0
-};
-
-
 #include "movement_config.h"
 
+#include "movement_custom_signal_tunes.h"
+
 #if __EMSCRIPTEN__
 #include <emscripten.h>
 #endif

diff --git a/movement/movement_custom_signal_tunes.h b/movement/movement_custom_signal_tunes.h
deleted file mode 100644 (file)
index 78f8d12..0000000
--- a/movement/movement_custom_signal_tunes.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2023 Jeremy O'Brien
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef MOVEMENT_CUSTOM_SIGNAL_TUNES_H_
-#define MOVEMENT_CUSTOM_SIGNAL_TUNES_H_
-
-#ifdef SIGNAL_TUNE_DEFAULT
-int8_t signal_tune[] = {
-    BUZZER_NOTE_C8, 5,
-    BUZZER_NOTE_REST, 6,
-    BUZZER_NOTE_C8, 5,
-    0
-};
-#endif // SIGNAL_TUNE_DEFAULT
-
-#ifdef SIGNAL_TUNE_ZELDA_SECRET
-int8_t signal_tune[] = {
-    BUZZER_NOTE_G5, 8,
-    BUZZER_NOTE_F5SHARP_G5FLAT, 8,
-    BUZZER_NOTE_D5SHARP_E5FLAT, 8,
-    BUZZER_NOTE_A4, 8,
-    BUZZER_NOTE_G4SHARP_A4FLAT, 8,
-    BUZZER_NOTE_E5, 8,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 8,
-    BUZZER_NOTE_C6, 20,
-    0
-};
-#endif // SIGNAL_TUNE_ZELDA_SECRET
-
-#ifdef SIGNAL_TUNE_MARIO_THEME
-int8_t signal_tune[] = {
-    BUZZER_NOTE_E6, 7,
-    BUZZER_NOTE_REST, 2,
-    BUZZER_NOTE_E6, 7,
-    BUZZER_NOTE_REST, 10,
-    BUZZER_NOTE_E6, 7,
-    BUZZER_NOTE_REST, 11,
-    BUZZER_NOTE_C6, 7,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_E6, 7,
-    BUZZER_NOTE_REST, 10,
-    BUZZER_NOTE_G6, 8,
-    BUZZER_NOTE_REST, 30,
-    BUZZER_NOTE_G5, 8,
-    0
-};
-#endif // SIGNAL_TUNE_MARIO_THEME
-
-#ifdef SIGNAL_TUNE_MGS_CODEC
-int8_t signal_tune[] = {
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_REST, 6,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
-    BUZZER_NOTE_C6, 1,
-    0
-};
-#endif // SIGNAL_TUNE_MGS_CODEC
-
-#ifdef SIGNAL_TUNE_KIM_POSSIBLE
-int8_t signal_tune[] = {
-    BUZZER_NOTE_G7, 6,
-    BUZZER_NOTE_G4, 2,
-    BUZZER_NOTE_REST, 5,
-    BUZZER_NOTE_G7, 6,
-    BUZZER_NOTE_G4, 2,
-    BUZZER_NOTE_REST, 5,
-    BUZZER_NOTE_A7SHARP_B7FLAT, 6,
-    BUZZER_NOTE_REST, 2,
-    BUZZER_NOTE_G7, 6,
-    BUZZER_NOTE_G4, 2,
-    0
-};
-#endif // SIGNAL_TUNE_KIM_POSSIBLE
-
-#ifdef SIGNAL_TUNE_POWER_RANGERS
-int8_t signal_tune[] = {
-    BUZZER_NOTE_D8, 6,
-    BUZZER_NOTE_REST, 8,
-    BUZZER_NOTE_D8, 6,
-    BUZZER_NOTE_REST, 8,
-    BUZZER_NOTE_C8, 6,
-    BUZZER_NOTE_REST, 2,
-    BUZZER_NOTE_D8, 6,
-    BUZZER_NOTE_REST, 8,
-    BUZZER_NOTE_F8, 6,
-    BUZZER_NOTE_REST, 8,
-    BUZZER_NOTE_D8, 6,
-    0
-};
-#endif // SIGNAL_TUNE_POWER_RANGERS
-
-#ifdef SIGNAL_TUNE_LAYLA
-int8_t signal_tune[] = {
-    BUZZER_NOTE_A6, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_C7, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_D7, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F7, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_D7, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_C7, 5,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_D7, 20,
-    0
-};
-#endif // SIGNAL_TUNE_LAYLA
-
-#ifdef SIGNAL_TUNE_HARRY_POTTER_SHORT
-int8_t signal_tune[] = {
-    BUZZER_NOTE_B5, 12,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_E6, 12,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_G6, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_E6, 16,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_B6, 8,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_A6, 24,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6SHARP_G6FLAT, 24,
-    0
-};
-#endif // SIGNAL_TUNE_HARRY_POTTER_SHORT
-
-#ifdef SIGNAL_TUNE_HARRY_POTTER_LONG
-int8_t signal_tune[] = {
-    BUZZER_NOTE_B5, 12,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_E6, 12,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_G6, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_E6, 16,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_B6, 8,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_A6, 24,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6SHARP_G6FLAT, 24,
-    BUZZER_NOTE_REST, 1,
-
-    BUZZER_NOTE_E6, 12,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_G6, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_D6SHARP_E6FLAT, 16,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_F6, 8,
-    BUZZER_NOTE_REST, 1,
-    BUZZER_NOTE_B5, 24,
-
-    0
-};
-#endif // SIGNAL_TUNE_HARRY_POTTER_LONG
-
-#endif // MOVEMENT_CUSTOM_SIGNAL_TUNES_H_

diff --git a/movement_custom_signal_tunes.h b/movement_custom_signal_tunes.h
new file mode 100644 (file)
index 0000000..96f083b
--- /dev/null
+++ b/movement_custom_signal_tunes.h
@@ -0,0 +1,202 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Jeremy O'Brien
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#ifdef SIGNAL_TUNE_DEFAULT
+int8_t signal_tune[] = {
+    BUZZER_NOTE_C8, 5,
+    BUZZER_NOTE_REST, 6,
+    BUZZER_NOTE_C8, 5,
+    0
+};
+#endif // SIGNAL_TUNE_DEFAULT
+
+#ifdef SIGNAL_TUNE_ZELDA_SECRET
+int8_t signal_tune[] = {
+    BUZZER_NOTE_G5, 8,
+    BUZZER_NOTE_F5SHARP_G5FLAT, 8,
+    BUZZER_NOTE_D5SHARP_E5FLAT, 8,
+    BUZZER_NOTE_A4, 8,
+    BUZZER_NOTE_G4SHARP_A4FLAT, 8,
+    BUZZER_NOTE_E5, 8,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 8,
+    BUZZER_NOTE_C6, 20,
+    0
+};
+#endif // SIGNAL_TUNE_ZELDA_SECRET
+
+#ifdef SIGNAL_TUNE_MARIO_THEME
+int8_t signal_tune[] = {
+    BUZZER_NOTE_E6, 7,
+    BUZZER_NOTE_REST, 2,
+    BUZZER_NOTE_E6, 7,
+    BUZZER_NOTE_REST, 10,
+    BUZZER_NOTE_E6, 7,
+    BUZZER_NOTE_REST, 11,
+    BUZZER_NOTE_C6, 7,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_E6, 7,
+    BUZZER_NOTE_REST, 10,
+    BUZZER_NOTE_G6, 8,
+    BUZZER_NOTE_REST, 30,
+    BUZZER_NOTE_G5, 8,
+    0
+};
+#endif // SIGNAL_TUNE_MARIO_THEME
+
+#ifdef SIGNAL_TUNE_MGS_CODEC
+int8_t signal_tune[] = {
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_REST, 6,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    BUZZER_NOTE_G5SHARP_A5FLAT, 1,
+    BUZZER_NOTE_C6, 1,
+    0
+};
+#endif // SIGNAL_TUNE_MGS_CODEC
+
+#ifdef SIGNAL_TUNE_KIM_POSSIBLE
+int8_t signal_tune[] = {
+    BUZZER_NOTE_G7, 6,
+    BUZZER_NOTE_G4, 2,
+    BUZZER_NOTE_REST, 5,
+    BUZZER_NOTE_G7, 6,
+    BUZZER_NOTE_G4, 2,
+    BUZZER_NOTE_REST, 5,
+    BUZZER_NOTE_A7SHARP_B7FLAT, 6,
+    BUZZER_NOTE_REST, 2,
+    BUZZER_NOTE_G7, 6,
+    BUZZER_NOTE_G4, 2,
+    0
+};
+#endif // SIGNAL_TUNE_KIM_POSSIBLE
+
+#ifdef SIGNAL_TUNE_POWER_RANGERS
+int8_t signal_tune[] = {
+    BUZZER_NOTE_D8, 6,
+    BUZZER_NOTE_REST, 8,
+    BUZZER_NOTE_D8, 6,
+    BUZZER_NOTE_REST, 8,
+    BUZZER_NOTE_C8, 6,
+    BUZZER_NOTE_REST, 2,
+    BUZZER_NOTE_D8, 6,
+    BUZZER_NOTE_REST, 8,
+    BUZZER_NOTE_F8, 6,
+    BUZZER_NOTE_REST, 8,
+    BUZZER_NOTE_D8, 6,
+    0
+};
+#endif // SIGNAL_TUNE_POWER_RANGERS
+
+#ifdef SIGNAL_TUNE_LAYLA
+int8_t signal_tune[] = {
+    BUZZER_NOTE_A6, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_C7, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_D7, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F7, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_D7, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_C7, 5,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_D7, 20,
+    0
+};
+#endif // SIGNAL_TUNE_LAYLA
+
+#ifdef SIGNAL_TUNE_HARRY_POTTER_SHORT
+int8_t signal_tune[] = {
+    BUZZER_NOTE_B5, 12,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_E6, 12,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_G6, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_E6, 16,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_B6, 8,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_A6, 24,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6SHARP_G6FLAT, 24,
+    0
+};
+#endif // SIGNAL_TUNE_HARRY_POTTER_SHORT
+
+#ifdef SIGNAL_TUNE_HARRY_POTTER_LONG
+int8_t signal_tune[] = {
+    BUZZER_NOTE_B5, 12,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_E6, 12,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_G6, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_E6, 16,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_B6, 8,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_A6, 24,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6SHARP_G6FLAT, 24,
+    BUZZER_NOTE_REST, 1,
+
+    BUZZER_NOTE_E6, 12,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_G6, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6SHARP_G6FLAT, 6,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_D6SHARP_E6FLAT, 16,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_F6, 8,
+    BUZZER_NOTE_REST, 1,
+    BUZZER_NOTE_B5, 24,
+
+    0
+};
+#endif // SIGNAL_TUNE_HARRY_POTTER_LONG