Merge pull request #11 from dmadison/shifter-calibration

dmadison · web-flow · commit 676d68452a8b · 2023-09-04T16:18:28.000-04:00
Tweak Logitech Shifter Calibration
diff --git a/src/SimRacing.cpp b/src/SimRacing.cpp
@@ -655,7 +655,7 @@ String Shifter::getGearString() const {
 */
 const float AnalogShifter::CalEngagementPoint = 0.70;
 const float AnalogShifter::CalReleasePoint = 0.50;
-const float AnalogShifter::CalEdgeOffset = 0.70;
+const float AnalogShifter::CalEdgeOffset = 0.60;
 
 AnalogShifter::AnalogShifter(uint8_t pinX, uint8_t pinY, uint8_t pinRev, uint8_t detectPin)
 	: 
@@ -980,7 +980,7 @@ void AnalogShifter::serialCalibration(Stream& iface) {
 LogitechShifter::LogitechShifter(uint8_t pinX, uint8_t pinY, uint8_t pinRev, uint8_t detectPin)
 	: AnalogShifter(pinX, pinY, pinRev, detectPin)
 {
-	this->setCalibration({ 490, 440 }, { 253, 799 }, { 262, 86 }, { 460, 826 }, { 470, 76 }, { 664, 841 }, { 677, 77 }, 0.70, 0.50, 0.70);
+	this->setCalibration({ 490, 440 }, { 253, 799 }, { 262, 86 }, { 460, 826 }, { 470, 76 }, { 664, 841 }, { 677, 77 });
 }
 
 //#########################################################

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ String Shifter::getGearString() const {`
`655`	`655`	`*/`
`656`	`656`	`const float AnalogShifter::CalEngagementPoint = 0.70;`
`657`	`657`	`const float AnalogShifter::CalReleasePoint = 0.50;`
`658`		`-const float AnalogShifter::CalEdgeOffset = 0.70;`
	`658`	`+const float AnalogShifter::CalEdgeOffset = 0.60;`
`659`	`659`
`660`	`660`	`AnalogShifter::AnalogShifter(uint8_t pinX, uint8_t pinY, uint8_t pinRev, uint8_t detectPin)`
`661`	`661`	`:`
`@@ -980,7 +980,7 @@ void AnalogShifter::serialCalibration(Stream& iface) {`
`980`	`980`	`LogitechShifter::LogitechShifter(uint8_t pinX, uint8_t pinY, uint8_t pinRev, uint8_t detectPin)`
`981`	`981`	`: AnalogShifter(pinX, pinY, pinRev, detectPin)`
`982`	`982`	`{`
`983`		`- this->setCalibration({ 490, 440 }, { 253, 799 }, { 262, 86 }, { 460, 826 }, { 470, 76 }, { 664, 841 }, { 677, 77 }, 0.70, 0.50, 0.70);`
	`983`	`+ this->setCalibration({ 490, 440 }, { 253, 799 }, { 262, 86 }, { 460, 826 }, { 470, 76 }, { 664, 841 }, { 677, 77 });`
`984`	`984`	`}`
`985`	`985`
`986`	`986`	`//#########################################################`