Skip to content

Commit 90a7fde

Browse files
ClutchplateDudeClutchplateDude
authored
Merge pull request #112 from OpenAstroTech/build-fix
OATControl V0.9.9.12
2 parents ca17634 + 110a426 commit 90a7fde

File tree

3 files changed

+49
-19
lines changed

3 files changed

+49
-19
lines changed

‎Software/OpenAstroTracker ASCOM/OATControl/DlgChooseOat.xaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<RowDefinition Height="Auto"/>
3636
<RowDefinition Height="Auto"/>
3737
<RowDefinition Height="Auto"/>
38+
<RowDefinition Height="Auto"/>
3839
<RowDefinition Height="*"/>
3940
<RowDefinition Height="Auto" />
4041
</Grid.RowDefinitions>
41-
<TextBlock Grid.Row="0" Grid.Column="0" Text="Available Connections" Margin="16" Foreground="{StaticResource AccentSelectedColorBrush}" />
42-
<Button Grid.Row="0" Grid.Column="1" Content="Rescan" Margin="10,10,10,10" Width="80" Style="{StaticResource AccentedSquareButtonStyle}" HorizontalAlignment="Right" Command="{Binding RescanCommand}" />
42+
<TextBlock Grid.Row="0" Grid.Column="0" Text="Available Connections" Margin="16,16,16,17" Foreground="{StaticResource AccentSelectedColorBrush}" />
43+
<Button Grid.Row="0" Grid.Column="1" Content="Rescan" Margin="0,10,10,11" Width="80" Style="{StaticResource AccentedSquareButtonStyle}" HorizontalAlignment="Right" Command="{Binding RescanCommand}" />
4344
<ListBox Grid.Row="0"
4445
Grid.Column="1"
45-
Grid.RowSpan="2"
4646
VerticalAlignment="Top"
4747
ItemsSource="{Binding AvailableDevices,Mode=OneWay}"
4848
ItemsPanel="{StaticResource ListBoxItemsPanel}"
@@ -53,7 +53,7 @@
5353
HorizontalAlignment="Stretch"
5454
MinWidth="20"
5555
Background="Transparent"
56-
Margin="0,12,100,16">
56+
Margin="0,12,100,0">
5757
<ListBox.ItemTemplate>
5858
<DataTemplate DataType="string">
5959
<Grid >
@@ -63,21 +63,24 @@
6363
</ListBox.ItemTemplate>
6464
</ListBox>
6565

66-
<TextBlock Grid.Row="2" Grid.Column="0" Text="Roll Level:" HorizontalAlignment="Right" Margin="0,10,10,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
67-
<local:LevelDisplay Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Value="{Binding RollOffset}" Range="3" Labels="-3|-2|-1|0|1|2|3" Margin="10,5,20,5" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
68-
69-
<TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding GPSStatus}" HorizontalAlignment="Center" Margin="10,5,10,20" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowGPSStatus, Converter={StaticResource ShowOnTrue}}"/>
66+
<TextBlock Grid.Row="2" Grid.Column="0" Text="Pitch Level:" HorizontalAlignment="Right" Margin="0,20,9,11" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
67+
<local:LevelDisplay Grid.Row="2" Grid.Column="1" Value="{Binding PitchOffset}" Range="3" Labels="-3|-2|-1|0|1|2|3" Margin="10,24,20,6" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
68+
69+
<TextBlock Grid.Row="3" Grid.Column="0" Text="Roll Level:" HorizontalAlignment="Right" Margin="0,0,9,11" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
70+
<local:LevelDisplay Grid.Row="3" Grid.Column="1" Value="{Binding RollOffset}" Range="3" Labels="-3|-2|-1|0|1|2|3" Margin="10,4,20,6" Visibility="{Binding ShowLevelDisplay, Converter={StaticResource CollapseOnFalse}}" />
71+
72+
<TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding GPSStatus}" HorizontalAlignment="Center" Margin="10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowGPSStatus, Converter={StaticResource ShowOnTrue}}"/>
7073

71-
<TextBlock Grid.Row="4" Grid.Column="0" Text="Latitude" HorizontalAlignment="Right" Margin="0,5,9,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
72-
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding Latitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,0,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
74+
<TextBlock Grid.Row="5" Grid.Column="0" Text="Latitude" HorizontalAlignment="Right" Margin="0,5,8,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
75+
<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding Latitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,0,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
7376

74-
<TextBlock Grid.Row="5" Grid.Column="0" Text="Longitude" HorizontalAlignment="Right" Margin="0,10,10,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
75-
<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding Longitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,5,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
77+
<TextBlock Grid.Row="6" Grid.Column="0" Text="Longitude" HorizontalAlignment="Right" Margin="0,10,10,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
78+
<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Longitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,5,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
7679

77-
<TextBlock Grid.Row="6" Grid.Column="0" Text="Altitude" HorizontalAlignment="Right" Margin="0,10,9,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
78-
<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Altitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,5,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
80+
<TextBlock Grid.Row="7" Grid.Column="0" Text="Altitude" HorizontalAlignment="Right" Margin="0,10,8,10" Foreground="{StaticResource AccentSelectedColorBrush}" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
81+
<TextBox Grid.Row="7" Grid.Column="1" Text="{Binding Altitude}" Width="150" FontWeight="Bold" FontSize="16" Foreground="{StaticResource AccentSelectedColorBrush}" Background="{StaticResource AccentColorBrush2}" Margin="5,5,0,5" HorizontalAlignment="Left" Visibility="{Binding ShowManualLocation, Converter={StaticResource CollapseOnFalse}}" />
7982

80-
<Grid Grid.Row="8" HorizontalAlignment="Stretch" Grid.ColumnSpan="2">
83+
<Grid Grid.Row="9" HorizontalAlignment="Stretch" Grid.ColumnSpan="2">
8184
<Grid.ColumnDefinitions>
8285
<ColumnDefinition Width="Auto" />
8386
<ColumnDefinition Width="*" />

‎Software/OpenAstroTracker ASCOM/OATControl/DlgChooseOat.xaml.cs

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ public enum Steps
4848
private bool _showNextButton = false;
4949
private bool _showLevelDisplay = false;
5050
private double _rollOffset;
51+
private double _pitchOffset;
5152
private List<double> _rollOffsetHistory;
53+
private List<double> _pitchOffsetHistory;
5254
private float _rollReference;
55+
private float _pitchReference;
5356
private MountVM _mountViewModel;
5457
private Steps _currentStep = Steps.Idle;
5558
private string _gpsStatus = string.Empty;
@@ -67,6 +70,7 @@ public DlgChooseOat(MountVM mountViewModel, Func<string, Task<string>> sendComma
6770
_sendCommand = sendCommand;
6871
_mountViewModel = mountViewModel;
6972
_rollOffsetHistory = new List<double>(5);
73+
_pitchOffsetHistory = new List<double>(5);
7074
_latitude = Settings.Default.SiteLatitude;
7175
_longitude = Settings.Default.SiteLongitude;
7276

@@ -184,6 +188,19 @@ public double RollOffset
184188
}
185189
}
186190

191+
public double PitchOffset
192+
{
193+
get { return _pitchOffset; }
194+
set
195+
{
196+
if (value != _pitchOffset)
197+
{
198+
_pitchOffset = value;
199+
OnPropertyChanged("PitchOffset");
200+
}
201+
}
202+
}
203+
187204
public Steps CurrentStep
188205
{
189206
get { return _currentStep; }
@@ -342,7 +359,9 @@ private async void ProcessStateMachine(object sender, EventArgs e)
342359

343360
// Get the reference angles from the level.
344361
string referenceAngles = await _sendCommand(":XLGR#,#");
345-
_rollReference = float.Parse(referenceAngles.Split(",".ToCharArray())[1]);
362+
var angles = referenceAngles.Split(",".ToCharArray());
363+
_pitchReference = float.Parse(angles[0]);
364+
_rollReference = float.Parse(angles[1]);
346365
ShowLevelDisplay = true;
347366
}
348367
else if (_mountViewModel.IsAddonSupported("GPS"))
@@ -363,16 +382,24 @@ private async void ProcessStateMachine(object sender, EventArgs e)
363382
string currentAngles = await _sendCommand(":XLGC#,#");
364383
if (!currentAngles.Contains("NAN"))
365384
{
366-
float currentRoll = float.Parse(currentAngles.Split(",".ToCharArray())[1]);
367-
385+
var angles = currentAngles.Split(",".ToCharArray());
386+
float currentPitch = float.Parse(angles[0]);
387+
float currentRoll = float.Parse(angles[1]);
388+
368389
// Keep a rolling average of the last 6 values.
369390
if (_rollOffsetHistory.Count > 5)
370391
{
371392
_rollOffsetHistory.RemoveAt(0);
372393
}
394+
if (_pitchOffsetHistory.Count > 5)
395+
{
396+
_pitchOffsetHistory.RemoveAt(0);
397+
}
373398

374399
_rollOffsetHistory.Add(currentRoll - _rollReference);
375400
RollOffset = _rollOffsetHistory.Average();
401+
_pitchOffsetHistory.Add(currentPitch- _pitchReference);
402+
PitchOffset = _pitchOffsetHistory.Average();
376403
}
377404
break;
378405

‎Software/OpenAstroTracker ASCOM/OATControl/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("0.9.9.11")]
54+
[assembly: AssemblyVersion("0.9.9.12")]
5555
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)