Skip to content

Commit 8a5271b

Browse files
committed
Whitespace
1 parent 44dae94 commit 8a5271b

File tree

2 files changed

+32
-11
lines changed

2 files changed

+32
-11
lines changed

irFFB/irFFB.cpp

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ DWORD WINAPI directFFBThread(LPVOID lParam) {
291291
}
292292

293293
prod[0] = s * firc6[0];
294-
r = (int)(prod[0] + prod[1] + prod[2] + prod[3] + prod[4] + prod[5]) + scaleTorque(yawForce[0]);
294+
r = (int)(prod[0] + prod[1] + prod[2] + prod[3] + prod[4] + prod[5]) +
295+
scaleTorque(yawForce[0]);
295296

296297
if (use360)
297298
r += scaleTorque(suspForceST[0]);
@@ -301,7 +302,8 @@ DWORD WINAPI directFFBThread(LPVOID lParam) {
301302
for (int i = 1; i < DIRECT_INTERP_SAMPLES; i++) {
302303

303304
prod[i] = s * firc6[i];
304-
r = (int)(prod[0] + prod[1] + prod[2] + prod[3] + prod[4] + prod[5]) + scaleTorque(yawForce[i]);
305+
r = (int)(prod[0] + prod[1] + prod[2] + prod[3] + prod[4] + prod[5]) +
306+
scaleTorque(yawForce[i]);
305307

306308
if (use360)
307309
r += scaleTorque(suspForceST[i]);
@@ -901,7 +903,9 @@ int APIENTRY wWinMain(
901903

902904
for (int i = 0; i < DIRECT_INTERP_SAMPLES; i++) {
903905
yawFilter[i] = yaw * firc6[i];
904-
yawForce[i] = yawFilter[0] + yawFilter[1] + yawFilter[2] + yawFilter[3] + yawFilter[4] + yawFilter[5];
906+
yawForce[i] =
907+
yawFilter[0] + yawFilter[1] + yawFilter[2] +
908+
yawFilter[3] + yawFilter[4] + yawFilter[5];
905909
}
906910

907911
if (*isOnTrack)
@@ -947,7 +951,11 @@ int APIENTRY wWinMain(
947951
setFFB(scaleTorque(swTorqueST[i] + suspForceST[i] + yawForce[i]));
948952
sleepSpinUntil(&start, 2000, 2760 * (i + 1));
949953
}
950-
setFFB(scaleTorque(swTorqueST[STmaxIdx] + suspForceST[STmaxIdx] + yawForce[STmaxIdx]));
954+
setFFB(
955+
scaleTorque(
956+
swTorqueST[STmaxIdx] + suspForceST[STmaxIdx] + yawForce[STmaxIdx]
957+
)
958+
);
951959

952960
}
953961
break;
@@ -958,7 +966,11 @@ int APIENTRY wWinMain(
958966
float sdiff = (suspForceST[0] - lastSuspForce) / 2.0f;
959967
int force, iMax = STmaxIdx << 1;
960968

961-
setFFB(scaleTorque(lastTorque + diff + lastSuspForce + sdiff + yawForce[0]));
969+
setFFB(
970+
scaleTorque(
971+
lastTorque + diff + lastSuspForce + sdiff + yawForce[0]
972+
)
973+
);
962974

963975
for (int i = 0; i < iMax; i++) {
964976

@@ -967,18 +979,29 @@ int APIENTRY wWinMain(
967979
if (i & 1) {
968980
diff = (swTorqueST[idx + 1] - swTorqueST[idx]) / 2.0f;
969981
sdiff = (suspForceST[idx + 1] - suspForceST[idx]) / 2.0f;
970-
force = scaleTorque(swTorqueST[idx] + diff + suspForceST[idx] + sdiff + yawForce[idx]);
982+
force =
983+
scaleTorque(
984+
swTorqueST[idx] + diff + suspForceST[idx] +
985+
sdiff + yawForce[idx]
986+
);
971987
}
972988
else
973-
force = scaleTorque(swTorqueST[idx] + suspForceST[idx] + yawForce[idx]);
989+
force =
990+
scaleTorque(
991+
swTorqueST[idx] + suspForceST[idx] + yawForce[idx]
992+
);
974993

975994
sleepSpinUntil(&start, 0, 1380 * (i + 1));
976995
setFFB(force);
977996

978997
}
979998

980999
sleepSpinUntil(&start, 0, 1380 * (iMax + 1));
981-
setFFB(scaleTorque(swTorqueST[STmaxIdx] + suspForceST[STmaxIdx] + yawForce[STmaxIdx]));
1000+
setFFB(
1001+
scaleTorque(
1002+
swTorqueST[STmaxIdx] + suspForceST[STmaxIdx] + yawForce[STmaxIdx]
1003+
)
1004+
);
9821005
lastTorque = swTorqueST[STmaxIdx];
9831006
lastSuspForce = suspForceST[STmaxIdx];
9841007

@@ -1294,7 +1317,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
12941317
switch (lParam) {
12951318
case WM_LBUTTONUP:
12961319
restore();
1297-
break;
1320+
break;
12981321
case WM_RBUTTONUP: {
12991322
HMENU trayMenu = CreatePopupMenu();
13001323
POINT curPoint;

irFFB/public.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,10 @@ DEFINE_GUID(GUID_DEVINTERFACE_VJOY, 0x781EF630, 0x72B2, 0x11d2, 0xB8, 0x52, 0x00
122122

123123
#ifndef __HIDPORT_H__
124124
// Copied from hidport.h
125-
#define IOCTL_HID_SET_FEATURE 0xB0191
126125
#define IOCTL_HID_WRITE_REPORT 0xB000F
127126

128127
#define MAX_N_DEVICES 16 // Maximum number of vJoy devices
129128

130-
131129
typedef struct _HID_DEVICE_ATTRIBUTES {
132130

133131
ULONG Size;

0 commit comments

Comments
 (0)