Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 109 additions & 113 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cargo-features = ["profile-rustflags"]

[workspace]
resolver = "3"
members = ["crates/*", "keyboards/*/crates/*"]
members = ["crates/*", "keyboards/ksps/*"]
exclude = ["crates/.cargo"]

[workspace.package]
Expand All @@ -21,6 +21,7 @@ rktk-drivers-rp = { path = "crates/rktk-drivers-rp", version = "0.2.0" }
rktk = { path = "crates/rktk", version = "0.2.0" }
rktk-log = { path = "crates/rktk-log", version = "0.2.0" }
rktk-rrp = { path = "crates/rktk-rrp", version = "0.2.0" }
rktk-ksp = { path = "crates/rktk-ksp", version = "0.2.0" }

# embedded core libraries
embedded-hal = "1.0.0"
Expand Down
11 changes: 11 additions & 0 deletions crates/rktk-ksp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "rktk-ksp"
authors.workspace = true
license.workspace = true
version.workspace = true
edition.workspace = true
repository.workspace = true

[dependencies]
embassy-executor.workspace = true
rktk.workspace = true
22 changes: 22 additions & 0 deletions crates/rktk-ksp/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#![no_std]

use rktk::hooks::{
AllHooks, Hooks,
interface::{CommonHooks, MasterHooks, RgbHooks, SlaveHooks},
};

pub trait RktkKsp {
type Irqs: Clone + Copy;
type Peri;

type PeriConfig;
type RunConfig;

fn init_peripherals(config: Self::PeriConfig) -> Self::Peri;
async fn start(
spawner: embassy_executor::Spawner,
p: Self::Peri,
hooks: impl AllHooks,
config: Self::RunConfig,
);
}
17 changes: 0 additions & 17 deletions keyboards/.cargo/config.toml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions keyboards/corne/.cargo/config.toml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[env]
RKTK_CONFIG_PATH = { value = "../corne/rktk.json", relative = true }

[build]
target = "thumbv6m-none-eabi"
2 changes: 0 additions & 2 deletions keyboards/keyball61/.cargo/config.toml

This file was deleted.

2 changes: 0 additions & 2 deletions keyboards/keyball61/crates/keyball61-rp/.cargo/config.toml

This file was deleted.

52 changes: 52 additions & 0 deletions keyboards/ksps/corne-nrf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# You can remove this line and `forced-target` property and use `.cargo/config.toml` if your crate isn't in workspace.
cargo-features = ["per-package-target"]

[lib]
path = "src/lib.rs"
test = false
doctest = false
bench = false

[package]
name = "rktk-ksp-corne-nrf"
authors.workspace = true
license.workspace = true
version.workspace = true
edition.workspace = true
repository.workspace = true
publish = false
forced-target = "thumbv7em-none-eabihf"

[dependencies]
rktk = { workspace = true }
rktk-drivers-nrf = { workspace = true, features = ["softdevice-ble"] }
rktk-drivers-common = { workspace = true }

cortex-m = { workspace = true }
cortex-m-rt = { workspace = true }
embassy-executor = { workspace = true, features = [
"arch-cortex-m",
"executor-thread",
"executor-interrupt",
] }

embassy-nrf = { workspace = true, features = [
"gpiote",
"time-driver-rtc1",
"nrf52840",
"nfc-pins-as-gpio",
] }
nrf-softdevice = { workspace = true, features = [
"critical-section-impl",
"s140",
"nrf52840",
] }

[features]
default = ["right"]

right = []
left = []

# Remove this line in your project. It's just used in this workspace for check.
_check = []
Empty file.
Loading