twiddling things trying to get drums working on CH
Mockband / build (push) Failing after 16s
Details
Mockband / build (push) Failing after 16s
Details
This commit is contained in:
parent
e54595e630
commit
13825855d3
5
Makefile
5
Makefile
|
@ -15,6 +15,11 @@ firmwares: build/MockBand.drums.hex
|
||||||
build/MockBand.drums.hex: VID=0x1bad
|
build/MockBand.drums.hex: VID=0x1bad
|
||||||
build/MockBand.drums.hex: PID=0x3110
|
build/MockBand.drums.hex: PID=0x3110
|
||||||
|
|
||||||
|
firmwares: build/MockBand.drums1.hex
|
||||||
|
build/MockBand.drums1.hex: VID=0x1bad
|
||||||
|
build/MockBand.drums1.hex: PID=00005
|
||||||
|
|
||||||
|
|
||||||
build/MockBand.%.hex: MockBand.ino
|
build/MockBand.%.hex: MockBand.ino
|
||||||
mkdir -p build/cache
|
mkdir -p build/cache
|
||||||
rm -f build/build.options.json
|
rm -f build/build.options.json
|
||||||
|
|
|
@ -142,8 +142,8 @@ void loop() {
|
||||||
}
|
}
|
||||||
#else // DRUMS
|
#else // DRUMS
|
||||||
buttonState.buttons |= (buttons >> 10) & 0b01011; // Cymbals
|
buttonState.buttons |= (buttons >> 10) & 0b01011; // Cymbals
|
||||||
bitWrite(buttonState.buttons, 10, buttons & (0b01111 << 0)); // Drum pad modifier
|
bitWrite(buttonState.buttons, 10, (buttons >> 0) & 0b01111); // Drum pad modifier
|
||||||
bitWrite(buttonState.buttons, 11, buttons & (0b01011 << 10)); // Cymbals modifier
|
bitWrite(buttonState.buttons, 11, (buttons >> 10) & 0b01011); // Cymbals modifier
|
||||||
buttonState.axis[3] = bitRead(buttons, 12)?255:0; // High hat
|
buttonState.axis[3] = bitRead(buttons, 12)?255:0; // High hat
|
||||||
|
|
||||||
// rbdrum2midi wants these set
|
// rbdrum2midi wants these set
|
||||||
|
@ -151,6 +151,9 @@ void loop() {
|
||||||
buttonState.velocity[1] = bitRead(buttonState.buttons, 2)?127:0; // R
|
buttonState.velocity[1] = bitRead(buttonState.buttons, 2)?127:0; // R
|
||||||
buttonState.velocity[2] = bitRead(buttonState.buttons, 1)?127:0; // G
|
buttonState.velocity[2] = bitRead(buttonState.buttons, 1)?127:0; // G
|
||||||
buttonState.velocity[3] = bitRead(buttonState.buttons, 0)?127:0; // B
|
buttonState.velocity[3] = bitRead(buttonState.buttons, 0)?127:0; // B
|
||||||
|
|
||||||
|
// Say the D-pad is centered
|
||||||
|
buttonState.hatAndConstant = 8;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DPAD
|
#ifdef DPAD
|
||||||
|
|
|
@ -70,13 +70,19 @@ Here's what each bit means:
|
||||||
hatAndConstant
|
hatAndConstant
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
Here's what the values mean:
|
The HAT switch reports its position like a clock.
|
||||||
|
|
||||||
* 2: right
|
7 0 1
|
||||||
* 6: left
|
|
||||||
* 0: up
|
6 8 2
|
||||||
* 4: down
|
|
||||||
* 8: nothing
|
5 4 3
|
||||||
|
|
||||||
|
0 is up,
|
||||||
|
2 is right,
|
||||||
|
4 is down,
|
||||||
|
6 is left,
|
||||||
|
and 8 is centered.
|
||||||
|
|
||||||
|
|
||||||
velocity
|
velocity
|
||||||
|
|
Loading…
Reference in New Issue