Skip to content

I
imagej-elphel
Commit f1c19f00 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Merge branch 'lwir' of git.elphel.com:Elphel/imagej-elphel into lwir

parents 52884d5b 8ddcb3ac
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/main/java/com/elphel/imagej/lwir/LwirReader.java
View file @ f1c19f00
...@@ -76,6 +76,8 @@ public class LwirReader { ...@@ -76,6 +76,8 @@ public class LwirReader {
public static final int FRAMES_SKIP = 4; public static final int FRAMES_SKIP = 4;
public static final int MAX_THREADS = 100; // combine from all classes? public static final int MAX_THREADS = 100; // combine from all classes?
public static final int FRAMES_AHEAD = 5;
/** Logger for this class. */ /** Logger for this class. */
private static final Logger LOGGER = private static final Logger LOGGER =
LoggerFactory.getLogger(LwirReader.class); LoggerFactory.getLogger(LwirReader.class);
...@@ -400,7 +402,7 @@ public class LwirReader { ...@@ -400,7 +402,7 @@ public class LwirReader {
String hex_chan = String.format("0x%x", channels); String hex_chan = String.format("0x%x", channels);
String url = "http://"+lrp.lwir_ip+"/parsedit.php?immediate&sensor_port="+chn+ String url = "http://"+lrp.lwir_ip+"/parsedit.php?immediate&sensor_port="+chn+
"&SENSOR_REGS67=0!"+hex_chan; "&SENSOR_REGS67=0*"+FRAMES_AHEAD+"!"+hex_chan;
// String url = "http://"+lrp.lwir_ip+"/parsedit.php?immediate&sensor_port="+chn+ // String url = "http://"+lrp.lwir_ip+"/parsedit.php?immediate&sensor_port="+chn+
// "&SENSOR_REGS67=0&*SENSOR_REGS67="+hex_chan; // "&SENSOR_REGS67=0&*SENSOR_REGS67="+hex_chan;
Document dom=null; Document dom=null;
...@@ -427,7 +429,7 @@ public class LwirReader { ...@@ -427,7 +429,7 @@ public class LwirReader {
LOGGER.error("programLWIRCamera() in " + url+ " - SAX error: " + se.toString()); LOGGER.error("programLWIRCamera() in " + url+ " - SAX error: " + se.toString());
return false; return false;
} }
for (int i = 0; i < FRAMES_SKIP; i++) { for (int i = 0; i < (FRAMES_SKIP+FRAMES_AHEAD); i++) {
if (!skipFrame(lrp)) { if (!skipFrame(lrp)) {
LOGGER.error("programLWIRCamera():Failed to skip frame"); LOGGER.error("programLWIRCamera():Failed to skip frame");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment