Skip to content

Commit

Permalink
USB: Remove "Bypass Startup Calibration"
Browse files Browse the repository at this point in the history
It wasn't hooked up to anything
  • Loading branch information
CookiePLMonster authored and jackun committed Dec 24, 2020
1 parent 2c1ebae commit f19985c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
7 changes: 0 additions & 7 deletions pcsx2/USB/usb-pad/dx/dinput-config.cpp
Expand Up @@ -49,7 +49,6 @@ namespace usb_pad
std::vector<DIJOYSTATE2> jso; // DInput joystick old state, only for config
std::vector<DIJOYSTATE2> jsi; // DInput joystick initial state, only for config

int32_t BYPASSCAL = 0;
int32_t GAINZ[2][1];
int32_t FFMULTI[2][1];
int32_t INVERTFORCES[2]{};
Expand Down Expand Up @@ -775,7 +774,6 @@ namespace usb_pad
SendMessage(GetDlgItem(hWnd, IDC_SLIDER5), TBM_SETPOS, 1, FFMULTI[port][0]);

SendMessage(GetDlgItem(hWnd, IDC_CHECK1), BM_SETCHECK, INVERTFORCES[port], 0);
SendMessage(GetDlgItem(hWnd, IDC_CHECK2), BM_SETCHECK, BYPASSCAL, 0);
SendMessage(GetDlgItem(hWnd, IDC_CHECK3), BM_SETCHECK, useRamp, 0);
//HANDLE hBitmap = LoadImage(NULL,MAKEINTRESOURCE(IDB_BITMAP1), IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);
//SendMessage(GetDlgItem(hWnd,IDC_PICTURELINK), STM_SETIMAGE, IMAGE_BITMAP, LPARAM(hBitmap));
Expand Down Expand Up @@ -1206,16 +1204,13 @@ namespace usb_pad
void ApplySettings(int port)
{
INVERTFORCES[port] = SendDlgItemMessage(hWnd, IDC_CHECK1, BM_GETCHECK, 0, 0);
BYPASSCAL = SendDlgItemMessage(hWnd, IDC_CHECK2, BM_GETCHECK, 0, 0);
useRamp = !!SendDlgItemMessage(hWnd, IDC_CHECK3, BM_GETCHECK, 0, 0);
GAINZ[port][0] = SendMessage(GetDlgItem(hWnd, IDC_SLIDER4), TBM_GETPOS, 0, 0);
FFMULTI[port][0] = SendMessage(GetDlgItem(hWnd, IDC_SLIDER5), TBM_GETPOS, 0, 0);
}

void SaveDInputConfig(int port, const char* dev_type)
{
SaveSetting(TEXT("dinput"), TEXT("BYPASSCAL"), BYPASSCAL);

wchar_t section[256];
swprintf_s(section, L"%S dinput %d", dev_type, port);

Expand Down Expand Up @@ -1263,8 +1258,6 @@ namespace usb_pad

void LoadDInputConfig(int port, const char* dev_type)
{
LoadSetting(TEXT("dinput"), TEXT("BYPASSCAL"), BYPASSCAL);

wchar_t section[256];
swprintf_s(section, L"%S dinput %d", dev_type, port);

Expand Down
3 changes: 0 additions & 3 deletions pcsx2/USB/usb-pad/dx/dx.h
Expand Up @@ -40,9 +40,6 @@ namespace usb_pad
{
namespace dx
{

extern int32_t BYPASSCAL;

//dinput control mappings

static const DWORD PRECMULTI = 100; //floating point precision multiplier, 100 - two digit precision after comma
Expand Down
1 change: 0 additions & 1 deletion pcsx2/USB/usb-pad/dx/versionproxy.h
Expand Up @@ -141,7 +141,6 @@
#define IDC_DEL17 1109
#define IDC_BUTTON1 1110
#define IDC_CHECK1 1111
#define IDC_CHECK2 1112
#define IDC_CHECK3 1113
#define IDC_SLIDER4 1114
#define IDC_BUTTON3 1116
Expand Down
1 change: 0 additions & 1 deletion pcsx2/USB/usb-pad/dx/versionproxy.rc
Expand Up @@ -158,7 +158,6 @@ BEGIN
CONTROL "",IDC_SLIDER5,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,510,223,102,23
CONTROL "INVERT FORCES",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,249,65,12
CONTROL "USE RAMP FOR VARIABLE (0x8) EFFECT",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,519,250,144,12
CONTROL "BYPASS STARTUP CALIBRATION",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,261,126,12
PUSHBUTTON "Reset Defaults",IDC_BUTTON3,594,261,60,12,NOT WS_VISIBLE
DEFPUSHBUTTON "OK",IDOK,498,282,80,20
PUSHBUTTON "Cancel",IDCANCEL,582,282,80,20
Expand Down

0 comments on commit f19985c

Please sign in to comment.