Mirrors/MissionControl
2
0
Fork 0
mirror of https://github.com/ndeadly/MissionControl synced 2025-02-17 05:38:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

btdrv-mitm: rename scale_factor variable to stickScaleFactor

Browse source
This commit is contained in:
ndeadly 2020-07-11 13:52:56 +02:00
parent 89d98dc606
commit c87a46a39c
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
btdrv-mitm/source/controllers/dualshock4.cpp
View file

@ -10,7 +10,7 @@ namespace ams::controller {
namespace {
const constexpr float scale_factor = float(UINT12_MAX) / UINT8_MAX;
const constexpr float stickScaleFactor = float(UINT12_MAX) / UINT8_MAX;
const Dualshock4LedColour playerLedColours[] = {
{0x00, 0x00, 0x7f}, // blue
@ -71,12 +71,12 @@ namespace ams::controller {
void Dualshock4Controller::handleInputReport0x01(const Dualshock4ReportData *src, SwitchReportData *dst) {
packStickData(&dst->report0x30.left_stick,
static_cast<uint16_t>(scale_factor * src->report0x01.left_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT8_MAX - src->report0x01.left_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x01.left_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT8_MAX - src->report0x01.left_stick.y)) & 0xfff
);
packStickData(&dst->report0x30.right_stick,
static_cast<uint16_t>(scale_factor * src->report0x01.right_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT8_MAX - src->report0x01.right_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x01.right_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT8_MAX - src->report0x01.right_stick.y)) & 0xfff
);
dst->report0x30.buttons.dpad_down = (src->report0x01.buttons.dpad == Dualshock4DPad_S) ||
@ -116,12 +116,12 @@ namespace ams::controller {
//dst->report0x30.battery = (((src->report0x11.battery / 64) + 1) << 1) & 0xf ;
packStickData(&dst->report0x30.left_stick,
static_cast<uint16_t>(scale_factor * src->report0x11.left_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT8_MAX - src->report0x11.left_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x11.left_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT8_MAX - src->report0x11.left_stick.y)) & 0xfff
);
packStickData(&dst->report0x30.right_stick,
static_cast<uint16_t>(scale_factor * src->report0x11.right_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT8_MAX - src->report0x11.right_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x11.right_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT8_MAX - src->report0x11.right_stick.y)) & 0xfff
);
dst->report0x30.buttons.dpad_down = (src->report0x11.buttons.dpad == Dualshock4DPad_S) ||

10
btdrv-mitm/source/controllers/xboxone.cpp
View file

@ -9,7 +9,7 @@ namespace ams::controller {
namespace {
const constexpr float scale_factor = float(UINT12_MAX) / UINT16_MAX;
const constexpr float stickScaleFactor = float(UINT12_MAX) / UINT16_MAX;
}
@ -48,12 +48,12 @@ namespace ams::controller {
void XboxOneController::handleInputReport0x01(const XboxOneReportData *src, SwitchReportData *dst) {
packStickData(&dst->report0x30.left_stick,
static_cast<uint16_t>(scale_factor * src->report0x01.left_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT16_MAX - src->report0x01.left_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x01.left_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT16_MAX - src->report0x01.left_stick.y)) & 0xfff
);
packStickData(&dst->report0x30.right_stick,
static_cast<uint16_t>(scale_factor * src->report0x01.right_stick.x) & 0xfff,
static_cast<uint16_t>(scale_factor * (UINT16_MAX - src->report0x01.right_stick.y)) & 0xfff
static_cast<uint16_t>(stickScaleFactor * src->report0x01.right_stick.x) & 0xfff,
static_cast<uint16_t>(stickScaleFactor * (UINT16_MAX - src->report0x01.right_stick.y)) & 0xfff
);
dst->report0x30.buttons.dpad_down = (src->report0x01.buttons.dpad == XboxOneDPad_S) ||