forked from TeamTofuShop/segatools
idz, idac, swdc: added FFB centering spring feature
This commit is contained in:
@ -79,6 +79,14 @@ void idac_di_config_load(struct idac_di_config *cfg, const wchar_t *filename)
|
||||
cfg->gear[i] = GetPrivateProfileIntW(L"dinput", key, i + 1, filename);
|
||||
}
|
||||
|
||||
// FFB configuration
|
||||
|
||||
cfg->center_spring_strength = GetPrivateProfileIntW(
|
||||
L"dinput",
|
||||
L"centerSpringStrength",
|
||||
30,
|
||||
filename);
|
||||
|
||||
}
|
||||
|
||||
void idac_xi_config_load(struct idac_xi_config *cfg, const wchar_t *filename)
|
||||
|
@ -23,6 +23,9 @@ struct idac_di_config {
|
||||
uint8_t gear[6];
|
||||
bool reverse_brake_axis;
|
||||
bool reverse_accel_axis;
|
||||
|
||||
// FFB configuration
|
||||
uint16_t center_spring_strength;
|
||||
};
|
||||
|
||||
struct idac_xi_config {
|
||||
|
@ -44,7 +44,8 @@ HRESULT idac_di_dev_start(IDirectInputDevice8W *dev, HWND wnd)
|
||||
return hr;
|
||||
}
|
||||
|
||||
void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
|
||||
void idac_di_dev_start_fx(
|
||||
IDirectInputDevice8W *dev, IDirectInputEffect **out, uint16_t strength)
|
||||
{
|
||||
/* Set up force-feedback on devices that support it. This is just a stub
|
||||
for the time being, since we don't yet know how the serial port force
|
||||
@ -67,7 +68,7 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
|
||||
DWORD axis;
|
||||
LONG direction;
|
||||
DIEFFECT fx;
|
||||
DICONSTANTFORCE cf;
|
||||
DICONDITION cond;
|
||||
HRESULT hr;
|
||||
|
||||
assert(dev != NULL);
|
||||
@ -77,11 +78,17 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
|
||||
|
||||
dprintf("DirectInput: Starting force feedback (may take a sec)\n");
|
||||
|
||||
// Auto-centering effect
|
||||
axis = DIJOFS_X;
|
||||
direction = 0;
|
||||
|
||||
memset(&cf, 0, sizeof(cf));
|
||||
cf.lMagnitude = 0;
|
||||
memset(&cond, 0, sizeof(cond));
|
||||
cond.lOffset = 0;
|
||||
cond.lPositiveCoefficient = strength;
|
||||
cond.lNegativeCoefficient = strength;
|
||||
cond.dwPositiveSaturation = strength; // For FG920?
|
||||
cond.dwNegativeSaturation = strength; // For FG920?
|
||||
cond.lDeadBand = 0;
|
||||
|
||||
memset(&fx, 0, sizeof(fx));
|
||||
fx.dwSize = sizeof(fx);
|
||||
@ -93,20 +100,19 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
|
||||
fx.cAxes = 1;
|
||||
fx.rgdwAxes = &axis;
|
||||
fx.rglDirection = &direction;
|
||||
fx.cbTypeSpecificParams = sizeof(cf);
|
||||
fx.lpvTypeSpecificParams = &cf;
|
||||
fx.cbTypeSpecificParams = sizeof(cond);
|
||||
fx.lpvTypeSpecificParams = &cond;
|
||||
|
||||
hr = IDirectInputDevice8_CreateEffect(
|
||||
dev,
|
||||
&GUID_ConstantForce,
|
||||
&GUID_Spring,
|
||||
&fx,
|
||||
&obj,
|
||||
NULL);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
dprintf("DirectInput: DirectInput force feedback unavailable: %08x\n",
|
||||
dprintf("DirectInput: Centering spring force feedback unavailable: %08x\n",
|
||||
(int) hr);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -114,15 +120,15 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
|
||||
|
||||
if (FAILED(hr)) {
|
||||
IDirectInputEffect_Release(obj);
|
||||
dprintf("DirectInput: DirectInput force feedback start failed: %08x\n",
|
||||
dprintf("DirectInput: Centering spring force feedback start failed: %08x\n",
|
||||
(int) hr);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
*out = obj;
|
||||
|
||||
dprintf("DirectInput: Force feedback initialized and set to zero\n");
|
||||
dprintf("DirectInput: Centering spring effects initialized with strength %d%%\n",
|
||||
strength / 100);
|
||||
}
|
||||
|
||||
HRESULT idac_di_dev_poll(
|
||||
|
@ -11,7 +11,7 @@ union idac_di_state {
|
||||
};
|
||||
|
||||
HRESULT idac_di_dev_start(IDirectInputDevice8W *dev, HWND wnd);
|
||||
void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out);
|
||||
void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out, uint16_t strength);
|
||||
HRESULT idac_di_dev_poll(
|
||||
IDirectInputDevice8W *dev,
|
||||
HWND wnd,
|
||||
|
15
idacio/di.c
15
idacio/di.c
@ -75,6 +75,7 @@ static uint8_t idac_di_gear[6];
|
||||
static bool idac_di_use_pedals;
|
||||
static bool idac_di_reverse_brake_axis;
|
||||
static bool idac_di_reverse_accel_axis;
|
||||
static uint16_t idac_di_center_spring_strength;
|
||||
|
||||
HRESULT idac_di_init(
|
||||
const struct idac_di_config *cfg,
|
||||
@ -173,7 +174,9 @@ HRESULT idac_di_init(
|
||||
return hr;
|
||||
}
|
||||
|
||||
idac_di_dev_start_fx(idac_di_dev, &idac_di_fx);
|
||||
// Convert the strength from 0-100 to 0-10000 for DirectInput
|
||||
idac_di_dev_start_fx(idac_di_dev, &idac_di_fx,
|
||||
idac_di_center_spring_strength * 100);
|
||||
|
||||
if (cfg->pedals_name[0] != L'\0') {
|
||||
hr = IDirectInput8_EnumDevices(
|
||||
@ -364,6 +367,16 @@ static HRESULT idac_di_config_apply(const struct idac_di_config *cfg)
|
||||
idac_di_gear[i] = cfg->gear[i];
|
||||
}
|
||||
|
||||
// FFB configuration
|
||||
|
||||
if (cfg->center_spring_strength < 0 || cfg->center_spring_strength > 100) {
|
||||
dprintf("Wheel: Invalid center spring strength: %i\n", cfg->center_spring_strength);
|
||||
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
idac_di_center_spring_strength = cfg->center_spring_strength;
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user