From b53000bb197027478927a4155418aa32112eee31 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 21 Jul 2023 15:46:13 -0600
Subject: fixed default channel mode after using factory reset with colors

---
 spaghetti-monster/anduril/factory-reset.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/factory-reset.c b/spaghetti-monster/anduril/factory-reset.c
index 1e9714a..f9fb472 100644
--- a/spaghetti-monster/anduril/factory-reset.c
+++ b/spaghetti-monster/anduril/factory-reset.c
@@ -33,6 +33,11 @@ void factory_reset() {
     }
     // explode, if button pressed long enough
     if (reset) {
+        #if defined(FACTORY_RESET_WARN_CHANNEL) && defined(DEFAULT_CHANNEL_MODE)
+        // return to default channel before saving
+        set_channel_mode(DEFAULT_CHANNEL_MODE);
+        #endif
+
         // auto-calibrate temperature
         // AVR 1-Series has factory calibrated thermal sensor, always remove the offset on reset
         #if defined(USE_THERMAL_REGULATION) && defined(AVRXMEGA3)
@@ -43,11 +48,6 @@ void factory_reset() {
         thermal_config_save(1, 21);
         #endif
 
-        #if defined(FACTORY_RESET_WARN_CHANNEL) && defined(DEFAULT_CHANNEL_MODE) && (FACTORY_RESET_WARN_CHANNEL != DEFAULT_CHANNEL_MODE)
-        // return to default channel before saving
-        set_channel_mode(DEFAULT_CHANNEL_MODE);
-        #endif
-
         // save all settings to eeprom
         // (assuming they're all at default because we haven't loaded them yet)
         save_config();
-- 
cgit v1.2.3