lcd 0.4

os/src/console.rs

@@ -1,6 +1,6 @@
 use core::fmt::{self, Write};
 
-use crate::scall_sbi::put_char;
+use crate::{driver::print_with_lcd, scall_sbi::put_char};
 
 struct STDOUT;
 
@@ -14,7 +14,8 @@ impl Write for STDOUT {
 }
 
 pub fn print(args: fmt::Arguments) {
-    STDOUT.write_fmt(args).unwrap();
+    // STDOUT.write_fmt(args).unwrap();
+    print_with_lcd(args);
 }
 
 #[macro_export]

os/src/driver/lcd/mod.rs

@@ -1,3 +1,5 @@
+use core::fmt;
+
 use k210_pac::SPI0;
 use lazy_static::*;
 use k210_hal::prelude::*;
@@ -21,12 +23,6 @@ mod console;
 pub fn init() {
 
     DRIVER.lock();
-    let mut image: ScreenImage = [0; DISP_PIXELS / 2];
-
-
-        CONSOLE.lock().render(&mut image);// render 会导致不执行 task
-        DRIVER.lock().flush(&image);
-        // lcd.draw_picture(0, 0, DISP_WIDTH, DISP_HEIGHT, &image);
 }
 
 
@@ -92,4 +88,12 @@ lazy_static!{
     lcd.clear(lcd_colors::BLUE);
         Mutex::new(lcd)
     };
+}
+
+pub fn print_with_lcd(args: fmt::Arguments){
+    let mut image: ScreenImage = [0; DISP_PIXELS / 2];
+    CONSOLE.lock().write_fmt(args).unwrap();
+
+    CONSOLE.lock().render(&mut image);// render 会导致不执行 task
+    DRIVER.lock().flush(&image);
 }

os/src/driver/mod.rs

@@ -4,3 +4,4 @@ pub fn init() {
     gpio::init();
     lcd::init();
 }
+pub use lcd::print_with_lcd;