hold to disable focus mode

Author: eliasreid

headers/gamepad.h

@@ -218,6 +218,8 @@ class Gamepad {
 
 	HotkeyEntry hotkeys[16];
 	GamepadHotkey lastAction = HOTKEY_NONE;
+
+	absolute_time_t disableFocusModeTimeout = nil_time;
 };
 
 #endif

headers/storagemanager.h

@@ -64,8 +64,6 @@ class Storage {
 	void setFunctionalPinMappings();
 	char* currentProfileLabel();
 
-	void setFocusModeOverride( bool enabled );
-
 	void ResetSettings(); 				// EEPROM Reset Feature
 
 	uint32_t GetFlashSize() { return systemFlashSize; }

proto/enums.proto

@@ -368,8 +368,7 @@ enum GamepadHotkey
 	HOTKEY_AMBIENT_LIGHT_EFFECTS_FRAME_SPEED_UP   = 68;
 	HOTKEY_AMBIENT_LIGHT_EFFECTS_FRAME_SPEED_DOWN = 69;
 	HOTKEY_AMBIENT_LIGHT_EFFECTS_CUSTOM_LINKAGE   = 70;
-    HOTKEY_ENABLE_FOCUS_MODE_OVERRIDE  = 71;
-    HOTKEY_DISABLE_FOCUS_MODE_OVERRIDE = 72;
+    HOTKEY_FOCUS_MODE_TOGGLE  = 71;
 }
 
 enum AnimationEffects

src/addons/focus_mode.cpp

@@ -32,23 +32,6 @@ void FocusModeAddon::process() {
 
 	if (!options.enabled) return;
 
-	//check if held
-
-	//is buttons held?
-	//first just use aux
-	// if( gamepad->state.aux )
-	// {
-	// 	if (is_nil_time(focusModeDisableTimeout)) {
-	// 		focusModeDisableTimeout = make_timeout_time_ms(3000);
-	// 	}
-
-	// 	if( time_reached( focusModeDisableTimeout ) )
-	// 	{
-	// 		Storage::getInstance().getAddonOptions().focusModeOptions.overrideEnabled = false;
-	// 	}
-	// }
-
-	
 	if ( options.overrideEnabled || values & mapFocusMode->pinMask ) {
 			if (buttonLockMask & GAMEPAD_MASK_DU) {
 				gamepad->state.dpad &= ~GAMEPAD_MASK_UP;

src/gamepad.cpp

@@ -691,20 +691,36 @@ void Gamepad::processHotkeyAction(GamepadHotkey action) {
 				EventManager::getInstance().triggerEvent(new GPMenuNavigateEvent(GpioAction::MENU_NAVIGATION_TOGGLE));
 			}
 			break;
-		case HOTKEY_ENABLE_FOCUS_MODE_OVERRIDE:
-			if (action != lastAction) {
-				Storage::getInstance().setFocusModeOverride( true );
-				reqSave = true;
+		case HOTKEY_FOCUS_MODE_TOGGLE:
+		{
+			auto &focusModeOptions = Storage::getInstance().getAddonOptions().focusModeOptions;
+
+			if( !focusModeOptions.overrideEnabled )
+			{
+				if (action != lastAction)
+				{
+					focusModeOptions.overrideEnabled = true;
+					reqSave = true;
+				}
 			}
-			break;
-		case HOTKEY_DISABLE_FOCUS_MODE_OVERRIDE:
-			if (action != lastAction) {
-
-				//can I force timer here?
+			else // override is already enabled, hold action to disable
+			{
+				//start timer if last action was not HOTKEY_FOCUS_MODE_TOGGLE (i.e.. it has not been held), or
+				//if the timer has not yet been started
+				if( lastAction != action || is_nil_time(disableFocusModeTimeout))
+				{
+					constexpr uint32_t focusModeToggleHoldMs = 3000;
+					disableFocusModeTimeout = make_timeout_time_ms(focusModeToggleHoldMs);
+				}
 
-				Storage::getInstance().setFocusModeOverride( false );
-				reqSave = true;
+				if( time_reached( disableFocusModeTimeout ) )
+				{
+					disableFocusModeTimeout = nil_time;
+					focusModeOptions.overrideEnabled = false;
+					reqSave = true;
+				}
 			}
+		}
 			break;
 		default: // Unknown action
 			break;

src/storagemanager.cpp

@@ -106,11 +106,6 @@ char* Storage::currentProfileLabel() {
 		return this->config.profileOptions.gpioMappingsSets[config.gamepadOptions.profileNumber-2].profileLabel;
 }
 
-void Storage::setFocusModeOverride( bool enabled )
-{
-	config.addonOptions.focusModeOptions.overrideEnabled = enabled;
-}
-
 void Storage::setFunctionalPinMappings()
 {
 	GpioMappingInfo* alts = nullptr;

www/src/Locales/en/SettingsPage.jsx

@@ -139,8 +139,6 @@ export default {
 		'menu-nav-back': 'Menu Back',
 		'menu-nav-toggle': 'Menu Toggle',
 		'focus-mode-toggle': 'Focus Mode Toggle',
-		'focus-mode-override-enable': 'Enable Focus Mode Override',
-		'focus-mode-override-disable': 'Disable Focus Mode Override',
 	},
 	'forced-setup-mode-label': 'Forced Setup Mode',
 	'forced-setup-mode-options': {

www/src/Pages/SettingsPage.jsx

@@ -294,8 +294,7 @@ const HOTKEY_ACTIONS = [
 	{ labelKey: 'hotkey-actions.menu-nav-select', value: 48 },
 	{ labelKey: 'hotkey-actions.menu-nav-back', value: 49 },
 	{ labelKey: 'hotkey-actions.menu-nav-toggle', value: 50 },
-	{ labelKey: 'hotkey-actions.focus-mode-override-enable', value: 71 },
-	{ labelKey: 'hotkey-actions.focus-mode-override-disable', value: 72 },
+	{ labelKey: 'hotkey-actions.focus-mode-toggle', value: 71 },
 ];
 
 const FORCED_SETUP_MODES = [