Bugfixes and changelog update

Author: Electronicks

CHANGELOG.md

@@ -3,6 +3,17 @@
 Most recent updates will appear first.
 This is a summary of new features and bugfixes. Read the README to learn how to use the features mentioned here.
 
+## 3.6.1
+
+Fixing all the stuff I broke.
+
+### Bugfixes
+
+* Fix crash on Simultaneous press
+* Fix crash on command action
+* Improve handling of overlaping sim press and diag press
+* Fix SCROLL_WHEEL stick mode
+
 ## 3.6.0
 
 New features, bugfixes and all around improvements!

JoyShockMapper/include/DigitalButton.h

@@ -26,7 +26,6 @@ enum class BtnState
 	SimRelease,
 	DiagPressMaster,
 	DiagPressSlave,
-	DiagRelease,
 	DblPressStart,
 	DblPressNoPress,
 	DblPressNoPressTap,

JoyShockMapper/src/DigitalButton.cpp

@@ -355,7 +355,6 @@ class ActiveMappingState : public DigitalButtonState
 	{
 		Released rel{ e.pressTime, e.turboTime, e.holdTime };
 		react(rel);
-		delete _nextState;
 		// Redirect change of state to the caller of the Sync
 		if (e.nextState == nullptr)
 		{
@@ -374,14 +373,14 @@ class ActiveMappingState : public DigitalButtonState
 				pimpl()->_masterPress = nullptr;
 				pimpl()->_keyToRelease = *e.activeMapping;
 				pimpl()->_nameToRelease = e.nameToRelease;
-
 			}
 			else // release diagonal
 			{
 				// DEBUG_LOG << "Button " << pimpl()->_id << " releases active diagonal\n";
 				pimpl()->ClearKey();
 			}
 			pimpl()->_press_times = e.pressTime;
+			delete _nextState;
 			_nextState = e.nextState;
 		}
 	}
@@ -514,7 +513,7 @@ class NoPress : public DigitalButtonState
 	{
 		DigitalButtonState::react(e);
 		pimpl()->_press_times = e.time_now;
-		if (pimpl()->_mapping.hasSimMappings())
+		if (pimpl()->_mapping.hasSimMappings() && pimpl()->GetPressDurationMS(e.time_now) < SettingsManager::getV<float>(SettingID::SIM_PRESS_WINDOW)->value())
 		{
 			changeState<WaitSim>();
 		}
@@ -709,6 +708,35 @@ class WaitSim : public DigitalButtonState
 				// Start counting time between two start presses
 				changeState<DblPressStart>();
 			}
+			else if (pimpl()->_mapping.hasDiagMappings())
+			{
+				size_t counter = 0;
+				optional<MapIterator> diag = nullopt;
+				for (auto btn = pimpl()->_context->_getMatchingDiagBtn(pimpl()->_id, diag); btn;
+				     btn = pimpl()->_context->_getMatchingDiagBtn(pimpl()->_id, diag))
+				{
+					// DEBUG_LOG << "Button " << pimpl()->_id << " enables diagonal press with " << btn->_id << " who is in state " << btn->getCurrentStateName() << '\n';
+					pimpl()->_masterPress = btn;
+					pimpl()->_nameToRelease = pimpl()->_mapping.getDiagPressName((*diag)->first);
+					pimpl()->_keyToRelease = (*diag)->second.value();
+					Sync sync;
+					sync.nameToRelease = pimpl()->_nameToRelease;
+					sync.activeMapping = &*pimpl()->_keyToRelease;
+					sync.pressTime = e.time_now;
+					sync.holdTime = e.holdTime;
+					sync.turboTime = e.turboTime;
+					sync.dblPressWindow = e.dblPressWindow;
+					sync.nextState = new DiagPressMaster();
+					pimpl()->_masterPress->sendEvent(sync);
+					++*diag;
+					counter++;
+				}
+
+				if (counter > 0)
+					changeState<DiagPressSlave>();
+				else
+					changeState<BtnPress>();
+			}
 			else // Handle regular press mapping
 			{
 				changeState<BtnPress>();
@@ -756,6 +784,26 @@ class SimRelease : public DigitalButtonState
 		changeState<NoPress>();
 		pimpl()->ClearKey();
 	}
+
+	REACT(Sync)
+	final
+	{
+		if (e.nextState != nullptr && e.activeMapping != nullptr)
+		{
+			Released rel{ e.pressTime, e.turboTime, e.holdTime };
+			react(rel);
+			// Redirect change of state to the caller of the Sync
+
+			// Activate Diagonal
+			// DEBUG_LOG << "Button " << pimpl()->_id << " enables active diagonal as master\n";
+			pimpl()->_masterPress = nullptr;
+			pimpl()->_keyToRelease = *e.activeMapping;
+			pimpl()->_nameToRelease = e.nameToRelease;
+			pimpl()->_press_times = e.pressTime;
+			delete _nextState;
+			_nextState = e.nextState;
+		}
+	}
 };
 
 
@@ -810,11 +858,6 @@ class DiagPressSlave : public DigitalButtonState
 	}
 };
 
-class DiagRelease : public DigitalButtonState
-{
-	DB_CONCRETE_STATE(DiagRelease)
-};
-
 class DblPressStart : public pocket_fsm::NestedStateMachine<ActiveMappingState, DigitalButtonState>
 {
 	DB_CONCRETE_STATE(DblPressStart)