一部処理の見直しと本文に合わせて処理内容を変更した。

Author: kotetuco

src/font_def.rs

@@ -4,7 +4,6 @@
 //
 
 // 8 x 16のフォントデータ
-#[allow(unused_imports)]
 pub static FONT_DATAS: [[u8; 16]; 256] = [
 [0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0],
 [0x0,0x0,0x38,0x44,0x82,0xaa,0xaa,0x82,0x82,0xaa,0x92,0x44,0x38,0x0,0x0,0x0],

src/lib.rs

@@ -22,26 +22,27 @@ pub extern "C" fn entry() {
     let graphics: Graphics = Graphics::new();
 
     // rectangle
-    graphics.draw_box(20, 20, 100, 100, &RGB::light_red());
-    graphics.draw_box(70, 50, 100, 100, &RGB::light_green());
-    graphics.draw_box(120, 80, 100, 100, &RGB::light_blue());
+    graphics.draw_box(0, 0, 240, 160, &RGB::dark_green());
 
     // circle
     let radius:u16 = 20;
-    graphics.draw_circle(graphics.width() - (radius + 1), (radius + 1), radius, &RGB::light_yellow());
+    graphics.draw_circle(graphics.width() - (radius + 1),
+                         (radius + 1),
+                         radius,
+                         &RGB::white());
 
     // character
-    graphics.draw_string("Hello, World!", 0, 0, &RGB::white());
+    graphics.draw_string("Hello, World!", 10, 10, &RGB::white());
 
     loop {}
 }
 
 fn init_graphic() {
     let ioram_address: u32 = 0x04000000;
+    let video_mode: *mut u8 = ioram_address as *mut u8;
+	let bg: *mut u8 = (ioram_address + 1) as *mut u8;
     unsafe {
-        let video_mode: *mut u8 = ioram_address as *mut u8;
         *video_mode = 0x03; // mode 3
-        let bg: *mut u8 = (ioram_address + 1) as *mut u8;
         *bg = 0x04; // BG2
     }
 }

src/rgb.rs

@@ -33,62 +33,62 @@ impl RGBDef for RGB {
     }
 
     fn light_red() -> RGB {
-        return RGB { r: 0xFF, g: 0x00, b: 0x00,};
+        return RGB { r: 0x1F, g: 0x00, b: 0x00,};
     }
 
     fn light_green() -> RGB {
-        return RGB { r: 0x00, g: 0xFF, b: 0x00,};
+        return RGB { r: 0x00, g: 0x1F, b: 0x00,};
     }
 
     fn light_yellow() -> RGB {
-        return RGB { r: 0xFF, g: 0xFF, b: 0x00,};
+        return RGB { r: 0x1F, g: 0x1F, b: 0x00,};
     }
 
     fn light_blue() -> RGB {
-        return RGB { r: 0x00, g: 0x00, b: 0xFF,};
+        return RGB { r: 0x00, g: 0x00, b: 0x1F,};
     }
 
     fn light_purple() -> RGB {
-        return RGB { r: 0xFF, g: 0x00, b: 0xFF,};
+        return RGB { r: 0x1F, g: 0x00, b: 0x1F,};
     }
 
     fn light_pale_blue() -> RGB {
-        return RGB { r: 0x00, g: 0xFF, b: 0xFF,};
+        return RGB { r: 0x00, g: 0x1F, b: 0x1F,};
     }
 
     fn white() -> RGB {
-        return RGB { r: 0xFF, g: 0xFF, b: 0xFF,};
+        return RGB { r: 0x1F, g: 0x1F, b: 0x1F,};
     }
 
     fn light_gray() -> RGB {
-        return RGB { r: 0xC6, g: 0xC6, b: 0xC6,};
+        return RGB { r: 0x0F, g: 0x0F, b: 0x0F,};
     }
 
     fn dark_red() -> RGB {
-        return RGB { r: 0x84, g: 0x00, b: 0x00,};
+        return RGB { r: 0x0F, g: 0x00, b: 0x00,};
     }
 
     fn dark_green() -> RGB {
-        return RGB { r: 0x00, g: 0x84, b: 0x00,};
+        return RGB { r: 0x00, g: 0x0F, b: 0x00,};
     }
 
     fn dark_yellow() -> RGB {
-        return RGB { r: 0x84, g: 0x84, b: 0x00,};
+        return RGB { r: 0x0F, g: 0x0F, b: 0x00,};
     }
 
     fn dark_blue() -> RGB {
-        return RGB { r: 0x00, g: 0x00, b: 0x84,};
+        return RGB { r: 0x00, g: 0x00, b: 0x0F,};
     }
 
     fn dark_purple() -> RGB {
-        return RGB { r: 0x84, g: 0x00, b: 0x84,};
+        return RGB { r: 0x0F, g: 0x00, b: 0x0F,};
     }
 
     fn dark_pale_blue() -> RGB {
-        return RGB { r: 0x00, g: 0x84, b: 0x84,};
+        return RGB { r: 0x0F, g: 0x0F, b: 0x0F,};
     }
 
     fn dark_gray() -> RGB {
-        return RGB { r: 0x84, g: 0x84, b: 0x84,};
+        return RGB { r: 0x07, g: 0x07, b: 0x07,};
     }
 }