Update compatibility with newer dependencies (#1)

* Update version

* Display works, touch not

* Driver working

* Use better config for the display

Author: rafaelcaricio

.cargo/config

@@ -1,7 +1,7 @@
 [target.thumbv7em-none-eabihf]
 # runner = 'arm-none-eabi-gdb -q -x .gdbinit'
-# runner = "arm-none-eabi-gdb -q -x openocd.gdb"
-runner = "arm-none-eabi-gdb -q -x segger.gdb"
+runner = "arm-none-eabi-gdb -x openocd.gdb -q"
+#runner = "arm-none-eabi-gdb -q -x segger.gdb"
 
 rustflags = [
     "-C", "link-arg=-Tlink.x",

.embed.toml

@@ -0,0 +1,9 @@
+[probe]
+protocol = "Swd"
+
+[flashing]
+enabled = true
+restore_unwritten_bytes = false
+
+[general]
+chip = "nrf52832_xxAA"

Cargo.toml

@@ -21,13 +21,15 @@ readme = "README.md"
 
 [dependencies]
 cortex-m = "0.6.2"
-embedded-hal = {version ="0.2.3", features = ["unproven"] }
-
+embedded-hal = "0.2.3"
 
 [dev-dependencies]
 cortex-m-rt = "0.6.12"
-nrf52832-hal = {version = "0.8.1", default-features = false, features = ["xxAA-package", "rt"]}
-panic-rtt-core = {version="0.1.0"}
-st7789 = { git = "https://github.com/tstellanova/st7789" }
+cortex-m-semihosting = "0.3.5"
+nrf52832-hal = { version = "0.10", default-features = false, features = ["xxAA-package", "rt"] }
+panic-halt = "0.2.0"
+st7789 = { version = "0.5.0", features = ["graphics", "batch", "buffer"], default-features = false }
+display-interface = "0.4.0"
+display-interface-spi = "0.4.0"
 shared-bus = {version = "0.1.4", features = ["cortexm"] }
-embedded-graphics = "0.6.0"
+embedded-graphics = "0.6.2"

examples/touchpad.rs

@@ -1,29 +1,23 @@
 #![no_std]
 #![no_main]
 
-use panic_rtt_core::{self, rtt_init_print, rprintln};
+extern crate cortex_m_rt as rt;
+extern crate nrf52832_hal;
+extern crate panic_halt;
 
-use nrf52832_hal as p_hal;
-use p_hal::gpio::{GpioExt, Level};
-use p_hal::nrf52832_pac as pac;
-use p_hal::{delay::Delay, rng::RngExt, spim, twim};
+use nrf52832_hal::gpio::p0::Parts;
+use nrf52832_hal::{self as hal, gpio::Level, pac, spim, twim, Delay, Rng};
 
-use cortex_m_rt as rt;
+use cortex_m_rt::entry;
+use cortex_m_semihosting::hprintln;
 use cst816s::{TouchEvent, TouchGesture, CST816S};
+use display_interface_spi::SPIInterfaceNoCS;
 use embedded_graphics::pixelcolor::{raw::RawU16, Rgb565};
 use embedded_graphics::{prelude::*, primitives::*, style::*};
 use embedded_hal::digital::v2::OutputPin;
-use rt::entry;
-use st7789::Orientation;
+use st7789::{Orientation, ST7789};
 
-use embedded_hal::blocking::delay::{DelayMs, DelayUs};
-use nrf52832_hal::prelude::ClocksExt;
-
-pub type HalSpimError = p_hal::spim::Error;
-
-pub type Spim0PortType = p_hal::spim::Spim<pac::SPIM0>;
-pub type DisplaySckPinType = p_hal::gpio::p0::P0_18<p_hal::gpio::Output<p_hal::gpio::PushPull>>;
-pub type DisplayMosiPinType = p_hal::gpio::p0::P0_26<p_hal::gpio::Output<p_hal::gpio::PushPull>>;
+use embedded_hal::blocking::delay::DelayUs;
 
 const SCREEN_WIDTH: i32 = 240;
 const SCREEN_HEIGHT: i32 = 240;
@@ -36,26 +30,25 @@ const SCREEN_RADIUS: u32 = (MIN_SCREEN_DIM / 2) as u32;
 ///
 #[entry]
 fn main() -> ! {
-    rtt_init_print!(NoBlockTrim);
-
     let cp = pac::CorePeripherals::take().unwrap();
     let mut delay_source = Delay::new(cp.SYST);
 
     // PineTime has a 32 MHz HSE (HFXO) and a 32.768 kHz LSE (LFXO)
     // Optimize clock config
     let dp = pac::Peripherals::take().unwrap();
-    let _clockit = dp.CLOCK.constrain().enable_ext_hfosc();
+    let _clocks = hal::clocks::Clocks::new(dp.CLOCK).enable_ext_hfosc();
 
-    let port0 = dp.P0.split();
+    //let port0 = dp.P0.split();
+    let port0 = Parts::new(dp.P0);
 
     // random number generator peripheral
-    let mut rng = dp.RNG.constrain();
+    let mut rng = Rng::new(dp.RNG);
 
     // vibration motor output: drive low to activate motor
     let mut vibe = port0.p0_16.into_push_pull_output(Level::High).degrade();
     pulse_vibe(&mut vibe, &mut delay_source, 10);
 
-    rprintln!("\r\n--- BEGIN ---");
+    hprintln!("\r\n--- BEGIN ---").unwrap();
 
     // internal i2c0 bus devices: BMA421 (accel), HRS3300 (hrs), CST816S (TouchPad)
     // BMA421-INT:  P0.08
@@ -65,9 +58,7 @@ fn main() -> ! {
         sda: port0.p0_06.into_floating_input().degrade(),
     };
     let i2c_port = twim::Twim::new(dp.TWIM1, i2c0_pins, twim::Frequency::K400);
-    // let i2c_bus0 = shared_bus::CortexMBusManager::new(i2c_port);
-
-    delay_source.delay_ms(1u8);
+    //let i2c_bus0 = shared_bus::CortexMBusManager::new(i2c_port);
 
     let spim0_pins = spim::Pins {
         sck: port0.p0_02.into_push_pull_output(Level::Low).degrade(),
@@ -77,28 +68,24 @@ fn main() -> ! {
 
     // create SPIM0 interface, 8 Mbps, use 122 as "over read character"
     let spim0 = spim::Spim::new(dp.SPIM0, spim0_pins, spim::Frequency::M8, spim::MODE_3, 122);
-    let spi_bus0 = shared_bus::CortexMBusManager::new(spim0);
+    //let spi_bus0 = shared_bus::CortexMBusManager::new(spim0);
 
     // backlight control pin for display: always on
-    let mut _backlight = port0.p0_22.into_push_pull_output(Level::Low);
+    let _backlight = port0.p0_22.into_push_pull_output(Level::Low);
     // SPI chip select (CSN) for the display.
-    let display_csn = port0.p0_25.into_push_pull_output(Level::High);
+    let _display_csn = port0.p0_25.into_push_pull_output(Level::Low);
     // data/clock switch pin for display
     let display_dc = port0.p0_18.into_push_pull_output(Level::Low);
     // reset pin for display
     let display_rst = port0.p0_26.into_push_pull_output(Level::Low);
 
+    // display interface abstraction from SPI and DC
+    let di = SPIInterfaceNoCS::new(spim0, display_dc);
+
     // create display driver
-    let mut display = st7789::new_display_driver(
-        spi_bus0.acquire(),
-        display_csn,
-        display_dc,
-        display_rst,
-        SCREEN_WIDTH as u16,
-        SCREEN_HEIGHT as u16,
-    );
+    let mut display = ST7789::new(di, display_rst, SCREEN_WIDTH as u16, SCREEN_HEIGHT as u16);
     display.init(&mut delay_source).unwrap();
-    display.set_orientation(&Orientation::Portrait).unwrap();
+    display.set_orientation(Orientation::Portrait).unwrap();
 
     draw_background(&mut display);
 
@@ -117,7 +104,7 @@ fn main() -> ! {
 
         if let Some(evt) = touchpad.read_one_touch_event(true) {
             refresh_count += 1;
-            rprintln!("{:?}",evt);
+            //hprintln!("{:?}", evt).unwrap();
 
             draw_marker(&mut display, &evt, rand_color);
             let vibe_time = match evt.gesture {

openocd.gdb

@@ -40,8 +40,8 @@ define hook-quit
     set confirm off
 end
 
-
 load
+monitor reset halt
 
 # start the process but immediately halt the processor
 # stepi

src/lib.rs

@@ -72,21 +72,19 @@ where
 
     /// Read enough registers to fill our read buf
     pub fn read_registers(&mut self) -> Result<(), Error<CommE, PinE>> {
+        let read_reg = [Self::REG_FIRST; 1];
         self.i2c
-            .write_read(
-                Self::DEFAULT_I2C_ADDRESS,
-                &[Self::REG_FIRST],
-                self.blob_buf.as_mut(),
-            )
+            .write_read(Self::DEFAULT_I2C_ADDRESS, &read_reg, self.blob_buf.as_mut())
             .map_err(Error::Comm)?;
         Ok(())
     }
 
     pub fn read_truncated_registers(&mut self) -> Result<(), Error<CommE, PinE>> {
+        let read_reg = [Self::REG_FIRST; 1];
         self.i2c
             .write_read(
                 Self::DEFAULT_I2C_ADDRESS,
-                &[Self::REG_FIRST],
+                &read_reg,
                 self.blob_buf[0..ONE_EVENT_LEN].as_mut(),
             )
             .map_err(Error::Comm)?;
@@ -192,7 +190,7 @@ where
 const BLOB_BUF_LEN: usize = (10 * 6) + 3; // (MAX_TOUCH_CHANNELS * RAW_TOUCH_EVENT_LEN) + GESTURE_HEADER_LEN;
 const ONE_EVENT_LEN: usize = 6 + 3; // RAW_TOUCH_EVENT_LEN + GESTURE_HEADER_LEN
 
-#[derive(Debug,PartialEq)]
+#[derive(Debug, PartialEq)]
 #[repr(u8)]
 pub enum TouchGesture {
     None = 0x00,