Skip to content

Commit

Permalink
Merge branch 'feat/low-power'
Browse files Browse the repository at this point in the history
  • Loading branch information
HaoboGu committed Jun 8, 2024
2 parents e54b229 + 748d38a commit 0848246
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 19 deletions.
40 changes: 22 additions & 18 deletions src/keymap.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
use crate::{COL, NUM_LAYER, ROW};
use rmk::action::KeyAction;
use rmk::{a, k, layer, mo};
//! You can specify the default keymap here, or in `keyboard.toml`
//! Check the documentation here: https://haobogu.github.io/rmk/configuration.html#keymap-config
//!

#[rustfmt::skip]
pub static KEYMAP: [[[KeyAction; COL]; ROW]; NUM_LAYER] = [
layer!([
[k!(AudioVolUp), k!(B), k!(AudioVolDown)],
[k!(Kp4), k!(LShift), k!(Kp6)],
[mo!(1), k!(Kp2), k!(Kp3)],
[mo!(1), a!(No), k!(Kp0)]
]),
layer!([
[k!(Kp7), k!(Kp8), k!(Kp9)],
[k!(Kp4), k!(LCtrl), k!(Kp6)],
[mo!(1), k!(Kp2), k!(Kp3)],
[mo!(1), a!(No), k!(Kp0)]
]),
];
// use crate::{COL, NUM_LAYER, ROW};
// use rmk::action::KeyAction;
// use rmk::{a, k, layer, mo};

// #[rustfmt::skip]
// pub static KEYMAP: [[[KeyAction; COL]; ROW]; NUM_LAYER] = [
// layer!([
// [k!(AudioVolUp), k!(B), k!(AudioVolDown)],
// [k!(Kp4), k!(LShift), k!(Kp6)],
// [mo!(1), k!(Kp2), k!(Kp3)],
// [mo!(1), a!(No), k!(Kp0)]
// ]),
// layer!([
// [k!(Kp7), k!(Kp8), k!(Kp9)],
// [k!(Kp4), k!(LCtrl), k!(Kp6)],
// [mo!(1), k!(Kp2), k!(Kp3)],
// [mo!(1), a!(No), k!(Kp0)]
// ]),
// ];
1 change: 0 additions & 1 deletion src/main_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#![no_main]
{% endif %}

mod keymap;
mod vial;

use crate::keymap::KEYMAP;
Expand Down

0 comments on commit 0848246

Please sign in to comment.