From 8a42d6cf8af4849437b8cf92e412015c51d2bd85 Mon Sep 17 00:00:00 2001
From: Jonathan Nilsson <jonathan@voysys.se>
Date: Wed, 15 Sep 2021 07:07:25 +0200
Subject: [PATCH] Update pac so we can use rt 0.7 (#107)

* Update pac so we can use rt 0.7

* Update pac in all board crates
---
 boards/adafruit_macropad/Cargo.toml | 2 +-
 boards/feather_rp2040/Cargo.toml    | 2 +-
 boards/pico/Cargo.toml              | 2 +-
 boards/pico_explorer/Cargo.toml     | 4 ++--
 boards/pico_lipo_16mb/Cargo.toml    | 2 +-
 rp2040-hal/Cargo.toml               | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boards/adafruit_macropad/Cargo.toml b/boards/adafruit_macropad/Cargo.toml
index e170f7e..e890409 100644
--- a/boards/adafruit_macropad/Cargo.toml
+++ b/boards/adafruit_macropad/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7.2"
 rp2040-hal = { path = "../../rp2040-hal", version = "0.2.0"}
-cortex-m-rt = { version = "0.6.14", optional = true }
+cortex-m-rt = { version = "0.7", optional = true }
 
 [features]
 default = ["rt"]
diff --git a/boards/feather_rp2040/Cargo.toml b/boards/feather_rp2040/Cargo.toml
index 1dc534f..e83ae34 100644
--- a/boards/feather_rp2040/Cargo.toml
+++ b/boards/feather_rp2040/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7.2"
 rp2040-hal = { path = "../../rp2040-hal", version = "0.2.0"}
-cortex-m-rt = { version = "0.6.14", optional = true }
+cortex-m-rt = { version = "0.7", optional = true }
 embedded-time = "0.12.0"
 
 [dev-dependencies]
diff --git a/boards/pico/Cargo.toml b/boards/pico/Cargo.toml
index b62f658..2dfb934 100644
--- a/boards/pico/Cargo.toml
+++ b/boards/pico/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7.2"
 rp2040-hal = { path = "../../rp2040-hal", version = "0.2.0"}
-cortex-m-rt = { version = "0.6.14", optional = true }
+cortex-m-rt = { version = "0.7", optional = true }
 embedded-time = "0.12.0"
 usb-device= "0.2.8"
 usbd-serial = "0.1.1"
diff --git a/boards/pico_explorer/Cargo.toml b/boards/pico_explorer/Cargo.toml
index 5d7a94e..1c62cb6 100644
--- a/boards/pico_explorer/Cargo.toml
+++ b/boards/pico_explorer/Cargo.toml
@@ -12,8 +12,8 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7.2"
 rp2040-hal = { path = "../../rp2040-hal", version = "0.2.0"}
-cortex-m-rt = { version="0.6.14", optional=true }
-embedded-hal = { version="0.2.4", features=["unproven"] }
+cortex-m-rt = { version = "0.7", optional = true }
+embedded-hal = { version = "0.2.4", features = ["unproven"] }
 st7789 = "0.6.1"
 display-interface-spi = "0.4.1"
 embedded-time = "0.12.0"
diff --git a/boards/pico_lipo_16mb/Cargo.toml b/boards/pico_lipo_16mb/Cargo.toml
index eb99fcb..2842cf7 100644
--- a/boards/pico_lipo_16mb/Cargo.toml
+++ b/boards/pico_lipo_16mb/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7.2"
 rp2040-hal = { path = "../../rp2040-hal", version = "0.2.0"}
-cortex-m-rt = { version = "0.6.14", optional = true }
+cortex-m-rt = { version = "0.7", optional = true }
 
 [features]
 default = ["rt"]
diff --git a/rp2040-hal/Cargo.toml b/rp2040-hal/Cargo.toml
index 1349432..1f207fa 100644
--- a/rp2040-hal/Cargo.toml
+++ b/rp2040-hal/Cargo.toml
@@ -14,14 +14,14 @@ cortex-m = "0.7.2"
 embedded-hal = { version = "0.2.5", features = ["unproven"] }
 embedded-time = "0.12.0"
 nb = "1.0"
-rp2040-pac = { git = "https://github.com/rp-rs/rp2040-pac", rev = "0226d2c28e8dca03475d6783cbdf07f535859c23" }
+rp2040-pac = "0.1.5"
 paste = "1.0"
 void = { version = "1.0.2", default-features = false }
 usb-device = "0.2.8"
 itertools = { version = "0.10.1", default-features = false }
 
 [dev-dependencies]
-cortex-m-rt = "0.6.14"
+cortex-m-rt = "0.7"
 panic-halt = "0.2.0"
 rp2040-boot2 = { git = "https://github.com/rp-rs/rp2040-boot2-rs", rev = "67400f600b192e950b58df79ddc9b57ff209ef08" }
 hd44780-driver = "0.4.0"