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.

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

GH-266 remove redundant driver folder #299

Merged
merged 5 commits into from
Mar 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<Description>Driver for the Adafruit IO data logging system</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\DataLoggers.Core\Driver\DataLoggers.Core\DataLoggers.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\DataLoggers.Core\Driver\DataLoggers.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Description>Data logger library</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<Description>Driver for the ThingSpeak data logging system</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\DataLoggers.Core\Driver\DataLoggers.Core\DataLoggers.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\DataLoggers.Core\Driver\DataLoggers.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<Description>Text based stack navigation and editor for pixel and character displays</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\..\icon.png" Pack="true" PackagePath="" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<ProjectReference Include="..\..\..\MicroGraphics\Driver\Graphics.MicroGraphics\MicroGraphics.csproj" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\Graphics.MicroGraphics\Driver\Graphics.MicroGraphics.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<Company>Wilderness Labs, Inc</Company>
Expand All @@ -9,7 +9,14 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<None Remove="menu.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="menu.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Displays.TextDisplayMenu.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\Source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\Driver\FeatherWings.MotorWing\FeatherWings.MotorWing.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\FeatherWings.DotstarWing\FeatherWings.DotstarWing.csproj" />
<None Remove="menu.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="menu.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Displays.TextDisplayMenu.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\Source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Libraries_and_Frameworks\Graphics\MicroGraphics\Driver\Graphics.MicroGraphics\MicroGraphics.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Description>Lightweight integer accurate 2d graphics drawing system designed for embedded systems</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<Company>Wilderness Labs, Inc</Company>
Expand Down Expand Up @@ -29,9 +29,9 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\..\..\Meadow.Core\source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation.Peripherals\Displays.TftSpi\Driver\Displays.TFTSPI\Displays.TftSpi.csproj" />
<ProjectReference Include="..\..\Driver\Graphics.MicroGraphics\MicroGraphics.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.TftSpi\Driver\Displays.TftSpi.csproj" />
<ProjectReference Include="..\..\Driver\Graphics.MicroGraphics.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Driver\Graphics.MicroGraphics\MicroGraphics.csproj" />
<ProjectReference Include="..\..\Driver\Graphics.MicroGraphics.csproj" />
</ItemGroup>

</Project>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Authors>Wilderness Labs, Inc</Authors>
<TargetFramework>netstandard2.1</TargetFramework>
Expand All @@ -19,7 +19,7 @@
<LangVersion>latestmajor</LangVersion>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaProcessor\Location.Gnss.NmeaParsing.csproj" />
<ProjectReference Include="..\..\..\Graphics\MicroGraphics\Driver\Graphics.MicroGraphics\MicroGraphics.csproj" />
<ProjectReference Include="..\..\..\Graphics.MicroGraphics\Driver\Graphics.MicroGraphics.csproj" />
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaParsing.csproj" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\Source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x\Displays.Ssd130x.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
Expand All @@ -13,6 +13,6 @@
<ItemGroup>
<None Include="..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaProcessor\Location.Gnss.NmeaParsing.csproj" />
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaParsing.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
Expand All @@ -13,6 +13,6 @@
<ItemGroup>
<None Include="..\..\..\..\icon.png" Pack="true" PackagePath="" />
<ProjectReference Include="..\..\..\..\..\..\Meadow.Core\source\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaProcessor\Location.Gnss.NmeaParsing.csproj" />
<ProjectReference Include="..\..\Driver\Location.Gnss.NmeaParsing.csproj" />
</ItemGroup>
</Project>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Client
namespace Meadow.Foundation.Web.Maple
{
public class MapleClient
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace Meadow.Foundation.Web.Maple.Client
namespace Meadow.Foundation.Web.Maple
{
public class ServerModel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<Description>Maple is an ultra-lightweight RESTful web API Server, built specifically for Meadow. It provides an easy to extend architecture, and has integrated JSON support via System.Text.Json.</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\..\icon.png" Pack="true" PackagePath="" />
<None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Web.Maple.Client\Meadow.Foundation.Web.Maple.Client.csproj" />
<ProjectReference Include="..\..\Driver\Web.Maple.MapleClient.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Meadow.Foundation.Web.Maple.Client;
using Meadow.Foundation.Web.Maple;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Threading.Tasks;

namespace Maple.ClientConsole_Sample
namespace Maple.MapleClient_Sample
{
class MainClass
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public abstract class ActionResult : IActionResult
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public class ContentResult : ActionResult
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Net;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public interface IActionResult
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public interface IOutputFormatter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public class JsonOutputFormatter : IOutputFormatter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
internal class MapleSerializationStrategy : SimpleJson.PocoJsonSerializerStrategy
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Net;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public class NotFoundResult : StatusCodeResult
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Net;
using System.Threading.Tasks;

namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public abstract class ObjectResult : ActionResult
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Meadow.Foundation.Web.Maple.Server
namespace Meadow.Foundation.Web.Maple
{
public class OkObjectResult : ObjectResult
{
Expand Down
Loading