Skip to content

Commit

Permalink
OB1: sync to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamorham
jamorham committed May 24, 2020
1 parent 3f17d8e commit 5965663
Showing 1 changed file with 47 additions and 19 deletions.
66 changes: 47 additions & 19 deletions app/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java
View file
Expand Up @@ -95,6 +95,7 @@
import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingStop;
import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.usingAlt;
import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.BOND;
import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSE;
import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSED;
Expand Down Expand Up @@ -207,7 +208,7 @@ public class Ob1G5CollectionService extends G5BaseService {
private static int error_count = 0;
private static int connectNowFailures = 0;
private static int connectFailures = 0;
private static int scanTimeouts = 0;
private static volatile int scanTimeouts = 0;
private static boolean lastConnectFailed = false;
private static boolean preScanFailureMarker = false;
private static boolean auth_succeeded = false;
Expand Down Expand Up @@ -472,7 +473,7 @@ private synchronized void scan_for_device() {
if (always_scan || scan_next_run || (transmitterMAC == null) || (!transmitterID.equals(transmitterIDmatchingMAC)) || (static_last_timestamp < 1)) {
scan_next_run = false; // reset if set
transmitterMAC = null; // reset if set
last_scan_started = JoH.tsl();
last_scan_started = tsl();
scanWakeLock = JoH.getWakeLock("xdrip-jam-g5-scan", (int) Constants.MINUTE_IN_MS * 7);


Expand Down Expand Up @@ -530,7 +531,8 @@ private synchronized void scan_for_device() {

private void stopScanWithTimeoutAndReschedule() {
stopScan();
UserError.Log.d(TAG, "Stopped scan due to timeout at: " + JoH.dateTimeText(JoH.tsl()));
UserError.Log.d(TAG, "Stopped scan due to timeout at: " + JoH.dateTimeText(tsl()));
//noinspection NonAtomicOperationOnVolatileField
scanTimeouts++;
tryLoadingSavedMAC();
prepareToWakeup();
Expand Down Expand Up @@ -572,7 +574,7 @@ private synchronized void connect_to_device(boolean auto) {
UserError.Log.wtf(TAG, "Got Error from state subscription: " + throwable);
}));

last_connect_started = JoH.tsl();
last_connect_started = tsl();
// Attempt to establish a connection // TODO does this need different connection timeout for auto vs normal?
connectionSubscription = new Subscription(bleDevice.establishConnection(auto)
.timeout(7, TimeUnit.MINUTES)
Expand Down Expand Up @@ -829,8 +831,8 @@ private synchronized void prepareToWakeup() {
if (JoH.ratelimit("g5-wakeup-timer", 5)) {
final long when = DexSyncKeeper.anticipate(transmitterID);
if (when > 0) {
final long when_offset = when - JoH.tsl();
UserError.Log.d(TAG, "(" + JoH.dateTimeText(JoH.tsl()) + ") Wake up time anticipated at: " + JoH.dateTimeText(when));
final long when_offset = when - tsl();
UserError.Log.d(TAG, "(" + JoH.dateTimeText(tsl()) + ") Wake up time anticipated at: " + JoH.dateTimeText(when));
scheduleWakeUp(when_offset - Constants.SECOND_IN_MS * 15, "anticipate");
} else {
scheduleWakeUp(Constants.SECOND_IN_MS * 285, "anticipate");
Expand All @@ -851,11 +853,11 @@ private synchronized void prepareToWakeup() {

private void scheduleWakeUp(long future, final String info) {
if (future <= 0) future = 5000;
UserError.Log.d(TAG, "Scheduling wakeup @ " + JoH.dateTimeText(JoH.tsl() + future) + " (" + info + ")");
UserError.Log.d(TAG, "Scheduling wakeup @ " + JoH.dateTimeText(tsl() + future) + " (" + info + ")");
if (pendingIntent == null)
//pendingIntent = PendingIntent.getService(this, 0, new Intent(this, this.getClass()), 0);
pendingIntent = WakeLockTrampoline.getPendingIntent(this.getClass());
wakeup_time = JoH.tsl() + future;
wakeup_time = tsl() + future;
JoH.wakeUpIntent(this, future, pendingIntent);
}

Expand Down Expand Up @@ -944,7 +946,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
xdrip.checkAppContext(getApplicationContext());
final PowerManager.WakeLock wl = JoH.getWakeLock("g5-start-service", 310000);
try {
UserError.Log.d(TAG, "WAKE UP WAKE UP WAKE UP WAKE UP @ " + JoH.dateTimeText(JoH.tsl()));
UserError.Log.d(TAG, "WAKE UP WAKE UP WAKE UP WAKE UP @ " + JoH.dateTimeText(tsl()));
msg("Wake up");
if (wakeup_time > 0) {
wakeup_jitter = JoH.msSince(wakeup_time);
Expand Down Expand Up @@ -1198,6 +1200,12 @@ private void onConnectionFailure(final Throwable throwable) {
if (state == CONNECT_NOW) {
connectNowFailures++;
lastConnectFailed = true;

if ((connectNowFailures % 12 == 7) && genericBluetoothWatchdog()) {
UserError.Log.e(TAG, "Initiating bluetooth watchdog reset");
JoH.niceRestartBluetooth(xdrip.getAppContext());
}

if (throwable instanceof BleGattCallbackTimeoutException) {
if (throwable.getMessage().contains("BleGattOperation{description='CONNECTION_STATE'")) {
UserError.Log.d(TAG, "Setting pre-scan failure marker enabled due to exception type");
Expand Down Expand Up @@ -1257,7 +1265,7 @@ public void tryGattRefresh() {
// We have connected to the device!
private void onConnectionReceived(RxBleConnection this_connection) {
msg("Connected");
static_last_connected = JoH.tsl();
static_last_connected = tsl();
lastConnectFailed = false;
preScanFailureMarker = false;

Expand Down Expand Up @@ -1285,7 +1293,7 @@ private synchronized void onConnectionStateChange(RxBleConnection.RxBleConnectio
switch (newState) {
case CONNECTING:
connection_state = "Connecting";
connecting_time = JoH.tsl();
connecting_time = tsl();
break;
case CONNECTED:
connection_state = "Connected";
Expand Down Expand Up @@ -1355,6 +1363,10 @@ private boolean g5BluetoothWatchdog() {
return Pref.getBoolean("g5_bluetooth_watchdog", true);
}

private boolean genericBluetoothWatchdog() {
return Pref.getBoolean("bluetooth_watchdog", true);
}

public static void updateLast(long timestamp) {
if ((static_last_timestamp == 0) && (transmitterID != null)) {
final String ref = "last-ob1-data-" + transmitterID;
Expand Down Expand Up @@ -1563,13 +1575,29 @@ public IBinder onBind(Intent intent) {
private static final String IS_STARTED = "G5_IS_STARTED";
private static final String IS_FAILED = "G5_IS_FAILED";

public static void processCalibrationState(CalibrationState state) {
private static volatile long lastProcessCalibrationState;

public static void processCalibrationState(final CalibrationState state, final long incomingTimestamp) {
if (incomingTimestamp > lastProcessCalibrationState) {
processCalibrationState(state);
} else {
UserError.Log.d(TAG, "Ignoring calibration state as it is: " + JoH.dateTimeText(incomingTimestamp) + " vs local: " + JoH.dateTimeText(lastProcessCalibrationState));
}
}

public static void processCalibrationState(final CalibrationState state) {

if (state == CalibrationState.Unknown) {
UserError.Log.d(TAG, "Not processing push of unknown state as this is the unset state");
return;
}

if (JoH.msSince(lastProcessCalibrationState) < Constants.MINUTE_IN_MS) {
UserError.Log.d(TAG, "Ignoring duplicate processCalibration State");
return;
}
lastProcessCalibrationState = tsl();

lastSensorStatus = state.getExtendedText();
lastSensorState = state;

Expand Down Expand Up @@ -1599,7 +1627,7 @@ public static void processCalibrationState(CalibrationState state) {
Inevitable.task("ask initial calibration", SECOND_IN_MS * 30, () -> {
final PendingIntent pi = PendingIntent.getActivity(xdrip.getAppContext(), G5_CALIBRATION_REQUEST, JoH.getStartActivityIntent(c), PendingIntent.FLAG_UPDATE_CURRENT);
// pending intent not used on wear
JoH.showNotification(state.getText(), "G5 Calibration Required", android_wear ? null : pi, G5_CALIBRATION_REQUEST, state == CalibrationState.NeedsFirstCalibration, true, false);
JoH.showNotification(state.getText(), "Calibration Required", android_wear ? null : pi, G5_CALIBRATION_REQUEST, state == CalibrationState.NeedsFirstCalibration, true, false);

});
} else if (!needs_calibration && was_needing_calibration) {
Expand All @@ -1614,7 +1642,7 @@ public static void processCalibrationState(CalibrationState state) {
Ob1G5StateMachine.restartSensorWithTimeTravel();
} else {
UserError.Log.uel(TAG, "Attempting to auto-start sensor");
Ob1G5StateMachine.startSensor(JoH.tsl());
Ob1G5StateMachine.startSensor(tsl());
}
final PendingIntent pi = PendingIntent.getActivity(xdrip.getAppContext(), G5_SENSOR_RESTARTED, JoH.getStartActivityIntent(Home.class), PendingIntent.FLAG_UPDATE_CURRENT);
JoH.showNotification("Auto Start", "Sensor Requesting Restart", pi, G5_SENSOR_RESTARTED, true, true, false);
Expand All @@ -1629,7 +1657,7 @@ public static void processCalibrationState(CalibrationState state) {

if (is_failed && !was_failed) {
final PendingIntent pi = PendingIntent.getActivity(xdrip.getAppContext(), G5_SENSOR_FAILED, JoH.getStartActivityIntent(Home.class), PendingIntent.FLAG_UPDATE_CURRENT);
JoH.showNotification(state.getText(), "G5 Sensor FAILED", pi, G5_SENSOR_FAILED, true, true, false);
JoH.showNotification(state.getText(), "Sensor FAILED", pi, G5_SENSOR_FAILED, true, true, false);
UserError.Log.ueh(TAG, "Native Sensor is now marked FAILED: " + state.getExtendedText());
}
// we can't easily auto-cancel a failed notice as auto-restart may mean the user is not aware of it?
Expand All @@ -1649,7 +1677,7 @@ private static void updateG5State(boolean now, boolean previous, String referenc

private static void storeCalibrationState(final CalibrationState state) {
PersistentStore.setByte(OB1G5_STATESTORE, state.getValue());
PersistentStore.setLong(OB1G5_STATESTORE_TIME, JoH.tsl());
PersistentStore.setLong(OB1G5_STATESTORE_TIME, tsl());
}

private static CalibrationState getStoredCalibrationState() {
Expand Down Expand Up @@ -1736,7 +1764,7 @@ public static boolean fallbackToXdripAlgorithm() {
public static void msg(String msg) {
lastState = msg + " " + JoH.hourMinuteString();
UserError.Log.d(TAG, "Status: " + lastState);
lastStateUpdated = JoH.tsl();
lastStateUpdated = tsl();
if (android_wear && wear_broadcast) {
BroadcastGlucose.sendLocalBroadcast(null);
}
Expand Down Expand Up @@ -1792,7 +1820,7 @@ private long purdahMs() {

void setPurdah(final long duration) {
if (duration > 0) {
PersistentStore.setLong(PREF_PURDAH, JoH.tsl() + duration);
PersistentStore.setLong(PREF_PURDAH, tsl() + duration);
}
}

Expand Down Expand Up @@ -1964,7 +1992,7 @@ public void run() {
l.add(new StatusItem("Voltage A", bt.voltagea, bt.voltagea < LOW_BATTERY_WARNING_LEVEL ? BAD : NORMAL));
l.add(new StatusItem("Voltage B", bt.voltageb, bt.voltageb < (LOW_BATTERY_WARNING_LEVEL - 10) ? BAD : NORMAL));
l.add(new StatusItem("Resistance", bt.resist, bt.resist > 1400 ? BAD : (bt.resist > 1000 ? NOTICE : (bt.resist > 750 ? NORMAL : Highlight.GOOD))));
if (vr != null && !FirmwareCapability.isFirmwareTemperatureCapable(vr.firmware_version_string)) {
if (vr != null && FirmwareCapability.isFirmwareTemperatureCapable(vr.firmware_version_string)) {
l.add(new StatusItem("Temperature", bt.temperature + " \u2103"));
}
}
Expand Down

0 comments on commit 5965663

Please sign in to comment.