fix idle sd access

Author: profezzorn

ProffieOS.ino

@@ -410,6 +410,7 @@ void EnableAmplifier();
 bool AmplifierIsActive();
 void MountSDCard();
 const char* GetSaveDir();
+bool AvoidIdleSDAccess();
 
 #include "common/lsfs.h"
 #include "common/strfun.h"

common/sd_card.h

@@ -82,8 +82,23 @@ class SDCard : Looper {
 
 SDCard sdcard;
 inline void MountSDCard() { sdcard.Mount(); }
+
+bool AvoidIdleSDAccess() {
+#ifdef MOUNT_SD_SETTING)
+  if (LSFS::GetAllowMount()) return true;
+#elif defined(USB_CLASS_MSC)
+  // This fallback won't work as well as the
+  // MOUNT_SD_SETTING, but it will allow users
+  // to access the SD card in some cases that
+  // might otherwise be impossible.
+  if (USBD_configured()) return true;
+#endif  
+  return false;
+}
+
 #else
 inline void MountSDCard() {  }
+bool AvoidIdleSDAccess() { return false; }
 #endif // v4 && enable_sd
 
 #endif

display/layer_controller.h

@@ -531,12 +531,8 @@ class StandarColorDisplayController : public SaberBase, public Looper, public Co
       }
     } else {
       // Off
-      if (looped_idle_ != Tristate::False) {
-//        if (EscapeIdleIfNeeded()) {
-//          SetMessage("    usb\nconnected");
-//        } else {
+      if (!AvoidIdleSDAccess()) {
 	scr_.Play(&SCR_idle);
-//        }
       }
     }
   }
@@ -549,7 +545,6 @@ class StandarColorDisplayController : public SaberBase, public Looper, public Co
    switch (effect) {
      case EFFECT_NEWFONT:
        looped_on_ = Tristate::Unknown;
-       looped_idle_ = Tristate::Unknown;
        Stop();
        if (!scr_.Play(&SCR_font)) {
 	 ShowDefault();
@@ -637,8 +632,6 @@ class StandarColorDisplayController : public SaberBase, public Looper, public Co
 
   // True if IMG_on is looped.
   volatile Tristate looped_on_ = Tristate::Unknown;
-  // True if IMG_idle is looped.
-  volatile Tristate looped_idle_ = Tristate::Unknown;
 };
 
 

display/ssd1306.h

@@ -146,7 +146,6 @@ class DisplayControllerBase {
   virtual int FillFrameBuffer(bool advance) = 0;
   virtual void SetDisplay(Display<Width, col_t>* display) = 0;
   virtual Screen GetScreen() { return SCREEN_UNSET; }
-  virtual void usb_connected() {}
 };
 
 template<int Width, class col_t>
@@ -176,7 +175,6 @@ class DisplayHelper1 {
     a->SetDisplay(display);
   }
   Screen GetScreen() { return a->GetScreen(); }
-  void usb_connected() { return a->usb_connected(); }
   void Advance(int t) { t_ -= t; }
 };
 
@@ -222,11 +220,6 @@ class DisplayHelper : public DisplayControllerBase<Width, col_t> {
     }
     return SCREEN_UNSET;
   }
-  void usb_connected() override {
-    for (size_t i = 0; i < sizeof...(OPERATIONS); i++) {
-      operations_[i].usb_connected();
-    }
-  }
 
   int FillFrameBuffer(bool advance) override {
     for (size_t i = 0; i < sizeof...(OPERATIONS); i++) {
@@ -407,14 +400,6 @@ class StandardDisplayController : public DisplayControllerBase<Width, col_t>, pu
     return last_delay_ = FillFrameBuffer2(advance);
   }
 
-#ifdef USB_CLASS_MSC
-  bool EscapeIdleIfNeeded() {
-    return looped_idle_ == Tristate::True && USBD_Configured();
-  }
-#else
-  bool EscapeIdleIfNeeded() { return false; }
-#endif
-
   void ShowDefault(bool ignore_lockup = false) {
     screen_ = SCREEN_PLI;
     t_ = 0;
@@ -427,7 +412,7 @@ class StandardDisplayController : public DisplayControllerBase<Width, col_t>, pu
     } else {
       // Off
       if (looped_idle_ != Tristate::False) {
-        if (EscapeIdleIfNeeded()) {
+        if (AvoidIdleSDAccess()) {
           SetMessage("    usb\nconnected");
         } else {
           SetFile(&img_.IMG_idle, 3600000.0);
@@ -518,11 +503,6 @@ class StandardDisplayController : public DisplayControllerBase<Width, col_t>, pu
       }
 
       case SCREEN_IMAGE:
-        if (EscapeIdleIfNeeded() && current_effect_ == &img_.IMG_idle) {
-          // We are idle-looping, and usb is connected. Time to stop.
-          SetMessage("    usb\nconnected");
-          return FillFrameBuffer2(advance);
-        }
         MountSDCard();
         {
           int count = 0;
@@ -585,14 +565,6 @@ class StandardDisplayController : public DisplayControllerBase<Width, col_t>, pu
     }
   }
 
-  void usb_connected() override {
-    if (EscapeIdleIfNeeded() && current_effect_ == &img_.IMG_idle) {
-      // We are idle-looping, and usb is connected. Time to stop.
-      SetMessage("    usb\nconnected");
-      SetScreenNow(SCREEN_MESSAGE);
-    }
-  }
-
   void ShowFileWithSoundLength(Effect* e, float duration) {
     if (duration == 0.0) {
       duration = SaberBase::sound_length * 1000;
@@ -1121,13 +1093,6 @@ class SSD1306Template : public Display<WIDTH, col_t>, I2CDevice, Looper, StateMa
   }
 
   void Loop() override {
-#ifdef USB_CLASS_MSC
-    static bool last_connected = false;
-    bool connected = USBD_Configured();
-    if (connected && !last_connected) controller_->usb_connected();
-    last_connected = connected;
-#endif
-
     STATE_MACHINE_BEGIN();
     while(true) {
       on_ = true;

props/prop_base.h

@@ -1640,9 +1640,15 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
 	bool mountable = atoi(arg) > 0;
 	LSFS::SetAllowMount(mountable);
 	if (mountable) {
-	  // Trigger the IDLE_OFF_TIME behavior to turn off idle sounds and animations.
-	  // (Otherwise we can't mount the sd card).
-	  if (!SaberBase::IsOn()) SaberBase::DoOff(OFF_IDLE, 0);
+	  if (SaberBase::IsOn()) {
+	    // Turn off. Idle sounds/animations should not start since we already set
+	    // SetAllowMount to true.
+	    Off();
+	  } else {
+	    // Trigger the IDLE_OFF_TIME behavior to turn off idle sounds and animations.
+	    // (Otherwise we can't mount the sd card).
+	    SaberBase::DoOff(OFF_IDLE, 0);
+	  }
 	}
       }
       STDOUT << "SD Access " 

sound/hybrid_font.h

@@ -483,7 +483,7 @@ class HybridFont : public SaberBase, public Looper {
     bool most_blades = location.on_blade(0);
     // SFX_in.SetFollowing( most_blades ?  &SFX_pstoff : nullptr );
 #ifdef ENABLE_IDLE_SOUND
-    if (most_blades) {
+    if (most_blades && CurrentIdleAccessState() == IDLE_ACCESS_OK) {
         if (SFX_pstoff) {
             SFX_in.SetFollowing(&SFX_pstoff);
             SFX_pstoff.SetFollowing(&SFX_idle);