Skip to content

Commit d674cf8

Browse files
committed
remove index from mapping ids
1 parent 923239c commit d674cf8

7 files changed

+10
-10
lines changed

src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ float SDLAxisDirectionToAxisDirectionMapping::GetNormalizedAxisDirectionValue()
4545
}
4646

4747
std::string SDLAxisDirectionToAxisDirectionMapping::GetAxisDirectionMappingId() {
48-
return StringHelper::Sprintf("P%d-S%d-D%d-LUSI%d-SDLA%d-AD%s", mPortIndex, mStickIndex, mDirection,
49-
ControllerInputMapping::mPhysicalDeviceType, mControllerAxis,
48+
return StringHelper::Sprintf("P%d-S%d-D%d-SDLA%d-AD%s", mPortIndex, mStickIndex, mDirection,
49+
mControllerAxis,
5050
mAxisDirection == 1 ? "P" : "N");
5151
}
5252

src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ int8_t SDLAxisDirectionToButtonMapping::GetMappingType() {
5050
}
5151

5252
std::string SDLAxisDirectionToButtonMapping::GetButtonMappingId() {
53-
return StringHelper::Sprintf("P%d-B%d-LUSI%d-SDLA%d-AD%s", mPortIndex, mBitmask,
54-
ControllerInputMapping::mPhysicalDeviceType, mControllerAxis,
53+
return StringHelper::Sprintf("P%d-B%d-SDLA%d-AD%s", mPortIndex, mBitmask,
54+
mControllerAxis,
5555
mAxisDirection == 1 ? "P" : "N");
5656
}
5757

src/controller/controldevice/controller/mapping/sdl/SDLButtonToAxisDirectionMapping.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ float SDLButtonToAxisDirectionMapping::GetNormalizedAxisDirectionValue() {
3030
}
3131

3232
std::string SDLButtonToAxisDirectionMapping::GetAxisDirectionMappingId() {
33-
return StringHelper::Sprintf("P%d-S%d-D%d-LUSI%d-SDLB%d", mPortIndex, mStickIndex, mDirection,
34-
ControllerInputMapping::mPhysicalDeviceType, mControllerButton);
33+
return StringHelper::Sprintf("P%d-S%d-D%d-SDLB%d", mPortIndex, mStickIndex, mDirection,
34+
mControllerButton);
3535
}
3636

3737
void SDLButtonToAxisDirectionMapping::SaveToConfig() {

src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ int8_t SDLButtonToButtonMapping::GetMappingType() {
3030
}
3131

3232
std::string SDLButtonToButtonMapping::GetButtonMappingId() {
33-
return StringHelper::Sprintf("P%d-B%d-LUSI%d-SDLB%d", mPortIndex, mBitmask, ControllerInputMapping::mPhysicalDeviceType,
33+
return StringHelper::Sprintf("P%d-B%d-SDLB%d", mPortIndex, mBitmask,
3434
mControllerButton);
3535
}
3636

src/controller/controldevice/controller/mapping/sdl/SDLGyroMapping.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void SDLGyroMapping::UpdatePad(float& x, float& y) {
5555
}
5656

5757
std::string SDLGyroMapping::GetGyroMappingId() {
58-
return StringHelper::Sprintf("P%d-LUSI%d", mPortIndex, ControllerInputMapping::mPhysicalDeviceType);
58+
return StringHelper::Sprintf("P%d", mPortIndex);
5959
}
6060

6161
void SDLGyroMapping::SaveToConfig() {

src/controller/controldevice/controller/mapping/sdl/SDLLEDMapping.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void SDLLEDMapping::SetLEDColor(Color_RGB8 color) {
3333
}
3434

3535
std::string SDLLEDMapping::GetLEDMappingId() {
36-
return StringHelper::Sprintf("P%d-SDLI%d", mPortIndex, ControllerLEDMapping::mPhysicalDeviceType);
36+
return StringHelper::Sprintf("P%d", mPortIndex);
3737
}
3838

3939
void SDLLEDMapping::SaveToConfig() {

src/controller/controldevice/controller/mapping/sdl/SDLRumbleMapping.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void SDLRumbleMapping::SetHighFrequencyIntensity(uint8_t intensityPercentage) {
4747
}
4848

4949
std::string SDLRumbleMapping::GetRumbleMappingId() {
50-
return StringHelper::Sprintf("P%d-LUSI%d", mPortIndex, ControllerRumbleMapping::mPhysicalDeviceType);
50+
return StringHelper::Sprintf("P%d", mPortIndex);
5151
}
5252

5353
void SDLRumbleMapping::SaveToConfig() {

0 commit comments

Comments
 (0)