From 44ad184609c15f62d542b479889f1b78b0aebae3 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 18 Jan 2024 23:42:09 -0800 Subject: [PATCH 1/5] add WinForms sample --- .../Samples/WinForms_Sample/MeadowApp.cs | 60 +++++++++++++++++++ .../WinForms_Sample/WinForms_Sample.csproj | 12 ++++ Source/Meadow.Foundation.sln | 10 ++++ 3 files changed, 82 insertions(+) create mode 100644 Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs create mode 100644 Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs new file mode 100644 index 0000000000..8c84fac377 --- /dev/null +++ b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs @@ -0,0 +1,60 @@ +using Meadow; +using Meadow.Foundation.Displays; +using Meadow.Foundation.Graphics; +using System.Windows.Forms; + +namespace WinForms_Sample +{ + public class MeadowApp : App + { + // + + WinFormsDisplay _display; + MicroGraphics _graphics = default!; + + public override Task Initialize() + { + _display = new WinFormsDisplay(240, 320); + + _graphics = new MicroGraphics(_display) + { + CurrentFont = new Font12x20(), + Stroke = 1 + }; + + _ = Task.Run(() => + { + Thread.Sleep(2000); + + _graphics.Clear(); + + _graphics.DrawTriangle(10, 30, 50, 50, 10, 50, Color.Red); + _graphics.DrawRectangle(20, 45, 40, 20, Color.Yellow, false); + _graphics.DrawCircle(50, 50, 40, Color.Blue, false); + _graphics.DrawText(5, 5, "Meadow F7", Color.White); + + _graphics.Show(); + }); + + return Task.CompletedTask; + } + + public override Task Run() + { + Application.Run(_display); + + return Task.CompletedTask; + } + + public static async Task Main(string[] args) + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + ApplicationConfiguration.Initialize(); + + await MeadowOS.Start(args); + } + + // + } +} \ No newline at end of file diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj new file mode 100644 index 0000000000..74ccc48df7 --- /dev/null +++ b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj @@ -0,0 +1,12 @@ + + + Exe + net8.0-windows + enable + enable + + + + + + \ No newline at end of file diff --git a/Source/Meadow.Foundation.sln b/Source/Meadow.Foundation.sln index 0632e4c21c..97713f013e 100644 --- a/Source/Meadow.Foundation.sln +++ b/Source/Meadow.Foundation.sln @@ -1445,6 +1445,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amg8833_Sample", "Meadow.Fo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.AsciiConsole", "Meadow.Foundation.Peripherals\Displays.AsciiConsole\Driver\Displays.AsciiConsole.csproj", "{27589062-708E-44CD-9DF4-0D16899265FE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{80EC3729-DB91-4F94-B11D-B611A214BA31}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForms_Sample", "Meadow.Foundation.Peripherals\Displays.WinForms\Samples\WinForms_Sample\WinForms_Sample.csproj", "{A5734B07-64C0-4C93-9EB0-390B0B6A075C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -3493,6 +3497,10 @@ Global {27589062-708E-44CD-9DF4-0D16899265FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {27589062-708E-44CD-9DF4-0D16899265FE}.Release|Any CPU.Build.0 = Release|Any CPU {27589062-708E-44CD-9DF4-0D16899265FE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {A5734B07-64C0-4C93-9EB0-390B0B6A075C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5734B07-64C0-4C93-9EB0-390B0B6A075C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5734B07-64C0-4C93-9EB0-390B0B6A075C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5734B07-64C0-4C93-9EB0-390B0B6A075C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4214,6 +4222,8 @@ Global {2F20AD5B-5879-432B-B44F-8540DAEE5C43} = {40687DAC-F3EF-4F70-850A-0429B9586648} {866EA918-39E3-4440-877C-70A3205A3D00} = {E608C8E7-1B76-4859-9AF9-C868B5C61994} {27589062-708E-44CD-9DF4-0D16899265FE} = {E775FF9F-8AC5-4994-B45A-20B50E2B03E2} + {80EC3729-DB91-4F94-B11D-B611A214BA31} = {BBF136B7-361C-4FC2-AACA-6B6ED79BDCF1} + {A5734B07-64C0-4C93-9EB0-390B0B6A075C} = {80EC3729-DB91-4F94-B11D-B611A214BA31} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF7CA16F-8C38-4546-87A2-5DAAF58A1520} From 4871433aeee6caba34873991fffd203f5ee0de28 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 18 Jan 2024 23:47:09 -0800 Subject: [PATCH 2/5] Minor update --- .../Samples/WinForms_Sample/MeadowApp.cs | 81 +++++++++---------- .../WinForms_Sample/WinForms_Sample.csproj | 1 + 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs index 8c84fac377..982cc47b46 100644 --- a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs +++ b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs @@ -3,58 +3,57 @@ using Meadow.Foundation.Graphics; using System.Windows.Forms; -namespace WinForms_Sample -{ - public class MeadowApp : App - { - // +namespace WinForms_Sample; - WinFormsDisplay _display; - MicroGraphics _graphics = default!; +// - public override Task Initialize() - { - _display = new WinFormsDisplay(240, 320); +public class MeadowApp : App +{ + WinFormsDisplay _display; + MicroGraphics _graphics = default!; - _graphics = new MicroGraphics(_display) - { - CurrentFont = new Font12x20(), - Stroke = 1 - }; + public override Task Initialize() + { + _display = new WinFormsDisplay(240, 320); - _ = Task.Run(() => - { - Thread.Sleep(2000); + _graphics = new MicroGraphics(_display) + { + CurrentFont = new Font12x20(), + Stroke = 1 + }; - _graphics.Clear(); + _ = Task.Run(() => + { + Thread.Sleep(2000); - _graphics.DrawTriangle(10, 30, 50, 50, 10, 50, Color.Red); - _graphics.DrawRectangle(20, 45, 40, 20, Color.Yellow, false); - _graphics.DrawCircle(50, 50, 40, Color.Blue, false); - _graphics.DrawText(5, 5, "Meadow F7", Color.White); + _graphics.Clear(); - _graphics.Show(); - }); + _graphics.DrawTriangle(10, 30, 50, 50, 10, 50, Color.Red); + _graphics.DrawRectangle(20, 45, 40, 20, Color.Yellow, false); + _graphics.DrawCircle(50, 50, 40, Color.Blue, false); + _graphics.DrawText(5, 5, "Meadow F7", Color.White); - return Task.CompletedTask; - } + _graphics.Show(); + }); - public override Task Run() - { - Application.Run(_display); + return Task.CompletedTask; + } - return Task.CompletedTask; - } + public override Task Run() + { + Application.Run(_display); - public static async Task Main(string[] args) - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - ApplicationConfiguration.Initialize(); + return Task.CompletedTask; + } - await MeadowOS.Start(args); - } + public static async Task Main(string[] args) + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + ApplicationConfiguration.Initialize(); - // + await MeadowOS.Start(args); } -} \ No newline at end of file +} + +// \ No newline at end of file diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj index 74ccc48df7..0255f024c0 100644 --- a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj +++ b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/WinForms_Sample.csproj @@ -4,6 +4,7 @@ net8.0-windows enable enable + 10.0 From ec470eb402f2246fc80aead0ae90728dcc96f890 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 18 Jan 2024 23:49:49 -0800 Subject: [PATCH 3/5] Minor cleanup --- .../Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs index 982cc47b46..c4de8ea0f8 100644 --- a/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs +++ b/Source/Meadow.Foundation.Peripherals/Displays.WinForms/Samples/WinForms_Sample/MeadowApp.cs @@ -9,7 +9,7 @@ namespace WinForms_Sample; public class MeadowApp : App { - WinFormsDisplay _display; + WinFormsDisplay? _display; MicroGraphics _graphics = default!; public override Task Initialize() @@ -41,7 +41,7 @@ public override Task Initialize() public override Task Run() { - Application.Run(_display); + Application.Run(_display!); return Task.CompletedTask; } From 56c939505c12f3c7ed3b4346e6c0322f2959b0d3 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Fri, 19 Jan 2024 09:51:52 -0800 Subject: [PATCH 4/5] Update develop script .NET version --- .github/workflows/develop-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml index 24e1a92b50..d75a2ba0c8 100644 --- a/.github/workflows/develop-ci.yml +++ b/.github/workflows/develop-ci.yml @@ -63,7 +63,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: - 7.0.x + 8.0.x - name: Build Meadow Foundation run: dotnet build -c Release Meadow.Foundation/Source/Meadow.Foundation.sln From 3be59b74f40b29c97ca06ac5341400f82c34b0b5 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Fri, 19 Jan 2024 09:58:22 -0800 Subject: [PATCH 5/5] Update script --- .github/workflows/main-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 01a7f17468..30a0fd6344 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: - 7.0.x + 8.0.x - name: Build Meadow Foundation run: dotnet build -c Release Meadow.Foundation/Source/Meadow.Foundation.sln