mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-21 22:52:22 +00:00
updates to Daq
New DLL, and some LED control, but hasn't fixed stalling problem.
This commit is contained in:
Douglas Gillespie
parent
910950878d
commit
3da8401756
Binary file not shown.
@ -20,6 +20,9 @@ public class SmruDaqJNI {
|
||||
|
||||
static public final int SMRU_RET_OK = 0;
|
||||
|
||||
static public final int GREEN_LED = 1;
|
||||
static public final int RED_LED = 0;
|
||||
|
||||
/**
|
||||
* Have rebuilt SAIL Daq interface in 2022, but in principle this was
|
||||
* just a straight rebuild of the exact same JNI code. the main purpose was to check
|
||||
@ -29,11 +32,6 @@ public class SmruDaqJNI {
|
||||
private static final String SILIB = "SailDaqJNI";
|
||||
// private static final String SILIB = "SailDaqV7";
|
||||
|
||||
/**
|
||||
* this is the verbose level for the C code part.
|
||||
*/
|
||||
private static final int verboseLevel = 0;
|
||||
|
||||
private static final String DEVNAME = "/dev/cypress_smru0";
|
||||
|
||||
private static final int MINJNIVERSION = 5;
|
||||
@ -265,7 +263,7 @@ public class SmruDaqJNI {
|
||||
this.smruDaqSystem = smruDaqSystem;
|
||||
loadLibrary();
|
||||
if (haveLibrary()) {
|
||||
setVerbose(verboseLevel);
|
||||
setVerbose(SmruDaqSystem.VERBOSELEVEL);
|
||||
|
||||
/**
|
||||
* List the devices, but don't do any resetting and
|
||||
@ -492,7 +490,7 @@ public class SmruDaqJNI {
|
||||
public int toggleLED(int board, int led) {
|
||||
board = boardOrder[board];
|
||||
int state = getLED(board, led);
|
||||
System.out.println("state="+state);
|
||||
// System.out.println("LED state="+state);
|
||||
if (state == 0) {
|
||||
state = 1;
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@ import java.util.List;
|
||||
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
@ -13,6 +14,7 @@ import soundPlayback.PlaybackControl;
|
||||
import soundPlayback.PlaybackSystem;
|
||||
import Acquisition.AcquisitionControl;
|
||||
import Acquisition.AcquisitionDialog;
|
||||
import Acquisition.AcquisitionProcess;
|
||||
import Acquisition.DaqSystem;
|
||||
import Acquisition.AudioDataQueue;
|
||||
import PamController.PamControlledUnitSettings;
|
||||
@ -49,7 +51,8 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
|
||||
public static final String oldCardName = "SMRU Ltd DAQ Card";
|
||||
|
||||
private static final int VERBOSELEVEL = 0;
|
||||
public static final int VERBOSELEVEL = 0;
|
||||
|
||||
|
||||
/**
|
||||
* @param daqControl
|
||||
@ -61,6 +64,11 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
smruDaqJNI = new SmruDaqJNI(this);
|
||||
|
||||
nDaqCards = smruDaqJNI.getnDevices();
|
||||
for (int i = 0; i < nDaqCards; i++) {
|
||||
for (int l = 0; l < 2; l++) {
|
||||
smruDaqJNI.setLED(i, l, 0);
|
||||
}
|
||||
}
|
||||
|
||||
smruDaqDialogPanel = new SmruDaqDialogPanel(this);
|
||||
PamSettingManager.getInstance().registerSettings(this);
|
||||
@ -275,6 +283,8 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
boolean prepareDaqCard(int iBoard, boolean fullReset) {
|
||||
// devices are left closed, so will need to reopen them.
|
||||
// of course, there is a vile lookup table, so...
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.GREEN_LED, 0);
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.RED_LED, 0);
|
||||
int hardId = smruDaqJNI.getBoardOrder(iBoard);
|
||||
int prepOk = smruDaqJNI.prepareDevice(hardId, fullReset);
|
||||
terminalPrint("Opened daq card returned " + prepOk, 1);
|
||||
@ -313,6 +323,7 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
|
||||
if (ans) {
|
||||
Thread t = new Thread(new DaqThread());
|
||||
t.setPriority(Thread.MAX_PRIORITY);
|
||||
t.start();
|
||||
keepRunning = true;
|
||||
daqThreadRunning = true;
|
||||
@ -371,18 +382,43 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
boolean first = true;
|
||||
boolean needRestart = false;
|
||||
int iChan;
|
||||
// some flags on checks of incoming data rate
|
||||
// long recentSamples = 0;
|
||||
// long recentCheckTime = System.currentTimeMillis();
|
||||
int loopCount = 0;
|
||||
for (int iBoard = 0; iBoard < nDaqCards; iBoard++) {
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.GREEN_LED, 1);
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.RED_LED, 0);
|
||||
}
|
||||
|
||||
while (keepRunning) {
|
||||
iChan = 0;
|
||||
dataMillis = daqControl.getAcquisitionProcess().absSamplesToMilliseconds(totalSamples);
|
||||
if (isStalled()) {
|
||||
needRestart = true;
|
||||
for (int iBoard = 0; iBoard < nDaqCards; iBoard++) {
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.GREEN_LED, 0);
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.RED_LED, 1);
|
||||
}
|
||||
// don't set this false or the shutdown doesn't work properly.
|
||||
// keepRunning = false;
|
||||
break;
|
||||
}
|
||||
loopCount++;
|
||||
for (int iBoard = 0; iBoard < nDaqCards && keepRunning; iBoard++) {
|
||||
if ((loopCount % 10000) == 0) {
|
||||
// toggleLED(iBoard, 0);
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.GREEN_LED, 1);
|
||||
}
|
||||
for (int i = 0; i < boardChannels[iBoard] && keepRunning; i++) {
|
||||
newData = smruDaqJNI.readSamples(iBoard, i, wantedSamples);
|
||||
if (newData == null) {
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.RED_LED, 1);
|
||||
System.out.println(String.format("Null data read from smruDaqJNI.readSamples board %d, chan %d, samples %d",
|
||||
iBoard, i, wantedSamples));
|
||||
// System.out.println("Issue restart ...");
|
||||
needRestart = true;
|
||||
keepRunning = false;
|
||||
// keepRunning = false;
|
||||
break;
|
||||
}
|
||||
readSamples = newData.length;
|
||||
@ -411,17 +447,45 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings {
|
||||
}
|
||||
|
||||
|
||||
|
||||
totalSamples += readSamples;
|
||||
|
||||
}
|
||||
};
|
||||
daqThreadRunning = false;
|
||||
if (needRestart) {
|
||||
PamController pamController = PamController.getInstance();
|
||||
pamController.pamStop();
|
||||
PamDialog.showWarning(daqControl.getGuiFrame(), daqControl.getUnitName(), "Problem with one or more SAIL DAQ Cards.\n"
|
||||
+ "Restart PAMGuard, check connections and try again." );
|
||||
// pamController.startLater();
|
||||
|
||||
for (int iBoard = 0; iBoard < nDaqCards; iBoard++) {
|
||||
smruDaqJNI.setLED(iBoard, SmruDaqJNI.GREEN_LED, 0);
|
||||
}
|
||||
|
||||
if (needRestart) {
|
||||
SwingUtilities.invokeLater(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
PamController pamController = PamController.getInstance();
|
||||
pamController.pamStop();
|
||||
System.out.println("Problem with one or more SAIL DAQ Cards. "
|
||||
+ "Restart PAMGuard, check connections and try again." );
|
||||
// PamDialog.showWarning(daqControl.getGuiFrame(), daqControl.getUnitName(), "Problem with one or more SAIL DAQ Cards.\n"
|
||||
// + "Restart PAMGuard, check connections and try again." );
|
||||
pamController.startLater();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// private long lastFakeStall = 0;
|
||||
private boolean isStalled() {
|
||||
// if (lastFakeStall == 0) {
|
||||
// lastFakeStall = System.currentTimeMillis();
|
||||
// }
|
||||
// long now = System.currentTimeMillis();
|
||||
// if (now-lastFakeStall > 10000) {
|
||||
// System.out.println("Random pretend stalled");
|
||||
// lastFakeStall = 0;
|
||||
// return true;
|
||||
// }
|
||||
return daqControl.getAcquisitionProcess().isStalled();
|
||||
}
|
||||
|
||||
public static short getSample(byte[] buffer, int position) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user