B1Display: Cleanup

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

b1display/src/main.rs

@@ -9,7 +9,6 @@ use cortex_m::delay::Delay;
 use defmt_rtt as _;
 use embedded_hal::digital::v2::{InputPin, OutputPin};
 
-use rp2040_hal::gpio::bank0::Gpio18;
 use rp2040_hal::gpio::{Output, Pin, PushPull};
 //#[cfg(debug_assertions)]
 //use panic_probe as _;
@@ -19,7 +18,7 @@ use embedded_graphics::pixelcolor::Rgb565;
 use embedded_graphics::prelude::*;
 use embedded_graphics::primitives::*;
 use embedded_hal::blocking::spi;
-use st7306_lcd::{Orientation, ST7306};
+use st7306_lcd::ST7306;
 
 // Provide an alias for our BSP so we can switch targets quickly.
 // Uncomment the BSP you included in Cargo.toml, the rest of the code does not need to change.
@@ -29,9 +28,8 @@ use lotus_inputmodules::lotus_lcd_hal as bsp;
 
 use bsp::hal::{
     clocks::{init_clocks_and_plls, Clock},
-    pac,
+    gpio, pac,
     sio::Sio,
-    gpio,
     usb,
     watchdog::Watchdog,
     Timer,
@@ -151,30 +149,35 @@ fn main() -> ! {
         Pin<gpio::bank0::Gpio21, Output<PushPull>>,
         25,
         200,
-    > = ST7306::new(spi, dc, cs, rst, false, 300, 460);
+    > = ST7306::new(spi, dc, cs, rst, false, 300, 400);
     disp.init(&mut delay).unwrap();
 
-    disp.clear(Rgb565::BLACK).unwrap();
+    // TODO: Seems broken
+    //disp.clear(Rgb565::WHITE).unwrap();
+    Rectangle::new(Point::new(0, 0), Size::new(300, 400))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .draw(&mut disp)
+        .unwrap();
 
     let logo_rect = draw_logo(&mut disp).unwrap();
     Rectangle::new(Point::new(10, 10), Size::new(10, 10))
-        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
         .draw(&mut disp)
         .unwrap();
     Rectangle::new(Point::new(20, 20), Size::new(10, 10))
-        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
         .draw(&mut disp)
         .unwrap();
     Rectangle::new(Point::new(30, 30), Size::new(10, 10))
-        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
         .draw(&mut disp)
         .unwrap();
     Rectangle::new(Point::new(40, 40), Size::new(10, 10))
-        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
         .draw(&mut disp)
         .unwrap();
     Rectangle::new(Point::new(50, 50), Size::new(10, 10))
-        .into_styled(PrimitiveStyle::with_fill(Rgb565::WHITE))
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
         .draw(&mut disp)
         .unwrap();
     draw_text(
@@ -235,11 +238,11 @@ fn main() -> ! {
                 Ok(count) => {
                     if let Some(command) = parse_command(count, &buf) {
                         if let Command::Sleep(go_sleeping) = command {
-                            handle_sleep(host_sleeping, &mut state, &mut delay, &mut disp);
+                            handle_sleep(go_sleeping, &mut state, &mut delay, &mut disp);
                         } else if let SleepState::Awake = state.sleeping {
                             // While sleeping no command is handled, except waking up
                             //handle_command(&command, &mut disp, logo_rect);
-                            if let Some(response) = handle_command(&command, &mut disp, logo_rect) {
+                            if let Some(response) = handle_command(&command, logo_rect, &mut disp) {
                                 let _ = serial.write(&response);
                             };
                         }
@@ -266,10 +269,9 @@ fn handle_sleep<SPI, DC, CS, RST, const COLS: usize, const ROWS: usize>(
         (SleepState::Awake, false) => (),
         (SleepState::Awake, true) => {
             state.sleeping = SleepState::Sleeping;
-            //state.grid = display_sleep();
 
-            // Turn off backlight
-            disp.on_off(false);
+            // Turn off display
+            disp.on_off(false).unwrap();
 
             // TODO: Power Display controller down
 
@@ -281,8 +283,10 @@ fn handle_sleep<SPI, DC, CS, RST, const COLS: usize, const ROWS: usize>(
             // Restore back grid before sleeping
             state.sleeping = SleepState::Awake;
 
+            // Turn display back on
+            disp.on_off(true).unwrap();
+
             // TODO: Power display controller back on
-            disp.on_off(true);
         }
     }
 }

control.py

@@ -105,6 +105,14 @@ def main():
                         help="Get device version", action="store_true")
     parser.add_argument("--serial-dev", help="Change the serial dev. Probably /dev/ttyACM0 on Linux, COM0 on Windows",
                         default='/dev/ttyACM0')
+
+    parser.add_argument(
+        "--disp-str", help="Display a string on the LCD Display", type=str)
+    parser.add_argument("--display-on", help="Control display power",
+                        action=argparse.BooleanOptionalAction)
+    parser.add_argument("--invert-screen", help="Invert display",
+                        action=argparse.BooleanOptionalAction)
+
     args = parser.parse_args()
 
     if args.serial_dev is not None:
@@ -179,6 +187,12 @@ def main():
         show_string(args.string)
     elif args.symbols is not None:
         show_symbols(args.symbols)
+    elif args.disp_str is not None:
+        display_string(args.disp_str)
+    elif args.display_on is not None:
+        display_on_cmd(args.display_on)
+    elif args.invert_screen is not None:
+        invert_screen_cmd(args.invert_screen)
     elif args.version:
         version = get_version()
         print(f"Device version: {version}")
@@ -922,6 +936,23 @@ def gui():
 
     window.close()
 
+
+def display_string(disp_str):
+    b = [ord(x) for x in disp_str]
+    command = FWK_MAGIC + [0x09, len(disp_str)] + b
+    send_command(command)
+
+
+def display_on_cmd(on):
+    command = FWK_MAGIC + [0x014, int(on)]
+    send_command(command)
+
+
+def invert_screen_cmd(invert):
+    command = FWK_MAGIC + [0x015, int(invert)]
+    send_command(command)
+
+
 # 5x6 symbol font. Leaves 2 pixels on each side empty
 # We can leave one row empty below and then the display fits 5 of these digits.
 

lotus-inputmodules/src/control.rs

@@ -1,27 +1,25 @@
 use rp2040_hal::rom_data::reset_to_usb_boot;
 
+use crate::serialnum::{device_release, is_pre_release};
+
 #[cfg(feature = "b1display")]
 use crate::graphics::*;
 #[cfg(feature = "b1display")]
 use core::fmt::{Debug, Write};
 #[cfg(feature = "b1display")]
 use embedded_graphics::{
     pixelcolor::Rgb565,
-    prelude::{DrawTarget, Point, RgbColor},
+    prelude::{Point, RgbColor},
     primitives::Rectangle,
 };
 #[cfg(feature = "b1display")]
+use embedded_hal::blocking::spi;
+#[cfg(feature = "b1display")]
+use embedded_hal::digital::v2::OutputPin;
+#[cfg(feature = "b1display")]
 use heapless::String;
-use rp2040_hal::{
-    gpio::{bank0::*, Output, Pin, PushPull},
-    pac::SPI0,
-    spi::Enabled,
-    usb::UsbBus,
-    Spi,
-};
+#[cfg(feature = "b1display")]
 use st7306_lcd::{instruction::Instruction, ST7306};
-use tinybmp::Bmp;
-use usbd_serial::SerialPort;
 
 #[cfg(feature = "ledmatrix")]
 use crate::games::pong;
@@ -31,14 +29,10 @@ use crate::games::snake;
 use crate::matrix::*;
 #[cfg(feature = "ledmatrix")]
 use crate::patterns::*;
-use crate::serialnum::{device_release, is_pre_release};
 
 #[cfg(feature = "c1minimal")]
 use smart_leds::{SmartLedsWrite, RGB8};
 
-const WIDTH: usize = 300;
-const HEIGHT: usize = 400;
-
 pub enum _CommandVals {
     _Brightness = 0x00,
     _Pattern = 0x01,
@@ -408,10 +402,17 @@ pub fn handle_command(
 }
 
 #[cfg(feature = "b1display")]
-pub fn handle_command<D>(command: &Command, disp: &mut D, logo_rect: Rectangle) -> Option<[u8; 32]>
+pub fn handle_command<SPI, DC, CS, RST, const COLS: usize, const ROWS: usize>(
+    command: &Command,
+    logo_rect: Rectangle,
+    disp: &mut ST7306<SPI, DC, CS, RST, COLS, ROWS>,
+) -> Option<[u8; 32]>
 where
-    D: DrawTarget<Color = Rgb565>,
-    <D as DrawTarget>::Error: Debug,
+    SPI: spi::Write<u8>,
+    DC: OutputPin,
+    CS: OutputPin,
+    RST: OutputPin,
+    <SPI as spi::Write<u8>>::Error: Debug,
 {
     match command {
         Command::BootloaderReset => {
@@ -428,7 +429,7 @@ where
             clear_text(
                 disp,
                 Point::new(LOGO_OFFSET_X, LOGO_OFFSET_Y + logo_rect.size.height as i32),
-                Rgb565::WHITE
+                Rgb565::WHITE,
             )
             .unwrap();
 
@@ -440,25 +441,19 @@ where
             .unwrap();
             None
         }
-        //Command::DisplayOn(on) => {
-        //    disp.on_off(*on);
-        //    None
-        //    //if *on {
-        //    //    disp.write_command(Instruction::DISPON, &[]).unwrap();
-        //    //} else {
-        //    //    disp.write_command(Instruction::DISPOFF, &[]).unwrap();
-        //    //}
-        //}
-        //Command::InvertScreen(invert) => {
-        //    if *invert {
-        //        //let _ = serial.write("INVON\n\r".as_bytes());
-        //        disp.write_command(Instruction::INVON, &[]).unwrap();
-        //    } else {
-        //        //let _ = serial.write("INVOFF\n\r".as_bytes());
-        //        disp.write_command(Instruction::INVOFF, &[]).unwrap();
-        //    }
-        //}
-        _ => return handle_generic_command(command),
+        Command::DisplayOn(on) => {
+            disp.on_off(*on).unwrap();
+            None
+        }
+        Command::InvertScreen(invert) => {
+            if *invert {
+                disp.write_command(Instruction::INVON, &[]).unwrap();
+            } else {
+                disp.write_command(Instruction::INVOFF, &[]).unwrap();
+            }
+            None
+        }
+        _ => handle_generic_command(command),
     }
 }
 

lotus-inputmodules/src/graphics.rs

@@ -32,9 +32,9 @@ where
     D: DrawTarget<Color = Rgb565>,
 {
     let text = Text::new(
-        &target_text,
+        target_text,
         Point::new(30, 30) + offset,
-        MonoTextStyle::new(&FONT_9X15, Rgb565::WHITE),
+        MonoTextStyle::new(&FONT_9X15, Rgb565::BLACK),
     );
 
     text.draw(target)?;