reduce warning

This commit is contained in:
occheung 2020-09-18 12:23:28 +08:00
parent 72770d9276
commit a7073c419b
4 changed files with 12 additions and 28 deletions

View File

@ -6,33 +6,26 @@ use log::{info, warn};
use smoltcp as net; use smoltcp as net;
use stm32h7xx_hal::ethernet; use stm32h7xx_hal::ethernet;
use stm32h7xx_hal::{gpio::Speed, prelude::*, spi, pac}; 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;
use cortex_m_rt::{ use cortex_m_rt::entry;
entry,
exception,
};
use rtic::cyccnt::{Instant, U32Ext}; use rtic::cyccnt::{Instant, U32Ext};
use minimq::{ use minimq::{
embedded_nal::{IpAddr, Ipv4Addr, TcpStack, SocketAddr, Mode}, embedded_nal::{IpAddr, Ipv4Addr, TcpStack},
MqttClient, QoS MqttClient, QoS
}; };
use firmware::nal_tcp_client::{NetworkStack, NetStorage, NetworkInterface}; use firmware::nal_tcp_client::{NetworkStack, NetStorage};
use firmware::{ use firmware::{
cpld::{ cpld::{
CPLD, CPLD,
}, },
}; };
use firmware::Urukul; use firmware::Urukul;
use firmware::mqtt_mux::{MqttCommandType, MqttMux}; use firmware::mqtt_mux::MqttMux;
#[path = "util/logger.rs"] #[path = "util/logger.rs"]
mod logger; mod logger;
@ -93,7 +86,7 @@ fn main() -> ! {
logger::enable_itm(&dp.DBGMCU, &mut cp.DCB, &mut cp.ITM); logger::enable_itm(&dp.DBGMCU, &mut cp.DCB, &mut cp.ITM);
} }
logger::init(); 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 gpioa = dp.GPIOA.split(ccdr.peripheral.GPIOA);
let gpiob = dp.GPIOB.split(ccdr.peripheral.GPIOB); 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 cpld = CPLD::new(spi, (cs0, cs1, cs2), io_update);
let parts = cpld.split(); 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 parts.spi1, parts.spi2, parts.spi3, parts.spi4, parts.spi5, parts.spi6, parts.spi7
); );

View File

@ -42,6 +42,7 @@ macro_rules! construct_bitmask {
assert!(arg < (2 << self.get_width())); assert!(arg < (2 << self.get_width()));
(arg << (self.get_shift() % ((size_of::<$unsigned_type>() as u8) * 8))) (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) { pub(crate) fn set_data_by_arg(self, data: &mut $unsigned_type, arg: $unsigned_type) {
// Clear bits in field, then insert shifted argument // Clear bits in field, then insert shifted argument
*data &= (!self.get_bitmask()); *data &= (!self.get_bitmask());

View File

@ -1,17 +1,9 @@
use embedded_hal::{ use embedded_hal::{
digital::v2::{OutputPin, InputPin}, digital::v2::{OutputPin, InputPin},
blocking::spi::Transfer, blocking::spi::Transfer,
blocking::delay::{DelayMs, DelayUs}, blocking::delay::DelayUs,
}; };
use log::info;
use cortex_m;
use cortex_m::asm::nop;
use cortex_m_rt::entry;
use core::ptr;
use nb::block;
use log::{warn, debug};
#[derive(Debug)] #[derive(Debug)]
pub enum FPGAFlashError { pub enum FPGAFlashError {
@ -91,10 +83,10 @@ pub fn flash_ice40_fpga<SPI: Transfer<u8>,
_ => return Err(FPGAFlashError::ResetStatusError), _ => 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) // 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)?; spi.transfer(&mut dummy_13_bytes).map_err(|_| FPGAFlashError::SPICommunicationError)?;
debug!("User I/O pins activated."); info!("User I/O pins activated.");
Ok(()) Ok(())
} }

View File

@ -2,8 +2,6 @@ use embedded_hal::{
blocking::spi::Transfer, blocking::spi::Transfer,
digital::v2::OutputPin, digital::v2::OutputPin,
}; };
use core::marker::PhantomData;
use crate::cpld::CPLD; use crate::cpld::CPLD;
use crate::Error; use crate::Error;