Skip to content

Commit

Permalink
silk-skia updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ctacke committed Apr 24, 2024
1 parent 7dcedbc commit 28f41c0
Show file tree
Hide file tree
Showing 35 changed files with 202 additions and 297 deletions.
32 changes: 13 additions & 19 deletions Source/Meadow.Desktop/Amg8833Camera/Amg8833Camera.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Graphics.MicroLayout\Driver\Graphics.MicroLayout.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Camera.Amg8833\Driver\Sensors.Camera.Amg8833.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
8 changes: 1 addition & 7 deletions Source/Meadow.Desktop/Amg8833Camera/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,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();
}
}
8 changes: 1 addition & 7 deletions Source/Meadow.Desktop/AvaloniaMeadow/AvaloniaMeadow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,9 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\source\ui\Meadow.Avalonia\Meadow.Avalonia.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Atmospheric.Bme68x\Driver\Sensors.Atmospheric.Bme68x.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file removed Source/Meadow.Desktop/AvaloniaMeadow/libmpsse.dll
Binary file not shown.
8 changes: 1 addition & 7 deletions Source/Meadow.Desktop/Blinky/Blinky.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file removed Source/Meadow.Desktop/Blinky/libmpsse.dll
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Lcd.CharacterDisplay\Driver\Displays.Lcd.CharacterDisplay.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file not shown.
8 changes: 4 additions & 4 deletions Source/Meadow.Desktop/I2C/I2C.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Motion.Bno055\Driver\Sensors.Motion.Bno055.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Motion.Mpu6050\Driver\Sensors.Motion.Mpu6050.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Motion.Bno055\Driver\Sensors.Motion.Bno055.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Motion.Mpu6050\Driver\Sensors.Motion.Mpu6050.csproj" />
</ItemGroup>
</Project>
24 changes: 13 additions & 11 deletions Source/Meadow.Desktop/I2C/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

public class MeadowApp : App<Desktop>
{
private FtdiExpander _expander = FtdiExpanderCollection.Devices[0];
private Bno055 _bno;
private FtdiExpander _expander;
private Mpu6050 _mpu;

public static async Task Main(string[] args)
Expand All @@ -17,6 +16,18 @@ public static async Task Main(string[] args)

public override Task Initialize()
{
Resolver.Log.Info("Checking for FT232H-compatible expander...");

if (FtdiExpanderCollection.Devices.Count == 0)
{
Resolver.Log.Info($"No expanders found!");
return base.Initialize();
}

Resolver.Log.Info($"{FtdiExpanderCollection.Devices.Count} expanders found");

_expander = FtdiExpanderCollection.Devices[0];

Resolver.Log.Info("Creating Outputs");

var bus = _expander.CreateI2cBus();
Expand All @@ -25,10 +36,6 @@ public override Task Initialize()
_mpu.Updated += _mpu_TemperatureUpdated;
_mpu.StartUpdating();

// var _bno = new Bno055(bus);
// _bno.EulerOrientationUpdated += OnEulerOrientationUpdated;
//_bno.StartUpdating();

return base.Initialize();
}

Expand All @@ -37,11 +44,6 @@ private void _mpu_TemperatureUpdated(object? sender, IChangeResult<(Meadow.Units
Debug.WriteLine($"Temp: {e.New.Temperature.Value.Fahrenheit}");
}

private void OnEulerOrientationUpdated(object? sender, IChangeResult<Meadow.Foundation.Spatial.EulerAngles> e)
{
Debug.WriteLine($"Heading: {e.New.Heading.Degrees}");
}

public override async Task Run()
{
}
Expand Down
36 changes: 15 additions & 21 deletions Source/Meadow.Desktop/Keyboard/Keyboard.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Hid.Keyboard\Driver\Sensors.Hid.Keyboard.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Hid.Keyboard\Driver\Sensors.Hid.Keyboard.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file removed Source/Meadow.Desktop/Keyboard/libmpsse.dll
Binary file not shown.
8 changes: 5 additions & 3 deletions Source/Meadow.Desktop/MauiMeadow/MauiMeadow.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -54,9 +54,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Meadow.Windows" Version="*" />
<PackageReference Include="Meadow.Maui" Version="*" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Ft232h" Version="*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
</ItemGroup>

</Project>
32 changes: 13 additions & 19 deletions Source/Meadow.Desktop/Max7219/Max7219Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Max7219\Driver\Displays.Max7219.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file removed Source/Meadow.Desktop/Max7219/libmpsse.dll
Binary file not shown.
1 change: 0 additions & 1 deletion Source/Meadow.Desktop/NetworkBasics/NetworkBasics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
Expand Down
24 changes: 9 additions & 15 deletions Source/Meadow.Desktop/SPI/SPI.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.TftSpi\Driver\Displays.TftSpi.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="libmpsse.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
Binary file removed Source/Meadow.Desktop/SPI/libmpsse.dll
Binary file not shown.
9 changes: 2 additions & 7 deletions Source/Meadow.Desktop/SerialPort/SerialPort.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
</ItemGroup>
</Project>
8 changes: 1 addition & 7 deletions Source/Meadow.Desktop/Touchscreen_Demo/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,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();
}
}
10 changes: 3 additions & 7 deletions Source/Meadow.Desktop/Touchscreen_Demo/Touchscreen_Demo.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Graphics.MicroLayout\Driver\Graphics.MicroLayout.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\desktop\Meadow.Desktop\Meadow.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Graphics.MicroLayout\Driver\Graphics.MicroLayout.csproj" />
</ItemGroup>
</Project>
Loading

0 comments on commit 28f41c0

Please sign in to comment.