tmeissner
/
raspberrypi
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

new record type for bmp-image data; new procedure read_bmp() for read and check bmp picture

master
T. Meissner 11 years ago
parent
9121f2a3c1
commit
a3b4148aa7
2 changed files with 69 additions and 44 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +45
    -23
      st7565-lcd/st7565lcd.adb
  2. +24
    -21
      st7565-lcd/st7565lcd.ads

+ 45
- 23
st7565-lcd/st7565lcd.adb View File

@ -1,21 +1,3 @@
-- raspilcd, a simple tool to display bmp pictures & text on a ST7565 LCD
-- Copyright (C) 2014 Torsten Meissner
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see http://www.gnu.org/licenses/.
with Interfaces;
use Interfaces;
with Interfaces.C;
@ -24,6 +6,8 @@ with Interfaces.C.extensions;
use Interfaces.C.extensions;
with bcm2835_h;
use bcm2835_h;
with Ada.Text_IO;
use Ada.Text_IO;
@ -152,7 +136,7 @@ package body st7565lcd is
end lcd_byte;
function bmp_to_lcd (bmp : t_bmp_array; color_mask : t_color_mask) return t_lcd_array is
function bmp_to_lcd (bmp_picture : t_bmp_picture) return t_lcd_array is
lcd : t_lcd_array := (others => 16#00#);
logic : byte;
begin
@ -160,9 +144,9 @@ package body st7565lcd is
logic := 16#01#;
for outdex in 0 .. 7 loop
for index in 0 .. 127 loop
if ((bmp(aussen * 1024 + outdex * 128 + index)(which_byte(color_mask.red)) or
bmp(aussen * 1024 + outdex * 128 + index)(which_byte(color_mask.green)) or
bmp(aussen * 1024 + outdex * 128 + index)(which_byte(color_mask.blue))) < 16#77#) then
if ((bmp_picture.data(aussen * 1024 + outdex * 128 + index)(which_byte(bmp_picture.mask.red)) or
bmp_picture.data(aussen * 1024 + outdex * 128 + index)(which_byte(bmp_picture.mask.green)) or
bmp_picture.data(aussen * 1024 + outdex * 128 + index)(which_byte(bmp_picture.mask.blue))) < 16#88#) then
lcd(aussen * 128 + index) := lcd(aussen * 128 + index) or logic;
end if;
end loop;
@ -185,9 +169,47 @@ package body st7565lcd is
when 16#FF000000# =>
return 3;
when others =>
return -1;
raise mask_exception;
end case;
end which_byte;
-- read_bmp : read a bmp file in t_bmp_picture record
procedure read_bmp (file : in Ada.Streams.Stream_IO.File_Type;
file_access : access Ada.Streams.Root_Stream_Type'Class;
bmp_picture : in out t_bmp_picture) is
begin
-- read header
t_bmp_header'Read(file_access, bmp_picture.header);
-- check for valid header
if (abs bmp_picture.header.biHeight /= 64 or bmp_picture.header.biWidth /= 128 or
(bmp_picture.header.biCompression /= 0 and bmp_picture.header.biCompression /= 3) or
bmp_picture.header.biBitCount /= 32) then
raise bmp_exception;
end if;
-- get color map if existing
if bmp_picture.header.biCompression = 3 then
t_color_mask'Read(file_access, bmp_picture.mask);
end if;
-- read in image data
if bmp_picture.header.biHeight < 0 then
-- top-down pixel matrix
for index in bmp_picture.data'range loop
if not Ada.Streams.Stream_IO.End_Of_File(file) then
t_byte_array'Read(file_access, bmp_picture.data(index));
end if;
end loop;
else
-- bottom-top pixel matrix
for row in reverse 0 .. 63 loop
for column in 0 .. 127 loop
if not Ada.Streams.Stream_IO.End_Of_File(file) then
t_byte_array'Read(file_access, bmp_picture.data(row * 128 + column));
end if;
end loop;
end loop;
end if;
end read_bmp;
end st7565lcd;

+ 24
- 21
st7565-lcd/st7565lcd.ads View File

@ -1,23 +1,7 @@
-- raspilcd, a simple tool to display bmp pictures & text on a ST7565 LCD
-- Copyright (C) 2014 Torsten Meissner
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see http://www.gnu.org/licenses/.
with Interfaces;
with Interfaces.C;
with Ada.Streams.Stream_IO;
package st7565lcd is
@ -32,7 +16,7 @@ package st7565lcd is
type t_font_array is array (natural range <>) of t_byte_array (0 .. 4);
type t_bmp_array is array (natural range <>) of t_byte_array (0 .. 3);
type t_bmp_array is array (0 .. 128 * 64 - 1) of t_byte_array (0 .. 3);
subtype t_lcd_array is t_byte_array (0 .. 128 * 8 - 1);
@ -64,6 +48,13 @@ package st7565lcd is
alpha : dword := 16#FF000000#;
end record;
-- bmp record
type t_bmp_picture is record
header : t_bmp_header;
mask : t_color_mask;
data : t_bmp_array;
end record;
-- character set
font_5x7 : constant t_font_array (32 .. 126) := (
@ -261,7 +252,14 @@ package st7565lcd is
LCD_SI : constant Interfaces.C.unsigned_char := 17;
-- procedures declarations
-- exceptions
mask_exception : exception;
bmp_exception : exception;
exception_head : string := "raspi-lcd version 0.1, (c) 2014 by tmeissner";
-- procedure declarations
procedure io_init;
procedure lcd_init;
procedure lcd_ascii57_string (xpos : natural; ypos : natural; data : string);
@ -271,8 +269,13 @@ package st7565lcd is
procedure lcd_set_page (page : natural; column : natural);
procedure lcd_transfer_data (value : byte; si : boolean);
procedure lcd_byte (data : byte);
procedure read_bmp (file : in Ada.Streams.Stream_IO.File_Type;
file_access : access Ada.Streams.Root_Stream_Type'Class;
bmp_picture : in out t_bmp_picture);
function bmp_to_lcd (bmp : t_bmp_array; color_mask : t_color_mask) return t_lcd_array;
-- function declarations
function bmp_to_lcd (bmp_picture : t_bmp_picture) return t_lcd_array;
function which_byte (data : dword) return integer;


Write Preview
Loading…
Cancel
Save