Merge branch 'master' of https://github.com/profezzorn/ProffieOS

profezzorn · Feb 25, 2024 · 946b6c5 · 946b6c5
2 parents 7344edc + c0f1f1d
commit 946b6c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/props/prop_base.h b/props/prop_base.h
@@ -1290,7 +1290,7 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
       PRINT_CHECK_BLADE=true;
       if (SaberBase::BladeIsOn(1)) {
 	STDOUT << "Turning off SINGLE blade.\n";
-	Off(OffType::OFF_NORMAL, EffectLocation(1000, ~~BladeSet::fromBlade(2)));
+	SaberBase::TurnOff(OffType::OFF_NORMAL, EffectLocation(1000, ~~BladeSet::fromBlade(2)));
       } else {
 	STDOUT << "Turning off all blades.\n";
 	Off(OffType::OFF_NORMAL);
@@ -1303,7 +1303,7 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
       if (SaberBase::BladeIsOn(2)) {
 	EffectLocation tmp = EffectLocation(1000, ~~BladeSet::fromBlade(1));
 	STDOUT << "Turning off SINGLE blade: " << tmp << "\n";
-	Off(OffType::OFF_NORMAL, tmp);
+	SaberBase::TurnOff(OffType::OFF_NORMAL, tmp);
       } else {
 	STDOUT << "Turning off all blades.\n";
 	Off(OffType::OFF_NORMAL);

diff --git a/props/saber_BC_buttons.h b/props/saber_BC_buttons.h
@@ -582,9 +582,9 @@ class SaberBCButtons : public PROP_INHERIT_PREFIX PropBase {
   void DetectMenuTurn() {
     float a = fusor.angle2() - current_menu_angle_;
     if (is_pointing_up()) return;
+    if (a > M_PI) a-=M_PI*2;
+    if (a < -M_PI) a+=M_PI*2;
     if (mode_volume_) {
-      if (a > M_PI) a-=M_PI*2;
-      if (a < -M_PI) a+=M_PI*2;
       if (a > M_PI / 6) VolumeUp();
       if (a < -M_PI / 6) VolumeDown();
     } else if (scroll_presets_) {