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
OpenStickCommunity · Apr 13, 2024 · 5723f47 · 5723f47
1 parent 59e2d19
commit 5723f47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/proto/config.proto b/proto/config.proto
@@ -6,8 +6,8 @@ import "enums.proto";
 message GamepadOptions
 {
     optional InputMode inputMode = 1;
-    optional DpadMode dpadMode = 2;
-    optional SOCDMode socdMode = 3;
+    optional DpadMode dpadMode = 2 [default = DPAD_MODE_DIGITAL];
+    optional SOCDMode socdMode = 3 [default = SOCD_MODE_NEUTRAL];
     optional bool invertXAxis = 4;
     optional bool invertYAxis = 5;
     optional bool switchTpShareForDs4 = 6;

diff --git a/src/config_utils.cpp b/src/config_utils.cpp
@@ -104,12 +104,6 @@
 #ifndef DEFAULT_INPUT_MODE_R2
     #define DEFAULT_INPUT_MODE_R2 INPUT_MODE_KEYBOARD
 #endif
-#ifndef DEFAULT_DPAD_MODE
-    #define DEFAULT_DPAD_MODE DPAD_MODE_DIGITAL
-#endif
-#ifndef DEFAULT_SOCD_MODE
-    #define DEFAULT_SOCD_MODE SOCD_MODE_NEUTRAL
-#endif
 #ifndef DEFAULT_FORCED_SETUP_MODE
     #define DEFAULT_FORCED_SETUP_MODE FORCED_SETUP_MODE_OFF
 #endif
@@ -247,8 +241,6 @@ void ConfigUtils::initUnsetPropertiesWithDefaults(Config& config)
 
     // gamepadOptions
     INIT_UNSET_PROPERTY(config.gamepadOptions, inputMode, DEFAULT_INPUT_MODE);
-    INIT_UNSET_PROPERTY(config.gamepadOptions, dpadMode, DEFAULT_DPAD_MODE);
-    INIT_UNSET_PROPERTY(config.gamepadOptions, socdMode, DEFAULT_SOCD_MODE);
     INIT_UNSET_PROPERTY(config.gamepadOptions, invertXAxis, false);
     INIT_UNSET_PROPERTY(config.gamepadOptions, switchTpShareForDs4, false);
     INIT_UNSET_PROPERTY(config.gamepadOptions, lockHotkeys, DEFAULT_LOCK_HOTKEYS);