Skip to content

Commit 05a9675

Browse files
committed
start replacing some initUnset... with proto defaults
I think this is going to be a long road, but this is the kind of thing that's possible even without a board config in place
1 parent 1d335e1 commit 05a9675

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

proto/config.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import "enums.proto";
66
message GamepadOptions
77
{
88
optional InputMode inputMode = 1;
9-
optional DpadMode dpadMode = 2;
10-
optional SOCDMode socdMode = 3;
9+
optional DpadMode dpadMode = 2 [default = DPAD_MODE_DIGITAL];
10+
optional SOCDMode socdMode = 3 [default = SOCD_MODE_NEUTRAL];
1111
optional bool invertXAxis = 4;
1212
optional bool invertYAxis = 5;
1313
optional bool switchTpShareForDs4 = 6;

src/config_utils.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
#ifndef DEFAULT_INPUT_MODE_R2
108108
#define DEFAULT_INPUT_MODE_R2 INPUT_MODE_KEYBOARD
109109
#endif
110-
#ifndef DEFAULT_DPAD_MODE
111-
#define DEFAULT_DPAD_MODE DPAD_MODE_DIGITAL
112-
#endif
113-
#ifndef DEFAULT_SOCD_MODE
114-
#define DEFAULT_SOCD_MODE SOCD_MODE_NEUTRAL
115-
#endif
116110
#ifndef DEFAULT_FORCED_SETUP_MODE
117111
#define DEFAULT_FORCED_SETUP_MODE FORCED_SETUP_MODE_OFF
118112
#endif
@@ -286,8 +280,6 @@ void ConfigUtils::initUnsetPropertiesWithDefaults(Config& config)
286280

287281
// gamepadOptions
288282
INIT_UNSET_PROPERTY(config.gamepadOptions, inputMode, DEFAULT_INPUT_MODE);
289-
INIT_UNSET_PROPERTY(config.gamepadOptions, dpadMode, DEFAULT_DPAD_MODE);
290-
INIT_UNSET_PROPERTY(config.gamepadOptions, socdMode, DEFAULT_SOCD_MODE);
291283
INIT_UNSET_PROPERTY(config.gamepadOptions, invertXAxis, false);
292284
INIT_UNSET_PROPERTY(config.gamepadOptions, switchTpShareForDs4, false);
293285
INIT_UNSET_PROPERTY(config.gamepadOptions, lockHotkeys, DEFAULT_LOCK_HOTKEYS);

0 commit comments

Comments
 (0)