diff --git a/pom.xml b/pom.xml index 5665658..02722c0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ NS-USBloader ns-usbloader - 0.2.2-SNAPSHOT + 0.2.3_DEVELOPMENT-SNAPSHOT https://github.com/developersu/ns-usbloader/ diff --git a/src/main/java/nsusbloader/NSLMain.java b/src/main/java/nsusbloader/NSLMain.java index c1b4828..06720a0 100644 --- a/src/main/java/nsusbloader/NSLMain.java +++ b/src/main/java/nsusbloader/NSLMain.java @@ -12,7 +12,7 @@ import java.util.Locale; import java.util.ResourceBundle; public class NSLMain extends Application { - public static final String appVersion = "v0.2.2"; + public static final String appVersion = "v0.2.3_DEVELOPMENT"; @Override public void start(Stage primaryStage) throws Exception{ diff --git a/src/main/java/nsusbloader/UsbCommunications.java b/src/main/java/nsusbloader/UsbCommunications.java index b8f74f9..393a51c 100644 --- a/src/main/java/nsusbloader/UsbCommunications.java +++ b/src/main/java/nsusbloader/UsbCommunications.java @@ -228,7 +228,15 @@ public class UsbCommunications extends Task { } else printLog("libusb doesn't supports function 'CAP_SUPPORTS_DETACH_KERNEL_DRIVER'. Proceeding.", EMsgType.WARNING); - + // Reset device + result = LibUsb.resetDevice(handlerNS); + if (result == 0) + printLog("Reset device", EMsgType.PASS); + else { + printLog("Reset device returned: " + result, EMsgType.FAIL); + close(); + return null; + } // Set configuration (soft reset if needed) result = LibUsb.setConfiguration(handlerNS, 1); // 1 - configuration all we need if (result != LibUsb.SUCCESS){ @@ -256,7 +264,27 @@ public class UsbCommunications extends Task { printLog("Set active configuration to device.", EMsgType.PASS); } + ////////////////////////////////////////// DEBUG INFORMATION START /////////////////////////////////////////// + // + ConfigDescriptor configDescriptor = new ConfigDescriptor(); + //result = LibUsb.getConfigDescriptor(deviceNS, (byte)0x01, configDescriptor); + result = LibUsb.getActiveConfigDescriptor(deviceNS, configDescriptor); + switch (result){ + case 0: + printLog("DBG: getActiveConfigDescriptor\n"+configDescriptor.dump(), EMsgType.PASS); + break; + case LibUsb.ERROR_NOT_FOUND: + printLog("DBG: getActiveConfigDescriptor: ERROR_NOT_FOUND", EMsgType.FAIL); + break; + default: + printLog("DBG: getActiveConfigDescriptor: "+result, EMsgType.FAIL); + break; + } + + LibUsb.freeConfigDescriptor(configDescriptor); + //*/ + ////////////////////////////////////////// DEBUG INFORMATION END ////////////////////////////////////////////// // Claim interface result = LibUsb.claimInterface(handlerNS, DEFAULT_INTERFACE); if (result != LibUsb.SUCCESS) { diff --git a/src/main/resources/res/app_logo.png b/src/main/resources/res/app_logo.png index 53c27bb..8a9748c 100644 Binary files a/src/main/resources/res/app_logo.png and b/src/main/resources/res/app_logo.png differ