nightscout · CAPTCG · May 29, 2026 · May 29, 2026 · May 31, 2026 · May 31, 2026
diff --git a/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt b/app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
@@ -29,6 +29,7 @@ import app.aaps.plugins.smoothing.NoSmoothingPlugin
 import app.aaps.plugins.smoothing.UnscentedKalmanFilterPlugin
 import app.aaps.plugins.source.AidexPlugin
 import app.aaps.plugins.source.DexcomPlugin
+import app.aaps.plugins.source.EversensePlugin
 import app.aaps.plugins.source.GlimpPlugin
 import app.aaps.plugins.source.GlunovoPlugin
 import app.aaps.plugins.source.IntelligoPlugin
@@ -270,6 +271,11 @@ abstract class PluginsListModule {
     @IntoMap
     @IntKey(440)
     abstract fun bindDexcomPlugin(plugin: DexcomPlugin): PluginBase
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(446)
+    abstract fun bindEversensePlugin(plugin: EversensePlugin): PluginBase
 
     @Binds
     @AllConfigs
@@ -384,4 +390,4 @@ abstract class PluginsListModule {
 
     @Qualifier
     annotation class Unfinished
-}
+}
diff --git a/core/data/src/main/kotlin/app/aaps/core/data/model/SourceSensor.kt b/core/data/src/main/kotlin/app/aaps/core/data/model/SourceSensor.kt
@@ -31,6 +31,8 @@ enum class SourceSensor(val text: String) {
     SIBIONIC("SI App"),
     SINO("Sino App"),
     EVERSENSE("Eversense"),
+    EVERSENSE_E3("Eversense E3"),
+    EVERSENSE_365("Eversense 365"),
     AIDEX("GlucoRx Aidex"),
     SYAI_TAG("Syai Tag"),
     INSTARA("Instara"),

diff --git a/core/data/src/main/kotlin/app/aaps/core/data/model/SourceSensorExtensions.kt b/core/data/src/main/kotlin/app/aaps/core/data/model/SourceSensorExtensions.kt
@@ -14,4 +14,6 @@ private val ADVANCED_FILTERING_SENSORS = setOf(
     SourceSensor.LIBRE_3,
     SourceSensor.SYAI_TAG,
     SourceSensor.RANDOM,
+    SourceSensor.EVERSENSE_365,
+    SourceSensor.EVERSENSE_E3,
 )
diff --git a/core/data/src/test/kotlin/app/aaps/core/data/model/SourceSensorExtensionsTest.kt b/core/data/src/test/kotlin/app/aaps/core/data/model/SourceSensorExtensionsTest.kt
@@ -35,7 +35,13 @@ class SourceSensorExtensionsTest {
     }
 
     @Test
-    fun `eversense does not support advanced filtering`() {
+    fun `eversense 365 and e3 support advanced filtering`() {
+        assertThat(SourceSensor.EVERSENSE_365.advancedFilteringSupported()).isTrue()
+        assertThat(SourceSensor.EVERSENSE_E3.advancedFilteringSupported()).isTrue()
+    }
+
+    @Test
+    fun `eversense legacy does not support advanced filtering`() {
         assertThat(SourceSensor.EVERSENSE.advancedFilteringSupported()).isFalse()
     }
 

diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationId.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/notifications/NotificationId.kt
@@ -1,4 +1,4 @@
-package app.aaps.core.interfaces.notifications
+package app.aaps.core.interfaces.notifications
 
 import app.aaps.core.interfaces.notifications.NotificationCategory.AUTOMATION
 import app.aaps.core.interfaces.notifications.NotificationCategory.CGM
@@ -101,6 +101,12 @@ enum class NotificationId(
     AIDEX_SENSOR_STABILIZING(97, NORMAL, CGM),
     AIDEX_REPLACE_SENSOR(98, NORMAL, CGM),
     AIDEX_SIGNAL_LOST(99, NORMAL, CGM),
+    // CGM — Eversense
+    EVERSENSE_ALARM(100, URGENT, CGM, allowMultiple = true),
+    EVERSENSE_FIRMWARE(101, INFO, CGM),
+    EVERSENSE_RELEASE(102, INFO, CGM),
+    EVERSENSE_PLACEMENT(103, URGENT, CGM),
+    EVERSENSE_CREDENTIALS(104, URGENT, CGM),
 
     // Loop / APS
     EASY_MODE_ENABLED(2, URGENT, LOOP),
@@ -160,3 +166,4 @@ enum class NotificationId(
         fun fromLegacyId(id: Int): NotificationId? = legacyIdMap[id]
     }
 }
+
diff --git a/core/keys/src/main/kotlin/app/aaps/core/keys/BooleanKey.kt b/core/keys/src/main/kotlin/app/aaps/core/keys/BooleanKey.kt
@@ -156,10 +156,14 @@ enum class BooleanKey(
     WearNotifyOnSmb(key = "wear_notifySMB", defaultValue = true, titleResId = R.string.pref_title_wear_notify_on_smb, summaryResId = R.string.pref_summary_wear_notify_on_smb),
     WearBroadcastData(key = "wear_broadcast_data", defaultValue = false, titleResId = R.string.pref_title_wear_broadcast_data, summaryResId = R.string.pref_summary_wear_broadcast_data, showInApsMode = false, showInPumpControlMode = false),
 
+    EversenseCloudUploadEnabled("eversense_cloud_upload_enabled", true, R.string.eversense_cloud_upload_enabled),
+    EversenseCloudUploadToast("eversense_notif_cloud_upload_toast", true, R.string.eversense_cloud_upload_toast),
     @Deprecated("remove after migration")
     WizardCalculationVisible("wizard_calculation_visible", defaultValue = false, titleResId = R.string.pref_title_wizard_calculation_visible),
     WizardCorrectionPercent("wizard_correction_percent", defaultValue = false, titleResId = R.string.pref_title_wizard_correction_percent),
     SiteRotationManagePump("site_rotation_manage_pump", defaultValue = false, titleResId = R.string.pref_title_site_rotation_manage_pump),
     SiteRotationManageCgm("site_rotation_manage_cgm", defaultValue = false, titleResId = R.string.pref_title_site_rotation_manage_cgm),
 
 }
+
+
diff --git a/core/keys/src/main/kotlin/app/aaps/core/keys/IntKey.kt b/core/keys/src/main/kotlin/app/aaps/core/keys/IntKey.kt
@@ -87,8 +87,8 @@ enum class IntKey(
     ),
     OverviewSageWarning(key = "statuslights_sage_warning", defaultValue = 216, min = 24, max = 720, titleResId = R.string.pref_title_sage_warning, defaultedBySM = true, unitType = UnitType.HOURS),
     OverviewSageCritical(key = "statuslights_sage_critical", defaultValue = 240, min = 24, max = 720, titleResId = R.string.pref_title_sage_critical, defaultedBySM = true, unitType = UnitType.HOURS),
-    OverviewSbatWarning(key = "statuslights_sbat_warning", defaultValue = 25, min = 0, max = 100, titleResId = R.string.pref_title_sbat_warning, defaultedBySM = true, unitType = UnitType.PERCENT),
-    OverviewSbatCritical(key = "statuslights_sbat_critical", defaultValue = 5, min = 0, max = 100, titleResId = R.string.pref_title_sbat_critical, defaultedBySM = true, unitType = UnitType.PERCENT),
+    OverviewSbatWarning(key = "statuslights_sbat_warning", defaultValue = 40, min = 0, max = 100, titleResId = R.string.pref_title_sbat_warning, defaultedBySM = true, unitType = UnitType.PERCENT),
+    OverviewSbatCritical(key = "statuslights_sbat_critical", defaultValue = 20, min = 0, max = 100, titleResId = R.string.pref_title_sbat_critical, defaultedBySM = true, unitType = UnitType.PERCENT),
     OverviewBageWarning(key = "statuslights_bage_warning", defaultValue = 216, min = 24, max = 1000, titleResId = R.string.pref_title_bage_warning, defaultedBySM = true, unitType = UnitType.HOURS),
     OverviewBageCritical(key = "statuslights_bage_critical", defaultValue = 240, min = 24, max = 1000, titleResId = R.string.pref_title_bage_critical, defaultedBySM = true, unitType = UnitType.HOURS),
     OverviewResWarning(key = "statuslights_res_warning", defaultValue = 80, min = 0, max = 300, titleResId = R.string.pref_title_res_warning, defaultedBySM = true, unitType = UnitType.INSULIN_INT),

diff --git a/core/keys/src/main/res/values/strings.xml b/core/keys/src/main/res/values/strings.xml
@@ -464,4 +464,8 @@
     <!--    Appearance preferences-->
     <string name="prefs_range_title">Range for visualization</string>
 
+    <string name="eversense_use_smoothing">Use ESEL smoothing</string>
+    <string name="eversense_cloud_upload_enabled">Enable Eversense cloud upload</string>
+    <string name="eversense_cloud_upload_toast">Show cloud upload result</string>
 </resources>
+
diff --git a/database/impl/src/main/kotlin/app/aaps/database/entities/GlucoseValue.kt b/database/impl/src/main/kotlin/app/aaps/database/entities/GlucoseValue.kt
@@ -93,6 +93,8 @@ data class GlucoseValue(
         MM_600_SERIES,
         MM_SIMPLERA,
         EVERSENSE,
+        EVERSENSE_E3,
+        EVERSENSE_365,
         AIDEX,
         RANDOM,
         UNKNOWN,

diff --git a/...istence/src/main/kotlin/app/aaps/database/persistence/converters/SourceSensorExtension.kt b/...istence/src/main/kotlin/app/aaps/database/persistence/converters/SourceSensorExtension.kt
@@ -32,6 +32,8 @@ fun GlucoseValue.SourceSensor.fromDb(): SourceSensor =
         GlucoseValue.SourceSensor.MM_600_SERIES          -> SourceSensor.MM_600_SERIES
         GlucoseValue.SourceSensor.MM_SIMPLERA            -> SourceSensor.MM_SIMPLERA
         GlucoseValue.SourceSensor.EVERSENSE              -> SourceSensor.EVERSENSE
+        GlucoseValue.SourceSensor.EVERSENSE_E3           -> SourceSensor.EVERSENSE_E3
+        GlucoseValue.SourceSensor.EVERSENSE_365          -> SourceSensor.EVERSENSE_365
         GlucoseValue.SourceSensor.AIDEX                  -> SourceSensor.AIDEX
         GlucoseValue.SourceSensor.RANDOM                 -> SourceSensor.RANDOM
         GlucoseValue.SourceSensor.UNKNOWN                -> SourceSensor.UNKNOWN
@@ -77,6 +79,8 @@ fun SourceSensor.toDb(): GlucoseValue.SourceSensor =
         SourceSensor.MM_600_SERIES          -> GlucoseValue.SourceSensor.MM_600_SERIES
         SourceSensor.MM_SIMPLERA            -> GlucoseValue.SourceSensor.MM_SIMPLERA
         SourceSensor.EVERSENSE              -> GlucoseValue.SourceSensor.EVERSENSE
+        SourceSensor.EVERSENSE_E3           -> GlucoseValue.SourceSensor.EVERSENSE_E3
+        SourceSensor.EVERSENSE_365          -> GlucoseValue.SourceSensor.EVERSENSE_365
         SourceSensor.AIDEX                  -> GlucoseValue.SourceSensor.AIDEX
         SourceSensor.RANDOM                 -> GlucoseValue.SourceSensor.RANDOM
         SourceSensor.UNKNOWN                -> GlucoseValue.SourceSensor.UNKNOWN

diff --git a/plugins/eversense/.gitignore b/plugins/eversense/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/plugins/eversense/build.gradle.kts b/plugins/eversense/build.gradle.kts
@@ -0,0 +1,28 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.ksp)
+
+    id("kotlinx-serialization")
+    id("android-module-dependencies")
+    id("test-module-dependencies")
+}
+
+android {
+    namespace = "com.nightscout.eversense"
+}
+
+dependencies {
+    api(libs.androidx.core)
+    api(platform(libs.kotlinx.serialization.bom))
+    api(libs.kotlinx.serialization.json)
+
+    api(libs.org.slf4j.api)
+    api(libs.com.github.tony19.logback.android)
+
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.81")
+    implementation("org.bouncycastle:bcprov-jdk18on:1.81")
+
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+}
+
+
diff --git a/plugins/eversense/consumer-rules.pro b/plugins/eversense/consumer-rules.pro
diff --git a/plugins/eversense/proguard-rules.pro b/plugins/eversense/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/plugins/eversense/src/main/AndroidManifest.xml b/plugins/eversense/src/main/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+
+    <application>
+    </application>
+
+</manifest>