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

fw-rust: Remove module prefix if already used.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Now, use everywhere `block!` instead of `nb::block!`, except when only
used once.
This commit is contained in:
finga 2022-04-08 01:26:30 +02:00
parent afc4edab59
commit 027a3b3444
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,8 @@ impl Lcd {
self.rst.set_high(); self.rst.set_high();
let init_sequence = [ let init_sequence = [
0x40, // (6) Set Scroll Line: Display start line 0 0x40, // (6) Set Scroll Line: Display start line 0
0xA1, // (13) Set SEG direction: SEG reverse 0xA1, // (13) Set SEG direction: SEG reverse
0xC0, // (14) Set COM direction: Normal COM0 - COM63 0xC0, // (14) Set COM direction: Normal COM0 - COM63
0xA6, // (11) Set Inverse Display: Display inverse off 0xA6, // (11) Set Inverse Display: Display inverse off
0xA2, // (17) Set LCD Bias Ratio: Set Bias 1/9 (Duty 1/65) 0xA2, // (17) Set LCD Bias Ratio: Set Bias 1/9 (Duty 1/65)
@ -34,7 +34,7 @@ impl Lcd {
0x27, // (8) Set VLCD Resistor Ratio: Set Contrast 0x27, // (8) Set VLCD Resistor Ratio: Set Contrast
0xEE, // (18) Reset Cursor Update Mode 0xEE, // (18) Reset Cursor Update Mode
0x81, // (9) Set Electronic Volume: Set Contrast 0x81, // (9) Set Electronic Volume: Set Contrast
nb::block!(eeprom::read_byte(&CONTRAST)).unwrap(), // (9) Set Electronic Volume: Set Contrast block!(eeprom::read_byte(&CONTRAST)).unwrap(), // (9) Set Electronic Volume: Set Contrast
0xFA, // (25) Set Adv. Program Control 0: Set Temperature compensation curve to -0.11%/°C 0xFA, // (25) Set Adv. Program Control 0: Set Temperature compensation curve to -0.11%/°C
0x90, // (25) Set Adv. Program Control 0: Set Temperature compensation curve to -0.11%/°C 0x90, // (25) Set Adv. Program Control 0: Set Temperature compensation curve to -0.11%/°C
0xAF, // (12) Set Display Enable: Display on 0xAF, // (12) Set Display Enable: Display on

13
firmware/rust/src/screen/setup.rs
View file

@ -1,5 +1,6 @@
use super::{Event, Home, Screens}; use super::{Event, Home, Screens};
use crate::{eeprom, lcd::Lcd, Input, BACKLIGHT, CONTRAST}; use crate::{eeprom, lcd::Lcd, Input, BACKLIGHT, CONTRAST};
use nb::block;
enum Selection { enum Selection {
Backlight, Backlight,
@ -19,8 +20,8 @@ impl Setup {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
active: Selection::Backlight, active: Selection::Backlight,
backlight: nb::block!(eeprom::read_byte(&BACKLIGHT)).unwrap(), backlight: block!(eeprom::read_byte(&BACKLIGHT)).unwrap(),
contrast: nb::block!(eeprom::read_byte(&CONTRAST)).unwrap(), contrast: block!(eeprom::read_byte(&CONTRAST)).unwrap(),
} }
} }
@ -52,12 +53,12 @@ impl Setup {
return Event::Backlight(self.backlight); return Event::Backlight(self.backlight);
} }
Input::Select => { Input::Select => {
nb::block!(eeprom::write_byte(&BACKLIGHT, self.backlight)).unwrap(); block!(eeprom::write_byte(&BACKLIGHT, self.backlight)).unwrap();
Selection::Backlight Selection::Backlight
} }
Input::Back => { Input::Back => {
self.active = Selection::Backlight; self.active = Selection::Backlight;
self.backlight = nb::block!(eeprom::read_byte(&BACKLIGHT)).unwrap(); self.backlight = block!(eeprom::read_byte(&BACKLIGHT)).unwrap();
return Event::Backlight(self.backlight); return Event::Backlight(self.backlight);
} }
}, },
@ -87,12 +88,12 @@ impl Setup {
return Event::Contrast(self.contrast); return Event::Contrast(self.contrast);
} }
Input::Select => { Input::Select => {
nb::block!(eeprom::write_byte(&CONTRAST, self.contrast)).unwrap(); block!(eeprom::write_byte(&CONTRAST, self.contrast)).unwrap();
Selection::Contrast Selection::Contrast
} }
Input::Back => { Input::Back => {
self.active = Selection::Contrast; self.active = Selection::Contrast;
self.contrast = nb::block!(eeprom::read_byte(&CONTRAST)).unwrap(); self.contrast = block!(eeprom::read_byte(&CONTRAST)).unwrap();
return Event::Contrast(self.contrast); return Event::Contrast(self.contrast);
} }
}, },