1
1
mirror of synced 2025-02-12 08:32:57 +01:00

Change drum hit value processing

This commit is contained in:
esuo1198 2024-04-27 23:42:58 +09:00
parent 56cc1b0ce2
commit d91dc023e7

View File

@ -93,11 +93,9 @@ bnusio_GetFirmwareVersion () {
return 126; return 126;
} }
u16 drumMin = 15000;
u16 drumMax = 30000;
u16 drumWaitPeriod = 4; u16 drumWaitPeriod = 4;
bool valueStates[] = {false, false, false, false, false, false, false, false};
u16 lastHitValue = drumMin;
Keybindings *analogButtons[] Keybindings *analogButtons[]
= {&P1_LEFT_BLUE, &P1_LEFT_RED, &P1_RIGHT_RED, &P1_RIGHT_BLUE, &P2_LEFT_BLUE, &P2_LEFT_RED, &P2_RIGHT_RED, &P2_RIGHT_BLUE}; = {&P1_LEFT_BLUE, &P1_LEFT_RED, &P1_RIGHT_RED, &P1_RIGHT_BLUE, &P2_LEFT_BLUE, &P2_LEFT_RED, &P2_RIGHT_RED, &P2_RIGHT_BLUE};
@ -137,9 +135,9 @@ bnusio_GetAnalogIn (u8 which) {
buttonWaitPeriodP2 = drumWaitPeriod; buttonWaitPeriodP2 = drumWaitPeriod;
} }
lastHitValue++; u16 hitValue = !valueStates[which] ? 50 : 51;
if (lastHitValue >= drumMax) lastHitValue = drumMin; valueStates[which] = !valueStates[which];
return lastHitValue; return (hitValue << 15) / 100 + 1;
} }
if (IsButtonTapped (*button)) { if (IsButtonTapped (*button)) {
if (isP1) buttonQueueP1.push (which); if (isP1) buttonQueueP1.push (which);
@ -156,9 +154,10 @@ bnusio_GetAnalogIn (u8 which) {
} }
if (isP1) buttonWaitPeriodP1 = drumWaitPeriod; if (isP1) buttonWaitPeriodP1 = drumWaitPeriod;
else buttonWaitPeriodP2 = drumWaitPeriod; else buttonWaitPeriodP2 = drumWaitPeriod;
lastHitValue++;
if (lastHitValue >= drumMax) lastHitValue = drumMin; u16 hitValue = !valueStates[which] ? 50 : 51;
return lastHitValue; valueStates[which] = !valueStates[which];
return (hitValue << 15) / 100 + 1;
} else { } else {
return 0; return 0;
} }