diff --git a/app/src/main/java/info/nightscout/androidaps/Services/Intents.java b/app/src/main/java/info/nightscout/androidaps/Services/Intents.java index 1c2753b847..25485fb34d 100644 --- a/app/src/main/java/info/nightscout/androidaps/Services/Intents.java +++ b/app/src/main/java/info/nightscout/androidaps/Services/Intents.java @@ -38,7 +38,6 @@ public interface Intents { String EXTRA_TIMESTAMP = "com.eveningoutpost.dexdrip.Extras.Time"; String EXTRA_RAW = "com.eveningoutpost.dexdrip.Extras.Raw"; String XDRIP_DATA_SOURCE_DESCRIPTION = "com.eveningoutpost.dexdrip.Extras.SourceDesc"; - String EXTRA_NOISE = "com.eveningoutpost.dexdrip.Extras.Noise"; String ACTION_NEW_BG_ESTIMATE_NO_DATA = "com.eveningoutpost.dexdrip.BgEstimateNoData"; diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java index 3ecc969fc6..0a936f23d8 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java +++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java @@ -37,8 +37,6 @@ public class BgReading implements DataPointWithLabelInterface { @DatabaseField public double raw; @DatabaseField - public double noise = -999; // xDrip sends -999 to indicate lack of a noise reading (due to missed readings or calibration) - @DatabaseField public boolean isFiltered; @DatabaseField public String sourcePlugin; @@ -154,7 +152,6 @@ public class BgReading implements DataPointWithLabelInterface { raw = other.raw; direction = other.direction; _id = other._id; - noise = other.noise; sourcePlugin = other.sourcePlugin; isFiltered = other.isFiltered; } diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index 868e44b65e..c954d8c06a 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -123,8 +123,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { "isFiltered", "integer"); createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS, "sourcePlugin", "text"); - createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS, - "noise", "real"); } catch (SQLException e) { log.error("Can't create database", e); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java index c97a01e516..2c7f399beb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java @@ -50,15 +50,8 @@ public class SourceXdripPlugin extends PluginBase implements BgSourceInterface { bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME); bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP); bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW); - bgReading.noise = bundle.getDouble(Intents.EXTRA_NOISE, -999); String sourceDescription = bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, ""); bgReading.isFiltered = sourceDescription.equals("G5 Native"); - if (MainApp.engineeringMode && !bgReading.isFiltered && bgReading.noise >= 0 && bgReading.noise <= 4) { - // TODO syncing noice with NS is neither implemented nor tested - // * NSUpload.uploadBg - log.debug("Setting filtered=true, since noise is provided and passed check: " + bgReading.noise); - bgReading.isFiltered = true; - } bgReading.sourcePlugin = getName(); boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());