Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Protobuf Config #263

Merged
merged 100 commits into from
May 25, 2023
Merged

Protobuf Config #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
dc3236e
Build makefsdata for Linux w/ MUSL
mthiesen Mar 12, 2023
4659a97
Restored deflate support to makefsdata
mthiesen Mar 12, 2023
2136666
Merge remote-tracking branch 'upstream/main' into main
mthiesen Mar 26, 2023
4291b69
Added nanopb library
mthiesen Mar 26, 2023
96f74b6
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen Apr 4, 2023
aff0e9d
Initial version of Proto config
mthiesen Apr 4, 2023
ca0b3f0
Added AnimationOptions_Proto
mthiesen Apr 4, 2023
05dbb21
Storage::toJSON() WIP
mthiesen Apr 6, 2023
8672790
Pretty JSON output
mthiesen Apr 8, 2023
3e97571
Use std::string instead of std::ostringstream
mthiesen Apr 8, 2023
ee64ab4
Simplify ToJSON() and implented repeated support
mthiesen Apr 9, 2023
5e84afe
Default initialization
mthiesen Apr 12, 2023
69ac593
Fixed issue in nanopb_generator.py
mthiesen Apr 17, 2023
e25bbbd
Moved Config functions to separate file
mthiesen Apr 20, 2023
3b8e79e
Restored StorageManager to its pristine state
mthiesen Apr 23, 2023
beb3dea
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen Apr 23, 2023
c8c8c88
Config loading and saving
mthiesen Apr 29, 2023
9051bc8
Make FlashPROM cache public for the time being
mthiesen May 1, 2023
0c195bd
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 1, 2023
8b3dc35
Implemented api/getConfig and api/setConfig endpoints
mthiesen May 1, 2023
db2dd98
Moved most Gamepad enums to enums.proto
mthiesen May 1, 2023
70ca17e
Use DEFAULT_INPUT_MODE and DEFAULT_DPAD_MODE
mthiesen May 1, 2023
058b66d
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 1, 2023
4f71763
Renamed generic/short enum values
mthiesen May 1, 2023
7fd2058
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 3, 2023
eb50f9a
Moved bulk of config structs to the ConfigLegacy namespace
mthiesen May 3, 2023
c2362f0
Moved GamepadOptions and GamepadHotkeyEntry to ConfigLegacy
mthiesen May 4, 2023
0ac40ee
FlashPROM::start() is no longer needed
mthiesen May 4, 2023
dc93eb2
Added more settings to config.proto
mthiesen May 4, 2023
4206e2e
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 8, 2023
a9a5b55
Support for the latest config changes from main
mthiesen May 8, 2023
6b8a46d
Store config struct on the heap to avoid stack overflow
mthiesen May 8, 2023
7aca51b
Increase LWIP_HTTPD_POST_MAX_PAYLOAD_LEN to 8kb
mthiesen May 8, 2023
bd9fbf0
Further stack optimizations
mthiesen May 8, 2023
ad809af
Removed template to reduce code bloat
mthiesen May 8, 2023
774b50c
Update config.boardVersion and save after ConfigUtils::load()
mthiesen May 9, 2023
3dfb3c4
Config instance in StorageManager
mthiesen May 9, 2023
9d7aeaf
Renamed getAddonOptions() -> getLegacyAddonOptions()
mthiesen May 9, 2023
4e387cd
Added getters for sub-configs
mthiesen May 9, 2023
c678a85
Migrate PinMappings to Protobuf
mthiesen May 9, 2023
90a5508
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 10, 2023
b35f8bd
Fixed wrong name caused by overeager renaming
mthiesen May 10, 2023
6fbe453
Migrated reverse addon to Protobuf storage
mthiesen May 10, 2023
3929a4e
Mirrored latest version of AnimationOptions in Protobuf
mthiesen May 10, 2023
72729df
Fixed compatibility with arm-none-eabi-gcc 11.3.1
mthiesen May 13, 2023
716e2c6
Fixed crash issue in Release builds
mthiesen May 13, 2023
fcd6c7b
Fixed board configs
mthiesen May 13, 2023
ecd97c3
Added commented out PICO_DEOPTIMIZED_DEBUG to CMakeList.txt
mthiesen May 13, 2023
2731948
Added support for byte arrays to base64 encoder / decoder
mthiesen May 13, 2023
1a78e3d
Store binary data as byte arrays, convert to Base64 in JSON
mthiesen May 13, 2023
43ec7d9
Migrated api/getSplashImage and api/setSplashImage
mthiesen May 13, 2023
cdca2b0
Change footer magic to invalidate incompatible stored data
mthiesen May 13, 2023
537c180
Refactor pin assignment from JSON
deeebug May 13, 2023
5cbd6d3
Add bool to int workaround for web-config
deeebug May 13, 2023
56a91ba
Migrate SOCD Slider addon to ProtoBuf
deeebug May 13, 2023
1e5048a
Migrate On-Board LED addon to ProtoBuf
deeebug May 13, 2023
c0f11dd
Migrate Analog Input addon to ProtoBuf
deeebug May 13, 2023
a5713bb
Migrate BOOTSEL button addon to ProtoBuf
deeebug May 14, 2023
6a86ffb
Migrate Buzzer Speaker addon to ProtoBuf
deeebug May 14, 2023
a42ac3b
Migrate Dual Directional Input addon to ProtoBuf
deeebug May 14, 2023
beabf91
Migrate Extra Button addon to ProtoBuf
deeebug May 14, 2023
5ae66c5
Migrate I2C Analog ADS1219 addon to ProtoBuf
deeebug May 14, 2023
5a04091
Migrate Joystick Selection Slider addon to ProtoBuf
deeebug May 14, 2023
ecc7bb0
Migrate Player Number addon to ProtoBuf
deeebug May 14, 2023
f3f9d16
Migrate Turbo addon to ProtoBuf
deeebug May 14, 2023
18044ef
Migrate Wii Extension addon to ProtoBuf
deeebug May 14, 2023
6959755
Migrate PS4 Mode addon to ProtoBuf
deeebug May 14, 2023
e10bad1
Check writeCache when determining whether to save
mthiesen May 14, 2023
7bdd74f
We only allow saves from core0. Saves from core1 have to be marshalle…
mthiesen May 14, 2023
2f35339
Migrate AnimationOptions
mthiesen May 14, 2023
aabf57a
Merge remote-tracking branch 'upstream/ProtoBuf' into ProtobufSettings
mthiesen May 14, 2023
64e4127
Check serial and signature for size as well
mthiesen May 14, 2023
16e29de
Removed unncessary cast
mthiesen May 14, 2023
eb636f6
Moved PS4Options to config_legacy.cpp
mthiesen May 14, 2023
a0a9b83
Migrate Display addon to ProtoBuf
deeebug May 15, 2023
3a2953e
Removed old code related to SplashImage
mthiesen May 15, 2023
055f233
Removed old code related to AddonOptions
mthiesen May 15, 2023
a249338
Removed stale functions from ConfigManager
mthiesen May 15, 2023
f77a5b3
Moved OnBoardLedMode to config_legacy.cpp
mthiesen May 15, 2023
8eb33a6
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 15, 2023
d0795c0
Fixed issues caused by the merge
mthiesen May 15, 2023
3128989
Added new player LED properties to LEDOptions
mthiesen May 15, 2023
915e1fc
No more usage of ConfigLegacy::GamepadOptions
mthiesen May 15, 2023
3739fe2
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 16, 2023
b78010b
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 17, 2023
85d6398
Added switchTpShareForDs4 to config.proto
mthiesen May 17, 2023
4258fca
Conversion from legacy storage to Protobuf
mthiesen May 18, 2023
983281a
Return -1 for invalid pins from webconfig
mthiesen May 18, 2023
b806be9
More conversion from legacy storage to Protobuf
mthiesen May 18, 2023
1c3b2c0
Validate enums when converting from legacy config
mthiesen May 18, 2023
949a9cb
Remove switchTpShareForDs4 from legacy conversion
mthiesen May 18, 2023
41f5720
More conversion from legacy storage to Protobuf
mthiesen May 18, 2023
9505d57
Removed references to ConfigLegacy::BoardOptions
mthiesen May 18, 2023
2e0ca64
Fixed compilation of KB2040
mthiesen May 18, 2023
72fa060
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 18, 2023
0bbf552
Re-added /api/getConfig function entry
mthiesen May 19, 2023
f0d92d3
Fixed issue where JSLider addon fails to change dpadMode
mthiesen May 19, 2023
baf7832
Merge remote-tracking branch 'upstream/main' into ProtobufSettings
mthiesen May 25, 2023
f87dfb2
Migrated SNES options to Protobuf
mthiesen May 25, 2023
05b265a
Fixed saving of AnimationOptions
mthiesen May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ 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()

# 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.1)
set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -127,6 +135,8 @@ 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})
Expand All @@ -151,6 +161,7 @@ WiiExtension
SNESpad
pico_mbedtls
TinyUSB_Gamepad
nanopb
)

target_include_directories(${PROJECT_NAME} PUBLIC
Expand All @@ -159,6 +170,7 @@ headers/addons
headers/configs
headers/gamepad
configs/${GP2040_BOARDCONFIG}
${PROTO_OUTPUT_DIR}
)

target_compile_definitions(${PROJECT_NAME} PUBLIC
Expand Down
52 changes: 52 additions & 0 deletions compile_proto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
function (compile_proto)
find_package(Python3 REQUIRED COMPONENTS Interpreter)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll want to make a note that we require Python again for protobuf since we removed that previously.


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()
8 changes: 4 additions & 4 deletions configs/BentoBox/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -189,8 +189,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
Expand All @@ -199,7 +199,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

Expand Down
9 changes: 5 additions & 4 deletions configs/DURAL/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#ifndef DURAL_CONFIG_H_
#define DURAL_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.
// You can set any of the main pins as `-1` to disable it.
Expand Down Expand Up @@ -189,8 +190,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
Expand All @@ -199,7 +200,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

Expand Down
8 changes: 4 additions & 4 deletions configs/FightboardV3/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -198,8 +198,8 @@

#define BUTTON_LAYOUT BUTTON_LAYOUT_FIGHTBOARD_STICK
#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_FIGHTBOARD
#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

// Default theme
Expand All @@ -214,7 +214,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
#define PIN_DUAL_DIRECTIONAL_UP -1
Expand Down
8 changes: 4 additions & 4 deletions configs/FightboardV3Mirrored/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -198,8 +198,8 @@

#define BUTTON_LAYOUT BUTTON_LAYOUT_FIGHTBOARD_MIRRORED
#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_FIGHTBOARD_STICK_MIRRORED
#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

// Default theme
Expand All @@ -214,7 +214,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
#define PIN_DUAL_DIRECTIONAL_UP -1
Expand Down
9 changes: 5 additions & 4 deletions configs/FlatboxRev4/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#ifndef FLATBOX_REV4_CONFIG_H_
#define FLATBOX_REV4_CONFIG_H_

#include <GamepadEnums.h>
#include "enums.pb.h"

// Mapping between Flatbox Rev4 switch number (as silkscreened) and GPIO pin

#define FLATBOX_SW1_PIN 6
Expand Down Expand Up @@ -158,8 +159,8 @@
// 4 - `NOSPLASH` - This will not display a splash screen on boot
// Special note - All of the splash screen images can be changed via `include/bitmaps.h`

#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


Expand Down Expand Up @@ -200,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

Expand Down
9 changes: 5 additions & 4 deletions configs/FlatboxRev5/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#ifndef FLATBOX_REV5_CONFIG_H_
#define FLATBOX_REV5_CONFIG_H_

#include <GamepadEnums.h>
#include "enums.pb.h"

// Mapping between Flatbox rev5 switch number (as silkscreened) and GPIO pin

#define FLATBOX_SW1_PIN 14
Expand Down Expand Up @@ -158,8 +159,8 @@
// 4 - `NOSPLASH` - This will not display a splash screen on boot
// Special note - All of the splash screen images can be changed via `include/bitmaps.h`

#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


Expand Down Expand Up @@ -200,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

Expand Down
6 changes: 3 additions & 3 deletions configs/KB2040/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@
#define JSLIDER_ENABLED 1
#define BUTTON_LAYOUT BUTTON_LAYOUT_STICK
#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_VEWLIX
#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
Expand All @@ -212,7 +212,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

Expand Down
9 changes: 5 additions & 4 deletions configs/MavercadeKeebfighter/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#ifndef MAVERCADEKEEBFIGHTER_CONFIG_H_
#define MAVERCADEKEEBFIGHTER_CONFIG_H_

#include <GamepadEnums.h>
#include "enums.pb.h"

// Mapping between Mavercade Keebfighter switch number (as silkscreened) and GPIO pin

#define FLATBOX_SW1_PIN 14
Expand Down Expand Up @@ -177,8 +178,8 @@
// 4 - `NOSPLASH` - This will not display a splash screen on boot
// Special note - All of the splash screen images can be changed via `include/bitmaps.h`

#define SPLASH_MODE NOSPLASH
#define SPLASH_CHOICE MAIN
#define SPLASH_MODE SPLASH_MODE_NONE
#define SPLASH_CHOICE SPLASH_CHOICE_MAIN


// The default `BUTTON_LAYOUT` is `BUTTON_LAYOUT_STICK` which will show an arcade stick on the left hand side of the display.
Expand Down Expand Up @@ -218,7 +219,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

Expand Down
8 changes: 4 additions & 4 deletions configs/Pico/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -199,8 +199,8 @@

#define BUTTON_LAYOUT BUTTON_LAYOUT_STICK
#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_VEWLIX
#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
Expand All @@ -209,7 +209,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

Expand Down
9 changes: 5 additions & 4 deletions configs/PicoAnn/BoardConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#ifndef PICOANN_CONFIG_H_
#define PICOANN_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.
// You can set any of the main pins as `-1` to disable it.
Expand Down Expand Up @@ -189,8 +190,8 @@

#define BUTTON_LAYOUT BUTTON_LAYOUT_STICK
#define BUTTON_LAYOUT_RIGHT BUTTON_LAYOUT_VEWLIX
#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
Expand All @@ -199,7 +200,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

Expand Down
Loading