Skip to content

Fix snes rumble controller #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
undisbeliever wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −1
Open

Fix snes rumble controller #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7bf38
SNES: Clear _rumbleData when the rumble controller is latched
undisbeliever Apr 30, 2026
3ebdd21
SNES: Stop rumble controller shortly after the last rumble command
undisbeliever May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Core/SNES/Input/SnesRumbleController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ void SnesRumbleController::Serialize(Serializer& s)
{
SnesController::Serialize(s);
SV(_rumbleData);
SV(_rumbleActive);
SV(_lastRumbleFrame);
}

void SnesRumbleController::RefreshStateBuffer()
{
_rumbleData = 0;

//The LRG rumble controller stops rumbling shortly after the last rumble command.
//Not accurate, assumes the game regularly latches the controller.
if(_rumbleActive) {
if(_emu->GetFrameCount() - _lastRumbleFrame > 2) {
KeyManager::SetForceFeedback(0, 0);
_rumbleActive = false;
}
}

SnesController::RefreshStateBuffer();
}

uint8_t SnesRumbleController::ReadRam(uint16_t addr)
Expand All @@ -44,7 +62,8 @@ uint8_t SnesRumbleController::ReadRam(uint16_t addr)

KeyManager::SetForceFeedback(rightRumble, leftRumble);

_rumbleData = 0;
_rumbleActive = true;
_lastRumbleFrame = _emu->GetFrameCount();
}
}

Expand Down
3 changes: 3 additions & 0 deletions Core/SNES/Input/SnesRumbleController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ class SnesRumbleController : public SnesController
private:
SnesConsole* _console = nullptr;
uint16_t _rumbleData = 0;
bool _rumbleActive = false;
uint32_t _lastRumbleFrame = 0;

protected:
void Serialize(Serializer& s) override;
void RefreshStateBuffer() override;

public:
SnesRumbleController(Emulator* emu, SnesConsole* console, uint8_t port, KeyMappingSet keyMappings);
Expand Down
Loading