From c8fcebf6c21d7593cd5b1b79408c9229374f3825 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Mon, 3 Jul 2023 14:55:22 +0200 Subject: [PATCH 1/4] Prepping for release --- CHANGELOG.md | 5 +++-- Cargo.lock | 5 +++-- Cargo.toml | 8 ++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b935a20f..b0776ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.5.0] ### Added * Support for different ethernet daughterboards using the ENC424J00 has been added. @@ -63,7 +63,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added * Output interlock threshold is now limited to a maximum of 47 dBm -[Unreleased]: https://github.com/quartiq/booster/compare/v0.4.0...HEAD +[Unreleased]: https://github.com/quartiq/booster/compare/v0.5.0...HEAD +[0.5.0]: https://github.com/quartiq/booster/compare/v0.4.0...v0.5.0 [0.4.0]: https://github.com/quartiq/booster/compare/v0.3.0...v0.4.0 [0.3.0]: https://github.com/quartiq/booster/compare/v0.2.0...v0.3.0 [0.2.0]: https://github.com/quartiq/booster/compare/v0.1.0...v0.2.0 diff --git a/Cargo.lock b/Cargo.lock index 184365e9..45ea0bc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -456,8 +456,9 @@ dependencies = [ [[package]] name = "enc424j600" -version = "0.2.0" -source = "git+https://git.m-labs.hk/M-Labs/ENC424J600.git?rev=fbcc3778d27cfbeec7a1395c9b13a00c8a26af9a#fbcc3778d27cfbeec7a1395c9b13a00c8a26af9a" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825ccf836398d94464f4a26fb0ec0cb2b1f0b749e67acc64b7640bdc1f46804c" dependencies = [ "aligned 0.3.4", "cortex-m 0.5.11", diff --git a/Cargo.toml b/Cargo.toml index b48befeb..74534e03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "booster" # Keep versions in Cargo.toml and py/setup.py synchronized. -version = "0.3.0" +version = "0.5.0" resolver = "2" authors = [ "Ryan Summers ", @@ -52,6 +52,7 @@ smlang= "0.6" minireq = "0.2" 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.3", features=["shared-stack"] } [build-dependencies] @@ -61,11 +62,6 @@ built = { version = "0.6", features = ["git2"], default-features = false } version = "0.16" features = ["stm32f407", "rt", "usb_fs"] -[dependencies.enc424j600] -git = "https://git.m-labs.hk/M-Labs/ENC424J600.git" -rev = "fbcc3778d27cfbeec7a1395c9b13a00c8a26af9a" -features = [ "cortex-m-cpu" ] - [dependencies.ad5627] path = "ad5627" From cd07b7287ed7b5d2081cf7d4c12382db372de5d9 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Mon, 3 Jul 2023 14:59:09 +0200 Subject: [PATCH 2/4] Prepping for release --- CHANGELOG.md | 2 +- Cargo.toml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0776ffd..19bf06d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.5.0] +## [0.5.0] - 03-07-2023 ### Added * Support for different ethernet daughterboards using the ENC424J00 has been added. diff --git a/Cargo.toml b/Cargo.toml index 74534e03..8eda9627 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,27 +64,35 @@ features = ["stm32f407", "rt", "usb_fs"] [dependencies.ad5627] path = "ad5627" +version = "0.1" [dependencies.ads7924] path = "ads7924" +version = "0.1" [dependencies.dac7571] path = "dac7571" +version = "0.1" [dependencies.max6639] path = "max6639" +version = "0.1" [dependencies.max6642] path = "max6642" +version = "0.1" [dependencies.mcp3221] path = "mcp3221" +version = "0.1" [dependencies.microchip-24aa02e48] path = "microchip-24aa02e48" +version = "0.1" [dependencies.tca9548] path = "tca9548" +version = "0.1" [profile.dev] # Note: Opt-level 1 is required to avoid issues with stack overflow during hardware configuration. From 462cf94e5413cf271998a386db64f8395d4c8048 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Mon, 3 Jul 2023 15:12:11 +0200 Subject: [PATCH 3/4] Prepping drivers for release --- ad5627/Cargo.toml | 3 +++ ads7924/Cargo.toml | 3 +++ dac7571/Cargo.toml | 3 +++ max6639/Cargo.toml | 3 +++ max6642/Cargo.toml | 3 +++ mcp3221/Cargo.toml | 3 +++ microchip-24aa02e48/Cargo.toml | 3 +++ tca9548/Cargo.toml | 3 +++ 8 files changed, 24 insertions(+) diff --git a/ad5627/Cargo.toml b/ad5627/Cargo.toml index 4915a395..1549a600 100644 --- a/ad5627/Cargo.toml +++ b/ad5627/Cargo.toml @@ -3,6 +3,9 @@ name = "ad5627" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the AD5627 2-channel digital-to-analog converter (DAC)" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ads7924/Cargo.toml b/ads7924/Cargo.toml index 52d128fe..0d0402b9 100644 --- a/ads7924/Cargo.toml +++ b/ads7924/Cargo.toml @@ -3,6 +3,9 @@ name = "ads7924" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the ADS7924 external analog-to-digital converter (ADC)" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/dac7571/Cargo.toml b/dac7571/Cargo.toml index c332b80d..782b565a 100644 --- a/dac7571/Cargo.toml +++ b/dac7571/Cargo.toml @@ -3,6 +3,9 @@ name = "dac7571" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the DAC7571 external digital-to-analog converter (DAC)" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/max6639/Cargo.toml b/max6639/Cargo.toml index 8dc135b8..e2ed5d96 100644 --- a/max6639/Cargo.toml +++ b/max6639/Cargo.toml @@ -3,6 +3,9 @@ name = "max6639" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the MAX6639 fan speed controller" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/max6642/Cargo.toml b/max6642/Cargo.toml index 4b729922..b5908e43 100644 --- a/max6642/Cargo.toml +++ b/max6642/Cargo.toml @@ -3,6 +3,9 @@ name = "max6642" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the MAX6642 temperature sensor" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/mcp3221/Cargo.toml b/mcp3221/Cargo.toml index cd451322..4f1d9d58 100644 --- a/mcp3221/Cargo.toml +++ b/mcp3221/Cargo.toml @@ -3,6 +3,9 @@ name = "mcp3221" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the MCP3221 external analog-to-digital converter (ADC)" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/microchip-24aa02e48/Cargo.toml b/microchip-24aa02e48/Cargo.toml index 2e4abc7d..6690bdaa 100644 --- a/microchip-24aa02e48/Cargo.toml +++ b/microchip-24aa02e48/Cargo.toml @@ -3,6 +3,9 @@ name = "microchip-24aa02e48" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the Microchip 24AA02E48 EEPROM with EUI-48" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tca9548/Cargo.toml b/tca9548/Cargo.toml index 3a63c22d..3afede8e 100644 --- a/tca9548/Cargo.toml +++ b/tca9548/Cargo.toml @@ -3,6 +3,9 @@ name = "tca9548" version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" +description = "no_std driver for the TCA9548 I2C bus multiplexer" +license = "MIT" +repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From a0459971d8a71f30a70d8419453391d99c764ea6 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Mon, 3 Jul 2023 15:16:33 +0200 Subject: [PATCH 4/4] Fixing license --- ad5627/Cargo.toml | 2 +- ads7924/Cargo.toml | 2 +- dac7571/Cargo.toml | 2 +- max6639/Cargo.toml | 2 +- max6642/Cargo.toml | 2 +- mcp3221/Cargo.toml | 2 +- microchip-24aa02e48/Cargo.toml | 2 +- tca9548/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ad5627/Cargo.toml b/ad5627/Cargo.toml index 1549a600..53d1a78f 100644 --- a/ad5627/Cargo.toml +++ b/ad5627/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the AD5627 2-channel digital-to-analog converter (DAC)" -license = "MIT" +license = "MIT or APACHE-2" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ads7924/Cargo.toml b/ads7924/Cargo.toml index 0d0402b9..c6874f5c 100644 --- a/ads7924/Cargo.toml +++ b/ads7924/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the ADS7924 external analog-to-digital converter (ADC)" -license = "MIT" +license = "MIT or APACHE-2" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/dac7571/Cargo.toml b/dac7571/Cargo.toml index 782b565a..3d546a40 100644 --- a/dac7571/Cargo.toml +++ b/dac7571/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the DAC7571 external digital-to-analog converter (DAC)" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/max6639/Cargo.toml b/max6639/Cargo.toml index e2ed5d96..b9fc8644 100644 --- a/max6639/Cargo.toml +++ b/max6639/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the MAX6639 fan speed controller" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/max6642/Cargo.toml b/max6642/Cargo.toml index b5908e43..bf3119bf 100644 --- a/max6642/Cargo.toml +++ b/max6642/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the MAX6642 temperature sensor" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/mcp3221/Cargo.toml b/mcp3221/Cargo.toml index 4f1d9d58..97c426df 100644 --- a/mcp3221/Cargo.toml +++ b/mcp3221/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the MCP3221 external analog-to-digital converter (ADC)" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/microchip-24aa02e48/Cargo.toml b/microchip-24aa02e48/Cargo.toml index 6690bdaa..67d6945f 100644 --- a/microchip-24aa02e48/Cargo.toml +++ b/microchip-24aa02e48/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the Microchip 24AA02E48 EEPROM with EUI-48" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tca9548/Cargo.toml b/tca9548/Cargo.toml index 3afede8e..ad60a08b 100644 --- a/tca9548/Cargo.toml +++ b/tca9548/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Ryan Summers "] edition = "2018" description = "no_std driver for the TCA9548 I2C bus multiplexer" -license = "MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/quartiq/booster/" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html