Skip to content

Commit

Permalink
Merge pull request #39 from pmnxis/dev/eeprom_return_blocking
Browse files Browse the repository at this point in the history
EEPROM (Novella) module memory usage improvement with replace to blocking i2c
  • Loading branch information
pmnxis committed Oct 27, 2023
2 parents 9a9bd47 + 3996454 commit 0ca2b4e
Show file tree
Hide file tree
Showing 6 changed files with 335 additions and 58 deletions.
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"rust-analyzer.cargo.target": "thumbv6m-none-eabi",
"rust-analyzer.linkedProjects": [
"Cargo.toml",
"billmock-mptool/Cargo.toml",
"billmock-plug-card/Cargo.toml",
"card-terminal-adapter/Cargo.toml"
],
Expand Down
14 changes: 8 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ hw_0v4 = ["eeprom"]
hw_mini_0v4 = ["eeprom"]

[dependencies]
embassy-sync = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["defmt"] }
embassy-executor = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["defmt"] }
embassy-time = { version = "0.1.5", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["nightly", "defmt", "time-driver-any", "stm32g030c8", "memory-x", "unstable-pac", "exti", "unstable-traits"] } # "unstable-traits" for use InputPin trait for gpio
embassy-embedded-hal = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "d94b9fe6fb6adee82c1427e72450f77a0d0973c3", features = ["nightly"] }
embassy-sync = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["defmt"] }
embassy-executor = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["defmt"] }
embassy-time = { version = "0.1.5", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["nightly", "defmt", "time-driver-any", "stm32g030c8", "memory-x", "unstable-pac", "exti", "unstable-traits"] } # "unstable-traits" for use InputPin trait for gpio
embassy-embedded-hal = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "b6fc682117a41e8e63a9632e06da5a17f46d9ab0", features = ["nightly"] }
defmt = "0.3"
defmt-rtt = "0.4"

Expand All @@ -40,6 +40,8 @@ bit_field = "0.10"
nonmax = { version = "0.5.3", default-features = false, features = [] } # to use common NonMax
static_assertions = "1.1.0"
env_to_array = { version = "0.3.1", features = ["hex"] }
zeroable = "0.2.0"
const-zero = "0.1.1"

# Application specific library

Expand Down
2 changes: 1 addition & 1 deletion src/boards/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl Hardware {
// STM32G030 maximum CPU clock is 64Mhz.
let mut ret = Stm32Config::default();
ret.rcc.mux = embassy_stm32::rcc::ClockSrc::PLL(embassy_stm32::rcc::PllConfig {
source: embassy_stm32::rcc::PllSrc::HSI16,
source: embassy_stm32::rcc::PllSrc::HSI,
m: embassy_stm32::rcc::Pllm::DIV1,
n: embassy_stm32::rcc::Plln::MUL8,
r: embassy_stm32::rcc::Pllr::DIV2,
Expand Down
Loading

0 comments on commit 0ca2b4e

Please sign in to comment.