Merge pull request #5 from DCC-EX/development

Merge of v2.1
DCC-EX · Jul 28, 2020 · 6d755ab · 6d755ab
2 parents 6a3398d + 61460a9
commit 6d755ab
Show file tree

Hide file tree

Showing 29 changed files with 2,334 additions and 199 deletions.
diff --git a/BaseStationEX b/BaseStationEX
diff --git a/BaseStationInstaller/App.xaml b/BaseStationInstaller/App.xaml
@@ -6,6 +6,20 @@
         <local:ViewLocator/>
     </Application.DataTemplates>
 
+  <Application.Resources>
+    <Color x:Key="Primary">#FF00A3B9</Color>
+    <Color x:Key="Accent">#FF00353D</Color>
+    <Color x:Key="bgColor">#FF373737</Color>
+    <Color x:Key="fgColor">#FFFFFFFF</Color>
+    <Color x:Key="fgColorLow">#FF6C6C6C</Color>
+    <SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource Primary}"></SolidColorBrush>
+    <SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource Accent}"></SolidColorBrush>
+    <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{DynamicResource bgColor}"></SolidColorBrush>
+    <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource fgColor}"></SolidColorBrush>
+    <SolidColorBrush x:Key="ThemeForegroundLowBrush" Color="{DynamicResource FgColorLow}"></SolidColorBrush>
+
+  </Application.Resources>
+
     <Application.Styles>
         <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
         <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"/>

diff --git a/BaseStationInstaller/App.xaml.cs b/BaseStationInstaller/App.xaml.cs
@@ -3,6 +3,7 @@
 using Avalonia.Markup.Xaml;
 using BaseStationInstaller.ViewModels;
 using BaseStationInstaller.Views;
+using Avalonia.ReactiveUI;
 
 
 namespace BaseStationInstaller

diff --git a/BaseStationInstaller/Assets/Audiowide-Regular.ttf b/BaseStationInstaller/Assets/Audiowide-Regular.ttf
diff --git a/BaseStationInstaller/Assets/Flamenco-Regular.ttf b/BaseStationInstaller/Assets/Flamenco-Regular.ttf
diff --git a/BaseStationInstaller/Assets/avalonia-logo.ico b/BaseStationInstaller/Assets/avalonia-logo.ico
diff --git a/BaseStationInstaller/Assets/dcc-ex-logo.png b/BaseStationInstaller/Assets/dcc-ex-logo.png
diff --git a/BaseStationInstaller/Assets/dccex-logo.ico b/BaseStationInstaller/Assets/dccex-logo.ico
diff --git a/BaseStationInstaller/BaseStationInstaller.csproj b/BaseStationInstaller/BaseStationInstaller.csproj
@@ -5,11 +5,13 @@
     <RuntimeIdentifiers>win-x86;win-x64;osx-x64;linux-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
     <StartupObject>BaseStationInstaller.Program</StartupObject>
     <AssemblyName>BaseStationInstaller</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
     <Authors>Dex's Lab</Authors>
     <Company>DCC++ Extended</Company>
     <PackageProjectUrl>https://dcc-ex.github.io/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/DCC-EX/BaseStation-Installer</RepositoryUrl>
+    <PackageIcon>dcc-ex-logo.png</PackageIcon>
+    <ApplicationIcon>Assets\dccex-logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -21,14 +23,32 @@
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10" />
+    <PackageReference Include="Avalonia" Version="0.9.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.11" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.11" />
+    <PackageReference Include="Google.Protobuf" Version="3.12.3" />
+    <PackageReference Include="Grpc" Version="2.30.0" />
+    <PackageReference Include="Grpc.Core" Version="2.30.0" />
+    <PackageReference Include="Grpc.Core.Api" Version="2.30.0" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.30.0" />
+    <PackageReference Include="Grpc.Net.Common" Version="2.30.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.30.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.306" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.IO.Ports" Version="4.7.0" />
   </ItemGroup>
+  <ItemGroup>
+    <Protobuf Include="commands\board.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\commands.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\common.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\compile.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\core.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\lib.proto" GrpcServices="Client" />
+    <Protobuf Include="commands\upload.proto" GrpcServices="Client" />
+  </ItemGroup>
   <ItemGroup>
     <None Update="arduino-cli-runtimes\Linux_32bit\arduino-cli">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -57,5 +77,9 @@
     <None Update="arduino-cli-runtimes/*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Assets\dcc-ex-logo.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/BaseStationInstaller/Models/BaseStationSettings.cs b/BaseStationInstaller/Models/BaseStationSettings.cs
@@ -45,7 +45,7 @@ public static class BaseStationSettings
                     Name = "BaseStationEX",
                     Git = "https://github.com/DCC-EX/BaseStation-EX.git",
                     ConfigFile = $@"DCCpp_EX/DCCppEX/Config.h",
-                    InputFileLocation = "DCCpp_EX/DCCppEX/DCCppEX.ino",
+                    InputFileLocation = "DCCpp_EX/DCCppEX",
                    Libraries = new List<Library>(),
                    AllowAdvanced = true,
                     SupportedBoards = new List<Board>()
@@ -67,7 +67,7 @@ public static class BaseStationSettings
                     Name = "BaseStationClassic",
                     DisplayName = "Base Station Classic",
                     ConfigFile = @"DCCpp/Config.h",
-                    InputFileLocation = "DCCpp/DCCpp.ino",
+                    InputFileLocation = "DCCpp",
                     Git = "https://github.com/DCC-EX/BaseStation-Classic.git",
                     Libraries = new List<Library>(),
                     AllowAdvanced = false,
@@ -85,11 +85,11 @@ public static class BaseStationSettings
             },{
             new Config
                 {
-                    DisplayName = "CommandStation Test",
-                    Name = "CommandStation",
+                    DisplayName = "CommandStation EX",
+                    Name = "CommandStation-DCC",
                     Git = "https://github.com/DCC-EX/CommandStation-DCC.git",
-                    ConfigFile = @"src/main.cpp",
-                    InputFileLocation = @"src/main.cpp",
+                    ConfigFile = @"Config.h",
+                    InputFileLocation =  @"",
                     AllowAdvanced = true,
                     Libraries = new List<Library>()
                     {
@@ -109,6 +109,8 @@ public static class BaseStationSettings
                     {
                         new MotorShield("Arduino Motor Shield", MotorShieldType.Arduino),
                         new MotorShield("Pololu MC33926 Motor Shield", MotorShieldType.Pololu),
+                        new MotorShield("FireBox MK1", MotorShieldType.FireBox_MK1),
+                        new MotorShield("FireBox MK1S", MotorShieldType.FireBox_MK1S),
                         //new MotorShield("BTS7960B Motor Shield", MotorShieldType.BTS7960B),
                     }
                 }

diff --git a/BaseStationInstaller/Models/MotorShield.cs b/BaseStationInstaller/Models/MotorShield.cs
@@ -10,7 +10,9 @@ public enum MotorShieldType
     {
         Arduino,
         Pololu,
-        BTS7960B
+        BTS7960B,
+        FireBox_MK1,
+        FireBox_MK1S
     }
     public class MotorShield
     {