Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/serial settings #350

Merged
merged 12 commits into from
Dec 5, 2023
Merged

Feature/serial settings #350

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
65c5178
Using serial settings crate
ryan-summers Nov 16, 2023
cb8fb13
Adding new files
ryan-summers Nov 16, 2023
f9705ec
Adding functional refactor to use serial settings crate
ryan-summers Nov 16, 2023
eeef036
Updating CHANGELOG
ryan-summers Dec 4, 2023
08b0618
Updating serial settings crate
ryan-summers Dec 4, 2023
072f007
Updating dependencies
ryan-summers Dec 4, 2023
614cac0
Updating dependencies
ryan-summers Dec 4, 2023
786da37
Adding watchdog back
ryan-summers Dec 4, 2023
f06e361
Adding docs, fixing reboot
ryan-summers Dec 4, 2023
f2ddb60
Refactoring code after changes
ryan-summers Dec 4, 2023
e7125ae
Apply suggestions from code review
ryan-summers Dec 5, 2023
3508503
Update src/settings/global_settings.rs
ryan-summers Dec 5, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
142 changes: 116 additions & 26 deletions Cargo.lock
View file
Open in desktop

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

19 changes: 16 additions & 3 deletions Cargo.toml
View file
Open in desktop
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 @@ -58,12 +60,23 @@ rtt-target = {version = "0.3", features=["cortex-m"]}
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", branch = "feature/serial-settings-crate"}

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

[patch.crates-io.synopsys-usb-otg]
git = "https://github.com/quartiq/synopsys-usb-otg"
branch = "feature/usb-device-bump"

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

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

[dependencies.ad5627]
Expand Down
3 changes: 2 additions & 1 deletion memory.x
View file
Open in desktop
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
Loading