Change config name
This commit is contained in:
parent
7d49e168fa
commit
3376184a76
@ -87,5 +87,5 @@ wait_period = 4
|
|||||||
|
|
||||||
[controller]
|
[controller]
|
||||||
# use analog input
|
# use analog input
|
||||||
analog = false
|
analog_input = false
|
||||||
```
|
```
|
||||||
|
2
dist/config.toml
vendored
2
dist/config.toml
vendored
@ -41,4 +41,4 @@ image_path = ""
|
|||||||
wait_period = 4
|
wait_period = 4
|
||||||
|
|
||||||
[controller]
|
[controller]
|
||||||
analog = false
|
analog_input = false
|
||||||
|
@ -106,7 +106,7 @@ u16 buttonWaitPeriodP2 = 0;
|
|||||||
std::queue<u8> buttonQueueP1;
|
std::queue<u8> buttonQueueP1;
|
||||||
std::queue<u8> buttonQueueP2;
|
std::queue<u8> buttonQueueP2;
|
||||||
|
|
||||||
bool useTaikoController;
|
bool analogInput;
|
||||||
SDLAxis analogBindings[] = {
|
SDLAxis analogBindings[] = {
|
||||||
SDL_AXIS_LEFT_LEFT, SDL_AXIS_LEFT_RIGHT, SDL_AXIS_LEFT_DOWN, SDL_AXIS_LEFT_UP, // P1: LB, LR, RR, RB
|
SDL_AXIS_LEFT_LEFT, SDL_AXIS_LEFT_RIGHT, SDL_AXIS_LEFT_DOWN, SDL_AXIS_LEFT_UP, // P1: LB, LR, RR, RB
|
||||||
SDL_AXIS_RIGHT_LEFT, SDL_AXIS_RIGHT_RIGHT, SDL_AXIS_RIGHT_DOWN, SDL_AXIS_RIGHT_UP, // P2: LB, LR, RR, RB
|
SDL_AXIS_RIGHT_LEFT, SDL_AXIS_RIGHT_RIGHT, SDL_AXIS_RIGHT_DOWN, SDL_AXIS_RIGHT_UP, // P2: LB, LR, RR, RB
|
||||||
@ -115,7 +115,7 @@ SDLAxis analogBindings[] = {
|
|||||||
u16
|
u16
|
||||||
bnusio_GetAnalogIn (u8 which) {
|
bnusio_GetAnalogIn (u8 which) {
|
||||||
u16 analogValue;
|
u16 analogValue;
|
||||||
if (useTaikoController) {
|
if (analogInput) {
|
||||||
analogValue = (u16)(32768 * ControllerAxisIsDown (analogBindings[which]));
|
analogValue = (u16)(32768 * ControllerAxisIsDown (analogBindings[which]));
|
||||||
if (analogValue > 100) return analogValue;
|
if (analogValue > 100) return analogValue;
|
||||||
return 0;
|
return 0;
|
||||||
@ -320,10 +320,10 @@ Init () {
|
|||||||
toml_table_t *config = config_ptr.get ();
|
toml_table_t *config = config_ptr.get ();
|
||||||
auto drum = openConfigSection (config, "drum");
|
auto drum = openConfigSection (config, "drum");
|
||||||
if (drum) drumWaitPeriod = readConfigInt (drum, "wait_period", drumWaitPeriod);
|
if (drum) drumWaitPeriod = readConfigInt (drum, "wait_period", drumWaitPeriod);
|
||||||
auto taikoController = openConfigSection (config, "controller");
|
auto controller = openConfigSection (config, "controller");
|
||||||
if (taikoController) {
|
if (controller) {
|
||||||
useTaikoController = readConfigBool (taikoController, "analog", useTaikoController);
|
analogInput = readConfigBool (controller, "analog_input", analogInput);
|
||||||
if (useTaikoController) printf ("Using analog input mode. All the keyboard drum inputs have been disabled.\n");
|
if (analogInput) printf ("Using analog input mode. All the keyboard drum inputs have been disabled.\n");
|
||||||
}
|
}
|
||||||
auto card = openConfigSection (config, "card_reader");
|
auto card = openConfigSection (config, "card_reader");
|
||||||
if (card) {
|
if (card) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user