Add Renderfunction and Rainbow

ref #147

Author: Isabell Zorr

src/core/nRF52832/main.adb

@@ -19,6 +19,23 @@ is
    begin
       return S;
    end F;
+
+   procedure Rainbow (Color : Output.Pixel; Line : Natural);
+   procedure Rainbow (Color : Output.Pixel; Line : Natural) is
+   begin
+      for I in Line .. Line + 39 loop
+         Output.Render (I, 0, 1, 120, (1 .. 120 => Color));
+         Output.Render (I, 120, 1, 120, (1 .. 120 => Color));
+      end loop;
+   end Rainbow;
+
+   Red    : constant Output.Pixel := (255, 0, 24);
+   Orange : constant Output.Pixel := (255, 165, 44);
+   Yellow : constant Output.Pixel := (255, 255, 65);
+   Green  : constant Output.Pixel := (0, 128, 24);
+   Blue   : constant Output.Pixel := (0, 0, 249);
+   Purple : constant Output.Pixel := (134, 0, 125);
+
 begin
    Spi.Initialize;
    Output.Initialize;
@@ -31,14 +48,20 @@ begin
    Debug.Log_Debug ("Testing secondary stack...");
    Debug.Log_Debug (F (64));
    Debug.Log_Debug ("Finished.");
-   for I in 0 .. 239 loop
-      for J in 0 .. 239 loop
-         Output.Draw_Pixel (I, J, (Output.Color (J), Output.Color (I), Output.Color (J)));
+   for I in 0 .. 23 loop
+      for J in 0 .. 23 loop
+         Output.Render (I * 10, J * 10, 10, 10,
+                        (1 .. 100 => (Output.Color (J * 10),
+                                      Output.Color ((I + J) * 5),
+                                      Output.Color (I * 10))));
       end loop;
    end loop;
-   --  Output.Draw_Pixel (0, 0, (255, 0, 0));
-   --  Output.Draw_Pixel (0, 0, (0, 255, 0));
-   --  Output.Draw_Pixel (0, 0, (0, 0, 255));
+   Rainbow (Red, 0);
+   Rainbow (Orange, 40);
+   Rainbow (Yellow, 80);
+   Rainbow (Green, 120);
+   Rainbow (Blue, 160);
+   Rainbow (Purple, 200);
    Debug.Log_Debug ("There should be a Pixel");
-   Output.Turn_Off;
+   --  Output.Turn_Off;
 end Main;

src/core/nRF52832/st7789.adb

@@ -49,7 +49,7 @@ package body ST7789 is
       Write_CMD (SLPOUT);
       Write_Color_Mode (COLMOD, RGB565);
       Write_Data (MADCTL, MLRGB);
-      Set_Window (0, 240, 0, 240);
+      Set_Window (0, 239, 0, 239);
       Write_CMD (INVON);
       Write_CMD (NORON);
       Write_CMD (DISPON);
@@ -75,7 +75,8 @@ package body ST7789 is
       end if;
    end Write_CMD;
 
-   procedure Set_Window (X0 : Integer; Y0 : Integer; X1 : Integer; Y1 : Integer) is
+   procedure Set_Window (X0 : Display_Index; Y0 : Display_Index;
+                         X1 : Display_Index; Y1 : Display_Index) is
       type Buf is array (Positive range <>) of Byte;
       procedure Send is new Spi.Send (Byte, Positive, Buf);
       Buffer : Buf (1 .. 4);
@@ -100,7 +101,7 @@ package body ST7789 is
       Write_CMD (RAMWR);
    end Set_Window;
 
-   function Color_To_Byte (A : Color_Buffer) return Data_Buffer is
+   function Color_To_Byte (A : Frame) return Data_Buffer is
       use type Interfaces.Unsigned_8;
       Buf : Data_Buffer (1 .. A'Length * 2);
       I2  : Natural;
@@ -114,35 +115,17 @@ package body ST7789 is
       return Buf;
    end Color_To_Byte;
 
-   procedure Draw_Pixel (X : Integer; Y : Integer; C : Pixel) is
-      procedure Send_Color is new Spi.Send (Byte, Positive, Data_Buffer);
-      Buffer : Data_Buffer := Color_To_Byte ((1 => C));
+   procedure Render (X : Natural; Y : Natural; Width : Positive;
+                     Height : Positive; Window : Frame) is
+      Buffer : Data_Buffer := Color_To_Byte (Window);
+      procedure Render_Send is new Spi.Send (Byte, Positive, Data_Buffer);
    begin
-      --  Serial.Print ("Draw_Pixel" & ASCII.CR & ASCII.LF);
-      Set_Window (X, Y, X, Y);
+      Set_Window (Display_Index (X), Display_Index (Y),
+                  Display_Index (X + Width - 1), Display_Index (Y + Height - 1));
       GPIO.Write (DC_PIN, GPIO.High);
       GPIO.Write (CS_PIN, GPIO.Low);
-      Send_Color (Buffer);
+      Render_Send (Buffer);
       GPIO.Write (CS_PIN, GPIO.High);
-   end Draw_Pixel;
-
-   --  procedure Fill_Color_Buffer (C : Color; L : Integer) is
-   --     Buffer_Pixel : constant Integer := 128;
-   --     Chunks       : Integer          := Length / Buffer_Pixel;
-   --     Rest         : Integer          := Length mod Buffer_Pixel;
-   --  begin
-   --     null;
-   --  end Fill_Color_Buffer;
-   --
-   --  procedure Fill_Rect (X : Integer; Y : Integer; C : Color) is
-   --     W : Integer := Display.WIDTH;
-   --     H : Integer := Display.HEIGHT;
-   --  begin
-   --     Set_Window (X, Y, (X + W - 1), (Y + H - 1));
-   --     GPIO.Write (DC_PIN, GPIO.High);
-   --     GPIO.Write (CS_PIN, GPIO.Low);
-   --     Fill_Color_Buffer (C, (W * H));
-   --     GPIO.Write (CS_PIN, GPIO.High);
-   --  end Fill_Rect;
+   end Render;
 
 end ST7789;

src/core/nRF52832/st7789.ads

@@ -23,10 +23,18 @@ is
       Blue  : Color;
    end record;
 
-   procedure Draw_Pixel (X : Integer; Y : Integer; C : Pixel);
-
    procedure Turn_Off;
 
+   type Frame is array (Positive range <>) of Pixel;
+
+   procedure Render (X : Natural; Y : Natural; Width : Positive; Height : Positive;
+                     Window : Frame) with
+     Pre => X <= 240
+     and then Y <= 240
+     and then X + Width - 1 <= 240
+     and then Y + Height - 1 <= 240
+     and then Window'Length = Width * Height;
+
 private
 
    type Color_Mode is (RGB565) with
@@ -80,27 +88,35 @@ private
       type Data is private;
    procedure Write_Data_CMD (Cmd : Command; D : Data);
 
-   procedure Set_Window (X0 : Integer;
-                         Y0 : Integer;
-                         X1 : Integer;
-                         Y1 : Integer);
+   type Display_Size is range 0 .. 240;
+   subtype Display_Index is Display_Size range 0 .. 239;
+
+   procedure Set_Window (X0 : Display_Index;
+                         Y0 : Display_Index;
+                         X1 : Display_Index;
+                         Y1 : Display_Index) with
+     Pre => X0 <= 240
+     and then X1 <= 240
+     and then X0 <= X1
+     and then Y0 <= 240
+     and then Y1 <= 240
+     and then Y0 <= Y1;
 
    procedure Hard_Reset;
 
    procedure Soft_Reset;
 
    type Display is record
-      WIDTH  : Integer;
-      HEIGHT : Integer;
-      XSTART : Integer;
-      YSTART : Integer;
+      WIDTH  : Display_Size;
+      HEIGHT : Display_Size;
+      XSTART : Display_Index;
+      YSTART : Display_Index;
    end record;
 
    subtype Byte is Interfaces.Unsigned_8;
    type Data_Buffer is array (Positive range <>) of Byte;
-   type Color_Buffer is array (Positive range <>) of Pixel;
 
-   function Color_To_Byte (A : Color_Buffer) return Data_Buffer;
+   function Color_To_Byte (A : Frame) return Data_Buffer;
 
    --  procedure Fill_Color_Buffer (C : Color;
    --                               L : Integer);