nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unhit ifdefs

Browse source
This commit is contained in:
John Lewin 2018-07-12 17:13:55 -07:00
parent 53e5e80fcf
commit 249f562509
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
SetupWizard/SetupWizardTroubleshooting.cs
View file

@ -138,37 +138,42 @@ namespace MatterHackers.MatterControl
contentRow.AddChild(printerNameLabel);
contentRow.AddChild(new CriteriaRow(
"USB Connection",
"USB Connection",
"Retry",
"No USB device found. Check and reseat cables and try again",
usbStatus.AnyUsbDeviceExists,
() => UiThread.RunOnIdle(RefreshStatus)));
usbStatus.AnyUsbDeviceExists,
() => UiThread.RunOnIdle(RefreshStatus),
theme));
contentRow.AddChild(new CriteriaRow(
"USB Driver",
"USB Driver",
"Fix",
usbStatus.Summary,
usbStatus.IsDriverLoadable,
() => {
usbStatus.IsDriverLoadable,
() =>
{
string overridePath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "usboverride.local");
UsbDeviceDetails usbDetails = usbStatus.UsbDetails;
File.AppendAllText(overridePath, string.Format("{0},{1},{2}\r\n", usbDetails.VendorID, usbDetails.ProductID, usbDetails.DriverClass));
UiThread.RunOnIdle(() => RefreshStatus());
}));
},
theme));
contentRow.AddChild(new CriteriaRow(
"USB Permission",
"USB Permission",
"Request Permission",
"Click the 'Request Permission' button to gain Android access rights",
usbStatus.HasUsbPermission ,
() => {
usbStatus.HasUsbPermission,
() =>
{
if(checkForPermissionTimer == null)
if (checkForPermissionTimer == null)
{
checkForPermissionTimer = new System.Threading.Timer((state) => {
checkForPermissionTimer = new System.Threading.Timer((state) =>
{
if(FrostedSerialPort.HasPermissionToDevice(serialPort))
if (FrostedSerialPort.HasPermissionToDevice(serialPort))
{
UiThread.RunOnIdle(this.RefreshStatus);
checkForPermissionTimer.Dispose();
@ -177,7 +182,8 @@ namespace MatterHackers.MatterControl
}
FrostedSerialPort.RequestPermissionToDevice(serialPort);
}));
},
theme));
#endif
connectToPrinterRow = new CriteriaRow(