From a7073c419b36695f12bd0322b39eabb29e2c3ed2 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Fri, 18 Sep 2020 12:23:28 +0800
Subject: [PATCH] reduce warning

---
 examples/mqtt_client.rs | 21 +++++++--------------
 src/bitmask_macro.rs    |  1 +
 src/flash.rs            | 16 ++++------------
 src/spi_slave.rs        |  2 --
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/examples/mqtt_client.rs b/examples/mqtt_client.rs
index 3c6a1da..e3a4995 100644
--- a/examples/mqtt_client.rs
+++ b/examples/mqtt_client.rs
@@ -6,33 +6,26 @@ use log::{info, warn};
 use smoltcp as net;
 use stm32h7xx_hal::ethernet;
 use stm32h7xx_hal::{gpio::Speed, prelude::*, spi, pac};
-use embedded_hal::{
-    blocking::spi::Transfer,
-    digital::v2::OutputPin,
-};
 
-use heapless::{consts, String};
+use heapless::consts;
 
 use cortex_m;
-use cortex_m_rt::{
-    entry,
-    exception,
-};
+use cortex_m_rt::entry;
 use rtic::cyccnt::{Instant, U32Ext};
 
 use minimq::{
-    embedded_nal::{IpAddr, Ipv4Addr, TcpStack, SocketAddr, Mode},
+    embedded_nal::{IpAddr, Ipv4Addr, TcpStack},
     MqttClient, QoS
 };
 
-use firmware::nal_tcp_client::{NetworkStack, NetStorage, NetworkInterface};
+use firmware::nal_tcp_client::{NetworkStack, NetStorage};
 use firmware::{
 	cpld::{
 		CPLD,
     },
 };
 use firmware::Urukul;
-use firmware::mqtt_mux::{MqttCommandType, MqttMux};
+use firmware::mqtt_mux::MqttMux;
 
 #[path = "util/logger.rs"]
 mod logger;
@@ -93,7 +86,7 @@ fn main() -> ! {
         logger::enable_itm(&dp.DBGMCU, &mut cp.DCB, &mut cp.ITM);
     }
     logger::init();
-    let mut delay = cp.SYST.delay(ccdr.clocks);
+    // let mut delay = cp.SYST.delay(ccdr.clocks);
 
     let gpioa = dp.GPIOA.split(ccdr.peripheral.GPIOA);
     let gpiob = dp.GPIOB.split(ccdr.peripheral.GPIOB);
@@ -173,7 +166,7 @@ fn main() -> ! {
     let cpld = CPLD::new(spi, (cs0, cs1, cs2), io_update);
     let parts = cpld.split();
 
-    let mut urukul = Urukul::new(
+    let urukul = Urukul::new(
         parts.spi1, parts.spi2, parts.spi3, parts.spi4, parts.spi5, parts.spi6, parts.spi7
     );
 
diff --git a/src/bitmask_macro.rs b/src/bitmask_macro.rs
index 5486530..1c7a574 100644
--- a/src/bitmask_macro.rs
+++ b/src/bitmask_macro.rs
@@ -42,6 +42,7 @@ macro_rules! construct_bitmask {
 				assert!(arg < (2 << self.get_width()));
 				(arg << (self.get_shift() % ((size_of::<$unsigned_type>() as u8) * 8)))
 			}
+			#[allow(dead_code)]
 			pub(crate) fn set_data_by_arg(self, data: &mut $unsigned_type, arg: $unsigned_type) {
 				// Clear bits in field, then insert shifted argument
 				*data &= (!self.get_bitmask());
diff --git a/src/flash.rs b/src/flash.rs
index ca3aa45..21a6a3e 100644
--- a/src/flash.rs
+++ b/src/flash.rs
@@ -1,17 +1,9 @@
 use embedded_hal::{
 	digital::v2::{OutputPin, InputPin},
     blocking::spi::Transfer,
-    blocking::delay::{DelayMs, DelayUs},
+    blocking::delay::DelayUs,
 };
-
-use cortex_m;
-use cortex_m::asm::nop;
-use cortex_m_rt::entry;
-
-use core::ptr;
-use nb::block;
-
-use log::{warn, debug};
+use log::info;
 
 #[derive(Debug)]
 pub enum FPGAFlashError {
@@ -91,10 +83,10 @@ pub fn flash_ice40_fpga<SPI: Transfer<u8>,
         _ => return Err(FPGAFlashError::ResetStatusError),
     };
 
-    debug!("Configuration successful!");
+    info!("Configuration successful!");
     // Send at least another 49 clock cycles to activate IO pins (choosing same 13 bytes)
     spi.transfer(&mut dummy_13_bytes).map_err(|_| FPGAFlashError::SPICommunicationError)?;
-    debug!("User I/O pins activated.");
+    info!("User I/O pins activated.");
     Ok(())
 
 }
\ No newline at end of file
diff --git a/src/spi_slave.rs b/src/spi_slave.rs
index 0b1e89c..febfa04 100644
--- a/src/spi_slave.rs
+++ b/src/spi_slave.rs
@@ -2,8 +2,6 @@ use embedded_hal::{
 	blocking::spi::Transfer,
 	digital::v2::OutputPin,
 };
-use core::marker::PhantomData;
-
 use crate::cpld::CPLD;
 use crate::Error;