From 562c5fb600e2ac0eeb0c1e4639df172e1136d908 Mon Sep 17 00:00:00 2001 From: saledouble Date: Wed, 6 Nov 2019 13:08:02 -0500 Subject: [PATCH] Rejuvenate log levels --- src/deviation/DeviationUploader.java | 4 ++-- src/deviation/Dfu.java | 2 +- src/deviation/ZipFile.java | 4 ++-- src/deviation/filesystem/FlashIO.java | 2 +- src/deviation/filesystem/TxInterfaceCommon.java | 6 +++--- src/deviation/gui/MonitorUSB.java | 4 ++-- src/deviation/gui/TextEditor.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/deviation/DeviationUploader.java b/src/deviation/DeviationUploader.java index bcad942..5ce9340 100644 --- a/src/deviation/DeviationUploader.java +++ b/src/deviation/DeviationUploader.java @@ -167,12 +167,12 @@ private static void readBinFromDevice(DfuDevice dev, String fname, int address, private static void listDevices(List devs) { if (devs.size() == 0) { - LOG.info("No devices found."); + LOG.fine("No devices found."); } else { LOG.info(String.format("Device\t%9s %8s %8s %7s %s", "Interface", "Start", "End", "Size", "Count")); for (DfuDevice dev: devs) { int i = 0; - LOG.info(String.format("%s", dev.getTxInfo().type().getName())); + LOG.fine(String.format("%s", dev.getTxInfo().type().getName())); for (DfuInterface iface: dev.Interfaces()) { for (SegmentParser segment: iface.Memory().segments()) { for (Sector sector: segment.sectors()) { diff --git a/src/deviation/Dfu.java b/src/deviation/Dfu.java index 081600c..34a8123 100644 --- a/src/deviation/Dfu.java +++ b/src/deviation/Dfu.java @@ -313,7 +313,7 @@ public static int setIdle(DfuDevice dev) LOG.severe("Device still in Runtime Mode!"); return -1; case DfuStatus.STATE_DFU_ERROR: - LOG.fine("dfuERROR, clearing status"); + LOG.warning("dfuERROR, clearing status"); if (clearStatus(dev) < 0) { LOG.severe("error clear_status"); return -1; diff --git a/src/deviation/ZipFile.java b/src/deviation/ZipFile.java index b4dada4..a6a7bc7 100644 --- a/src/deviation/ZipFile.java +++ b/src/deviation/ZipFile.java @@ -38,7 +38,7 @@ private List GetFileList(String fname) { } ostream.flush(); if (ostream.size() != ze.getSize()) { - LOG.warning(String.format("Only read %d bytes from %s:%s (expected %d)", ostream.size(), zipFile, fname, ze.getSize())); + LOG.info(String.format("Only read %d bytes from %s:%s (expected %d)", ostream.size(), zipFile, fname, ze.getSize())); } else { buffer = ostream.toByteArray(); } @@ -69,7 +69,7 @@ public byte[] read(String fname) { } ostream.flush(); if (ostream.size() != ze.getSize()) { - LOG.warning(String.format("Only read %d bytes from %s:%s (expected %d)", ostream.size(), zipFile, fname, ze.getSize())); + LOG.info(String.format("Only read %d bytes from %s:%s (expected %d)", ostream.size(), zipFile, fname, ze.getSize())); } else { buffer = ostream.toByteArray(); } diff --git a/src/deviation/filesystem/FlashIO.java b/src/deviation/filesystem/FlashIO.java index f10ab07..2cf0303 100644 --- a/src/deviation/filesystem/FlashIO.java +++ b/src/deviation/filesystem/FlashIO.java @@ -86,7 +86,7 @@ public void close() throws IOException { } } } - public void flush() { LOG.info("flush");} + public void flush() { LOG.finer("flush");} public int getSectorSize() throws IOException { return fsSectorSize; } public long getSize() throws IOException { return ram.length - startOffset; } public boolean isClosed() { return false; } diff --git a/src/deviation/filesystem/TxInterfaceCommon.java b/src/deviation/filesystem/TxInterfaceCommon.java index 1a16d18..f774bdb 100644 --- a/src/deviation/filesystem/TxInterfaceCommon.java +++ b/src/deviation/filesystem/TxInterfaceCommon.java @@ -23,11 +23,11 @@ protected static List readDirRecur(String parent, FsDirectory dir) thr if (entry.isDirectory()) { if (entry.getName().equals(".") || entry.getName().equals("..")) continue; - LOG.fine(String.format("DIR: %s", entry.getName())); + LOG.finer(String.format("DIR: %s", entry.getName())); files.addAll(readDirRecur(parent + entry.getName() + "/", entry.getDirectory())); } else { files.add(new FileInfo(parent + entry.getName(), (int)entry.getFile().getLength())); - LOG.fine(String.format("FILE: %s (%d)", entry.getName(), entry.getFile().getLength())); + LOG.finer(String.format("FILE: %s (%d)", entry.getName(), entry.getFile().getLength())); } } return files; @@ -45,7 +45,7 @@ protected void readDir(FileSystem fs, String dirStr) { Iterator itr = dir.iterator(); while(itr.hasNext()) { FsDirectoryEntry entry = itr.next(); - LOG.info(entry.getName()); + LOG.finer(entry.getName()); } } catch (IOException e) { e.printStackTrace(); } } diff --git a/src/deviation/gui/MonitorUSB.java b/src/deviation/gui/MonitorUSB.java index 8df4adc..68710eb 100644 --- a/src/deviation/gui/MonitorUSB.java +++ b/src/deviation/gui/MonitorUSB.java @@ -59,7 +59,7 @@ public String doInBackground() { if (dfuDev != null) { LibUsb.freeDeviceList(this.devices, true); dfuDev = null; - LOG.info("Unplug detected"); + LOG.finer("Unplug detected"); state_changed = true; //Signal disconnect } @@ -71,7 +71,7 @@ public String doInBackground() { dfuDev = dev; dfuDev.setTxInfo(TxInfo.getTxInfo(dfuDev)); this.devices = devices; - LOG.info("Hotplug detected"); + LOG.finer("Hotplug detected"); state_changed = true; //Signal connect/change } else { diff --git a/src/deviation/gui/TextEditor.java b/src/deviation/gui/TextEditor.java index e967246..c17f1a1 100644 --- a/src/deviation/gui/TextEditor.java +++ b/src/deviation/gui/TextEditor.java @@ -73,7 +73,7 @@ public TextEditor(FileInfo file) { textArea.setMarkOccurrences(true); textArea.append(finalData); Font f = textArea.getFont(); - LOG.info(String.format("Font: %d", f.getSize())); + LOG.finer(String.format("Font: %d", f.getSize())); f = new Font(f.getFamily(), f.getStyle(), f.getSize()+5); textArea.setFont(f); RTextScrollPane sp = new RTextScrollPane(textArea);