diff --git a/Source/Devices/Modbus/Modbus.Device.Samples.sln b/Source/Devices/Modbus/Modbus.Device.Samples.sln new file mode 100644 index 00000000..48270245 --- /dev/null +++ b/Source/Devices/Modbus/Modbus.Device.Samples.sln @@ -0,0 +1,45 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34316.72 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tstat8_Sample", "Tstat8_Sample\Tstat8_Sample.csproj", "{BF6E370F-F567-4E11-96C3-83E62C5B73A7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_ref", "_ref", "{22E0295F-C4C6-4243-8A4C-9F4AFEDB4990}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Modbus", "..\..\..\..\Meadow.Modbus\src\Meadow.Modbus\Meadow.Modbus.csproj", "{86D9EAB4-A0F5-49AD-816E-87A115D172EF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{3FBF6C98-C435-469F-9124-8508851C1F02}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BF6E370F-F567-4E11-96C3-83E62C5B73A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF6E370F-F567-4E11-96C3-83E62C5B73A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF6E370F-F567-4E11-96C3-83E62C5B73A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF6E370F-F567-4E11-96C3-83E62C5B73A7}.Release|Any CPU.Build.0 = Release|Any CPU + {86D9EAB4-A0F5-49AD-816E-87A115D172EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86D9EAB4-A0F5-49AD-816E-87A115D172EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86D9EAB4-A0F5-49AD-816E-87A115D172EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86D9EAB4-A0F5-49AD-816E-87A115D172EF}.Release|Any CPU.Build.0 = Release|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Release|Any CPU.Build.0 = Release|Any CPU + {3FBF6C98-C435-469F-9124-8508851C1F02}.Release|Any CPU.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {86D9EAB4-A0F5-49AD-816E-87A115D172EF} = {22E0295F-C4C6-4243-8A4C-9F4AFEDB4990} + {3FBF6C98-C435-469F-9124-8508851C1F02} = {22E0295F-C4C6-4243-8A4C-9F4AFEDB4990} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {48F60EEB-CC4F-4A4D-992B-CBEA14A1BDE1} + EndGlobalSection +EndGlobal diff --git a/Source/Meadow.Cloud/MultiPlatform/CloudSample.Desktop/CloudSample.Desktop.csproj b/Source/Meadow.Cloud/MultiPlatform/CloudSample.Desktop/CloudSample.Desktop.csproj index 9bd45580..8c1100d8 100644 --- a/Source/Meadow.Cloud/MultiPlatform/CloudSample.Desktop/CloudSample.Desktop.csproj +++ b/Source/Meadow.Cloud/MultiPlatform/CloudSample.Desktop/CloudSample.Desktop.csproj @@ -1,7 +1,7 @@  Exe - net8.0;net8.0-windows + net8.0 enable enable diff --git a/Source/Meadow.Desktop/AvaloniaMeadow/AvaloniaMeadow.csproj b/Source/Meadow.Desktop/AvaloniaMeadow/AvaloniaMeadow.csproj index 8d10236e..074da5f9 100644 --- a/Source/Meadow.Desktop/AvaloniaMeadow/AvaloniaMeadow.csproj +++ b/Source/Meadow.Desktop/AvaloniaMeadow/AvaloniaMeadow.csproj @@ -1,7 +1,7 @@ WinExe - net7.0 + net8.0 enable true app.manifest diff --git a/Source/Meadow.Desktop/HMI_Views/HMI_Views.csproj b/Source/Meadow.Desktop/HMI_Views/HMI_Views.csproj index 31aeb106..6a38a7b9 100644 --- a/Source/Meadow.Desktop/HMI_Views/HMI_Views.csproj +++ b/Source/Meadow.Desktop/HMI_Views/HMI_Views.csproj @@ -1,13 +1,9 @@ Exe - net8.0;net8.0-windows + net8.0 enable - - - true - diff --git a/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs b/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs index f987a804..d3ae82fd 100644 --- a/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs +++ b/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs @@ -24,9 +24,9 @@ public override Task Initialize() // Screen size of a ILI9341 display //var views = new CultivarView(Device.Display); - //var views = new ProjectLabDemoView(Device.Display); + var views = new ProjectLabDemoView(Device.Display); //var views = new AtmosphericHMI(Device.Display); - var views = new WifiWeatherV2(Device.Display); + //var views = new WifiWeatherV2(Device.Display); _ = Task.Run(() => { @@ -47,12 +47,6 @@ public override Task Run() private void ExecutePlatformDisplayRunner() { -#if WINDOWS - System.Windows.Forms.Application.Run(Device.Display as System.Windows.Forms.Form); -#endif - if (Device.Display is GtkDisplay gtk) - { - gtk.Run(); - } + (Device.Display as SilkDisplay).Run(); } } \ No newline at end of file diff --git a/Source/Meadow.Desktop/I2C/I2C.csproj b/Source/Meadow.Desktop/I2C/I2C.csproj index 5e11c172..6fb67296 100644 --- a/Source/Meadow.Desktop/I2C/I2C.csproj +++ b/Source/Meadow.Desktop/I2C/I2C.csproj @@ -1,24 +1,18 @@ - - - Exe - net8.0;net8.0-windows - enable - - - - true - - + + + Exe + net8.0;net8.0-windows + enable + + + + true + + - - - - - PreserveNewest - - + \ No newline at end of file diff --git a/Source/Meadow.Desktop/I2C/libmpsse.dll b/Source/Meadow.Desktop/I2C/libmpsse.dll deleted file mode 100644 index a3d19379..00000000 Binary files a/Source/Meadow.Desktop/I2C/libmpsse.dll and /dev/null differ diff --git a/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs b/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs index 0b5287ea..cc1f934e 100644 --- a/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs +++ b/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs @@ -52,12 +52,13 @@ public override Task OnShutdown() private void ExecutePlatformDisplayRunner() { + (Device.Display as SilkDisplay).Run(); #if WINDOWS System.Windows.Forms.Application.Run(Device.Display as System.Windows.Forms.Form); #endif - if (Device.Display is GtkDisplay gtk) - { - gtk.Run(); - } + // if (Device.Display is GtkDisplay gtk) + // { + // gtk.Run(); + // } } } diff --git a/Source/Meadow.Desktop/PixelDisplay/PixelDisplay_Sample.csproj b/Source/Meadow.Desktop/PixelDisplay/PixelDisplay_Sample.csproj index 815f70d2..4455e8b7 100644 --- a/Source/Meadow.Desktop/PixelDisplay/PixelDisplay_Sample.csproj +++ b/Source/Meadow.Desktop/PixelDisplay/PixelDisplay_Sample.csproj @@ -1,14 +1,10 @@  Exe - net8.0;net8.0-windows + net8.0 enable - - true - - diff --git a/Source/Meadow.Desktop/PixelDisplay/Program.cs b/Source/Meadow.Desktop/PixelDisplay/Program.cs index 005ce69f..98cfe2e8 100644 --- a/Source/Meadow.Desktop/PixelDisplay/Program.cs +++ b/Source/Meadow.Desktop/PixelDisplay/Program.cs @@ -6,9 +6,9 @@ public class Program public static async Task Main(string[] args) { #if WINDOWS - System.Windows.Forms.Application.EnableVisualStyles(); - System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); - ApplicationConfiguration.Initialize(); +// System.Windows.Forms.Application.EnableVisualStyles(); +// System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); +// ApplicationConfiguration.Initialize(); #endif await MeadowOS.Start(args); }