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

Compare commits

base: finga:027a3b3444dfc0794b4d3e6a292509ef5f147d1e
Branches Tags
finga:main
..
compare: finga:3f19ad6ee9f8f78bd351fc0806d99a1ce3360517
Branches Tags
finga:main

No commits in common. "027a3b3444dfc0794b4d3e6a292509ef5f147d1e" and "3f19ad6ee9f8f78bd351fc0806d99a1ce3360517" have entirely different histories.
027a3b3444 ... 3f19ad6ee9

3 changed files with 9 additions and 17 deletions
Show stats Expand all files Collapse all files

7
.woodpecker.yml
View file

@ -26,10 +26,3 @@ pipeline:
commands: commands:
- cd firmware/rust/ - cd firmware/rust/
- cargo build --all-features - cargo build --all-features
build_release:
group: default
image: rust_avr
commands:
- cd firmware/rust/
- cargo build --all-features --release

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

@ -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
block!(eeprom::read_byte(&CONTRAST)).unwrap(), // (9) Set Electronic Volume: Set Contrast nb::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,6 +1,5 @@
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,
@ -20,8 +19,8 @@ impl Setup {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
active: Selection::Backlight, active: Selection::Backlight,
backlight: block!(eeprom::read_byte(&BACKLIGHT)).unwrap(), backlight: nb::block!(eeprom::read_byte(&BACKLIGHT)).unwrap(),
contrast: block!(eeprom::read_byte(&CONTRAST)).unwrap(), contrast: nb::block!(eeprom::read_byte(&CONTRAST)).unwrap(),
} }
} }
@ -53,12 +52,12 @@ impl Setup {
return Event::Backlight(self.backlight); return Event::Backlight(self.backlight);
} }
Input::Select => { Input::Select => {
block!(eeprom::write_byte(&BACKLIGHT, self.backlight)).unwrap(); nb::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 = block!(eeprom::read_byte(&BACKLIGHT)).unwrap(); self.backlight = nb::block!(eeprom::read_byte(&BACKLIGHT)).unwrap();
return Event::Backlight(self.backlight); return Event::Backlight(self.backlight);
} }
}, },
@ -88,12 +87,12 @@ impl Setup {
return Event::Contrast(self.contrast); return Event::Contrast(self.contrast);
} }
Input::Select => { Input::Select => {
block!(eeprom::write_byte(&CONTRAST, self.contrast)).unwrap(); nb::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 = block!(eeprom::read_byte(&CONTRAST)).unwrap(); self.contrast = nb::block!(eeprom::read_byte(&CONTRAST)).unwrap();
return Event::Contrast(self.contrast); return Event::Contrast(self.contrast);
} }
}, },