diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java index 1c3e4a87a..5afc7f185 100644 --- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java +++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java @@ -56,7 +56,7 @@ public class GBDaoGenerator { public static void main(String[] args) throws Exception { - final Schema schema = new Schema(102, MAIN_PACKAGE + ".entities"); + final Schema schema = new Schema(101, MAIN_PACKAGE + ".entities"); Entity userAttributes = addUserAttributes(schema); Entity user = addUserInfo(schema, userAttributes); @@ -193,7 +193,6 @@ public class GBDaoGenerator { addGenericHeartRateSample(schema, user, device); addGenericSpo2Sample(schema, user, device); addGenericStressSample(schema, user, device); - addGenericHrvSummarySample(schema, user, device); addGenericHrvValueSample(schema, user, device); addGenericTemperatureSample(schema, user, device); @@ -1774,19 +1773,6 @@ public class GBDaoGenerator { return heartRateSample; } - private static Entity addGenericHrvSummarySample(Schema schema, Entity user, Entity device) { - Entity hrvSummarySample = addEntity(schema, "GenericHrvSummarySample"); - addCommonTimeSampleProperties("AbstractHrvSummarySample", hrvSummarySample, user, device); - hrvSummarySample.addIntProperty(SAMPLE_HRV_WEEKLY_AVERAGE).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_LAST_NIGHT_AVERAGE).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_LAST_NIGHT_5MIN_HIGH).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_BASELINE_LOW_UPPER).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_BASELINE_BALANCED_LOWER).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_BASELINE_BALANCED_UPPER).codeBeforeGetter(OVERRIDE); - hrvSummarySample.addIntProperty(SAMPLE_HRV_STATUS_NUM).codeBeforeGetter(OVERRIDE); - return hrvSummarySample; - } - private static Entity addGenericHrvValueSample(Schema schema, Entity user, Entity device) { Entity hrvValueSample = addEntity(schema, "GenericHrvValueSample"); addCommonTimeSampleProperties("AbstractHrvValueSample", hrvValueSample, user, device); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/GenericHrvSummarySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/GenericHrvSummarySampleProvider.java deleted file mode 100644 index adbf8c61d..000000000 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/GenericHrvSummarySampleProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (C) 2025 Thomas Kuehne - - This file is part of Gadgetbridge. - - Gadgetbridge is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Gadgetbridge is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . */ - -package nodomain.freeyourgadget.gadgetbridge.devices; - -import androidx.annotation.NonNull; - -import de.greenrobot.dao.AbstractDao; -import de.greenrobot.dao.Property; -import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; -import nodomain.freeyourgadget.gadgetbridge.entities.GenericHrvSummarySample; -import nodomain.freeyourgadget.gadgetbridge.entities.GenericHrvSummarySampleDao; -import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; - -public class GenericHrvSummarySampleProvider extends AbstractTimeSampleProvider { - public GenericHrvSummarySampleProvider(final GBDevice device, final DaoSession session) { - super(device, session); - } - - @NonNull - @Override - public AbstractDao getSampleDao() { - return getSession().getGenericHrvSummarySampleDao(); - } - - @NonNull - @Override - protected Property getTimestampSampleProperty() { - return GenericHrvSummarySampleDao.Properties.Timestamp; - } - - @NonNull - @Override - protected Property getDeviceIdentifierSampleProperty() { - return GenericHrvSummarySampleDao.Properties.DeviceId; - } - - @Override - public GenericHrvSummarySample createSample() { - return new GenericHrvSummarySample(); - } -} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java index 4c0f1b60b..6cf0dd00e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java @@ -32,7 +32,6 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCardAction; import nodomain.freeyourgadget.gadgetbridge.devices.GenericHeartRateSampleProvider; -import nodomain.freeyourgadget.gadgetbridge.devices.GenericHrvSummarySampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GenericHrvValueSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GenericSpo2SampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.GenericStressSampleProvider; @@ -116,11 +115,6 @@ public class UltrahumanDeviceCoordinator extends AbstractBLEDeviceCoordinator { return "Ultrahuman Healthcare Pvt Ltd"; } - @Override - public TimeSampleProvider getHrvSummarySampleProvider(GBDevice device, DaoSession session) { - return new GenericHrvSummarySampleProvider(device, session); - } - @Override public TimeSampleProvider getHrvValueSampleProvider(GBDevice device, DaoSession session) { return new GenericHrvValueSampleProvider(device, session);