From ce9ae48f2af313b9c7b705f6168a30ecd5a36dbc Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Sat, 18 Apr 2020 10:54:55 +0200
Subject: [PATCH] Adding WIP update to use HAL

---
 .cargo/config  | 2 +-
 Cargo.toml     | 2 +-
 src/eeprom.rs  | 2 +-
 src/eth.rs     | 2 +-
 src/i2c.rs     | 2 +-
 src/main.rs    | 4 ++--
 stabilizer.cfg | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 382c36e..a765d53 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,5 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "gdb-multiarch -q -x openocd.gdb"
+runner = "gdb-multiarch -q -x bmp.gdb"
 rustflags = ["-C", "link-arg=-Tlink.x"]
 
 [build]
diff --git a/Cargo.toml b/Cargo.toml
index c62c914..66e5451 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ panic-halt = "0.2"
 serde = { version = "1.0", features = ["derive"], default-features = false }
 heapless = "0.5"
 serde-json-core = "0.1"
-stm32h7 = { version = "0.10", features = ["stm32h743", "rt"] }
+stm32h7 = { version = "0.10", features = ["stm32h743v", "rt"] }
 cortex-m-rtfm = "0.5"
 smoltcp = { version = "0.6", features = ["ethernet", "proto-ipv4", "socket-tcp"], default-features = false }
 
diff --git a/src/eeprom.rs b/src/eeprom.rs
index fe30680..a50dd69 100644
--- a/src/eeprom.rs
+++ b/src/eeprom.rs
@@ -1,5 +1,5 @@
 use super::i2c;
-use stm32h7::stm32h743 as pac;
+use stm32h7::stm32h743v as pac;
 
 const I2C_ADDR: u8 = 0xa0;
 
diff --git a/src/eth.rs b/src/eth.rs
index 9cd1c9c..d108982 100644
--- a/src/eth.rs
+++ b/src/eth.rs
@@ -3,7 +3,7 @@ use smoltcp::phy;
 use smoltcp::time::Instant;
 use smoltcp::wire::EthernetAddress;
 use smoltcp::Result;
-use stm32h7::stm32h743 as pac;
+use stm32h7::stm32h743v as pac;
 
 #[allow(dead_code)]
 mod phy_consts {
diff --git a/src/i2c.rs b/src/i2c.rs
index 9c431ca..2118194 100644
--- a/src/i2c.rs
+++ b/src/i2c.rs
@@ -1,4 +1,4 @@
-use stm32h7::stm32h743 as pac;
+use stm32h7::stm32h743v as pac;
 
 // Adapted from stm32h7xx embedded-hal
 
diff --git a/src/main.rs b/src/main.rs
index f7e9f94..5cc2497 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,7 +33,7 @@ use core::fmt::Write;
 use cortex_m_rt::exception;
 use heapless::{consts::*, String, Vec};
 use rtfm::cyccnt::{Instant, U32Ext as _};
-use stm32h7::stm32h743 as pac;
+use stm32h7::stm32h743v as pac;
 
 use smoltcp as net;
 
@@ -94,7 +94,7 @@ macro_rules! create_socket {
     };
 }
 
-#[rtfm::app(device = stm32h7::stm32h743, peripherals = true, monotonic = rtfm::cyccnt::CYCCNT)]
+#[rtfm::app(device = stm32h7::stm32h743v, peripherals = true, monotonic = rtfm::cyccnt::CYCCNT)]
 const APP: () = {
     struct Resources {
         spi: (pac::SPI1, pac::SPI2, pac::SPI4, pac::SPI5),
diff --git a/stabilizer.cfg b/stabilizer.cfg
index 51d7c6c..ea01d24 100644
--- a/stabilizer.cfg
+++ b/stabilizer.cfg
@@ -1,4 +1,4 @@
-source [find interface/stlink.cfg]
+source [find interface/stlink-v2.cfg]
 transport select hla_swd
 source [find target/stm32h7x_dual_bank.cfg]