Pull Merge

Dev/Connection/OHVProtocolServer/OHVConnector/OHVConnector.csproj

@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="GSG.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=807456855d2bd861, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\OHV\Assambly\GSG.NET.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -48,11 +52,5 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QueueObject.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\GSG\GSG\GSG.NET\GSG.NET.csproj">
-      <Project>{11e12a58-fdbc-444a-90e6-db96b7e98ff4}</Project>
-      <Name>GSG.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Dev/OHV/OHV.Module.MainViews/Views/HistoryView.xaml

@@ -23,7 +23,7 @@
             <Grid Margin="15,15" Background="#263238">
                 <DockPanel>
                     <DataGrid ItemsSource="{Binding AlarmList}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False" materialDesign:DataGridAssist.CellPadding="13 8 8 8" 
-                                  materialDesign:DataGridAssist.ColumnHeaderPadding="8" Background="{x:Null}">
+                                  materialDesign:DataGridAssist.ColumnHeaderPadding="8" Background="{x:Null}" IsReadOnly="True">
                         <DataGrid.Resources>
                             <Style TargetType="{x:Type DataGridRow}">
                                 <Style.Triggers>
@@ -33,7 +33,6 @@
                                 </Style.Triggers>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center" />
                                 <Setter Property="FontSize" Value="15"/>
-                                <Setter Property="IsEnabled" Value="False"/>
                             </Style>
                         </DataGrid.Resources>
 

Dev/OHV/OHV.Module.MainViews/Views/HistoryViewModel.cs

@@ -1,5 +1,6 @@
 using OHV.Common.Model;
 using OHV.SqliteDAL;
+using Prism.Commands;
 using Prism.Mvvm;
 using System;
 using System.Collections.Generic;
@@ -7,6 +8,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace OHV.Module.MainViews.Views
 {
@@ -21,10 +23,19 @@ namespace OHV.Module.MainViews.Views
             set { this.SetProperty( ref this._alarmList , value ); }
         }
 
+        public ICommand AlarmResetCommand { get; set; }
+
         public HistoryViewModel( SqliteManager _sql )
         {
             this.sql = _sql;
             this.AlarmList = new ObservableCollection<Alarm>( sql.AlarmDAL.All );
+            this.AlarmResetCommand = new DelegateCommand( ExecuteAlarmResetCommand );
+        }
+
+        private void ExecuteAlarmResetCommand( )
+        {
+            // Alarm Data Reset
+            //Thread.Sleep(100)?
         }
 
         public void Init( ) { }

Dev/OHV/OHV.Module.MainViews/Views/UnitView.xaml

@@ -105,7 +105,7 @@
                             </StackPanel>
                         </Button>
 
-                        <Button HorizontalAlignment="Stretch"
+                        <!--<Button HorizontalAlignment="Stretch"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             Margin="20"
                             materialDesign:ButtonAssist.CornerRadius="20"
@@ -115,105 +115,9 @@
                                 <materialDesign:PackIcon Kind="NetworkOutline" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="auto" Height="100"/>
                                 <TextBlock FontSize="30" Text="OCS" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
                             </StackPanel>
-                        </Button>
+                        </Button>-->
                     </StackPanel>
                 </Grid>
-
-                <!--<DockPanel Grid.Column="0" Grid.Row="0" >
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                             Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding InoutPupup}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="LedOn" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="InOut" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>
-
-                <DockPanel Grid.Column="1" Grid.Row="0">
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                             Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding ServoConfigCommand}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="Gear" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="Motor" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>
-
-                <DockPanel Grid.Column="2" Grid.Row="0">
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding BatteryPopup}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="BatteryCharging" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="Battery" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>
-
-                <DockPanel Grid.Column="0" Grid.Row="1">
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding SteerPopup}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="CarHandBrake" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="Steering" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>
-
-                <DockPanel Grid.Column="1" Grid.Row="1">
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding OpticalReaderPopup}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="WifiStrength2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="Lazer" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>
-
-                <DockPanel Grid.Column="2" Grid.Row="1">
-                    <StackPanel VerticalAlignment="Center">
-                        <Button HorizontalAlignment="Stretch"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            Margin="20"
-                            materialDesign:ButtonAssist.CornerRadius="20"
-                            Command="{Binding OcsPopup}"
-                            Height="150" Width="250">
-                            <StackPanel>
-                                <materialDesign:PackIcon Kind="NetworkOutline" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="auto" Height="100"/>
-                                <TextBlock FontSize="20" Text="OCS" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </DockPanel>-->
             </Grid>
         </Grid>
     </Grid>

Dev/OHV/OHV.Vehicle/Concept/D_MainWindow.xaml

@@ -133,7 +133,8 @@
                         <StackPanel Orientation="Vertical">
                             
                             <Button Margin="15" Width="200" Height="50"
-                                    Command="{Binding BuzzerStopCommand}">
+                                    Command="{Binding BuzzerStopCommand}"
+                                    CommandParameter="Buzzer">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="BullhornOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="35" Width="auto" Margin="0,0,40,0"/>
                                     <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Buzzer Stop" FontSize="15"/>
@@ -141,7 +142,8 @@
                             </Button>
                             
                             <Button Margin="15" Width="200" Height="50"
-                                    Command="{Binding EmergencyStopCommand}">
+                                    Command="{Binding EmergencyStopCommand}"
+                                    CommandParameter="Emergency">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="AlarmLightOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="35" Width="auto" Margin="0,0,20,0"/>
                                     <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Emergency Stop" FontSize="15"/>

Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -130,6 +130,8 @@ namespace OHV.Vehicle.Concept
         public ICommand TestCommand { get; set; }
         public ICommand NavigateCommand { get; set; }
         public ICommand SystemOffCommand { get; set; }
+        public ICommand BuzzerStopCommand { get; set; }
+        public ICommand EmergencyStopCommand { get; set; }
 
         IRegionManager regionManager;
         public Common.Events.HostConnectedEventArgs.eConnectedState State { get; set; }