Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Ft232h to Ftxxxx #913

Merged
merged 5 commits into from
Feb 28, 2024
Merged

Rename Ft232h to Ftxxxx #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ced1587
Rename Ft232h to Ftxxxx
adrianstevens Feb 28, 2024
a9f5627
Project cleanup
adrianstevens Feb 28, 2024
9747f00
Cleanup
adrianstevens Feb 28, 2024
2bc2208
Re-add native libraries
adrianstevens Feb 28, 2024
557dfea
Update main-ci.yml
ctacke Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/main-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Main Build
on:
workflow_dispatch:
pull_request:
branches: [ main ]
push:
branches: [ main ]

Expand Down
2 changes: 1 addition & 1 deletion ..._Frameworks/Graphics.MicroLayout/Samples/Ili9488Charts_Sample/Ili9488Charts_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.TftSpi\Driver\Displays.TftSpi.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ft232h\Driver\ICs.IOExpanders.Ft232h.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\Driver\Graphics.MicroLayout.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ibraries_and_Frameworks/Graphics.MicroLayout/Samples/MAX7219_Sample/MAX7219_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Max7219\Driver\Displays.Max7219.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ft232h\Driver\ICs.IOExpanders.Ft232h.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\ICs.IOExpanders.Ftxxxx\Driver\ICs.IOExpanders.Ftxxxx.csproj" />
<ProjectReference Include="..\..\Driver\Graphics.MicroLayout.csproj" />
</ItemGroup>

Expand Down
27 changes: 0 additions & 27 deletions ...Meadow.Foundation.Peripherals/ICs.IOExpanders.Ft232h/Driver/ICs.IOExpanders.Ft232h.csproj
View file
Open in desktop

This file was deleted.

Binary file removed ...ce/Meadow.Foundation.Peripherals/ICs.IOExpanders.Ft232h/Native/Windows/Win32/libmpsse.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Source/Meadow.Foundation.Peripherals/ICs.IOExpanders.Ft232h/Native/Windows/x64/libmpsse.dll
View file
Open in desktop
Binary file not shown.
0 ...PSSE_and_MCU_Host_Bus_Emulation_Modes.pdf → ...PSSE_and_MCU_Host_Bus_Emulation_Modes.pdf
View file
Open in desktop
File renamed without changes.
0 ...2h/Data Sheets/D2XX_Programmers_Guide.pdf → ...xxxx/Datasheet/D2XX_Programmers_Guide.pdf
View file
Open in desktop
File renamed without changes.
0 ...s.IOExpanders.Ft232h/Data Sheets/ftd2xx.h → ...ICs.IOExpanders.Ftxxxx/Datasheet/ftd2xx.h
View file
Open in desktop
File renamed without changes.
0 ...IOExpanders.Ft232h/Driver/AssemblyInfo.cs → ...IOExpanders.Ftxxxx/Driver/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...Expanders.Ft232h/Driver/Ft2232Expander.cs → ...Expanders.Ftxxxx/Driver/Drivers/Ft2232.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@

namespace Meadow.Foundation.ICs.IOExpanders;

public class Ft2232Expander : FtdiExpander
/// <summary>
/// Represents an FT2232 USB IO expander
/// </summary>
public class Ft2232 : FtdiExpander
{
internal Ft2232Expander()
internal Ft2232()
{
}

/// <inheritdoc/>
public override II2cBus CreateI2cBus(int channel = 0, I2cBusSpeed busSpeed = I2cBusSpeed.Standard)
{
// TODO: depends on part
// TODO: make sure no SPI is in use
var bus = new Ft23xxxI2cBus(this, busSpeed);
var bus = new Ft23xxI2cBus(this, busSpeed);
bus.Configure();
return bus;
}

/// <inheritdoc/>
public override ISpiBus CreateSpiBus(int channel, SpiClockConfiguration configuration)
{
// TODO: make sure no SPI is in use

throw new NotSupportedException();
}
}
}
10 changes: 6 additions & 4 deletions ...Expanders.Ft232h/Driver/Ft232hExpander.cs → ...Expanders.Ftxxxx/Driver/Drivers/Ft232h.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

namespace Meadow.Foundation.ICs.IOExpanders;

public class Ft232hExpander : FtdiExpander
/// <summary>
/// Represents an FT232H USB IO expander
/// </summary>
public class Ft232h : FtdiExpander
{
internal Ft232hExpander()
internal Ft232h()
{
}

Expand All @@ -22,9 +25,8 @@ public override II2cBus CreateI2cBus(int channel = 0, I2cBusSpeed busSpeed = I2c
public override ISpiBus CreateSpiBus(int channel, SpiClockConfiguration configuration)
{
// TODO: make sure no SPI is in use

var bus = new Ft232hSpiBus(this, configuration);
bus.Configure();
return bus;
}
}
}
29 changes: 29 additions & 0 deletions Source/Meadow.Foundation.Peripherals/ICs.IOExpanders.Ftxxxx/Driver/Drivers/Ft4232.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Meadow.Hardware;
using System;

namespace Meadow.Foundation.ICs.IOExpanders;

/// <summary>
/// Represents an FT4232 USB IO expander
/// </summary>
public class Ft4232 : FtdiExpander
{
internal Ft4232()
{
}

/// <inheritdoc/>
public override II2cBus CreateI2cBus(int channel = 0, I2cBusSpeed busSpeed = I2cBusSpeed.Standard)
{
// TODO: depends on part
var bus = new Ft23xxI2cBus(this, busSpeed);
bus.Configure();
return bus;
}

/// <inheritdoc/>
public override ISpiBus CreateSpiBus(int channel, SpiClockConfiguration configuration)
{
throw new NotSupportedException();
}
}
0 ...s.IOExpanders.Ft232h/Driver/Exceptions.cs → ...s.IOExpanders.Ftxxxx/Driver/Exceptions.cs
View file
Open in desktop
File renamed without changes.
0 .../Driver/FtdiExpander.DigitalOutputPort.cs → .../Driver/FtdiExpander.DigitalOutputPort.cs
View file
Open in desktop
File renamed without changes.
0 ...t232h/Driver/FtdiExpander.Ft232hI2cBus.cs → ...txxxx/Driver/FtdiExpander.Ft232hI2cBus.cs
View file
Open in desktop
File renamed without changes.
0 ...t232h/Driver/FtdiExpander.Ft232hSpiBus.cs → ...txxxx/Driver/FtdiExpander.Ft232hSpiBus.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...232h/Driver/FtdiExpander.Ft23xxxI2cBus.cs → ...txxxx/Driver/FtdiExpander.Ft23xxI2cBus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ namespace Meadow.Foundation.ICs.IOExpanders;

public abstract partial class FtdiExpander
{
public class Ft23xxxI2cBus : I2CBus, II2cBus
public class Ft23xxI2cBus : I2CBus, II2cBus
{
internal Ft23xxxI2cBus(FtdiExpander expander, I2cBusSpeed busSpeed)
internal Ft23xxI2cBus(FtdiExpander expander, I2cBusSpeed busSpeed)
: base(expander, busSpeed)
{
}
Expand Down
0 ...ders.Ft232h/Driver/FtdiExpander.I2CBus.cs → ...ders.Ftxxxx/Driver/FtdiExpander.I2CBus.cs
View file
Open in desktop
File renamed without changes.
0 ...32h/Driver/FtdiExpander.PinDefinitions.cs → ...xxx/Driver/FtdiExpander.PinDefinitions.cs
View file
Open in desktop
File renamed without changes.
0 ...ders.Ft232h/Driver/FtdiExpander.SpiBus.cs → ...ders.Ftxxxx/Driver/FtdiExpander.SpiBus.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...IOExpanders.Ft232h/Driver/FtdiExpander.cs → ...IOExpanders.Ftxxxx/Driver/FtdiExpander.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ internal static FtdiExpander Create(
{
FtdiExpander expander = deviceType switch
{
FtDeviceType.Ft232H => new Ft232hExpander
FtDeviceType.Ft232H => new Ft232h
{
Index = index,
Flags = flags,
Expand All @@ -60,7 +60,7 @@ internal static FtdiExpander Create(
Description = description,
Handle = handle
},
FtDeviceType.Ft2232 => new Ft2232Expander
FtDeviceType.Ft2232 => new Ft2232
{
Index = index,
Flags = flags,
Expand Down
0 ...s.Ft232h/Driver/FtdiExpanderCollection.cs → ...s.Ftxxxx/Driver/FtdiExpanderCollection.cs
View file
Open in desktop
File renamed without changes.
0 ...IOExpanders.Ft232h/Driver/I2CClockRate.cs → ...IOExpanders.Ftxxxx/Driver/I2CClockRate.cs
View file
Open in desktop
File renamed without changes.
28 changes: 28 additions & 0 deletions ...Meadow.Foundation.Peripherals/ICs.IOExpanders.Ftxxxx/Driver/ICs.IOExpanders.Ftxxxx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageIcon>icon.png</PackageIcon>
<Authors>Wilderness Labs, Inc</Authors>
<TargetFramework>netstandard2.1</TargetFramework>
<OutputType>Library</OutputType>
<AssemblyName>Ft2xxx</AssemblyName>
<Company>Wilderness Labs, Inc</Company>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
<PackageId>Meadow.Foundation.ICs.IOExpanders.Ft232h</PackageId>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<PackageTags>Meadow.Foundation,IOExpanders,expander,IO,Ft232h,ft2232,ft4232</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Ft2xxx family of USB IOExpanders for GPIO, I2C, SPI on Windows</Description>
</PropertyGroup>
<ItemGroup>
<None Include=".\Readme.md" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
</Project>
0 ...OExpanders.Ft232h/Driver/Native.Ftd2xx.cs → ...OExpanders.Ftxxxx/Driver/Native.Ftd2xx.cs
View file
Open in desktop
File renamed without changes.
0 ...t232h/Driver/Native.I2CTransferOptions.cs → ...txxxx/Driver/Native.I2CTransferOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...s/ICs.IOExpanders.Ft232h/Driver/Native.cs → ...s/ICs.IOExpanders.Ftxxxx/Driver/Native.cs
View file
Open in desktop
File renamed without changes.
0 ...s/ICs.IOExpanders.Ft232h/Driver/Readme.md → ...s/ICs.IOExpanders.Ftxxxx/Driver/Readme.md
View file
Open in desktop
File renamed without changes.
Loading
Loading