Skip to content

Gamepad connection status & device path #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r57zone wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −0
Open

Gamepad connection status & device path #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions JoyShockLibrary/JoyShockLibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,8 @@ JSL_SETTINGS JslGetControllerInfoAndSettings(int deviceId)
settings.isConnected = true;
settings.isCalibrating = jc->use_continuous_calibration;
settings.autoCalibrationEnabled = jc->motion.GetCalibrationMode() != GamepadMotionHelpers::CalibrationMode::Manual;
settings.isWired = jc->is_usb;
settings.controllerPath = jc->path;

switch (jc->controller_type)
{
Expand Down
4 changes: 4 additions & 0 deletions JoyShockLibrary/JoyShockLibrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// JoyShockLibrary.h - Contains declarations of functions
#pragma once

#include <string>

#if _MSC_VER // this is defined when compiling with Visual Studio
#define JOY_SHOCK_API __declspec(dllexport) // Visual Studio needs annotating exported functions with this
#else
Expand Down Expand Up @@ -134,10 +136,12 @@ typedef struct JSL_SETTINGS {
int colour = 0;
int playerNumber = 0;
int controllerType = 0;
std::string controllerPath;
int splitType = 0;
bool isCalibrating = false;
bool autoCalibrationEnabled = false;
bool isConnected = false;
bool isWired = false;
} JSL_SETTINGS;

extern "C" JOY_SHOCK_API int JslConnectDevices();
Expand Down