Remove dead code

diff --git a/keywing/src/buffer.rs b/keywing/src/buffer.rs
index f334eb4d5d5338e97cb2158c07a5ff1414beba40..6898b68cee465f892220181ab4006560ac881a10 100644 (file)
--- a/keywing/src/buffer.rs
+++ b/keywing/src/buffer.rs
@@ -1,12 +1,10 @@
 use embedded_graphics::{
     drawable::Pixel,
-    geometry::{Point, Size},
+    geometry::Size,
     pixelcolor::{
         raw::{RawData, RawU16},
         Rgb565,
     },
-    primitives::Rectangle,
-    style::{PrimitiveStyle, Styled},
     DrawTarget,
 };
 
@@ -17,7 +15,10 @@ pub struct FrameBuffer<'a> {
 
 impl<'a> FrameBuffer<'a> {
     pub fn new(raw: &'a mut [[u16; 320]; 240]) -> Self {
-        Self { buf: raw, dirty: false }
+        Self {
+            buf: raw,
+            dirty: false,
+        }
     }
 
     pub fn inner(&mut self) -> Option<&[u16]> {

diff --git a/keywing/src/main.rs b/keywing/src/main.rs
index 15df83b6a085c773dc318c48a87743b1dfbc4af2..2397fa8931a081a9040f3b3617cbe59800ebac38 100644 (file)
--- a/keywing/src/main.rs
+++ b/keywing/src/main.rs
@@ -2,8 +2,7 @@
 #![no_main]
 
 // Panic provider crate
-use cortex_m;
-use panic_persist;
+use panic_persist as _;
 
 // Used to set the program entry point
 use cortex_m_rt::entry;
@@ -13,18 +12,18 @@ use nrf52840_hal::{
     gpio::{p0::Parts as P0Parts, p1::Parts as P1Parts, Level},
     prelude::*,
     spim::{Frequency as SpimFrequency, Pins as SpimPins, MODE_0},
-    target::{CorePeripherals, Peripherals},
+    target::Peripherals,
     twim::{Frequency as TwimFrequency, Pins as TwimPins},
     Clocks, Rng, Spim, Timer, Twim,
 };
 
-use rtt_target::{rprint, rprintln, rtt_init_print};
+use rtt_target::{rprintln, rtt_init_print};
 
 use embedded_graphics::{
     fonts::{Font8x16, Text},
     pixelcolor::Rgb565,
     prelude::*,
-    style::{TextStyle, TextStyleBuilder},
+    style::TextStyleBuilder,
 };
 
 use bbq10kbd::{Bbq10Kbd, KeyRaw};
@@ -33,133 +32,6 @@ mod buffer;
 
 use ili9341::{Ili9341, Orientation};
 
-const TEXT_SAMPLE: &[&str] = &[
-    "for x in 0..10 {",
-    "  for y in 0..10 {",
-    "    let rand: u16 = rng.random_u16();",
-    "    buffy.iter_mut().for_each(|px| {",
-    "      *px = swap(rand)",
-    "    });",
-    "    lcd.draw_raw(",
-    "      32 * x,",
-    "      24 * y,",
-    "      (32 * (x + 1)) - 1,",
-    "      (24 * (y + 1)) - 1,",
-    "      &buffy,",
-    "    ).unwrap();",
-    "  }",
-    "}",
-];
-
-const TEXT_SAMPLE2: &[&[(i32, Rgb565, &str)]] = &[
-    // "for x in 0..10 {",
-    &[
-        (0, Rgb565::RED, "for "),
-        (4, Rgb565::WHITE, "x "),
-        (6, Rgb565::RED, "in "),
-        (9, Rgb565::MAGENTA, "0"),
-        (10, Rgb565::RED, ".."),
-        (12, Rgb565::MAGENTA, "10"),
-        (14, Rgb565::WHITE, " {"),
-    ],
-    // "  for y in 0..10 {",
-    &[
-        (2, Rgb565::RED, "for "),
-        (6, Rgb565::WHITE, "y "),
-        (8, Rgb565::RED, "in "),
-        (11, Rgb565::MAGENTA, "0"),
-        (12, Rgb565::RED, ".."),
-        (14, Rgb565::MAGENTA, "10"),
-        (16, Rgb565::WHITE, " {"),
-    ],
-    // "    let rand: u16 = rng.random_u16();",
-    &[
-        (4, Rgb565::CYAN, "let "),
-        (8, Rgb565::WHITE, "rand: "),
-        (14, Rgb565::CYAN, "u16 "),
-        (18, Rgb565::RED, "= "),
-        (20, Rgb565::WHITE, "rng."),
-        (24, Rgb565::CYAN, "random_u16"),
-        (34, Rgb565::WHITE, "();"),
-    ],
-    // "    buffy.iter_mut().for_each(|px| {",
-    &[
-        (4, Rgb565::WHITE, "buffy."),
-        (10, Rgb565::CYAN, "iter_mut"),
-        (18, Rgb565::WHITE, "()."),
-        (21, Rgb565::CYAN, "for_each"),
-        (29, Rgb565::WHITE, "(|"),
-        (31, Rgb565::YELLOW, "px"),
-        (33, Rgb565::WHITE, "| {"),
-    ],
-    // "      *px = swap(rand)",
-    &[
-        (6, Rgb565::RED, "*"),
-        (7, Rgb565::WHITE, "px "),
-        (10, Rgb565::RED, "= "),
-        (12, Rgb565::CYAN, "swap"),
-        (16, Rgb565::WHITE, "(rand)"),
-    ],
-    // "    });",
-    &[(4, Rgb565::WHITE, "});")],
-    // "    lcd.draw_raw(",
-    &[
-        (4, Rgb565::WHITE, "lcd."),
-        (8, Rgb565::CYAN, "draw_raw"),
-        (16, Rgb565::WHITE, "("),
-    ],
-    // "      32 * x,",
-    &[
-        (6, Rgb565::MAGENTA, "32 "),
-        (9, Rgb565::RED, "* "),
-        (11, Rgb565::WHITE, "x,"),
-    ],
-    // "      24 * y,",
-    &[
-        (6, Rgb565::MAGENTA, "24 "),
-        (9, Rgb565::RED, "* "),
-        (11, Rgb565::WHITE, "y,"),
-    ],
-    // "      (32 * (x + 1)) - 1,",
-    &[
-        (6, Rgb565::WHITE, "("),
-        (7, Rgb565::MAGENTA, "32 "),
-        (10, Rgb565::RED, "* "),
-        (12, Rgb565::WHITE, "(x "),
-        (15, Rgb565::RED, "+ "),
-        (17, Rgb565::MAGENTA, "1"),
-        (18, Rgb565::WHITE, ")) "),
-        (21, Rgb565::RED, "- "),
-        (23, Rgb565::MAGENTA, "1"),
-        (24, Rgb565::WHITE, ","),
-    ],
-    // "      (24 * (y + 1)) - 1,",
-    &[
-        (6, Rgb565::WHITE, "("),
-        (7, Rgb565::MAGENTA, "24 "),
-        (10, Rgb565::RED, "* "),
-        (12, Rgb565::WHITE, "(y "),
-        (15, Rgb565::RED, "+ "),
-        (17, Rgb565::MAGENTA, "1"),
-        (18, Rgb565::WHITE, ")) "),
-        (21, Rgb565::RED, "- "),
-        (23, Rgb565::MAGENTA, "1"),
-        (24, Rgb565::WHITE, ","),
-    ],
-    // "      &buffy,",
-    &[(6, Rgb565::RED, "&"), (7, Rgb565::WHITE, "buffy,")],
-    // "    ).unwrap();",
-    &[
-        (4, Rgb565::WHITE, ")."),
-        (6, Rgb565::CYAN, "unwrap"),
-        (12, Rgb565::WHITE, "();"),
-    ],
-    // "  }",
-    &[(2, Rgb565::WHITE, "}")],
-    // "}",
-    &[(0, Rgb565::WHITE, "}")],
-];
-
 #[entry]
 fn main() -> ! {
     match inner_main() {
@@ -169,12 +41,10 @@ fn main() -> ! {
 }
 
 fn inner_main() -> Result<(), &'static str> {
-    let mut board = Peripherals::take().ok_or("Error getting board!")?;
-    let mut corep = CorePeripherals::take().ok_or("Error")?;
+    let board = Peripherals::take().ok_or("Error getting board!")?;
     let mut timer = Timer::new(board.TIMER0);
     let mut delay = Timer::new(board.TIMER1);
-    let mut rng = Rng::new(board.RNG);
-    let mut toggle = false;
+    let mut _rng = Rng::new(board.RNG);
     let _clocks = Clocks::new(board.CLOCK).enable_ext_hfosc();
 
     // use ChannelMode::NoBlockS
@@ -190,7 +60,7 @@ fn inner_main() -> Result<(), &'static str> {
     let p1 = P1Parts::new(board.P1);
 
     let kbd_lcd_reset = p1.p1_08; // GPIO5, D5
-    let stm_cs = p0.p0_07; // GPIO6, D6,
+    let _stm_cs = p0.p0_07; // GPIO6, D6,
     let lcd_cs = p0.p0_26; // GPIO9, D9,
     let lcd_dc = p0.p0_27; // GPIO10, D10
 
@@ -209,8 +79,8 @@ fn inner_main() -> Result<(), &'static str> {
     let mut kbd = Bbq10Kbd::new(kbd_i2c);
 
     // Pull the neopixel lines low so noise doesn't make it turn on spuriously
-    let keywing_neopixel = p0.p0_06.into_push_pull_output(Level::Low); // GPIO11, D11
-    let feather_neopixel = p0.p0_16.into_push_pull_output(Level::Low);
+    let _keywing_neopixel = p0.p0_06.into_push_pull_output(Level::Low); // GPIO11, D11
+    let _feather_neopixel = p0.p0_16.into_push_pull_output(Level::Low);
 
     let spim = Spim::new(
         board.SPIM3,
@@ -248,8 +118,7 @@ fn inner_main() -> Result<(), &'static str> {
         .background_color(Rgb565::BLACK)
         .build();
 
-    let mut ctr: u8 = 0;
-    kbd.set_backlight(ctr).unwrap();
+    kbd.set_backlight(255).unwrap();
 
     let vers = kbd.get_version().unwrap();
 
@@ -262,9 +131,6 @@ fn inner_main() -> Result<(), &'static str> {
 
     rprintln!("Vers: {:?}", vers);
 
-    let mut cursor_y = 0;
-    let mut cursor_x = 0;
-
     let mut cursor = Cursor { x: 0, y: 0 };
 
     lcd.clear(Rgb565::BLACK).map_err(|_| "Fade to error")?;
@@ -350,23 +216,16 @@ fn inner_main() -> Result<(), &'static str> {
             KeyRaw::Invalid => {
                 if let Some(buf) = fbuffy.inner() {
                     timer.start(1_000_000u32);
-                    lcd.draw_raw(
-                        0, 0,
-                        319, 239,
-                        buf
-                    ).map_err(|_| "bad buffy")?;
+                    lcd.draw_raw(0, 0, 319, 239, buf).map_err(|_| "bad buffy")?;
                     let done = timer.read();
                     rprintln!("Drew in {}ms.", done / 1000);
                 } else {
                     timer.delay_ms(38u8);
                 }
-
             }
             _ => {}
         }
     }
-
-    Ok(())
 }
 
 struct Cursor {
@@ -420,31 +279,3 @@ impl Cursor {
         Point::new(self.x * 8, self.y * 16)
     }
 }
-
-// let key_raw = kbd.get_fifo_key_raw().unwrap();
-
-// match key_raw {
-//     KeyRaw::Invalid => {
-//         timer.delay_ms(1000u16);
-//         let state = kbd.get_key_status().unwrap();
-//         rprintln!("Key Status: {:?}", state);
-//     }
-//     key @ _ => {
-//         ctr = ctr.wrapping_add(5);
-//         rprintln!("Key: {:?} - {}", key, ctr);
-//         kbd.set_backlight(ctr).unwrap();
-//         assert_eq!(kbd.get_backlight().unwrap(), ctr);
-//     }
-// }
-
-// Special keys
-// LL: 6
-// LR: 17
-// RL: 7
-// RR: 18
-//
-// D-L: 3
-// D-U: 1
-// D-R: 4
-// D-D: 2
-// D-C: 5