From a7fea8fb238d8e2c85ca1470a6250c4543c41939 Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Mon, 12 Jun 2023 09:30:09 -0500 Subject: [PATCH 1/7] Updating dependencies - Updating cortex-m from 0.6 to 0.7 - Updated cortex-m-rt from 0.6 to 0.7 in /examples - Updated cortex-m-semihosting from 0.3.2 to 0.5 in /examples - Pointing to github repo (for now) for tm4c129x and tm4c123x deps --- examples/tiva-c-connected-launchpad/Cargo.toml | 6 +++--- examples/tiva-c-launchpad/Cargo.toml | 6 +++--- tm4c-hal/Cargo.toml | 2 +- tm4c123x-hal/Cargo.toml | 4 ++-- tm4c129x-hal/Cargo.toml | 6 ++++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/examples/tiva-c-connected-launchpad/Cargo.toml b/examples/tiva-c-connected-launchpad/Cargo.toml index 6b981c5..7fa1c3e 100644 --- a/examples/tiva-c-connected-launchpad/Cargo.toml +++ b/examples/tiva-c-connected-launchpad/Cargo.toml @@ -8,9 +8,9 @@ name = "tiva-c-connected-launchpad" version = "0.1.0" [dependencies] -cortex-m = "0.6" -cortex-m-rt = "0.6" -cortex-m-semihosting = "0.3.2" +cortex-m = "0.7" +cortex-m-rt = "0.7" +cortex-m-semihosting = "0.5" panic-halt = "0.2.0" [dependencies.tm4c129x-hal] diff --git a/examples/tiva-c-launchpad/Cargo.toml b/examples/tiva-c-launchpad/Cargo.toml index b5837ec..993247e 100644 --- a/examples/tiva-c-launchpad/Cargo.toml +++ b/examples/tiva-c-launchpad/Cargo.toml @@ -8,9 +8,9 @@ name = "tiva-c-launchpad" version = "0.1.0" [dependencies] -cortex-m = "0.6" -cortex-m-rt = "0.6" -cortex-m-semihosting = "0.3.2" +cortex-m = "0.7" +cortex-m-rt = "0.7" +cortex-m-semihosting = "0.5" panic-halt = "0.2.0" [dependencies.tm4c123x-hal] diff --git a/tm4c-hal/Cargo.toml b/tm4c-hal/Cargo.toml index 02cc81d..b115df1 100644 --- a/tm4c-hal/Cargo.toml +++ b/tm4c-hal/Cargo.toml @@ -16,7 +16,7 @@ repository = "https://github.com/rust-embedded-community/tm4c-hal" documentation = "https://docs.rs/tm4c-hal" [dependencies] -cortex-m = "0.6" +cortex-m = "0.7" nb = "1" [dependencies.embedded-hal] diff --git a/tm4c123x-hal/Cargo.toml b/tm4c123x-hal/Cargo.toml index b42d2c7..94f90d5 100644 --- a/tm4c123x-hal/Cargo.toml +++ b/tm4c123x-hal/Cargo.toml @@ -19,7 +19,7 @@ version = "0.2.2" default-features = false [dependencies.cortex-m] -version = "0.6" +version = "0.7" [dependencies.embedded-hal] version = "0.2.2" @@ -29,7 +29,7 @@ features = ["unproven"] version = "1" [dependencies.tm4c123x] -version = "0.9" +git = "https://github.com/m-labs/dslite2svd" [dependencies.void] version = "1.0" diff --git a/tm4c129x-hal/Cargo.toml b/tm4c129x-hal/Cargo.toml index ccc3f65..ecfa90f 100644 --- a/tm4c129x-hal/Cargo.toml +++ b/tm4c129x-hal/Cargo.toml @@ -15,9 +15,11 @@ repository = "https://github.com/rust-embedded-community/tm4c-hal/tm4c129x-hal" edition = "2018" [dependencies] -cortex-m = "0.6" +cortex-m = "0.7" nb = "1" -tm4c129x = "0.9" + +[dependencies.tm4c129x] +git = "https://github.com/m-labs/dslite2svd" [dependencies.cast] version = "0.2" From b6f2747c202c5ecad1dfb9d41e5d5f2884e5ae08 Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Tue, 27 Jun 2023 11:59:05 -0500 Subject: [PATCH 2/7] Added version tag to tm4c129x and tm4c123x git deps. --- tm4c123x-hal/Cargo.toml | 1 + tm4c129x-hal/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/tm4c123x-hal/Cargo.toml b/tm4c123x-hal/Cargo.toml index 94f90d5..1930c68 100644 --- a/tm4c123x-hal/Cargo.toml +++ b/tm4c123x-hal/Cargo.toml @@ -30,6 +30,7 @@ version = "1" [dependencies.tm4c123x] git = "https://github.com/m-labs/dslite2svd" +tag = "v0.9.1" [dependencies.void] version = "1.0" diff --git a/tm4c129x-hal/Cargo.toml b/tm4c129x-hal/Cargo.toml index ecfa90f..98cd831 100644 --- a/tm4c129x-hal/Cargo.toml +++ b/tm4c129x-hal/Cargo.toml @@ -20,6 +20,7 @@ nb = "1" [dependencies.tm4c129x] git = "https://github.com/m-labs/dslite2svd" +tag = "v0.9.1" [dependencies.cast] version = "0.2" From ff109d7bcdcade15f7047c44b9da2ed38af3fc7f Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Wed, 5 Jul 2023 08:00:23 -0500 Subject: [PATCH 3/7] Reverted tm4c123x and tm4c129x back to crates.io --- tm4c123x-hal/Cargo.toml | 3 +-- tm4c129x-hal/Cargo.toml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tm4c123x-hal/Cargo.toml b/tm4c123x-hal/Cargo.toml index 1930c68..5260486 100644 --- a/tm4c123x-hal/Cargo.toml +++ b/tm4c123x-hal/Cargo.toml @@ -29,8 +29,7 @@ features = ["unproven"] version = "1" [dependencies.tm4c123x] -git = "https://github.com/m-labs/dslite2svd" -tag = "v0.9.1" +version = "0.9.1" [dependencies.void] version = "1.0" diff --git a/tm4c129x-hal/Cargo.toml b/tm4c129x-hal/Cargo.toml index 98cd831..6d17c0a 100644 --- a/tm4c129x-hal/Cargo.toml +++ b/tm4c129x-hal/Cargo.toml @@ -19,8 +19,7 @@ cortex-m = "0.7" nb = "1" [dependencies.tm4c129x] -git = "https://github.com/m-labs/dslite2svd" -tag = "v0.9.1" +version = "0.9.1" [dependencies.cast] version = "0.2" From 4dcb30e9cd851027423f65e3a0501756a3e76291 Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Wed, 5 Jul 2023 09:00:31 -0500 Subject: [PATCH 4/7] Updated versions and added notes in Readme.md --- tm4c123x-hal/Cargo.toml | 2 +- tm4c123x-hal/README.md | 6 ++++++ tm4c129x-hal/Cargo.toml | 2 +- tm4c129x-hal/README.md | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tm4c123x-hal/Cargo.toml b/tm4c123x-hal/Cargo.toml index 5260486..a30e2a3 100644 --- a/tm4c123x-hal/Cargo.toml +++ b/tm4c123x-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tm4c123x-hal" -version = "0.10.2" +version = "0.10.3" authors = [ "Jorge Aparicio ", "Jonathan 'theJPster' Pallant ", diff --git a/tm4c123x-hal/README.md b/tm4c123x-hal/README.md index 47f72a0..3ebb455 100644 --- a/tm4c123x-hal/README.md +++ b/tm4c123x-hal/README.md @@ -8,6 +8,12 @@ ## Changelog +* Update 0.10.3 - Updated the dependencies for the supporting crate tm4c123x to +0.9.1 which supports newer version of cortex-m. Version 0.10.3 can be used with newer +versions of RTIC and has been tested in hardware (Launchpad and custom PCB) +using RTIC 1.1.4. Testing included SPI, ADC, Timers, EEPROM, GPIO, UART, +and multiple interrupts (UART, GPIO, TIMERS, ADC). + ### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c123x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c123x-hal-0.10.2...master)) * Use sealed traits for `*Pin` marker traits diff --git a/tm4c129x-hal/Cargo.toml b/tm4c129x-hal/Cargo.toml index 6d17c0a..0ab6c6a 100644 --- a/tm4c129x-hal/Cargo.toml +++ b/tm4c129x-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tm4c129x-hal" -version = "0.9.2" +version = "0.9.3" authors = [ "Jorge Aparicio ", "Jonathan 'theJPster' Pallant ", diff --git a/tm4c129x-hal/README.md b/tm4c129x-hal/README.md index 9311569..1c87649 100644 --- a/tm4c129x-hal/README.md +++ b/tm4c129x-hal/README.md @@ -8,6 +8,11 @@ ## Changelog +* Update 0.9.3 - Updated the dependencies for the supporting crate tm4c129x to +0.9.1 which supports newer version of cortex-m. This _should_ allow for running +newer version of RTIC / cortex-m, however, unlike the tm4c123 this hasn't been +tested. + ### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c129x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c129x-hal-0.9.2...master)) * Use sealed traits for `*Pin` marker traits From 09b3bd4a087bde4321ee40a12e17427099ebdf2d Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Wed, 5 Jul 2023 10:16:20 -0500 Subject: [PATCH 5/7] Update tm4c129x-hal/README.md Co-authored-by: Diego Barrios Romero --- tm4c129x-hal/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tm4c129x-hal/README.md b/tm4c129x-hal/README.md index 1c87649..c41fa3a 100644 --- a/tm4c129x-hal/README.md +++ b/tm4c129x-hal/README.md @@ -13,7 +13,7 @@ newer version of RTIC / cortex-m, however, unlike the tm4c123 this hasn't been tested. -### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c129x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c129x-hal-0.9.2...master)) +### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c129x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c129x-hal-0.9.3...master)) * Use sealed traits for `*Pin` marker traits * Do not reexport `tm4c-hal` macros From 68b3c5785c63c0ace4513b3c282c6d014d4ff6ee Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Wed, 5 Jul 2023 10:16:30 -0500 Subject: [PATCH 6/7] Update tm4c123x-hal/README.md Co-authored-by: Diego Barrios Romero --- tm4c123x-hal/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tm4c123x-hal/README.md b/tm4c123x-hal/README.md index 3ebb455..ea42713 100644 --- a/tm4c123x-hal/README.md +++ b/tm4c123x-hal/README.md @@ -14,7 +14,7 @@ versions of RTIC and has been tested in hardware (Launchpad and custom PCB) using RTIC 1.1.4. Testing included SPI, ADC, Timers, EEPROM, GPIO, UART, and multiple interrupts (UART, GPIO, TIMERS, ADC). -### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c123x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c123x-hal-0.10.2...master)) +### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c123x-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c123x-hal-0.10.3...master)) * Use sealed traits for `*Pin` marker traits * Do not reexport `tm4c-hal` macros From f285303a1900a2822984a702d841f38146a2bd13 Mon Sep 17 00:00:00 2001 From: Austin McElroy Date: Wed, 5 Jul 2023 10:22:48 -0500 Subject: [PATCH 7/7] Added to changelog --- tm4c-hal/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tm4c-hal/README.md b/tm4c-hal/README.md index f75378d..9502df5 100644 --- a/tm4c-hal/README.md +++ b/tm4c-hal/README.md @@ -7,6 +7,11 @@ depending on your processor. ## Changelog +* Updated dependencies in tm4c123x, tm4c129x, tm4c123x-hal, and +tm4c129x-hal to use newer version of cortex-m (up to v0.7 as of this release). + +### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c-hal-0.4.1...master)) + * Basic EEPROM Read, Write, Erase added ### Unreleased Changes ([Source](https://github.com/rust-embedded-community/tm4c-hal/tree/master/tm4c-hal) [Diff](https://github.com/rust-embedded-community/tm4c-hal/compare/tm4c-hal-0.4.1...master))