From 027a3b3444dfc0794b4d3e6a292509ef5f147d1e Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Fri, 8 Apr 2022 01:26:30 +0200
Subject: [PATCH] fw-rust: Remove module prefix if already used.

Now, use everywhere `block!` instead of `nb::block!`, except when only
used once.
---
 firmware/rust/src/lcd.rs          |  6 +++---
 firmware/rust/src/screen/setup.rs | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/firmware/rust/src/lcd.rs b/firmware/rust/src/lcd.rs
index 9c77a19..d6d86d0 100644
--- a/firmware/rust/src/lcd.rs
+++ b/firmware/rust/src/lcd.rs
@@ -25,8 +25,8 @@ impl Lcd {
         self.rst.set_high();
 
         let init_sequence = [
-            0x40,                                              // (6)  Set Scroll Line: Display start line 0
-            0xA1, // (13) Set SEG direction: SEG reverse
+            0x40,                                          // (6)  Set Scroll Line: Display start line 0
+            0xA1,                                          // (13) Set SEG direction: SEG reverse
             0xC0, // (14) Set COM direction: Normal COM0 - COM63
             0xA6, // (11) Set Inverse Display: Display inverse off
             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
             0xEE, // (18) Reset Cursor Update Mode
             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
             0x90, // (25) Set Adv. Program Control 0: Set Temperature compensation curve to -0.11%/°C
             0xAF, // (12) Set Display Enable: Display on
diff --git a/firmware/rust/src/screen/setup.rs b/firmware/rust/src/screen/setup.rs
index 91cb2e2..37946e0 100644
--- a/firmware/rust/src/screen/setup.rs
+++ b/firmware/rust/src/screen/setup.rs
@@ -1,5 +1,6 @@
 use super::{Event, Home, Screens};
 use crate::{eeprom, lcd::Lcd, Input, BACKLIGHT, CONTRAST};
+use nb::block;
 
 enum Selection {
     Backlight,
@@ -19,8 +20,8 @@ impl Setup {
     pub fn new() -> Self {
         Self {
             active: Selection::Backlight,
-            backlight: nb::block!(eeprom::read_byte(&BACKLIGHT)).unwrap(),
-            contrast: nb::block!(eeprom::read_byte(&CONTRAST)).unwrap(),
+            backlight: block!(eeprom::read_byte(&BACKLIGHT)).unwrap(),
+            contrast: block!(eeprom::read_byte(&CONTRAST)).unwrap(),
         }
     }
 
@@ -52,12 +53,12 @@ impl Setup {
                     return Event::Backlight(self.backlight);
                 }
                 Input::Select => {
-                    nb::block!(eeprom::write_byte(&BACKLIGHT, self.backlight)).unwrap();
+                    block!(eeprom::write_byte(&BACKLIGHT, self.backlight)).unwrap();
                     Selection::Backlight
                 }
                 Input::Back => {
                     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);
                 }
             },
@@ -87,12 +88,12 @@ impl Setup {
                     return Event::Contrast(self.contrast);
                 }
                 Input::Select => {
-                    nb::block!(eeprom::write_byte(&CONTRAST, self.contrast)).unwrap();
+                    block!(eeprom::write_byte(&CONTRAST, self.contrast)).unwrap();
                     Selection::Contrast
                 }
                 Input::Back => {
                     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);
                 }
             },