hulthe/tangentbord1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix right.rs

Browse Source
This commit is contained in:
Joakim Hulthe
2023-05-08 19:43:18 +02:00
parent 4f59a59693
commit 2b66c022f7
2 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
layers-right.ron
View File

@ -10,10 +10,10 @@
// Row 2 // Row 2
Key(D), Key(D),
Key(H), ModTap(H, RCtrl),
Key(T), ModTap(T, RShift),
Key(N), ModTap(N, RAlt),
Key(S), ModTap(S, RMod),
// Row 3 // Row 3
Key(B), Key(B),
@ -24,8 +24,37 @@
// Thumbpad // Thumbpad
PrevLayer, PrevLayer,
Mod(RAlt), Key(Return),
Mod(RMod), Key(Delete),
], ],
) ),
Layer(
buttons: [
// Row 1
Key(D6),
Key(D7),
Key(D8),
Key(D9),
Key(D0),
// Row 2
Key(Apostrophe),
ModTap(Slash, RCtrl),
ModTap(Equal, RShift),
ModTap(Accent, RAlt),
ModTap(Pound, RMod),
// Row 3
None,
None,
None,
None,
None,
// Thumbpad
PrevLayer,
Key(Return),
Key(Delete),
],
),
] ]

44
src/bin/right.rs
View File

@ -29,7 +29,7 @@ async fn main(_spawner: Spawner) {
let _neopixel_power = Output::new(board.neopixel_power, Level::High); let _neopixel_power = Output::new(board.neopixel_power, Level::High);
let mut neopixel = Ws2812::new(board.PIO0, board.DMA_CH0, board.neopixel.degrade()); let mut neopixel = Ws2812::new(board.PIO0, board.DMA_CH0, board.neopixel.degrade());
let mut neopixels_d5 = Ws2812::new(board.PIO1, board.DMA_CH1, board.d5.degrade()); let neopixels_d5 = Ws2812::new(board.PIO1, board.DMA_CH1, board.d5.degrade());
neopixel.write(&[Rgb::new(0xFF, 0x00, 0x00)]).await; neopixel.write(&[Rgb::new(0xFF, 0x00, 0x00)]).await;
usb::setup_logger_and_keyboard(board.USB).await; usb::setup_logger_and_keyboard(board.USB).await;
@ -44,46 +44,40 @@ async fn main(_spawner: Spawner) {
}; };
let keyboard = KeyboardConfig { let keyboard = KeyboardConfig {
layers,
pins: [ pins: [
// TODO: reconfigure these for right PCB // TODO: reconfigure these for right PCB
// row 1 // row 1
board.d24.degrade(),
board.a3.degrade(),
board.a2.degrade(),
board.a1.degrade(),
board.a0.degrade(),
// row 2
board.d25.degrade(),
board.sck.degrade(),
board.mosi.degrade(),
board.miso.degrade(),
board.d2.degrade(),
// row 3
board.d12.degrade(), board.d12.degrade(),
board.d11.degrade(), board.d11.degrade(),
board.d10.degrade(), board.d10.degrade(),
board.d9.degrade(), board.d9.degrade(),
board.d3.degrade(),
// thumbpad
board.d7.degrade(), board.d7.degrade(),
board.scl.degrade(), // row 2
board.a2.degrade(),
board.a1.degrade(),
board.a0.degrade(),
board.sda.degrade(), board.sda.degrade(),
board.scl.degrade(),
// row 3
board.mosi.degrade(),
board.sck.degrade(),
board.d25.degrade(),
board.d24.degrade(),
board.a3.degrade(),
// thumbpad
board.d3.degrade(),
board.d2.degrade(),
board.miso.degrade(),
], ],
led_map: [0, 1, 2, 3, 4, 9, 8, 7, 6, 5, 10, 11, 12, 13, 14, 15, 16, 17],
led_driver: neopixels_d5,
layers,
}; };
keyboard.create().await; keyboard.create().await;
for w in 0usize.. { for w in 0usize.. {
neopixel.write(&[wheel(w as u8)]).await; neopixel.write(&[wheel(w as u8)]).await;
neopixels_d5
.write(&[
wheel((w + 50) as u8),
wheel((w + 100) as u8),
wheel((w + 150) as u8),
wheel((w + 200) as u8),
])
.await;
Timer::after(Duration::from_millis(10)).await; Timer::after(Duration::from_millis(10)).await;
} }
} }