Merge branch 'master' into kurt/shorter-unlock-time

OpenSourceLightshows · Aug 23, 2024 · 8c81878 · 8c81878
2 parents 8e46314 + a573886
commit 8c81878
Show file tree

Hide file tree

Showing 27 changed files with 153,594 additions and 154,797 deletions.
diff --git a/Helios/Helios.cpp b/Helios/Helios.cpp
@@ -386,12 +386,12 @@ void Helios::handle_off_menu(uint8_t mag, bool past)
       cur_state = STATE_TOGGLE_LOCK;
       Led::clear();
       return; // RETURN HERE
-    case 2:  // blue reset defaults
+    case 2:  // green global brightness
       cur_state = STATE_SET_GLOBAL_BRIGHTNESS;
       return; // RETURN HERE
-    case 3:  // green global brightness
+    case 3:  // blue reset defaults
       cur_state = STATE_SET_DEFAULTS;
-      return; // RETURN HERE
+      return; //RETURN HERE
     default:
       // just go back to sleep in hold-past off menu
       enter_sleep();