finga/clock_generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fw-rust: Use DefaultClock type alias everywhere
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
finga 2022-04-02 18:48:23 +02:00
parent b51511dbab
commit 791a0a0245
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
firmware/rust/src/lcd.rs
View file

@ -1,5 +1,4 @@
use atmega_hal::{
clock::MHz8,
delay::Delay,
port::{mode::Output, Pin, PB0, PB1},
Spi,
@ -8,7 +7,7 @@ use core::convert::TryInto;
use embedded_hal::{blocking::delay::DelayMs, spi::FullDuplex};
use nb::block;
use crate::{assets::SYMBOL_TABLE, eeprom, CONTRAST};
use crate::{assets::SYMBOL_TABLE, eeprom, DefaultClock, CONTRAST};
// TODO: Make `cd` and `rst` pins generic pins
pub struct Lcd {
@ -23,7 +22,7 @@ impl Lcd {
}
pub fn init(&mut self) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
// TODO: Test if delay is really needed
delay.delay_ms(1_u8);
@ -71,7 +70,7 @@ impl Lcd {
fn fill(&mut self, segment: u8, page: u8, width: u8, data: u8) {
assert!(segment + width <= 102);
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
self.move_cursor(segment, page);
@ -97,7 +96,7 @@ impl Lcd {
}
pub fn print(&mut self, segment: u8, page: u8, string: &str) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
for i in 0..2 {
self.move_cursor(segment, page + i);
@ -123,7 +122,7 @@ impl Lcd {
}
pub fn print_inverted(&mut self, segment: u8, page: u8, string: &str) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
for i in 0..2 {
self.move_cursor(segment, page + i);
@ -150,7 +149,7 @@ impl Lcd {
pub fn print_u8(&mut self, segment: u8, page: u8, digits: u8, data: u8) {
assert!(digits <= 3);
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
let mut array = [0usize; 3];
for (i, item) in array.iter_mut().enumerate() {
@ -183,7 +182,7 @@ impl Lcd {
pub fn print_u8_inverted(&mut self, segment: u8, page: u8, digits: u8, data: u8) {
assert!(digits <= 3);
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
let mut array = [0usize; 3];
for (i, item) in array.iter_mut().enumerate() {
@ -215,7 +214,7 @@ impl Lcd {
}
pub fn print_freq(&mut self, segment: u8, page: u8, data: u32) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
let mut array = [0usize; 9];
for (i, item) in array.iter_mut().enumerate() {
@ -269,7 +268,7 @@ impl Lcd {
}
pub fn print_freq_digit(&mut self, segment: u8, page: u8, data: u32, digit: u8) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
let mut array = [0usize; 9];
for (i, item) in array.iter_mut().enumerate() {
@ -342,7 +341,7 @@ impl Lcd {
}
pub fn print_icon(&mut self, segment: u8, page: u8, symbol: &[u8]) {
let mut delay = Delay::<MHz8>::new();
let mut delay = Delay::<DefaultClock>::new();
self.move_cursor(segment, page);
// TODO: This delay fixes issues, try find a better solution