caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

RL: replace deprecated code

Browse source
This commit is contained in:
Milos Kozak 2022-04-21 15:26:47 +02:00
parent 4e0d9e25b7
commit 06a07724fb
1 changed files with 40 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
View file

@ -1,20 +1,21 @@
package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble; package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble;
import android.os.AsyncTask;
import android.os.SystemClock; import android.os.SystemClock;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import info.nightscout.shared.logging.AAPSLogger;
import info.nightscout.shared.logging.LTag;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperationResult; import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.operations.BLECommOperationResult;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil; import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil; import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
import info.nightscout.shared.logging.AAPSLogger;
import info.nightscout.shared.logging.LTag;
/** /**
* Created by geoff on 5/26/16. * Created by geoff on 5/26/16.
@ -22,30 +23,21 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
public class RFSpyReader { public class RFSpyReader {
private final AAPSLogger aapsLogger; private final AAPSLogger aapsLogger;
private static AsyncTask<Void, Void, Void> readerTask; ExecutorService executor = Executors.newSingleThreadExecutor();
private RileyLinkBLE rileyLinkBle; private final RileyLinkBLE rileyLinkBle;
private final Semaphore waitForRadioData = new Semaphore(0, true); private final Semaphore waitForRadioData = new Semaphore(0, true);
private final LinkedBlockingQueue<byte[]> mDataQueue = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue<byte[]> mDataQueue = new LinkedBlockingQueue<>();
private int acquireCount = 0; private int acquireCount = 0;
private int releaseCount = 0; private int releaseCount = 0;
private boolean stopAtNull = true; private boolean stopAtNull = true;
private static boolean isRunning = false;
RFSpyReader(AAPSLogger aapsLogger, RileyLinkBLE rileyLinkBle) { RFSpyReader(AAPSLogger aapsLogger, RileyLinkBLE rileyLinkBle) {
this.aapsLogger = aapsLogger; this.aapsLogger = aapsLogger;
// xyz setRileyLinkBle(rileyLinkBle);
this.rileyLinkBle = rileyLinkBle; this.rileyLinkBle = rileyLinkBle;
} }
public void setRileyLinkBle(RileyLinkBLE rileyLinkBle) {
if (readerTask != null) {
readerTask.cancel(true);
}
this.rileyLinkBle = rileyLinkBle;
}
void setRileyLinkEncodingType(RileyLinkEncodingType encodingType) { void setRileyLinkEncodingType(RileyLinkEncodingType encodingType) {
aapsLogger.debug("setRileyLinkEncodingType: " + encodingType); aapsLogger.debug("setRileyLinkEncodingType: " + encodingType);
stopAtNull = !(encodingType == RileyLinkEncodingType.Manchester || // stopAtNull = !(encodingType == RileyLinkEncodingType.Manchester || //
@ -90,57 +82,46 @@ public class RFSpyReader {
public void start() { public void start() {
isRunning = true; executor.execute(() -> {
UUID serviceUUID = UUID.fromString(GattAttributes.SERVICE_RADIO);
UUID radioDataUUID = UUID.fromString(GattAttributes.CHARA_RADIO_DATA);
BLECommOperationResult result;
//noinspection InfiniteLoopStatement
while (true) {
try {
acquireCount++;
waitForRadioData.acquire();
aapsLogger.debug(LTag.PUMPBTCOMM, ThreadUtil.sig() + "waitForRadioData acquired (count=" + acquireCount + ") at t="
+ SystemClock.uptimeMillis());
SystemClock.sleep(100);
SystemClock.sleep(1);
result = rileyLinkBle.readCharacteristicBlocking(serviceUUID, radioDataUUID);
SystemClock.sleep(100);
readerTask = new AsyncTask<Void, Void, Void>() { if (result.resultCode == BLECommOperationResult.RESULT_SUCCESS) {
if (stopAtNull) {
@Override // only data up to the first null is valid
protected Void doInBackground(Void... voids) { for (int i = 0; i < result.value.length; i++) {
UUID serviceUUID = UUID.fromString(GattAttributes.SERVICE_RADIO); if (result.value[i] == 0) {
UUID radioDataUUID = UUID.fromString(GattAttributes.CHARA_RADIO_DATA); result.value = ByteUtil.substring(result.value, 0, i);
BLECommOperationResult result; break;
while (isRunning) {
try {
acquireCount++;
waitForRadioData.acquire();
aapsLogger.debug(LTag.PUMPBTCOMM, ThreadUtil.sig() + "waitForRadioData acquired (count=" + acquireCount + ") at t="
+ SystemClock.uptimeMillis());
SystemClock.sleep(100);
SystemClock.sleep(1);
result = rileyLinkBle.readCharacteristicBlocking(serviceUUID, radioDataUUID);
SystemClock.sleep(100);
if (result.resultCode == BLECommOperationResult.RESULT_SUCCESS) {
if (stopAtNull) {
// only data up to the first null is valid
for (int i = 0; i < result.value.length; i++) {
if (result.value[i] == 0) {
result.value = ByteUtil.substring(result.value, 0, i);
break;
}
} }
} }
mDataQueue.add(result.value);
} else if (result.resultCode == BLECommOperationResult.RESULT_INTERRUPTED) {
aapsLogger.error(LTag.PUMPBTCOMM, "Read operation was interrupted");
} else if (result.resultCode == BLECommOperationResult.RESULT_TIMEOUT) {
aapsLogger.error(LTag.PUMPBTCOMM, "Read operation on Radio Data timed out");
} else if (result.resultCode == BLECommOperationResult.RESULT_BUSY) {
aapsLogger.error(LTag.PUMPBTCOMM, "FAIL: RileyLinkBLE reports operation already in progress");
} else if (result.resultCode == BLECommOperationResult.RESULT_NONE) {
aapsLogger.error(LTag.PUMPBTCOMM, "FAIL: got invalid result code: " + result.resultCode);
} }
} catch (InterruptedException e) { mDataQueue.add(result.value);
aapsLogger.error(LTag.PUMPBTCOMM, "Interrupted while waiting for data"); } else if (result.resultCode == BLECommOperationResult.RESULT_INTERRUPTED) {
aapsLogger.error(LTag.PUMPBTCOMM, "Read operation was interrupted");
} else if (result.resultCode == BLECommOperationResult.RESULT_TIMEOUT) {
aapsLogger.error(LTag.PUMPBTCOMM, "Read operation on Radio Data timed out");
} else if (result.resultCode == BLECommOperationResult.RESULT_BUSY) {
aapsLogger.error(LTag.PUMPBTCOMM, "FAIL: RileyLinkBLE reports operation already in progress");
} else if (result.resultCode == BLECommOperationResult.RESULT_NONE) {
aapsLogger.error(LTag.PUMPBTCOMM, "FAIL: got invalid result code: " + result.resultCode);
} }
} catch (InterruptedException e) {
aapsLogger.error(LTag.PUMPBTCOMM, "Interrupted while waiting for data");
} }
return null;
} }
}.execute(); });
} }
public void stop() {
isRunning = false;
}
} }