GAMEPAD: remove unused param and change xone to xbox

xone-gamepad
Alessandro Toia 2 years ago
parent 4be3ba20c2
commit a8ab4e2991

@ -10,7 +10,7 @@ std::vector<gamepad> gamepad_data;
std::vector<std::string> list;
bool gamepad_found = false;
int gamepad_count = 0;
int xone_count = 0;
int xbox_count = 0;
int ds4_count = 0;
int ds5_count = 0;
int switch_count = 0;
@ -25,7 +25,7 @@ bool operator<(const gamepad& a, const gamepad& b)
void gamepad_update(){
fs::path path("/sys/class/power_supply");
list.clear();
xone_count = 0;
xbox_count = 0;
ds4_count = 0;
ds5_count = 0;
switch_count = 0;
@ -36,7 +36,7 @@ void gamepad_update(){
if (fileName.find(n) != std::string::npos) {
list.push_back(p.path());
gamepad_found = true;
xone_count += 1;
xbox_count += 1;
}
}
//CHECK FOR DUAL SHOCK 4 DEVICES
@ -63,7 +63,7 @@ void gamepad_update(){
void gamepad_info () {
gamepad_count = 0;
gamepad_data.clear();
int xone_counter = 0;
int xbox_counter = 0;
int ds4_counter = 0;
int ds5_counter = 0;
int switch_counter = 0;
@ -82,11 +82,11 @@ void gamepad_info () {
//Xone devices
if (path.find("gip") != std::string::npos || path.find("xpadneo") != std::string::npos) {
if (xone_count == 1 )
if (xbox_count == 1 )
gamepad_data[gamepad_count].name = "XBOX PAD";
else
gamepad_data[gamepad_count].name = "XBOX PAD-" + to_string(xone_counter + 1);
xone_counter++;
gamepad_data[gamepad_count].name = "XBOX PAD-" + to_string(xbox_counter + 1);
xbox_counter++;
}
//DualShock 4 devices
if (path.find("sony_controller") != std::string::npos) {

@ -61,7 +61,6 @@ class HudElements{
static void fps_only();
static void gamescope_fsr();
static void gamescope_frame_timing();
static void xone_battery();
static void gamepad_battery();
void convert_colors(struct overlay_params& params);

@ -78,7 +78,6 @@ typedef unsigned long KeySym;
OVERLAY_PARAM_BOOL(fsr) \
OVERLAY_PARAM_BOOL(mangoapp_steam) \
OVERLAY_PARAM_BOOL(debug) \
OVERLAY_PARAM_BOOL(xone_battery) \
OVERLAY_PARAM_BOOL(gamepad_battery) \
OVERLAY_PARAM_CUSTOM(fps_sampling_period) \
OVERLAY_PARAM_CUSTOM(output_folder) \

Loading…
Cancel
Save