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

Switch to layer matrix instead of layer list

Browse Source
This commit is contained in:
Joakim Hulthe
2023-07-21 16:18:47 +02:00
parent 2c239b6248
commit dcf950cc66
15 changed files with 438 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
left/build.rs
View File

@ -46,9 +46,10 @@ fn memory() {
fn serialize_layout(ron_path: &str, postcard_path: &str) {
println!("cargo:rerun-if-changed={ron_path}");
println!("cargo:rerun-if-changed={postcard_path}");
let layers = fs::read_to_string(ron_path).expect("Failed to read .ron");
let layers: Vec<Layer> = ron::from_str(&layers).expect("Failed to deserialize .ron");
let layers: Vec<Vec<Layer>> = ron::from_str(&layers).expect("Failed to deserialize .ron");
let serialized = postcard::to_stdvec(&layers).expect("Failed to serialize layers");

247
left/layers.ron
View File

@ -1,89 +1,180 @@
[
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Comma),
Key(Period),
Key(P),
Key(Y),
[
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Comma),
Key(Period),
Key(P),
Key(Y),
// Row 2
ModTap(A, LMod),
ModTap(O, LAlt),
ModTap(E, LShift),
ModTap(U, LCtrl),
Key(I),
// Row 2
ModTap(A, LMod),
ModTap(O, LAlt),
ModTap(E, LShift),
ModTap(U, LCtrl),
Key(I),
// Row 3
Key(Colon),
Key(Q),
Key(J),
Key(K),
Key(X),
// Row 3
Key(Colon),
Key(Q),
Key(J),
Key(K),
Key(X),
// Thumbpad
Key(Backspace),
Key(Space),
HoldLayer(1),
],
),
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Slash),
Key(Equal),
Key(Accent),
Key(Period),
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Slash),
Key(Equal),
Key(Accent),
Key(Period),
// Row 2
ModTap(BackslashPipe, LMod),
ModTap(Dash, LAlt),
ModTap(LBracket, LShift),
ModTap(RBracket, LCtrl),
Key(Tab),
// Row 2
ModTap(BackslashPipe, LMod),
ModTap(Dash, LAlt),
ModTap(LBracket, LShift),
ModTap(RBracket, LCtrl),
Key(Tab),
// Row 3
None,
None,
None,
Key(Apostrophe),
None,
// Row 3
None,
None,
None,
Key(Apostrophe),
None,
// Thumbpad
Key(Backspace),
Key(Space),
HoldLayer(1),
],
),
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Mute),
Key(VolumeDown),
Key(VolumeUp),
None,
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Mute),
Key(VolumeDown),
Key(VolumeUp),
None,
// Row 2
Mod(LMod),
Mod(LAlt),
Mod(LShift),
Mod(LCtrl),
None,
// Row 2
Mod(LMod),
Mod(LAlt),
Mod(LShift),
Mod(LCtrl),
None,
// Row 3
None,
None,
None,
None,
None,
// Row 3
None,
None,
None,
None,
None,
// Thumbpad
Key(Backspace),
Key(Space),
HoldLayer(1),
],
),
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
],
[ // gaming row
Layer(
buttons: [
// Row 1
Key(Escape),
Key(Q),
Key(W),
Key(E),
Key(R),
// Row 2
Mod(LShift),
Key(A),
Key(S),
Key(D),
Key(F),
// Row 3
Mod(LCtrl),
Key(Z),
Key(X),
Key(C),
Key(V),
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
Layer(
buttons: [
// Row 1
Key(D1),
Key(D2),
Key(D3),
Key(D4),
Key(D5),
// Row 2
Key(D6),
Key(D7),
Key(D8),
Key(D9),
Key(D0),
// Row 3
None,
None,
None,
None,
None,
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
Layer(
buttons: [
// Row 1
None,
None,
None,
None,
None,
// Row 2
None,
None,
None,
None,
None,
// Row 3
None,
None,
None,
None,
None,
// Thumbpad
Key(Backspace),
Key(Space),
Layer(Peek, Right, 1),
],
),
],
]

BIN
left/src/layers.pc
View File

Binary file not shown.

2
left/src/main.rs
View File

@ -54,7 +54,7 @@ async fn main(_spawner: Spawner) {
neopixel.write(&[Rgb::new(0xFF, 0x00, 0x00)]).await;
let layers = include_bytes!("layers.pc");
let Ok(layers): Result<Vec<Layer>, _> = postcard::from_bytes(layers) else {
let Ok(layers): Result<Vec<Vec<Layer>>, _> = postcard::from_bytes(layers) else {
log::error!("Failed to deserialize layer config");
stall().await
};