Skip to content

Commit

Permalink
Merge pull request #350 from quartiq/feature/serial-settings
Browse files Browse the repository at this point in the history
Feature/serial settings
  • Loading branch information
ryan-summers authored Dec 5, 2023
2 parents dad5e6a + 3508503 commit c58831b
Show file tree
Hide file tree
Showing 16 changed files with 545 additions and 528 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
* Network stack is randomly seeded on startup so that random ports are used.
* Serial terminal replaced with `menu` for simplicity
* The broker can now be specified using DNS

## [0.5.0] - 03-07-2023

Expand Down
140 changes: 114 additions & 26 deletions Cargo.lock

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

16 changes: 13 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ exclude = [
]

[dependencies]
embedded-storage = "0.3"
embedded-io = "0.6"
serde_with = { version = "3.4", default-features = false, features = ["macros"] }
serde-json-core = "0.5"
cortex-m = "0.7.7"
Expand All @@ -42,9 +44,9 @@ serde = {version = "1.0", features = ["derive"], default-features = false }
menu = "0.3"
rtt-logger = "0.2"
bbqueue = "0.5"
usbd-serial = "0.1.0"
shared-bus = { version = "0.3", features = ["cortex-m"] }
usb-device = "0.2.9"
usb-device = "0.3.0"
usbd-serial = "0.2.0"
encdec = { version = "0.9", default-features = false }
crc-any = { version = "2.4.3", default-features = false }
panic-persist = { version = "0.3", features = ["custom-panic-handler", "utf8"] }
Expand All @@ -59,11 +61,19 @@ enum-iterator = { version = "1.4", default-features = false }
enc424j600 = { version = "0.3", features = ["cortex-m-cpu"] }
smoltcp-nal = { version = "0.4", features=["shared-stack"] }

serial-settings = {git = "https://github.com/quartiq/stabilizer"}
postcard = "1"

[patch.crates-io.usbd-serial]
git = "https://github.com/rust-embedded-community/usbd-serial"
branch = "rs/bugfix"

[build-dependencies]
built = { version = "0.7", features = ["git2"], default-features = false }

[dependencies.stm32f4xx-hal]
version = "0.17"
git = "https://github.com/quartiq/stm32f4xx-hal"
branch = "rs/synopsys-patch"
features = ["stm32f407", "rt", "usb_fs"]

[dependencies.ad5627]
Expand Down
3 changes: 2 additions & 1 deletion memory.x
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
MEMORY
{
/* NOTE 1 K = 1 KiBi = 1024 bytes */
FLASH : ORIGIN = 0x08000000, LENGTH = 1M
/* Note: The last 128KB flash sector is reserved for settings storage. */
FLASH : ORIGIN = 0x08000000, LENGTH = 896K
RAM : ORIGIN = 0x20000000, LENGTH = 127K
PANDUMP : ORIGIN = 0x2001FC00, LENGTH = 1K
}
Expand Down
Loading

0 comments on commit c58831b

Please sign in to comment.