diff --git a/pom.xml b/pom.xml index 02722c0..918b010 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ NS-USBloader ns-usbloader - 0.2.3_DEVELOPMENT-SNAPSHOT + 0.2.3_DEV-SNAPSHOT https://github.com/developersu/ns-usbloader/ @@ -140,7 +140,7 @@ org.usb4java usb4java - 1.3.0 + 1.2.0 compile @@ -155,6 +155,18 @@ 1.8 + + + maven-jar-plugin + 2.4 + + + default-jar + none + + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/src/main/java/nsusbloader/NSLMain.java b/src/main/java/nsusbloader/NSLMain.java index 06720a0..7fd6cba 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.3_DEVELOPMENT"; + public static final String appVersion = "v0.2.3_DEV"; @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 393a51c..abd9301 100644 --- a/src/main/java/nsusbloader/UsbCommunications.java +++ b/src/main/java/nsusbloader/UsbCommunications.java @@ -114,19 +114,17 @@ public class UsbCommunications extends Task { switch (result){ case 0: - System.out.println("SUCCES"); - System.out.println("\n"+configDescriptor.dump()); + printLog("DBG: getActiveConfigDescriptor\n"+configDescriptor.dump(), EMsgType.PASS); break; case LibUsb.ERROR_NOT_FOUND: - System.out.println("ERROR_NOT_FOUND "+result); + printLog("DBG: getActiveConfigDescriptor: ERROR_NOT_FOUND", EMsgType.FAIL); break; default: - System.out.println("UNKNOWN "+result); + printLog("DBG: getActiveConfigDescriptor: "+result, EMsgType.FAIL); break; } - System.out.println(); - //LibUsb.freeConfigDescriptor(configDescriptor); + LibUsb.freeConfigDescriptor(configDescriptor); //*/ /* * So what did we learn? @@ -228,6 +226,7 @@ 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) @@ -237,6 +236,7 @@ public class UsbCommunications extends Task { close(); return null; } + */ // Set configuration (soft reset if needed) result = LibUsb.setConfiguration(handlerNS, 1); // 1 - configuration all we need if (result != LibUsb.SUCCESS){ @@ -264,27 +264,6 @@ 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) {