3.2.1.0

.circleci/config.yml

@@ -4,35 +4,58 @@ version: 2.1
 
 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
 orbs:
-  android: circleci/android@2.3.0
+  android: circleci/android@2.4.0
   codecov: codecov/codecov@3.3.0
 
 jobs:
   # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
   build-and-test:
-    # These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/
-    executor:
-      name: android/android-machine
-      resource-class: large
-      tag: 2023.11.1
+    machine: true
+    resource_class: nightscout/android
 
     steps:
       - checkout
 
-      - android/change-java-version:
-          java-version: 17
+      - run:
+          name: Create avd
+          command: |
+            echo "no" | /opt/android-sdk/cmdline-tools/latest/bin/avdmanager --verbose create avd -n citest -k "system-images;android-29;google_apis_playstore;x86" --force
+
+      - run:
+          name: Launch emulator
+          command: |
+            export ANDROID_SDK_ROOT=/opt/android-sdk
+            export ANDROID_HOME=/opt/android-sdk
+            emulator -avd citest -delay-adb -verbose -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim
+          background: true
+
+      - run:
+          name: Run connectedFullDebugAndroidTest
+          command: |
+            export ANDROID_SDK_ROOT=/opt/android-sdk
+            export ANDROID_HOME=/opt/android-sdk
+            env
+            ./gradlew -Dorg.gradle.jvmargs=-Xmx6g connectedFullDebugAndroidTest
 
-      - android/start-emulator-and-run-tests:
-          system-image: system-images;android-29;google_apis;x86
-          # Compile while the emulator starts to use the time.
-          post-emulator-launch-assemble-command: ./gradlew compileFullDebugUnitTestSources compileFullDebugAndroidTestSources
-          test-command: ./gradlew connectedFullDebugAndroidTest
+      - run:
+          name: Kill emulators
+          command: |
+            echo "Killing emulators"
+            adb devices | grep emulator | cut -f1 | while read -r line; do adb -s $line emu kill; done
 
-      - android/run-tests:
-          test-command: ./gradlew testFullDebugUnitTest
+      - run:
+          name: Run testFullDebugUnitTest
+          command: |
+            export ANDROID_SDK_ROOT=/opt/android-sdk
+            export ANDROID_HOME=/opt/android-sdk
+            ./gradlew -Dorg.gradle.jvmargs=-Xmx6g testFullDebugUnitTest
 
-      - android/run-tests:
-          test-command: ./gradlew --stacktrace jacocoAllDebugReport
+      - run:
+          run: Run jacocoAllDebugReport
+          command: |
+            export ANDROID_SDK_ROOT=/opt/android-sdk
+            export ANDROID_HOME=/opt/android-sdk
+            ./gradlew --stacktrace jacocoAllDebugReport
 
       - run:
           name: Save test results

app/build.gradle.kts

@@ -198,6 +198,7 @@ dependencies {
     implementation(project(":pump:danar"))
     implementation(project(":pump:diaconn"))
     implementation(project(":pump:eopatch"))
+    implementation(project(":pump:equil"))
     implementation(project(":pump:medtrum"))
     implementation(project(":insight"))
     implementation(project(":pump:medtronic"))

app/src/main/kotlin/app/aaps/di/AppComponent.kt

@@ -14,6 +14,7 @@ import app.aaps.plugins.main.di.PluginsModule
 import app.aaps.plugins.source.di.SourceModule
 import app.aaps.plugins.sync.di.OpenHumansModule
 import app.aaps.plugins.sync.di.SyncModule
+import app.aaps.pump.equil.di.EquilModule
 import app.aaps.pump.virtual.di.VirtualPumpModule
 import app.aaps.shared.impl.di.SharedImplModule
 import app.aaps.ui.di.UiModule
@@ -76,6 +77,7 @@ import javax.inject.Singleton
         DanaRSModule::class,
         DiaconnG8Module::class,
         EopatchModule::class,
+        EquilModule::class,
         InsightModule::class,
         InsightDatabaseModule::class,
         MedtronicModule::class,

app/src/main/kotlin/app/aaps/di/PluginsListModule.kt

@@ -53,6 +53,7 @@ import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin
 import app.aaps.plugins.sync.openhumans.OpenHumansUploaderPlugin
 import app.aaps.plugins.sync.tidepool.TidepoolPlugin
 import app.aaps.plugins.sync.xdrip.XdripPlugin
+import app.aaps.pump.equil.EquilPumpPlugin
 import app.aaps.pump.virtual.VirtualPumpPlugin
 import dagger.Binds
 import dagger.Module
@@ -221,9 +222,15 @@ abstract class PluginsListModule {
     abstract fun bindMedtrumPlugin(plugin: MedtrumPlugin): PluginBase
 
     @Binds
-    @AllConfigs
+    @PumpDriver
     @IntoMap
     @IntKey(170)
+    abstract fun bindEquilPumpPlugin(plugin: EquilPumpPlugin): PluginBase
+
+    @Binds
+    @AllConfigs
+    @IntoMap
+    @IntKey(180)
     abstract fun bindVirtualPumpPlugin(plugin: VirtualPumpPlugin): PluginBase
 
     @Binds

build.gradle.kts

@@ -8,8 +8,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.2.1")
-        classpath("com.google.gms:google-services:4.4.0")
+        classpath("com.android.tools.build:gradle:8.4.0")
+        classpath("com.google.gms:google-services:4.4.1")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -58,5 +58,5 @@ allprojects {
 apply(from = "jacoco_aggregation.gradle.kts")
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }

buildSrc/build.gradle.kts

@@ -1,7 +1,7 @@
 object KtsBuildVersions {
 
-    const val gradle = "8.2.0"
-    const val kotlin = "1.9.10"
+    const val gradle = "8.4.0"
+    const val kotlin = "1.9.23"
 }
 
 plugins {

buildSrc/src/main/kotlin/Libs.kt

@@ -3,7 +3,7 @@ object Libs {
 
     object Kotlin {
 
-        const val kotlin = "1.9.10"
+        const val kotlin = "1.9.23"
 
         const val stdlibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin"
         const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$kotlin"

buildSrc/src/main/kotlin/Versions.kt

@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
 
 object Versions {
 
-    const val appVersion = "3.2.0.4"
+    const val appVersion = "3.2.1.0"
     const val versionCode = 1500
 
     const val ndkVersion = "21.1.6352462"

buildSrc/src/main/kotlin/jacoco-app-dependencies.gradle.kts

@@ -117,11 +117,11 @@ fun Project.registerCodeCoverageTask(
         description = "Generate Jacoco coverage reports on the ${sourceName.replaceFirstChar(Char::titlecase)} build."
 
         val javaDirectories = fileTree(
-            "${project.buildDir}/intermediates/classes/${sourcePath}"
+            layout.buildDirectory.dir("intermediates/classes/${sourcePath}")
         ) { exclude(excludedFiles) }
 
         val kotlinDirectories = fileTree(
-            "${project.buildDir}/tmp/kotlin-classes/${sourcePath}"
+            layout.buildDirectory.dir("tmp/kotlin-classes/${sourcePath}")
         ) { exclude(excludedFiles) }
 
         val coverageSrcDirectories = listOf(
@@ -137,7 +137,7 @@ fun Project.registerCodeCoverageTask(
         additionalClassDirs.setFrom(files(coverageSrcDirectories))
         sourceDirectories.setFrom(files(coverageSrcDirectories))
         executionData.setFrom(
-            files("${project.buildDir}/jacoco/${testTaskName}.exec")
+            files(layout.buildDirectory.dir("jacoco/${testTaskName}.exec"))
         )
 
         reports {

buildSrc/src/main/kotlin/jacoco-module-dependencies.gradle.kts

@@ -117,11 +117,11 @@ fun Project.registerCodeCoverageTask(
         description = "Generate Jacoco coverage reports on the ${sourceName.replaceFirstChar(Char::titlecase)} build."
 
         val javaDirectories = fileTree(
-            "${project.buildDir}/intermediates/classes/${sourcePath}"
+            layout.buildDirectory.dir("intermediates/classes/${sourcePath}")
         ) { exclude(excludedFiles) }
 
         val kotlinDirectories = fileTree(
-            "${project.buildDir}/tmp/kotlin-classes/${sourcePath}"
+            layout.buildDirectory.dir("tmp/kotlin-classes/${sourcePath}")
         ) { exclude(excludedFiles) }
 
         val coverageSrcDirectories = listOf(
@@ -137,7 +137,7 @@ fun Project.registerCodeCoverageTask(
         additionalClassDirs.setFrom(files(coverageSrcDirectories))
         sourceDirectories.setFrom(files(coverageSrcDirectories))
         executionData.setFrom(
-            files("${project.buildDir}/jacoco/${testTaskName}.exec")
+            files(layout.buildDirectory.dir("jacoco/${testTaskName}.exec"))
         )
 
         reports {

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/ManufacturerType.kt

@@ -12,5 +12,6 @@ enum class ManufacturerType(val description: String) {
     Roche("Roche"),
     Ypsomed("Ypsomed"),
     G2e("G2e"),
-    Eoflow("Eoflow");
+    Eoflow("Eoflow"),
+    Equil("Equil");
 }

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/defs/PumpType.kt

@@ -434,6 +434,24 @@ enum class PumpType {
         description = "Medtrum untested",
         model = "untested",
         parent = MEDTRUM_NANO
+    ),
+    EQUIL(
+        description = "Equil",
+        manufacturer = ManufacturerType.Equil,
+        model = "Equil",
+        bolusSize = 0.05,
+        specialBolusSize = null,
+        extendedBolusSettings = DoseSettings(0.05, 30, 5 * 60, 0.05),
+        pumpTempBasalType = PumpTempBasalType.Absolute,
+        tbrSettings = DoseSettings(0.05, 30, 24 * 60, 0.0, 35.0),
+        specialBasalDurations = PumpCapability.BasalRate_Duration30minAllowed,
+        baseBasalMinValue = 0.05,
+        baseBasalMaxValue = 3.0,
+        baseBasalStep = 0.01,
+        baseBasalSpecialSteps = null,
+        pumpCapability = PumpCapability.DiaconnCapabilities,
+        source = Source.EQuil,
+        useHardwareLink = true,
     );
 
     val description: String
@@ -506,7 +524,8 @@ enum class PumpType {
         Medtrum,
         MDI,
         VirtualPump,
-        Unknown
+        Unknown,
+        EQuil
     }
 
     companion object {

core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt

@@ -59,6 +59,7 @@ fun PumpType.Companion.fromDbPumpType(pt: InterfaceIDs.PumpType): PumpType =
         InterfaceIDs.PumpType.USER                        -> PumpType.USER
         InterfaceIDs.PumpType.DIACONN_G8                  -> PumpType.DIACONN_G8
         InterfaceIDs.PumpType.EOPATCH2                    -> PumpType.EOFLOW_EOPATCH2
+        InterfaceIDs.PumpType.EQUIL                       -> PumpType.EQUIL
         InterfaceIDs.PumpType.MEDTRUM                     -> PumpType.MEDTRUM_NANO
         InterfaceIDs.PumpType.MEDTRUM_300U                -> PumpType.MEDTRUM_300U
         InterfaceIDs.PumpType.MEDTRUM_UNTESTED            -> PumpType.MEDTRUM_UNTESTED
@@ -84,6 +85,7 @@ fun PumpType.Source.toDbSource(): UserEntry.Sources =
         PumpType.Source.Medtrum     -> UserEntry.Sources.Medtrum
         PumpType.Source.MDI         -> UserEntry.Sources.MDI
         PumpType.Source.VirtualPump -> UserEntry.Sources.VirtualPump
+        PumpType.Source.EQuil       -> UserEntry.Sources.Equil
         else                        -> UserEntry.Sources.Unknown
     }
 
@@ -121,6 +123,7 @@ fun PumpType.toDbPumpType(): InterfaceIDs.PumpType =
         PumpType.USER                      -> InterfaceIDs.PumpType.USER
         PumpType.DIACONN_G8                -> InterfaceIDs.PumpType.DIACONN_G8
         PumpType.EOFLOW_EOPATCH2           -> InterfaceIDs.PumpType.EOPATCH2
+        PumpType.EQUIL                     -> InterfaceIDs.PumpType.EQUIL
         PumpType.MEDTRUM_NANO              -> InterfaceIDs.PumpType.MEDTRUM
         PumpType.MEDTRUM_300U              -> InterfaceIDs.PumpType.MEDTRUM_300U
         PumpType.MEDTRUM_UNTESTED          -> InterfaceIDs.PumpType.MEDTRUM_UNTESTED

crowdin.yml

@@ -63,6 +63,8 @@ files:
     translation: /pump/danar/src/main/res/values-%android_code%/strings.xml
   - source: /pump/danars/src/main/res/values/strings.xml
     translation: /pump/danars/src/main/res/values-%android_code%/strings.xml
+  - source: /pump/equil/src/main/res/values/strings.xml
+    translation: /pump/equil/src/main/res/values-%android_code%/strings.xml
   - source: /pump/medtronic/src/main/res/values/strings.xml
     translation: /pump/medtronic/src/main/res/values-%android_code%/strings.xml
   - source: /pump/medtrum/src/main/res/values/strings.xml

database/entities/src/main/kotlin/app/aaps/database/entities/UserEntry.kt

@@ -176,6 +176,7 @@ data class UserEntry(
         OmnipodEros,
         OmnipodDash,        //No entry currently
         EOPatch2,
+        Equil,
         Medtrum,
         MDI,
         VirtualPump,

database/entities/src/main/kotlin/app/aaps/database/entities/embedments/InterfaceIDs.kt

@@ -48,6 +48,7 @@ data class InterfaceIDs @Ignore constructor(
         MDI,
         DIACONN_G8,
         EOPATCH2,
+        EQUIL,
         MEDTRUM,
         MEDTRUM_300U,
         MEDTRUM_UNTESTED,

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Sep 18 18:21:09 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt

@@ -97,6 +97,7 @@ class UserEntryPresentationHelperImpl @Inject constructor(
         Sources.OmnipodEros         -> R.drawable.ic_patch_pump_outline
         Sources.OmnipodDash         -> R.drawable.ic_patch_pump_outline
         Sources.EOPatch2            -> app.aaps.core.ui.R.drawable.ic_eopatch2_128
+        Sources.Equil               -> app.aaps.core.ui.R.drawable.ic_equil_128
         Sources.Medtrum             -> app.aaps.core.ui.R.drawable.ic_medtrum_128
         Sources.MDI                 -> R.drawable.ic_ict
         Sources.VirtualPump         -> R.drawable.ic_virtual_pump

jacoco_aggregation.gradle.kts

@@ -42,8 +42,8 @@ project.afterEvaluate {
         val classesDirectories = mutableListOf<String>().also {
             subprojects.forEach { proj ->
                 variants.forEach { variant ->
-                    it.add("${proj.buildDir}/intermediates/javac/$variant/classes")
-                    it.add("${proj.buildDir}/tmp/kotlin-classes/$variant")
+                    it.add("${proj.layout.buildDirectory}/intermediates/javac/$variant/classes")
+                    it.add("${proj.layout.buildDirectory}/tmp/kotlin-classes/$variant")
                 }
             }
         }
@@ -71,12 +71,12 @@ project.afterEvaluate {
         val executions = mutableListOf<String>().also {
             subprojects.forEach { proj ->
                 variants.forEach { variant ->
-                    val path = "${proj.buildDir}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec"
+                    val path = "${proj.layout.buildDirectory}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec"
                     if ((File(path)).exists()) {
                         it.add(path)
                         println("Collecting execution data from: $path")
                     }
-                    val androidPath = "${proj.buildDir}/outputs/code_coverage/${variant}AndroidTest/connected/"
+                    val androidPath = "${proj.layout.buildDirectory}/outputs/code_coverage/${variant}AndroidTest/connected/"
                     val androidFiles = fileTree(androidPath)
                     androidFiles.forEach { file ->
                         it.add(file.path)

plugins/constraints/src/main/res/xml/pref_safety.xml

@@ -21,7 +21,7 @@
             android:inputType="numberDecimal"
             android:key="@string/key_treatmentssafety_maxbolus"
             android:title="@string/max_bolus_title"
-            validate:floatmaxNumber="25.0"
+            validate:floatmaxNumber="60.0"
             validate:floatminNumber="0.1"
             validate:testType="floatNumericRange" />
 

plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt

@@ -25,6 +25,7 @@ class SignatureVerifierPluginTest : TestBase() {
     fun singleCharUnMapTest() {
         @Suppress("SpellCheckingInspection") val key = "2ΙšÄΠΒϨÒÇeЄtЄЗž-*Ж*ZcHijЊÄœ<|x\"Ε"
         val unmapped = singleCharUnMap(key)
+        assertThat(key.length).isEqualTo(32)
         assertThat(unmapped).isEqualTo("32:99:61:C4:A0:92:E8:D2:C7:65:04:74:04:17:7E:2D:2A:16:2A:5A:63:48:69:6A:0A:C4:53:3C:7C:78:22:95")
     }
 }

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -129,7 +129,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     val commands = mapOf(
         "BG" to "BG",
         "LOOP" to "LOOP STOP/DISABLE/START/ENABLE/RESUME/STATUS/CLOSED/LGS\nLOOP SUSPEND 20",
-        "NSCLIENT" to "NSCLIENT RESTART",
+        "AAPSCLIENT" to "AAPSCLIENT RESTART",
         "PUMP" to "PUMP\nPUMP CONNECT\nPUMP DISCONNECT 30\n",
         "BASAL" to "BASAL STOP/CANCEL\nBASAL 0.3\nBASAL 0.3 20\nBASAL 30%\nBASAL 30% 20\n",
         "BOLUS" to "BOLUS 1.2\nBOLUS 1.2 MEAL",
@@ -280,7 +280,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     else if (divided.size == 2 || divided.size == 3) processLOOP(divided, receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
 
-                "NSCLIENT" ->
+                "AAPSCLIENT" ->
                     if (divided.size == 2) processNSCLIENT(divided, receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
 
@@ -542,7 +542,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     private fun processNSCLIENT(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "RESTART") {
             rxBus.send(EventNSClientRestart())
-            sendSMS(Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"))
+            sendSMS(Sms(receivedSms.phoneNumber, "AAPSCLIENT RESTART SENT"))
             receivedSms.processed = true
         } else
             sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))