commit 1465872196d5171d73f47383c9e4f1332d31b620
parent ff2384c7a50dead1705e9c2aaa05c89e2cfee062
Author: Samdal <samdal@protonmail.com>
Date: Fri, 10 Nov 2023 21:51:04 +0100
make ifdefs clearer
Diffstat:
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
@@ -108,7 +108,9 @@ const CRGB gun_led_colors[PROTON_MODES_COUNT][GUN_NUM_LEDS] = {
};
#define SET_GUN_LED_ON(_led) gun_leds[_led] = gun_led_colors[current_mode][_led]
-#if 0
+#define JRGEN_EXTRA
+
+#ifdef JRGEN_EXTRA
enum {
power_down_sound = 1,
pack_hum_sound,
@@ -117,7 +119,9 @@ enum {
beep_sound,
beep_shoot_sound,
gun_overheat_sound,
-} trakcs;
+ shoot_sound,
+ ghostbusters_theme_song,
+} tracks;
#else
enum {
power_down_sound = 1,
@@ -127,10 +131,9 @@ enum {
beep_sound,
beep_shoot_sound,
gun_overheat_sound,
- shoot_sound,
- ghostbusters_theme_song,
-} tracks;
+} trakcs;
#endif
+
#define PACK_VOLUME 30
DFPlayerMini_Fast myMP3;
@@ -393,7 +396,7 @@ void run_proton_gun()
if (intensify_reload && !last_intensify_reload_state) {
static bool is_on = false;
is_on = !is_on;
-#if 0
+#ifdef JRGEN_EXTRA
if (is_on)
myMP3.play(ghostbusters_theme_song);
else
@@ -646,12 +649,12 @@ bool high_power_led(const uint8_t* ledcolor, const unsigned long spacing_delay,
if (red_state < R) red_state++;
else if (red_state > R) red_state--;
-#if 0
+#ifdef JRGEN_EXTRA
if (green_state < G) green_state++;
else if (green_state > G) green_state--;
#else
green_state = G;
-#endif;
+#endif
if (blue_state < B) blue_state++;
else if (blue_state > B) blue_state--;