Pulling release into stable_release (#324)

* Add an option to allow switching Touchpad and Share buttons (#254) Add an option to switch between Touchpad and Share buttons for PS4 Mode * Update development.md (#261) typo embeded to embedded * Update usedPins on save on /pin-mapping page (#262) * Update button labels for button label change and TP-Switch swap (#266) * Fix serialization of switchTpShareForDs4 * Add button labels for PS4 * Setup button labels for PS4 with TP & Share switch * Remove outdated Buttons constants * Update references to GP2040 in www (#264) * Update issue templates * SNES Controller Input Support (#252) * SNES controller support * adds webconfiguration options for SNESpad controller input * fix: corrects NES button mapping * fix[SNESpad]: updates lib to latest with snes mouse to analog working correctly * Fix invalid reference to button label (#279) * Protobuf Config (#263) * Build makefsdata for Linux w/ MUSL * Restored deflate support to makefsdata * Added nanopb library * Initial version of Proto config * Added AnimationOptions_Proto * Storage::toJSON() WIP * Pretty JSON output * Use std::string instead of std::ostringstream This approach reduces the binary size by ~200kb * Simplify ToJSON() and implented repeated support * Default initialization * Fixed issue in nanopb_generator.py nanopb would not generate code section with enum type defines if the source file does not contain any enums itself. However enums can be included from other source files. * Moved Config functions to separate file Implemented toJson() and fromJSON() * Restored StorageManager to its pristine state * Config loading and saving * Make FlashPROM cache public for the time being * Implemented api/getConfig and api/setConfig endpoints * Moved most Gamepad enums to enums.proto * Use DEFAULT_INPUT_MODE and DEFAULT_DPAD_MODE * Renamed generic/short enum values * Moved bulk of config structs to the ConfigLegacy namespace No more loading / saving of ConfigLegacy structs * Moved GamepadOptions and GamepadHotkeyEntry to ConfigLegacy * FlashPROM::start() is no longer needed * Added more settings to config.proto * Support for the latest config changes from main * Store config struct on the heap to avoid stack overflow * Increase LWIP_HTTPD_POST_MAX_PAYLOAD_LEN to 8kb We need more to fit the whole config * Further stack optimizations Only save config if content has changed * Removed template to reduce code bloat * Update config.boardVersion and save after ConfigUtils::load() This makes sure that any migrations performed are preserved in EEPROM * Config instance in StorageManager * Renamed getAddonOptions() -> getLegacyAddonOptions() Renamed setAddonOptions() -> setLegacyAddonOptions() * Added getters for sub-configs * Migrate PinMappings to Protobuf * Fixed wrong name caused by overeager renaming * Migrated reverse addon to Protobuf storage * Mirrored latest version of AnimationOptions in Protobuf * Fixed compatibility with arm-none-eabi-gcc 11.3.1 * Fixed crash issue in Release builds * Fixed board configs * Added commented out PICO_DEOPTIMIZED_DEBUG to CMakeList.txt Use this to toggle between optimized / unoptimized builds * Added support for byte arrays to base64 encoder / decoder * Store binary data as byte arrays, convert to Base64 in JSON * Migrated api/getSplashImage and api/setSplashImage * Change footer magic to invalidate incompatible stored data * Refactor pin assignment from JSON * Add bool to int workaround for web-config * Migrate SOCD Slider addon to ProtoBuf * Migrate On-Board LED addon to ProtoBuf * Migrate Analog Input addon to ProtoBuf * Migrate BOOTSEL button addon to ProtoBuf * Migrate Buzzer Speaker addon to ProtoBuf * Migrate Dual Directional Input addon to ProtoBuf * Migrate Extra Button addon to ProtoBuf * Migrate I2C Analog ADS1219 addon to ProtoBuf * Migrate Joystick Selection Slider addon to ProtoBuf * Migrate Player Number addon to ProtoBuf * Migrate Turbo addon to ProtoBuf * Migrate Wii Extension addon to ProtoBuf * Migrate PS4 Mode addon to ProtoBuf * Check writeCache when determining whether to save Due to the delay in FlashPROM we run the risk of delaying the save indefinitely * We only allow saves from core0. Saves from core1 have to be marshalled to core0. * Migrate AnimationOptions * Check serial and signature for size as well * Removed unncessary cast * Moved PS4Options to config_legacy.cpp * Migrate Display addon to ProtoBuf * Removed old code related to SplashImage * Removed old code related to AddonOptions * Removed stale functions from ConfigManager * Moved OnBoardLedMode to config_legacy.cpp * Fixed issues caused by the merge * Added new player LED properties to LEDOptions * No more usage of ConfigLegacy::GamepadOptions * Added switchTpShareForDs4 to config.proto * Conversion from legacy storage to Protobuf * Return -1 for invalid pins from webconfig * More conversion from legacy storage to Protobuf * Validate enums when converting from legacy config * Remove switchTpShareForDs4 from legacy conversion It is not part of the 0.7.1 release * More conversion from legacy storage to Protobuf * Removed references to ConfigLegacy::BoardOptions * Fixed compilation of KB2040 * Re-added /api/getConfig function entry Must have gotten lost in a merge * Fixed issue where JSLider addon fails to change dpadMode * Migrated SNES options to Protobuf * Fixed saving of AnimationOptions --------- Co-authored-by: deeebug <[email protected]> * Make danger zone an actual button (#284) * Reference splash bitmap data from BoardConfig.h (#282) * Reference splash bitmap data from BoardConfig.h * Remove unused constant for bitmap * Add documentation on default splash customization * .gitignore a couple files used by vim + tools (#267) * Implement Forced Setup Mode & Hotkey Lock settings (#273) * Implement Forced Setup Mode & Hotkey lock settings * Rename enums * Add warning to web-config for Forced Setup Mode * Update warning check text * Fix BoardConfig.h * Feature: webui color schemes (#295) * WIP * DarkMode is a Component not Service * Give the theme button a right margin * Use Dropdown from `react-bootstrap` and dynamically create dropdown items * Rename to ColorScheme * move colorScheme to AppContext * Stop setting localStorage here * Simplify setTheme logic and ensure data-bs-theme is 'light' not 'auto' when light system scheme * Remove unused imports * More contrast for the navbar * Fixed PS4Options saving (#298) Fixed ps4Options saving * Move invert Y to process() to avoid hotkey issues (#300) * Preparing 0.7.2 for release candidate (#310) * Fix #306 (#307) * Fixed PLEDs not being properly retrieved from protobuf (#311) * Fix #265 (#312) Fix external links * Disabled /api/getConfig (#318) * Add Stress FightPad (#319) * Add Stress FightPad * Add controller photo * New photo, blurred the NSFW text * Updating config for full censor, docs/index.html will be updated when release goes out. * Exclude fields from JSON config export (#322) * Fix button labels and hotkey when Touchpad Share are swapped (#317) * Fix Hotkey when Touchpad and Share are swapped in PS4 Mode When the Touchpad and Share buttons are swapped in PS4 Mode, Hotkey F1 will be the Touchpad button, and Start will not be the Option button, but the Start button. * Fix button label when touchpad and share swapped in ps4 mode When selecting button label is not the PS4 button label, the button label may be different. * Fix button label when touchpad and share swapped in ps4 mode When selecting button label is not the PS4 button label, the button label may be different. * Fix button label when touchpad and share swapped in ps4 mode When selecting button label is not the PS4 button label, the button label may be different. * Fix button label when touchpad and share swapped in ps4 mode When selecting button label is not the PS4 button label, the button label may be different. * Fix WebConfig button label when touchpad and share swapped in ps4 mode When selecting button label is not the PS4 button label, the button label may be different. * This change did not make sense to be part of the web config modification. * Doc updates for v0.7.2 (#323) * Doc updates * Remove unused image * Styling updates --------- Co-authored-by: deeebug <[email protected]> Co-authored-by: Wren <[email protected]> Co-authored-by: Pelsin <[email protected]> Co-authored-by: Henré Botha <[email protected]> Co-authored-by: TheTrain <[email protected]> Co-authored-by: Robert Dale Smith <[email protected]> Co-authored-by: Malte Thiesen <[email protected]> Co-authored-by: Oliver Sayers <[email protected]> Co-authored-by: Brian S. Stephan <[email protected]> Co-authored-by: FeralAI <[email protected]> Co-authored-by: teikai1216 <[email protected]>
OpenStickCommunity · Jun 12, 2023 · 42fc8d1 · 42fc8d1
1 parent adbaf82
commit 42fc8d1
Show file tree

Hide file tree

Showing 682 changed files with 45,236 additions and 2,497 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,36 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Have you checked the GP2040-CE documentation [HERE](https://gp2040-ce.info/#/) to confirm this feature doesn't already exist?
+
+Yes/No
+
+### Which problem is this feature request solving?
+
+Provide a clear and concise description of what the problem is. For example, "I'm always frustrated when..."
+
+
+### Describe the solution you would like to see
+
+Provide a clear and concise description of what you want to happen.
+
+
+### Describe alternatives you've considered
+
+Let us know about other solutions you've tried or researched.
+
+
+### Can you submit a pull request?
+
+Yes/No.
+
+
+### Are you planning on working on this feature yourself?
+
+Yes/No.
diff --git a/.github/ISSUE_TEMPLATE/general-questions.md b/.github/ISSUE_TEMPLATE/general-questions.md
@@ -0,0 +1,14 @@
+---
+name: General Questions
+about: Please do not use this section
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please do not use GitHub for asking general questions. Please use the [OpenStick Discord #support channel](https://discord.gg/K6sNzuJR). The maintainers and other community members can provide help and answer your questions there.
+
+If you've discovered a bug or would like to propose a change please use one of the other issue templates.
+
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/issue---bug-report.md b/.github/ISSUE_TEMPLATE/issue---bug-report.md
@@ -0,0 +1,52 @@
+---
+name: Issue / Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Prerequisites
+
+Please check the following before posting an issue / bug report.
+
+- [ ] I am running the latest version of the firmware found [HERE](https://github.com/OpenStickCommunity/GP2040-CE/releases)
+- [ ] I have checked the documentation [HERE](https://gp2040-ce.info/#/) and found no answer
+- [ ] I checked to make sure that this issue has not already been filed [HERE](https://github.com/OpenStickCommunity/GP2040-CE/issues)
+- [ ] I am reporting the issue to the correct repository
+
+### Context
+
+Please provide all relevant information about your setup. This is important in case the issue is not reproducible except for under certain conditions.  
+
+* Firmware Version:
+* Name of device:
+* Link to where you purchased the device:
+* Is this a custom build?:
+* Operating System:
+* Browser:
+
+
+### Expected Behavior
+
+Please describe the behaviour you are expecting.
+
+
+### Current Behavior
+
+What is the current behaviour?
+
+
+### Steps to Reproduce
+
+Please provide detailed steps for reproducing the issue.
+
+1. Step 1
+2. Step 2
+3. ETC...
+
+
+### Screenshots & Files
+
+Please include any relevant screenshots or files here.  If you are having issues with a board please include images of the front and back of the board.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -1,60 +1,60 @@
-name: CMake
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  pull_request_target:
-    branches: [ "main" ]
-  workflow_dispatch:
-  
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  call-node-workflow:
-    uses: ./.github/workflows/node.js.yml
-  build:
-    needs: call-node-workflow
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        GP2040_BOARDCONFIG: [Pico, BentoBox, DURAL, FightboardV3, FightboardV3Mirrored, FlatboxRev4, FlatboxRev5, KB2040, MavercadeKeebfighter, PicoAnn, PicoFightingBoard, ReflexEncoder, RP2040AdvancedBreakoutBoard, SparkFunProMicro, WaveshareZero ]
-
-    steps:
-    #Global Setup
-    - name: Checkout GP2040-CE
-      uses: actions/checkout@v3
-      
-    - name: Setup SDK pipeline
-      uses: Fortinbra/RaspberryPiPicoBuild@v1
-    
-    - name: Download a Build Artifact
-      uses: actions/[email protected]
-      with:
-        name: fsData
-        path: ${{github.workspace}}/lib/httpd/
-    
-    - name: Get core count
-      id: core_count
-      run : cat /proc/cpuinfo  | grep processor | wc -l
-      #End Global Setup
-
-    - name: Pico Build Configure CMake
-      shell: bash
-      run: PICO_SDK_PATH=${{github.workspace}}/pico-sdk GP2040_BOARDCONFIG=${{ matrix.GP2040_BOARDCONFIG }} SKIP_WEBBUILD=TRUE cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-    - name: Pico Build
-      shell: bash
-      run: GP2040_BOARDCONFIG=${{ matrix.GP2040_BOARDCONFIG }} cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel ${{steps.core_count.outputs.output}}
-   
-    - name: Upload Pico Artifact
-      uses: actions/[email protected]
-      with:
-        name: GP2040-CE - ${{ matrix.GP2040_BOARDCONFIG }}
-        path: ${{github.workspace}}/build/GP2040-CE_*_${{ matrix.GP2040_BOARDCONFIG }}.uf2
-        if-no-files-found: error
+name: CMake
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  pull_request_target:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  call-node-workflow:
+    uses: ./.github/workflows/node.js.yml
+  build:
+    needs: call-node-workflow
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        GP2040_BOARDCONFIG: [Pico, BentoBox, DURAL, FightboardV3, FightboardV3Mirrored, FlatboxRev4, FlatboxRev5, KB2040, MavercadeKeebfighter, PicoAnn, PicoFightingBoard, ReflexEncoder, RP2040AdvancedBreakoutBoard, SparkFunProMicro, WaveshareZero, Stress ]
+
+    steps:
+    #Global Setup
+    - name: Checkout GP2040-CE
+      uses: actions/checkout@v3
+
+    - name: Setup SDK pipeline
+      uses: Fortinbra/RaspberryPiPicoBuild@v1
+
+    - name: Download a Build Artifact
+      uses: actions/[email protected]
+      with:
+        name: fsData
+        path: ${{github.workspace}}/lib/httpd/
+
+    - name: Get core count
+      id: core_count
+      run : cat /proc/cpuinfo  | grep processor | wc -l
+      #End Global Setup
+
+    - name: Pico Build Configure CMake
+      shell: bash
+      run: PICO_SDK_PATH=${{github.workspace}}/pico-sdk GP2040_BOARDCONFIG=${{ matrix.GP2040_BOARDCONFIG }} SKIP_WEBBUILD=TRUE cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Pico Build
+      shell: bash
+      run: GP2040_BOARDCONFIG=${{ matrix.GP2040_BOARDCONFIG }} cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel ${{steps.core_count.outputs.output}}
+
+    - name: Upload Pico Artifact
+      uses: actions/[email protected]
+      with:
+        name: GP2040-CE - ${{ matrix.GP2040_BOARDCONFIG }}
+        path: ${{github.workspace}}/build/GP2040-CE_*_${{ matrix.GP2040_BOARDCONFIG }}.uf2
+        if-no-files-found: error
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,12 @@
 .pio
 .vscode/
+.cache/
 node_modules/
 configs/MyBoard
 .DS_Store
 build/
 
+.*.sw*
+compile_commands.json
 lib/httpd/fsdata.c
 modules/Custom.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,10 @@ if (PICO_SDK_VERSION_STRING VERSION_LESS "1.5.0")
   message(FATAL_ERROR "Raspberry Pi Pico SDK version 1.5.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}")
 endif()
 
-project(GP2040-CE LANGUAGES C CXX ASM VERSION 0.7.1)
+# Uncomment the next line for an unomptimized build for debugging. Use in conjunction with the Debug build type.
+# set(PICO_DEOPTIMIZED_DEBUG 1)
+
+project(GP2040-CE LANGUAGES C CXX ASM VERSION 0.7.2)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
@@ -84,6 +87,9 @@ FetchContent_Declare(ArduinoJson
 )
 FetchContent_MakeAvailable(ArduinoJson)
 
+include(compile_proto.cmake)
+compile_proto()
+
 # initialize the Raspberry Pi Pico SDK
 pico_sdk_init()
 add_subdirectory(lib)
@@ -106,6 +112,8 @@ src/addonmanager.cpp
 src/configmanager.cpp
 src/storagemanager.cpp
 src/system.cpp
+src/config_legacy.cpp
+src/config_utils.cpp
 src/configs/webconfig.cpp
 src/addons/analog.cpp
 src/addons/board_led.cpp
@@ -124,14 +132,17 @@ src/addons/reverse.cpp
 src/addons/turbo.cpp
 src/addons/slider_socd.cpp
 src/addons/wiiext.cpp
+src/addons/snes_input.cpp
 src/gamepad/GamepadDebouncer.cpp
 src/gamepad/GamepadDescriptors.cpp
+${PROTO_OUTPUT_DIR}/enums.pb.c
+${PROTO_OUTPUT_DIR}/config.pb.c
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}_${CMAKE_PROJECT_VERSION}_${GP2040_BOARDCONFIG})
 
 pico_set_program_name(GP2040-CE "GP2040-CE")
-pico_set_program_version(GP2040-CE "0.7.1")
+pico_set_program_version(GP2040-CE "0.7.2")
 
 target_link_libraries(${PROJECT_NAME}
 pico_stdlib
@@ -147,8 +158,10 @@ ArduinoJson
 rndis
 hardware_adc
 WiiExtension
+SNESpad
 pico_mbedtls
 TinyUSB_Gamepad
+nanopb
 )
 
 target_include_directories(${PROJECT_NAME} PUBLIC
@@ -157,6 +170,7 @@ headers/addons
 headers/configs
 headers/gamepad
 configs/${GP2040_BOARDCONFIG}
+${PROTO_OUTPUT_DIR}
 )
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC

diff --git a/compile_proto.cmake b/compile_proto.cmake
@@ -0,0 +1,52 @@
+function (compile_proto)
+	find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+	set(VENV ${CMAKE_CURRENT_BINARY_DIR}/venv)
+	set(VENV_FILE ${VENV}/environment.txt)
+	if(CMAKE_HOST_WIN32)
+		set(VENV_BIN_DIR ${VENV}/Scripts)
+	else()
+		set(VENV_BIN_DIR ${VENV}/bin)
+	endif()
+
+	add_custom_command(
+		DEPENDS ${CMAKE_SOURCE_DIR}/lib/nanopb/extra/requirements.txt
+		COMMAND ${Python3_EXECUTABLE} -m venv ${VENV}
+		COMMAND ${VENV_BIN_DIR}/pip --disable-pip-version-check install -r ${CMAKE_SOURCE_DIR}/lib/nanopb/extra/requirements.txt
+		COMMAND ${VENV_BIN_DIR}/pip freeze > ${VENV_FILE}
+		OUTPUT ${VENV_FILE}
+		COMMENT "Setting up Python Virtual Environment"
+	)
+
+	set(NANOPB_GENERATOR ${CMAKE_SOURCE_DIR}/lib/nanopb/generator/nanopb_generator.py)
+	set(PROTO_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/proto)
+	set(PROTO_OUTPUT_DIR ${PROTO_OUTPUT_DIR} PARENT_SCOPE)
+
+	add_custom_command(
+		DEPENDS ${VENV_FILE} ${NANOPB_GENERATOR} ${CMAKE_SOURCE_DIR}/proto/enums.proto ${CMAKE_SOURCE_DIR}/lib/nanopb/generator/proto/nanopb.proto
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${PROTO_OUTPUT_DIR}
+		COMMAND ${VENV_BIN_DIR}/python ${NANOPB_GENERATOR}
+			-q
+			-D ${PROTO_OUTPUT_DIR}
+			-I ${CMAKE_SOURCE_DIR}/proto
+			-I ${CMAKE_SOURCE_DIR}/lib/nanopb/generator/proto
+			${CMAKE_SOURCE_DIR}/proto/enums.proto
+		OUTPUT ${PROTO_OUTPUT_DIR}/enums.pb.c ${PROTO_OUTPUT_DIR}/enums.pb.h
+		COMMENT "Compiling enums.proto"
+	)
+
+	add_custom_command(
+		DEPENDS ${VENV_FILE} ${NANOPB_GENERATOR} ${CMAKE_SOURCE_DIR}/proto/enums.proto ${CMAKE_SOURCE_DIR}/proto/config.proto ${CMAKE_SOURCE_DIR}/lib/nanopb/generator/proto/nanopb.proto
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${PROTO_OUTPUT_DIR}
+		COMMAND ${VENV_BIN_DIR}/python ${NANOPB_GENERATOR}
+			-q
+			-D ${PROTO_OUTPUT_DIR}
+			-I ${CMAKE_SOURCE_DIR}/proto
+			-I ${CMAKE_SOURCE_DIR}/lib/nanopb/generator/proto
+			${CMAKE_SOURCE_DIR}/proto/config.proto
+		OUTPUT ${PROTO_OUTPUT_DIR}/config.pb.c ${PROTO_OUTPUT_DIR}/config.pb.h
+		COMMENT "Compiling config.proto"
+	)
+endfunction()
diff --git a/configs/BentoBox/BoardConfig.h b/configs/BentoBox/BoardConfig.h
@@ -6,7 +6,7 @@
 #ifndef PICO_BOARD_CONFIG_H_
 #define PICO_BOARD_CONFIG_H_
 
-#include <GamepadEnums.h>
+#include "enums.pb.h"
 
 // This is the main pin definition section.
 // This will let you specify which GPIO pin each button is assigned too.
@@ -56,6 +56,8 @@
 #define SLIDER_SOCD_SLOT_TWO  SOCD_MODE_SECOND_INPUT_PRIORITY
 #define SLIDER_SOCD_SLOT_DEFAULT SOCD_MODE_NEUTRAL
 
+#define DEFAULT_FORCED_SETUP_MODE FORCED_SETUP_MODE_OFF // 	FORCED_SETUP_MODE_OFF, FORCED_SETUP_MODE_LOCK_MODE_SWITCH, FORCED_SETUP_MODE_LOCK_WEB_CONFIG, FORCED_SETUP_MODE_LOCK_BOTH
+#define DEFAULT_LOCK_HOTKEYS false // or true
 
 // This is the LEDs section.
 // The default `TURBO_LED_PIN` pin is set to `15` ( it is recommended to run through 3V3(OUT) with a resistor)
@@ -189,8 +191,8 @@
 
 #define BUTTON_LAYOUT BUTTON_LAYOUT_STICKLESS
 #define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_STICKLESSB
-#define SPLASH_MODE NOSPLASH
-#define SPLASH_CHOICE MAIN
+#define SPLASH_MODE SPLASH_MODE_NONE
+#define SPLASH_CHOICE SPLASH_CHOICE_MAIN
 #define SPLASH_DURATION 7500 // Duration in milliseconds
 
 // Board LED Add-on Setting
@@ -199,7 +201,7 @@
 //                  on the current mode (config, normal, or no USB data)
 // INPUT_TEST     - Blinks whenever any input is made
 
-#define BOARD_LED_TYPE BOARD_LED_OFF
+#define BOARD_LED_TYPE ON_BOARD_LED_MODE_OFF
 
 // Dual Directional Add-on Options