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

wip

Browse Source
This commit is contained in:
Joakim Hulthe
2024-03-24 16:29:24 +01:00
parent 84f8222b30
commit 4a528eb4b7
44 changed files with 5438 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
right/.cargo/config.toml Normal file
View File

@ -0,0 +1,2 @@
[build]
target = "thumbv6m-none-eabi"

6
right/Cargo.toml
View File

@ -10,7 +10,6 @@ path = "../lib"
package = "tangentbord1-lib"
[dependencies]
tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false }
cortex-m-rt = "0.7"
embassy-rp = { version = "0.1.0", features = ["time-driver", "critical-section-impl"] }
embassy-executor = { version = "0.5.0", features = ["nightly", "executor-thread", "integrated-timers", "arch-cortex-m"] }
@ -21,6 +20,9 @@ log = "0.4.17"
postcard = { version = "1.0.4", features = ["alloc"] }
[build-dependencies]
tgnt = { git = "https://git.nubo.sh/hulthe/tgnt.git", default-features = false }
ron = "0.8.0"
postcard = { version = "1", features = ["use-std"] }
[build-dependencies.tangentbord1]
path = "../lib"
package = "tangentbord1-lib"

2
right/build.rs
View File

@ -13,7 +13,7 @@ use std::io::Write;
use std::path::PathBuf;
use std::{env, fs};
use tgnt::layer::Layer;
use tangentbord1::layer::Layer;
fn main() {
memory();

34
right/layers.ron
View File

@ -93,25 +93,25 @@
Layer(
buttons: [
// Row 1
None,
None,
None,
None,
None,
Key(Y),
Key(U),
Key(I),
Key(O),
Key(P),
// Row 2
None,
None,
None,
None,
None,
Key(H),
Key(J),
Key(K),
Key(L),
Key(G),
// Row 3
None,
None,
None,
None,
None,
Key(B),
Key(N),
Key(M),
Key(Comma),
Key(Period),
// Thumbpad
Layer(Peek, Right, 1),
@ -124,8 +124,8 @@
// Row 1
None,
None,
None,
None,
Key(CapsLock),
Key(Tab),
None,
// Row 2

34
right/src/main.rs
View File

@ -17,29 +17,19 @@ use tangentbord1::{
event::Half,
interrupts::Irqs,
keyboard::KeyboardConfig,
logger::Logger,
layer::Layer,
logger::LogMultiplexer,
rgb::Rgb,
util::stall,
ws2812::Ws2812,
{allocator, rtt, uart, usb},
};
use tgnt::layer::Layer;
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
let half = Half::Right;
let rtt_write = rtt::init_rtt_logger();
let logger = Logger {
outputs: [rtt_write],
};
logger.init();
log::error!("log_level: error");
log::warn!("log_level: warn");
log::info!("log_level: info");
log::debug!("log_level: debug");
log::trace!("log_level: trace");
let rtt_logger = rtt::init_rtt_logger();
allocator::init();
@ -100,7 +90,19 @@ async fn main(_spawner: Spawner) {
uart::start(board.tx, board.rx, board.UART0, half, events2).await;
usb::setup_logger_and_keyboard(board.USB, events1).await;
// TODO: delaying the logger until here is not ideal
let usb_logger = usb::setup_logger_and_keyboard(board.USB, events1).await;
let logger = LogMultiplexer {
outputs: [rtt_logger, usb_logger],
};
logger.init();
log::error!("log_level: error");
log::warn!("log_level: warn");
log::info!("log_level: info");
log::debug!("log_level: debug");
log::trace!("log_level: trace");
neopixel.write(&[Rgb::new(0x00, 0x00, 0xFF)]).await;
Timer::after_secs(5).await;
@ -110,7 +112,5 @@ async fn main(_spawner: Spawner) {
Timer::after_millis(10).await;
}
loop {
Timer::after_secs(5).await;
}
stall().await
}