Skip to content

Fix Logitech G25 Sequential Shifting Direction #23

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

Merged
dmadison merged 6 commits into from
Jan 1, 2026
Merged

Fix Logitech G25 Sequential Shifting Direction #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d14af6
Fix G25 sequential shift direction
dmadison Jan 1, 2026
b7cc4e3
Print position in G25 sequential calibration
dmadison Jan 1, 2026
ff768cd
Simplify G25 sequential calibration wording
dmadison Jan 1, 2026
1d13cfd
Remove excess space in calibration printout
dmadison Jan 1, 2026
167d1c6
Clarify sequential shift position docs
dmadison Jan 1, 2026
274bf91
Reword G25 shifter sequential swap comment
dmadison Jan 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
69 changes: 46 additions & 23 deletions src/SimRacing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ void AnalogShifter::serialCalibration(Stream& iface) {
iface.println(separator);
iface.println();

iface.print(F("shifter.setCalibration( "));
iface.print(F("shifter.setCalibration("));

for (int i = 0; i < 7; i++) {
iface.print('{');
Expand Down Expand Up @@ -1421,7 +1421,7 @@ LogitechShifterG25::LogitechShifterG25(
{
// using the calibration values from my own G25 shifter
this->setCalibration({ 508, 435 }, { 310, 843 }, { 303, 8 }, { 516, 827 }, { 540, 14 }, { 713, 846 }, { 704, 17 });
this->setCalibrationSequential(425, 619, 257);
this->setCalibrationSequential(425, 257, 619);
}

void LogitechShifterG25::begin() {
Expand Down Expand Up @@ -1463,17 +1463,17 @@ bool LogitechShifterG25::updateState(bool connected) {

// if we're neutral, check for up/down shift
if (this->sequentialState == 0) {
if (y >= this->seqCalibration.upTrigger) this->sequentialState = 1;
else if (y <= this->seqCalibration.downTrigger) this->sequentialState = -1;
if (y <= this->seqCalibration.upTrigger) this->sequentialState = 1;
else if (y >= this->seqCalibration.downTrigger) this->sequentialState = -1;
}

// if we're in up-shift mode, check for release
else if ((this->sequentialState == 1) && (y < this->seqCalibration.upRelease)) {
else if ((this->sequentialState == 1) && (y > this->seqCalibration.upRelease)) {
this->sequentialState = 0;
}

// if we're in down-shift mode, check for release
else if ((this->sequentialState == -1) && (y > this->seqCalibration.downRelease)) {
else if ((this->sequentialState == -1) && (y < this->seqCalibration.downRelease)) {
this->sequentialState = 0;
}

Expand Down Expand Up @@ -1526,16 +1526,34 @@ void LogitechShifterG25::setCalibrationSequential(int neutral, int up, int down,
releasePoint = engagePoint;
}

// if up/down calibration points are reversed, swap them
//
// in the original public release, pushing the shifter was 'shift up'
// and pulling the shifter was 'shift down'
//
// this bug was eventually fixed, so that now pushing the shifter is
// 'shift down' and pulling the shifter is 'shift up'. This matches the
// markings on the shifter itself (or mine, at least), and mirrors the
// behavior of a sequential shift lever in a real rally car.
//
// by swapping the calibration points here, the function maintains
// compatibility with calibration lines written for both versions
if(up > down) {
int temp = up;
up = down; // dogs and cats living together, mass hysteria
down = temp;
}

// calculate ranges
const int upRange = up - neutral;
const int downRange = neutral - down;
const int upRange = neutral - up;
const int downRange = down - neutral;

// calculate calibration points
this->seqCalibration.upTrigger = neutral + (upRange * engagePoint);
this->seqCalibration.upRelease = neutral + (upRange * releasePoint);
this->seqCalibration.upTrigger = neutral - (upRange * engagePoint);
this->seqCalibration.upRelease = neutral - (upRange * releasePoint);

this->seqCalibration.downTrigger = neutral - (downRange * engagePoint);
this->seqCalibration.downRelease = neutral - (downRange * releasePoint);
this->seqCalibration.downTrigger = neutral + (downRange * engagePoint);
this->seqCalibration.downRelease = neutral + (downRange * releasePoint);
}

void LogitechShifterG25::serialCalibrationSequential(Stream& iface) {
Expand Down Expand Up @@ -1582,23 +1600,23 @@ void LogitechShifterG25::serialCalibrationSequential(Stream& iface) {

const uint8_t NumPoints = 3;
const char* directions[2][2] = {
{ "away from you", "up" },
{ "towards you", "down" },
{ "pull", "towards you" },
{ "push", "away from you" },
};
int data[NumPoints];

int& neutral = data[0];
int& yMax = data[1];
int& yMin = data[2];
int& yMin = data[1];
int& yMax = data[2];

for (uint8_t i = 0; i < NumPoints; ++i) {
if (i == 0) {
iface.print(F("Leave the gear shifter in neutral"));
}
else {
iface.print(F("Please move the gear shifter "));
iface.print(F("Please "));
iface.print(directions[i - 1][0]);
iface.print(F(" to sequentially shift "));
iface.print(F(" the gear shifter "));
iface.print(directions[i - 1][1]);
iface.print(F(" and hold it there"));
}
Expand All @@ -1607,7 +1625,12 @@ void LogitechShifterG25::serialCalibrationSequential(Stream& iface) {

this->update();
data[i] = this->getPositionRaw(Axis::Y);
iface.println(); // spacing

iface.print(F("Shifter position recorded as "));
iface.print('\'');
iface.print(data[i]);
iface.print('\'');
iface.println('\n'); // spacing
}

iface.println(F("These settings are optional. Send 'y' to customize. Send any other character to continue with the default values."));
Expand Down Expand Up @@ -1635,20 +1658,20 @@ void LogitechShifterG25::serialCalibrationSequential(Stream& iface) {
flushClient(iface);

// apply and print
this->setCalibrationSequential(neutral, yMax, yMin, engagementPoint, releasePoint);
this->setCalibrationSequential(neutral, yMin, yMax, engagementPoint, releasePoint);

iface.println(F("Here is your calibration:"));
iface.println(separator);
iface.println();

iface.print(F("shifter.setCalibrationSequential( "));
iface.print(F("shifter.setCalibrationSequential("));

iface.print(neutral);
iface.print(", ");
iface.print(yMax);
iface.print(", ");
iface.print(yMin);
iface.print(", ");
iface.print(yMax);
iface.print(", ");

iface.print(engagementPoint);
iface.print(", ");
Expand Down
18 changes: 12 additions & 6 deletions src/SimRacing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,18 +1154,24 @@ namespace SimRacing {
bool inSequentialMode() const;

/**
* Check if the sequential shifter is shifted up
* Check if the sequential shifter is in the shift up position
*
* When in sequential mode, the shifter is considered to be in the
* "shift up" position when it is pulled towards the user.
*
* @returns 'true' if the sequential shifter is shifted up,
* 'false' otherwise
* @returns 'true' if the sequential shifter is in the shift up
* position, 'false' otherwise
*/
bool getShiftUp() const;

/**
* Check if the sequential shifter is shifted down
* Check if the sequential shifter is in the shift down position
*
* @returns 'true' if the sequential shifter is shifted down,
* 'false' otherwise
* When in sequential mode, the shifter is considered to be in the
* "shift down" position when it is pushed away from the user.
*
* @returns 'true' if the sequential shifter is in the shift down
* position, 'false' otherwise
*/
bool getShiftDown() const;

Expand Down