151,6 → 151,7 |
bool _bConnErr = false; |
bool _bFollowCopter = false; |
bool _bGPXLog = false; |
bool _Simulate = false; |
|
bool _bSaveWinStateNormal = true; |
bool _bSaveWinStateFull = true; |
2254,7 → 2255,7 |
for (int i = iStart; i < dtWaypoints.Rows.Count; i++) |
{ |
k = iStart > 0 ? k : -1; |
_sendWayPoint(dtWaypoints.Rows[i], k, 'w'); |
_sendWayPoint(dtWaypoints.Rows[i], k, 'w',false); |
|
_iWPCount = -1; |
iTimeout = 0; |
2277,7 → 2278,7 |
Log(LogMsgType.Error, "NOT CONNECTED!"); |
|
} |
bool _sendWayPoint(DataRow dr, int index, char command) |
bool _sendWayPoint(DataRow dr, int index, char command,bool bSim) |
{ |
|
if (serialPortCtrl.Port.IsOpen) |
2313,8 → 2314,11 |
bData[9] = (byte)((iVal >> 8) & 0xff); |
bData[10] = (byte)((iVal >> 16) & 0xff); |
bData[11] = (byte)(iVal >> 24); |
if(bSim) |
bData[12] = 3; //Status 'SIMULATE' |
//Status 'NEWDATA' |
bData[12] = 1; |
else |
bData[12] = 1; |
//heading |
iVal = Convert.ToInt16(dr[6]); |
bData[13] = (byte)(iVal & 0xff); |
3445,22 → 3449,6 |
}); |
|
} |
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 0); |
} |
private void comboBoxPOIColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 1); |
} |
private void comboBoxFSColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 2); |
} |
private void comboBoxLandingColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender,3); |
} |
void _MarkerColorSelection(object sender,int type) |
{ |
Dispatcher.Invoke(() => |
3482,8 → 3470,24 |
} |
}); |
} |
private void comboBoxCopterColor_DropDownClosed(object sender, EventArgs e) |
private void comboBoxWPColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 0); |
} |
private void comboBoxPOIColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 1); |
} |
private void comboBoxFSColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender, 2); |
} |
private void comboBoxLandingColor_DropDownClosed(object sender, EventArgs e) |
{ |
_MarkerColorSelection(sender,3); |
} |
private void comboBoxCopterColor_DropDownClosed(object sender, EventArgs e) |
{ |
Dispatcher.Invoke(() => { |
if (comboBoxCopterColor.SelectionBoxItem != null) |
{ |
3553,9 → 3557,9 |
if (dgvWP.SelectedIndex > -1 && dgvWP.SelectedIndex < dtWaypoints.Rows.Count) |
{ |
if (_wpCount > 0) |
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], -1, 's'); |
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], -1, 's',false); |
else |
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], 1, 's'); |
_sendWayPoint(dtWaypoints.Rows[dgvWP.SelectedIndex], 1, 's',false); |
|
//int index = dgvWP.SelectedIndex; |
//Thread t = new Thread(() => _sendWPList(index)); |
3569,16 → 3573,27 |
row.Background = new SolidColorBrush(Colors.Transparent); |
row.BorderBrush = new SolidColorBrush(Colors.Transparent); |
row.BorderThickness = new Thickness(0); |
dgvWP.UpdateLayout(); |
} |
_wpEdit = dgvWP.SelectedIndex; |
row = (DataGridRow)dgvWP.ItemContainerGenerator.ContainerFromIndex(_wpEdit); |
row.Background = new SolidColorBrush(Color.FromArgb(80, 0, 255, 100)); |
row.BorderBrush = new SolidColorBrush(Colors.SpringGreen); |
row.BorderThickness = new Thickness(2); |
dgvWP.UpdateLayout(); |
//_wpEdit = dgvWP.SelectedIndex; |
//row = (DataGridRow)dgvWP.ItemContainerGenerator.ContainerFromIndex(_wpEdit); |
//row.Background = new SolidColorBrush(Color.FromArgb(80, 0, 255, 100)); |
//row.BorderBrush = new SolidColorBrush(Colors.SpringGreen); |
//row.BorderThickness = new Thickness(2); |
}); |
} |
} |
private void btnWPSimulateStart_Click(object sender, RoutedEventArgs e) |
{ |
_Simulate = !_Simulate; |
if (dtWaypoints.Rows.Count > 0) |
{ |
DataRow dr = dtWaypoints.Rows[0]; |
dr[13] = _Simulate ? 3 : 0; |
_sendWayPoint(dr, 1, 's', true); |
rectSimulate.Visibility = _Simulate ? Visibility.Visible : Visibility.Hidden; |
} |
} |
private void dgvWP_MouseUp(object sender, MouseButtonEventArgs e) |
{ |
_dgvWPselectEditRow(); |
4078,6 → 4093,7 |
} |
} |
|
|
private void btnLoadGPXLog_Click(object sender, RoutedEventArgs e) |
{ |
_loadGPXLog(); |