Skip to content

Commit

Permalink
apis: organize into folders
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradjc @alevy
bradjc authored and alevy committed Jun 12, 2024
1 parent fc7c132 commit a17d179
Show file tree
Hide file tree
Showing 56 changed files with 74 additions and 74 deletions.
72 changes: 36 additions & 36 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,28 @@ rust_embedded = [
]

[dependencies]
libtock_adc = { path = "apis/adc" }
libtock_air_quality = { path = "apis/air_quality" }
libtock_alarm = { path = "apis/alarm" }
libtock_ambient_light = { path = "apis/ambient_light" }
libtock_buttons = { path = "apis/buttons" }
libtock_buzzer = { path = "apis/buzzer" }
libtock_console = { path = "apis/console" }
libtock_adc = { path = "apis/peripherals/adc" }
libtock_air_quality = { path = "apis/sensors/air_quality" }
libtock_alarm = { path = "apis/peripherals/alarm" }
libtock_ambient_light = { path = "apis/sensors/ambient_light" }
libtock_buttons = { path = "apis/interface/buttons" }
libtock_buzzer = { path = "apis/interface/buzzer" }
libtock_console = { path = "apis/interface/console" }
libtock_debug_panic = { path = "panic_handlers/debug_panic" }
libtock_gpio = { path = "apis/gpio" }
libtock_i2c_master = { path = "apis/i2c_master" }
libtock_i2c_master_slave = { path = "apis/i2c_master_slave" }
libtock_key_value = { path = "apis/key_value" }
libtock_leds = { path = "apis/leds" }
libtock_low_level_debug = { path = "apis/low_level_debug" }
libtock_ninedof = { path = "apis/ninedof" }
libtock_gpio = { path = "apis/peripherals/gpio" }
libtock_i2c_master = { path = "apis/peripherals/i2c_master" }
libtock_i2c_master_slave = { path = "apis/peripherals/i2c_master_slave" }
libtock_key_value = { path = "apis/storage/key_value" }
libtock_leds = { path = "apis/interface/leds" }
libtock_low_level_debug = { path = "apis/kernel/low_level_debug" }
libtock_ninedof = { path = "apis/sensors/ninedof" }
libtock_platform = { path = "platform" }
libtock_proximity = { path = "apis/proximity" }
libtock_rng = { path = "apis/rng" }
libtock_proximity = { path = "apis/sensors/proximity" }
libtock_rng = { path = "apis/peripherals/rng" }
libtock_runtime = { path = "runtime" }
libtock_sound_pressure = { path = "apis/sound_pressure" }
libtock_spi_controller = { path = "apis/spi_controller" }
libtock_temperature = { path = "apis/temperature" }
libtock_sound_pressure = { path = "apis/sensors/sound_pressure" }
libtock_spi_controller = { path = "apis/peripherals/spi_controller" }
libtock_temperature = { path = "apis/sensors/temperature" }

embedded-hal = { version = "1.0", optional = true }

Expand All @@ -64,23 +64,23 @@ panic = "abort"
[workspace]
exclude = ["tock"]
members = [
"apis/adc",
"apis/air_quality",
"apis/alarm",
"apis/ambient_light",
"apis/buttons",
"apis/buzzer",
"apis/console",
"apis/gpio",
"apis/i2c_master",
"apis/i2c_master_slave",
"apis/key_value",
"apis/leds",
"apis/low_level_debug",
"apis/ninedof",
"apis/proximity",
"apis/rng",
"apis/temperature",
"apis/interface/buttons",
"apis/interface/buzzer",
"apis/interface/console",
"apis/interface/leds",
"apis/kernel/low_level_debug",
"apis/peripherals/adc",
"apis/peripherals/alarm",
"apis/peripherals/gpio",
"apis/peripherals/i2c_master",
"apis/peripherals/i2c_master_slave",
"apis/peripherals/rng",
"apis/sensors/air_quality",
"apis/sensors/ambient_light",
"apis/sensors/ninedof",
"apis/sensors/proximity",
"apis/sensors/temperature",
"apis/storage/key_value",
"panic_handlers/debug_panic",
"panic_handlers/small_panic",
"platform",
Expand Down
4 changes: 2 additions & 2 deletions apis/buttons/Cargo.toml → apis/interface/buttons/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock buttons driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/buttons/src/lib.rs → apis/interface/buttons/src/lib.rs
View file
File renamed without changes.
0 apis/buttons/src/tests.rs → apis/interface/buttons/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/buzzer/Cargo.toml → apis/interface/buzzer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock buzzer driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/buzzer/src/lib.rs → apis/interface/buzzer/src/lib.rs
View file
File renamed without changes.
0 apis/buzzer/src/tests.rs → apis/interface/buzzer/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/console/Cargo.toml → apis/interface/console/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version.workspace = true
description = "libtock console driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/console/src/lib.rs → apis/interface/console/src/lib.rs
View file
File renamed without changes.
0 apis/console/src/tests.rs → apis/interface/console/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/leds/Cargo.toml → apis/interface/leds/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock leds driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/leds/src/lib.rs → apis/interface/leds/src/lib.rs
View file
File renamed without changes.
0 apis/leds/src/tests.rs → apis/interface/leds/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/low_level_debug/Cargo.toml → apis/kernel/low_level_debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock low-level debug drivers"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/low_level_debug/src/lib.rs → apis/kernel/low_level_debug/src/lib.rs
View file
File renamed without changes.
0 apis/low_level_debug/src/tests.rs → apis/kernel/low_level_debug/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/adc/Cargo.toml → apis/peripherals/adc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock adc driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/adc/src/lib.rs → apis/peripherals/adc/src/lib.rs
View file
File renamed without changes.
0 apis/adc/src/tests.rs → apis/peripherals/adc/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/alarm/Cargo.toml → apis/peripherals/alarm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version.workspace = true
description = "libtock alarm driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/alarm/src/lib.rs → apis/peripherals/alarm/src/lib.rs
View file
File renamed without changes.
0 apis/alarm/src/tests.rs → apis/peripherals/alarm/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/gpio/Cargo.toml → apis/peripherals/gpio/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ description = "libtock gpio driver"
rust_embedded = ["embedded-hal"]

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }
embedded-hal = { version = "1.0", optional = true }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/gpio/src/lib.rs → apis/peripherals/gpio/src/lib.rs
View file
File renamed without changes.
0 apis/gpio/src/tests.rs → apis/peripherals/gpio/src/tests.rs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion apis/i2c_master/Cargo.toml → apis/peripherals/i2c_master/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ rust-version.workspace = true
description = "libtock I2C master driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

0 apis/i2c_master/src/lib.rs → apis/peripherals/i2c_master/src/lib.rs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion apis/i2c_master_slave/Cargo.toml → apis/peripherals/i2c_master_slave/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ rust-version.workspace = true
description = "libtock I2C master-slave driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

0 apis/i2c_master_slave/src/lib.rs → apis/peripherals/i2c_master_slave/src/lib.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/rng/Cargo.toml → apis/peripherals/rng/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version.workspace = true
description = "libtock rng driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/rng/src/lib.rs → apis/peripherals/rng/src/lib.rs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion apis/spi_controller/Cargo.toml → apis/peripherals/spi_controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ rust-version.workspace = true
description = "libtock SPI controller driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }
0 apis/spi_controller/src/lib.rs → apis/peripherals/spi_controller/src/lib.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/air_quality/Cargo.toml → apis/sensors/air_quality/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock air quality driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/air_quality/src/lib.rs → apis/sensors/air_quality/src/lib.rs
View file
File renamed without changes.
0 apis/air_quality/src/tests.rs → apis/sensors/air_quality/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/ambient_light/Cargo.toml → apis/sensors/ambient_light/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock ambient light driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/ambient_light/src/lib.rs → apis/sensors/ambient_light/src/lib.rs
View file
File renamed without changes.
0 apis/ambient_light/src/tests.rs → apis/sensors/ambient_light/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/ninedof/Cargo.toml → apis/sensors/ninedof/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ rust-version.workspace = true
description = "libtock nine degrees of freedom driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }
libm = "0.2.7"

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/ninedof/src/lib.rs → apis/sensors/ninedof/src/lib.rs
View file
File renamed without changes.
0 apis/ninedof/src/tests.rs → apis/sensors/ninedof/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/proximity/Cargo.toml → apis/sensors/proximity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ rust-version.workspace = true
description = "libtock proximity driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }

0 apis/proximity/src/lib.rs → apis/sensors/proximity/src/lib.rs
View file
File renamed without changes.
0 apis/proximity/src/tests.rs → apis/sensors/proximity/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/sound_pressure/Cargo.toml → apis/sensors/sound_pressure/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock sound pressure driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/sound_pressure/src/lib.rs → apis/sensors/sound_pressure/src/lib.rs
View file
File renamed without changes.
0 apis/sound_pressure/src/tests.rs → apis/sensors/sound_pressure/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/temperature/Cargo.toml → apis/sensors/temperature/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
description = "libtock temperature driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/temperature/src/lib.rs → apis/sensors/temperature/src/lib.rs
View file
File renamed without changes.
0 apis/temperature/src/tests.rs → apis/sensors/temperature/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apis/key_value/Cargo.toml → apis/storage/key_value/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repository = "https://www.github.com/tock/libtock-rs"
description = "libtock key-value driver"

[dependencies]
libtock_platform = { path = "../../platform" }
libtock_platform = { path = "../../../platform" }

[dev-dependencies]
libtock_unittest = { path = "../../unittest" }
libtock_unittest = { path = "../../../unittest" }
0 apis/key_value/src/lib.rs → apis/storage/key_value/src/lib.rs
View file
File renamed without changes.
0 apis/key_value/src/tests.rs → apis/storage/key_value/src/tests.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions panic_handlers/debug_panic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://www.github.com/tock/libtock-rs"
rust-version.workspace = true

[dependencies]
libtock_console = { path = "../../apis/console" }
libtock_low_level_debug = { path = "../../apis/low_level_debug" }
libtock_console = { path = "../../apis/interface/console" }
libtock_low_level_debug = { path = "../../apis/kernel/low_level_debug" }
libtock_platform = { path = "../../platform" }
libtock_runtime = { path = "../../runtime" }
2 changes: 1 addition & 1 deletion panic_handlers/small_panic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repository = "https://www.github.com/tock/libtock-rs"
rust-version.workspace = true

[dependencies]
libtock_low_level_debug = { path = "../../apis/low_level_debug" }
libtock_low_level_debug = { path = "../../apis/kernel/low_level_debug" }
libtock_platform = { path = "../../platform" }
libtock_runtime = { path = "../../runtime" }

0 comments on commit a17d179

Please sign in to comment.