Skip to content

Commit

Permalink
Minor Cosmetics
Browse files Browse the repository at this point in the history
Added Buttons to get USB Drivers and USB Trouble Shotting Pages
  • Loading branch information
Dan Stark committed Apr 18, 2018
1 parent 19cfbaf commit 4599dfd
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 66 deletions.
Binary file modified .vs/RFEOnSite/v15/.suo
Binary file not shown.
Binary file modified .vs/RFEOnSite/v15/Server/sqlite3/storage.ide
Binary file not shown.
Binary file modified .vs/RFEOnSite/v15/sqlite3/storage.ide
Binary file not shown.
108 changes: 74 additions & 34 deletions RFEOnSite/Forms/Main Form/ApplicationMainForm.Designer.cs

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions RFEOnSite/Forms/Main Form/ApplicationMainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1370,5 +1370,15 @@ private void MenuStripMenuItemPreset_Click(object sender, EventArgs e)
{
Application.Exit();
}

private void BaudRate_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("http://j3.rf-explorer.com/62-rfe/troubleshooting/104-troubleshooting-usb-drivers");
}

private void button1_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("http://j3.rf-explorer.com/download/sw/win/RFExplorer_USB_Driver.zip");
}
}
}
1 change: 1 addition & 0 deletions RFEOnSite/GlobalData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public GlobalData()
public bool CancelActive { get { return mCancelActive; } set { mCancelActive = value; } }
public bool CsvDirectoryValid { get { return mCsvDirectoryValid; } set { mCsvDirectoryValid = value; } }
public bool CaptureImage { get { return mCaptureImage; } set { mCaptureImage = value; } }
public int BaudRate { get; set; }
}

public enum eBand { e700, e850, ePCS, eAWS, ePublicSafety };
Expand Down
3 changes: 1 addition & 2 deletions RFEOnSite/RFEOnSite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<MinimumRequiredVersion>1.3.2.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<ApplicationRevision>12</ApplicationRevision>
<ApplicationRevision>22</ApplicationRevision>
<ApplicationVersion>2.2.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
Expand Down Expand Up @@ -161,7 +161,6 @@
<Compile Include="RFEConfiguration.cs" />
<Compile Include="Serial Interfacce\SerialPorts.cs" />
<Compile Include="CSV Export\CsvExport.cs" />
<Compile Include="UIMethods.cs" />
<Compile Include="Forms\Whoop Downlink Form\WhoopNodeForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down
10 changes: 1 addition & 9 deletions RFEOnSite/RFExplorer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public RFExplorer()
mWaitingForConfigurationFlag = true;
}

//Background Thread to find and connect to serial port. Main Thread Awaits completion
public void InitializeSerialConnection(IProgress<string> UpdateUIComPortText)
{
mSerialPort.FindSerialPorts();
Expand Down Expand Up @@ -199,15 +200,6 @@ private void ReceiveThread(IProgress<RFEConfiguration> configurationProgress,
progressBarProgress.Report(0);
}
}
//else
//{
// // Sweeping is now done so stop and report results using two Progress callbacks.
// mCapture = false;
// sReceived = "";
// sNewText = "";
// sweepData.Report(mReceivedSweep);
// progressBarProgress.Report(0);
//}
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions RFEOnSite/Serial Interfacce/SerialPorts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ public class SerialPorts
{
private static string[] mEnumeratedComPortNames;
private static string[] mConnectedPorts;
private string mConnectedPort;
private SerialPort mSerialPort;
private bool mRFEConnected;

public string[] ComPortName { get { return mConnectedPorts; } }
public bool RFEConnected { get { return mRFEConnected; } }
public SerialPort Port { get { return mSerialPort; } set { mSerialPort = value; } }
public string ConnectedPortName { get { return mConnectedPort; } }
public string ConnectedPortName { get; private set; }
private static bool IsConnectedPort(string sPortName)
{
foreach (string sPort in mEnumeratedComPortNames)
Expand Down Expand Up @@ -103,11 +102,11 @@ public bool FindSerialPorts()

if (mConnectedPorts != null)
{
mConnectedPort = String.Concat(mConnectedPorts);
ConnectedPortName = String.Concat(mConnectedPorts);
return true;
}

mConnectedPort = "";
ConnectedPortName = "";
return false;
}

Expand Down
17 changes: 0 additions & 17 deletions RFEOnSite/UIMethods.cs

This file was deleted.

0 comments on commit 4599dfd

Please sign in to comment.