Skip to content

Commit

Permalink
Improvements to Wii calibration calculation (#923)
Browse files Browse the repository at this point in the history 
* Improvements to Wii calibration calculation

* Fixed offsets for outer analog values

* Commented out calibration outputs
  • Loading branch information
@mikepparks
mikepparks authored Mar 31, 2024
1 parent d0678f5 commit 066a38e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 34 deletions.
45 changes: 23 additions & 22 deletions lib/WiiExtension/extensions/ExtensionBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,44 +59,46 @@ bool ExtensionBase::calibrate(uint8_t *calibrationData) {
void ExtensionBase::postProcess() {
uint8_t i;

uint16_t minVal, maxVal, cenVal, outVal;
uint16_t minVal, maxVal, cenVal;
int16_t outVal;
int16_t centerOffset = 0;

for (i = 0; i < WiiAnalogs::WII_MAX_ANALOGS; ++i) {
// scale calibration values before using
if (i != WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION) {

outVal = applyCalibration(analogState[i], _analogCalibration[i].minimum, _analogCalibration[i].maximum, _analogCalibration[i].center);

minVal = map(_analogCalibration[i].minimum, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].origin-1, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].destination-1);
maxVal = map(_analogCalibration[i].maximum, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].origin-1, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].destination-1);
cenVal = map(_analogCalibration[i].center, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].origin-1, 0, _analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].destination-1);

if (isFirstRead) {
// stash the first read as the initial orientation. will reset on hotswap.
initialAnalogState[i] = map(analogState[i], 0, (_analogPrecision[i].origin-1), 0,(_analogPrecision[i].destination-1));

initialAnalogState[i] = outVal;
if (!_hasCalibrationData) {
cenVal = initialAnalogState[i];
}
}

if (_analogCalibration[i].useOffset) {
centerOffset = cenVal-initialAnalogState[i];
centerOffset = _analogCalibration[i].center-initialAnalogState[i];
} else {
centerOffset = 0;
}

outVal = map(analogState[i], 0, (_analogPrecision[i].origin-1), 0,(_analogPrecision[i].destination-1));
if ((i != WiiAnalogs::WII_ANALOG_LEFT_TRIGGER) && (i != WiiAnalogs::WII_ANALOG_RIGHT_TRIGGER)) {
outVal = bounds(outVal, minVal, maxVal);
outVal = map(outVal+centerOffset, minVal+centerOffset, maxVal+centerOffset, 0, (_analogPrecision[i].destination-1));
outVal = bounds(outVal, minVal, maxVal);
outVal = map(outVal, _analogCalibration[i].minimum, _analogCalibration[i].maximum, minVal, maxVal);
outVal = map(outVal, minVal, maxVal, 0, (_analogPrecision[WiiAnalogs::WII_ANALOG_CALIBRATION_PRECISION].destination-1));
} else {
outVal = bounds(outVal, 0, (_analogPrecision[i].destination-1));
}

applyCalibration(outVal, minVal, maxVal, cenVal);

if (outVal < 0) outVal = 0;
if (outVal > (_analogPrecision[i].destination-1)) outVal = (_analogPrecision[i].destination-1);
#if WII_EXTENSION_DEBUG==true
if (i == WiiAnalogs::WII_ANALOG_RIGHT_Y) {
if (i == WiiAnalogs::WII_ANALOG_LEFT_X) {
//printf("cur:%5d min=%5d:%5d max=%5d:%5d cen=%5d:%5d out:%5d off:%5d\n", analogState[i], _analogCalibration[i].minimum, minVal, _analogCalibration[i].maximum, maxVal, _analogCalibration[i].center, cenVal, outVal, centerOffset);
}
#endif
Expand Down Expand Up @@ -138,17 +140,16 @@ uint16_t ExtensionBase::applyCalibration(uint16_t pos, uint16_t min, uint16_t ma
uint16_t result;

#if WII_EXTENSION_CALIBRATION==true
if (pos >= min && pos <= max) {
result = pos;
float res;
if (pos == cen) {
res = 0;
} else if (pos < cen) {
res = (pos - min) / (cen - min + 1.0f) - 1.0f;
} else {
if (pos < min) {
result = min;
} else if (pos > max) {
result = max;
} else {
result = cen;
}
res = (pos - cen) / (max - cen + 1.0f);
}

result = (res - -1.0f) * (max - min) / (1.0f - -1.0f) + min;
#else
result = pos;
#endif
Expand Down
24 changes: 12 additions & 12 deletions lib/WiiExtension/extensions/NunchuckExtension.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ bool NunchuckExtension::calibrate(uint8_t *calibrationData) {

#if WII_EXTENSION_DEBUG==true
//printf("Calibration:\n");
//printf("X0G: %d\n", _accelX0G);
//printf("Y0G: %d\n", _accelY0G);
//printf("Z0G: %d\n", _accelZ0G);
//printf("X1G: %d\n", _accelX1G);
//printf("Y1G: %d\n", _accelY1G);
//printf("YZG: %d\n", _accelZ1G);
//printf("X Min: %d\n", _minX);
//printf("X Max: %d\n", _maxX);
//printf("X Center: %d\n", _cenX);
//printf("Y Min: %d\n", _minY);
//printf("Y Max: %d\n", _maxY);
//printf("Y Center: %d\n", _cenY);
//printf("X0G: %d\n", ((calibrationData[0] << 2) | ((calibrationData[3] >> 2) & 0x03)));
//printf("Y0G: %d\n", ((calibrationData[1] << 2) | ((calibrationData[3] >> 4) & 0x03)));
//printf("Z0G: %d\n", ((calibrationData[2] << 2) | ((calibrationData[3] >> 6) & 0x03)));
//printf("X1G: %d\n", ((calibrationData[4] << 2) | ((calibrationData[7] >> 2) & 0x03)));
//printf("Y1G: %d\n", ((calibrationData[5] << 2) | ((calibrationData[7] >> 4) & 0x03)));
//printf("YZG: %d\n", ((calibrationData[6] << 2) | ((calibrationData[7] >> 6) & 0x03)));
//printf("X Min: %d\n", calibrationData[8]);
//printf("X Max: %d\n", calibrationData[9]);
//printf("X Center: %d\n", calibrationData[10]);
//printf("Y Min: %d\n", calibrationData[11]);
//printf("Y Max: %d\n", calibrationData[12]);
//printf("Y Center: %d\n", calibrationData[13]);
#endif
#endif
return false;
Expand Down

0 comments on commit 066a38e

Please sign in to comment.