From ba220a25307bcade839b8e7af3755d339dc5b68a Mon Sep 17 00:00:00 2001 From: Mason Ticehurst Date: Fri, 9 Feb 2024 15:38:36 -0500 Subject: [PATCH] Address compiler warnings --- eRINA_STM32F7/src/rina/debug.adb | 1 + eRINA_STM32F7/src/rina/debug.ads | 1 - eRINA_STM32F7/src/rina/gui.adb | 7 +++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/eRINA_STM32F7/src/rina/debug.adb b/eRINA_STM32F7/src/rina/debug.adb index 717ce5b..6a0a181 100644 --- a/eRINA_STM32F7/src/rina/debug.adb +++ b/eRINA_STM32F7/src/rina/debug.adb @@ -1,5 +1,6 @@ with Bitmapped_Drawing; with STM32.Board; +with GUI; package body Debug is diff --git a/eRINA_STM32F7/src/rina/debug.ads b/eRINA_STM32F7/src/rina/debug.ads index f0384a0..ed49745 100644 --- a/eRINA_STM32F7/src/rina/debug.ads +++ b/eRINA_STM32F7/src/rina/debug.ads @@ -1,6 +1,5 @@ with HAL.Bitmap; with BMP_Fonts; -with GUI; package Debug is type Debug is (Error, Warning, Info); diff --git a/eRINA_STM32F7/src/rina/gui.adb b/eRINA_STM32F7/src/rina/gui.adb index d78bdde..4867732 100644 --- a/eRINA_STM32F7/src/rina/gui.adb +++ b/eRINA_STM32F7/src/rina/gui.adb @@ -1,5 +1,4 @@ with Bitmapped_Drawing; -with HAL.Bitmap; with STM32.Board; with STM32.RNG.Interrupts; @@ -7,8 +6,8 @@ package body GUI is function Scale (Point : in HAL.Bitmap.Point) return HAL.Bitmap.Point is begin - if STM32.Board.LCD_Natural_Width > 480 then - return (Point.X * 800 / 480, Point.Y * 480 / 272); + if STM32.Board.LCD_Natural_Width > Board_Resolution.Width then + return (Point.X * 800 / Board_Resolution.Width, Point.Y * Board_Resolution.Width / Board_Resolution.Height); else return Point; end if; @@ -28,7 +27,7 @@ package body GUI is end Print; procedure Initialize (Title : in String) is - Title_Location : HAL.Bitmap.Point := (80, 10); + Title_Location : constant HAL.Bitmap.Point := (80, 10); begin STM32.RNG.Interrupts.Initialize_RNG; STM32.Board.Display.Initialize;