diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..4ce4a9be35
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+
+[*{kt,kts}]
+disabled_rules=no-wildcard-imports
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3542887fac..3a7ab749b3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -22,6 +22,7 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
+      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
@@ -140,14 +141,28 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
+      <option name="RIGHT_MARGIN" value="120" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="5" />
       <option name="METHOD_ANNOTATION_WRAP" value="5" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <option name="CLASS_ANNOTATION_WRAP" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/build.gradle b/build.gradle
index fd870b3ad6..3b9caa5038 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,10 @@ buildscript {
             }
         }
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
+        maven { url "https://dl.bintray.com/kotlin/kotlinx" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
 
@@ -58,6 +59,11 @@ buildscript {
     }
 }
 
+plugins {
+    id "io.gitlab.arturbosch.detekt" version "1.16.0-RC2"
+    id "org.jlleitschuh.gradle.ktlint" version "9.4.1"
+}
+
 allprojects {
     repositories {
         google()
@@ -78,6 +84,8 @@ allprojects {
                 includeModule("org.jetbrains.trove4j", "trove4j")
             }
         }
+        maven { url "https://dl.bintray.com/kotlin/kotlinx" }
+
     }
     //Support @JvmDefault
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a5b8e899d..e53b7051f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index bf7d1c99c1..9d48cfa1c1 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.hiya.jacoco-android'
+apply plugin: "io.gitlab.arturbosch.detekt" // TODO move to `subprojects` section in global build.gradle
+apply plugin: "org.jlleitschuh.gradle.ktlint" // TODO move to `subprojects` section in global build.gradle
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
@@ -14,6 +16,11 @@ android {
     }
 }
 
+detekt { // TODO move to `subprojects` section in global build.gradle
+    toolVersion = "1.15.0-RC2"
+    config = files("./detekt-config.yml")  // TODO move to global space and use "../detekt-config.yml"
+}
+
 dependencies {
     implementation project(':core')
     implementation project(':omnipod-common')
diff --git a/omnipod-dash/detekt-config.yml b/omnipod-dash/detekt-config.yml
new file mode 100644
index 0000000000..0ecb5a111b
--- /dev/null
+++ b/omnipod-dash/detekt-config.yml
@@ -0,0 +1,690 @@
+build:
+  maxIssues: 0
+  excludeCorrectable: false
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'KtFileCountProcessor'
+
+console-reports:
+  active: true
+  exclude:
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    #  - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+
+comments:
+  active: true
+  excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  UndocumentedPublicClass:
+    active: false
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+  UndocumentedPublicFunction:
+    active: false
+  UndocumentedPublicProperty:
+    active: false
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+  ComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions: [run, let, apply, with, also, use, forEach, isNotNull, ifNull]
+  LabeledExpression:
+    active: false
+    ignoredLabels: []
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: false
+    ignoreDataClasses: true
+    ignoreAnnotated: []
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NamedArguments:
+    active: false
+    threshold: 3
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: false
+  RedundantSuspendModifier:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: false
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: false
+    methodNames: [toString, hashCode, equals, finalize]
+  InstanceOfCheckForException:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  NotImplementedDeclaration:
+    active: false
+  PrintStackTrace:
+    active: false
+  RethrowCaughtException:
+    active: false
+  ReturnFromFinally:
+    active: false
+    ignoreLabeled: false
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes:
+      - InterruptedException
+      - NumberFormatException
+      - ParseException
+      - MalformedURLException
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: false
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptions:
+      - IllegalArgumentException
+      - IllegalStateException
+      - IOException
+  ThrowingNewInstanceOfSameException:
+    active: false
+  TooGenericExceptionCaught:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptionNames:
+      - ArrayIndexOutOfBoundsException
+      - Error
+      - Exception
+      - IllegalMonitorStateException
+      - NullPointerException
+      - IndexOutOfBoundsException
+      - RuntimeException
+      - Throwable
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - Error
+      - Exception
+      - Throwable
+      - RuntimeException
+
+formatting:
+  active: true
+  android: false
+  autoCorrect: true
+  AnnotationOnSeparateLine:
+    active: false
+    autoCorrect: true
+  AnnotationSpacing:
+    active: false
+    autoCorrect: true
+  ArgumentListWrapping:
+    active: false
+    autoCorrect: true
+  ChainWrapping:
+    active: true
+    autoCorrect: true
+  CommentSpacing:
+    active: true
+    autoCorrect: true
+  EnumEntryNameCase:
+    active: false
+    autoCorrect: true
+  Filename:
+    active: true
+  FinalNewline:
+    active: true
+    autoCorrect: true
+    insertFinalNewLine: true
+  ImportOrdering:
+    active: false
+    autoCorrect: true
+    layout: 'idea'
+  Indentation:
+    active: false
+    autoCorrect: true
+    indentSize: 4
+    continuationIndentSize: 4
+  MaximumLineLength:
+    active: true
+    maxLineLength: 150
+  ModifierOrdering:
+    active: true
+    autoCorrect: true
+  MultiLineIfElse:
+    active: true
+    autoCorrect: true
+  NoBlankLineBeforeRbrace:
+    active: true
+    autoCorrect: true
+  NoConsecutiveBlankLines:
+    active: true
+    autoCorrect: true
+  NoEmptyClassBody:
+    active: true
+    autoCorrect: true
+  NoEmptyFirstLineInMethodBlock:
+    active: false
+    autoCorrect: true
+  NoLineBreakAfterElse:
+    active: true
+    autoCorrect: true
+  NoLineBreakBeforeAssignment:
+    active: true
+    autoCorrect: true
+  NoMultipleSpaces:
+    active: true
+    autoCorrect: true
+  NoSemicolons:
+    active: true
+    autoCorrect: true
+  NoTrailingSpaces:
+    active: true
+    autoCorrect: true
+  NoUnitReturn:
+    active: true
+    autoCorrect: true
+  NoUnusedImports:
+    active: true
+    autoCorrect: true
+  NoWildcardImports:
+    active: true
+  PackageName:
+    active: true
+    autoCorrect: true
+  ParameterListWrapping:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+  SpacingAroundColon:
+    active: true
+    autoCorrect: true
+  SpacingAroundComma:
+    active: true
+    autoCorrect: true
+  SpacingAroundCurly:
+    active: true
+    autoCorrect: true
+  SpacingAroundDot:
+    active: true
+    autoCorrect: true
+  SpacingAroundDoubleColon:
+    active: false
+    autoCorrect: true
+  SpacingAroundKeyword:
+    active: true
+    autoCorrect: true
+  SpacingAroundOperators:
+    active: true
+    autoCorrect: true
+  SpacingAroundParens:
+    active: true
+    autoCorrect: true
+  SpacingAroundRangeOperator:
+    active: true
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithAnnotations:
+    active: false
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithComments:
+    active: false
+    autoCorrect: true
+  StringTemplate:
+    active: true
+    autoCorrect: true
+
+naming:
+  active: true
+  ClassNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  EnumNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    forbiddenName: []
+  FunctionMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+    ignoreAnnotated: ['Composable']
+  FunctionParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  InvalidPackageDeclaration:
+    active: false
+    rootPackage: ''
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  ObjectPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  ForEachOnRange:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  SpreadOperator:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  Deprecation:
+    active: false
+  DuplicateCaseInWhenExpression:
+    active: true
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: false
+  IgnoredReturnValue:
+    active: false
+    restrictToAnnotatedMethods: true
+    returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult']
+  ImplicitDefaultLocale:
+    active: false
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeAnnotatedProperties: []
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: false
+  MissingWhenCase:
+    active: true
+    allowElseExpression: true
+  NullableToStringCall:
+    active: false
+  RedundantElseInWhen:
+    active: true
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnnecessaryNotNullOperator:
+    active: false
+  UnnecessarySafeCall:
+    active: false
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+  UnsafeCast:
+    active: false
+  UselessPostfixExpression:
+    active: false
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix: 'to'
+  DataClassShouldBeImmutable:
+    active: false
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: false
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenComment:
+    active: true
+    values: ['TODO:', 'FIXME:', 'STOPSHIP:']
+    allowedPatterns: ''
+  ForbiddenImport:
+    active: false
+    imports: []
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods: ['kotlin.io.println', 'kotlin.io.print']
+  ForbiddenPublicDataClass:
+    active: false
+    ignorePackages: ['*.internal', '*.internal.*']
+  ForbiddenVoid:
+    active: false
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    excludedFunctions: 'describeContents'
+    excludeAnnotatedFunction: ['dagger.Provides']
+  LibraryCodeMustSpecifyReturnType:
+    active: true
+  LibraryEntitiesShouldNotBePublic:
+    active: false
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    # TODO: re-enable omnipod-dash
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**', '**/omnipod-dash/**']
+    ignoreNumbers: ['-1', '0', '1', '2']
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+  MandatoryBracesIfStatements:
+    active: false
+  MandatoryBracesLoops:
+    active: false
+  MaxLineLength:
+    active: true
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  NestedClassesVisibility:
+    active: false
+  NewLineAtEndOfFile:
+    active: false
+  NoTabs:
+    active: false
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  OptionalWhenBraces:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: false
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions: 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: false
+  SpacingBetweenPackageAndImports:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 2
+  TrailingWhitespace:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableDecimalLength: 5
+  UnnecessaryAbstractClass:
+    active: true
+    excludeAnnotatedClasses: ['dagger.Module']
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: false
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: false
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+  UseArrayLiteralsInAnnotations:
+    active: false
+  UseCheckNotNull:
+    active: false
+  UseCheckOrError:
+    active: false
+  UseDataClass:
+    active: false
+    excludeAnnotatedClasses: []
+    allowVars: false
+  UseEmptyCounterpart:
+    active: false
+  UseIfEmptyOrIfBlank:
+    active: false
+  UseIfInsteadOfWhen:
+    active: false
+  UseRequire:
+    active: false
+  UseRequireNotNull:
+    active: false
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: false
+  WildcardImport:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeImports: ['java.util.*', 'kotlinx.android.synthetic.*']
\ No newline at end of file
diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
index 9edd38f85e..df9b08ef74 100644
--- a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
+++ b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
@@ -30,7 +30,9 @@ class DashHistoryTest {
     fun setUp() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         database = Room.inMemoryDatabaseBuilder(
-            context, DashHistoryDatabase::class.java).build()
+            context,
+            DashHistoryDatabase::class.java
+        ).build()
         dao = database.historyRecordDao()
         dashHistory = DashHistory(dao, HistoryMapper())
     }
@@ -69,4 +71,4 @@ class DashHistoryTest {
     fun tearDown() {
         database.close()
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt
index 6073957e5f..a649da837d 100644
--- a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt
+++ b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt
@@ -26,7 +26,6 @@ class RxSchedulerRule(val scheduler: Scheduler) : TestRule {
                     RxJavaPlugins.reset()
                     RxAndroidPlugins.reset()
                 }
-
             }
         }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt
index 953819cad3..7aa04163dd 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash
 
 import info.nightscout.androidaps.events.Event
 
-class EventOmnipodDashPumpValuesChanged : Event()
\ No newline at end of file
+class EventOmnipodDashPumpValuesChanged : Event()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 4f6b4e7e8c..f936739d9f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -129,19 +129,31 @@ class OmnipodDashPumpPlugin @Inject constructor(
         // TODO
     }
 
-    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+    override fun setTempBasalAbsolute(
+        absoluteRate: Double,
+        durationInMinutes: Int,
+        profile: Profile,
+        enforceNew: Boolean
+    ): PumpEnactResult {
         // TODO
         return PumpEnactResult(injector).success(false).enacted(false).comment("TODO")
     }
 
-    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+    override fun setTempBasalPercent(
+        percent: Int,
+        durationInMinutes: Int,
+        profile: Profile,
+        enforceNew: Boolean
+    ): PumpEnactResult {
         // TODO i18n
-        return PumpEnactResult(injector).success(false).enacted(false).comment("Omnipod Dash driver does not support percentage temp basals")
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support percentage temp basals")
     }
 
     override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
         // TODO i18n
-        return PumpEnactResult(injector).success(false).enacted(false).comment("Omnipod Dash driver does not support extended boluses")
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support extended boluses")
     }
 
     override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
@@ -151,7 +163,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     override fun cancelExtendedBolus(): PumpEnactResult {
         // TODO i18n
-        return PumpEnactResult(injector).success(false).enacted(false).comment("Omnipod Dash driver does not support extended boluses")
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support extended boluses")
     }
 
     override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
@@ -184,7 +197,8 @@ class OmnipodDashPumpPlugin @Inject constructor(
 
     override fun loadTDDs(): PumpEnactResult {
         // TODO i18n
-        return PumpEnactResult(injector).success(false).enacted(false).comment("Omnipod Dash driver does not support TDD")
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support TDD")
     }
 
     override fun canHandleDST(): Boolean {
@@ -207,4 +221,4 @@ class OmnipodDashPumpPlugin @Inject constructor(
     override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {
         // TODO
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt
index 172dd497b0..1ac3c8dd3b 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt
@@ -19,7 +19,8 @@ class OmnipodDashHistoryModule {
 
     @Provides
     @Singleton
-    internal fun provideHistoryRecordDao(dashHistoryDatabase: DashHistoryDatabase): HistoryRecordDao = dashHistoryDatabase.historyRecordDao()
+    internal fun provideHistoryRecordDao(dashHistoryDatabase: DashHistoryDatabase): HistoryRecordDao =
+        dashHistoryDatabase.historyRecordDao()
 
     @Provides
     @Reusable // no state, let system decide when to reuse or create new.
@@ -29,5 +30,4 @@ class OmnipodDashHistoryModule {
     @Singleton
     internal fun provideDashHistory(dao: HistoryRecordDao, historyMapper: HistoryMapper) =
         DashHistory(dao, historyMapper)
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
index 98780b10d9..cbd7e42804 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
@@ -47,4 +47,4 @@ abstract class OmnipodDashModule {
 
     @Binds
     abstract fun bindsOmnipodDashManagerImpl(omnipodManager: OmnipodDashManagerImpl): OmnipodDashManager
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt
index 1b1aaf6f13..fc0f0f4e52 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt
@@ -86,4 +86,4 @@ abstract class OmnipodDashWizardViewModelsModule {
     @OmnipodPluginQualifier
     @ViewModelKey(PodDiscardedViewModel::class)
     internal abstract fun podDiscardedViewModel(viewModel: DashPodDiscardedViewModel): ViewModel
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
index c567702331..aa5879f898 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
 import io.reactivex.Observable
@@ -9,9 +10,9 @@ import java.util.*
 
 interface OmnipodDashManager {
 
-    fun activatePodPart1(): Observable<PodEvent>
+    fun activatePodPart1(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent>
 
-    fun activatePodPart2(): Observable<PodEvent>
+    fun activatePodPart2(basalProgram: BasalProgram): Observable<PodEvent>
 
     fun getStatus(): Observable<PodEvent>
 
@@ -36,4 +37,4 @@ interface OmnipodDashManager {
     fun silenceAlerts(alerts: EnumSet<AlertType>): Observable<PodEvent>
 
     fun deactivatePod(): Observable<PodEvent>
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
index 8426a62e07..768613ce4e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
@@ -4,21 +4,15 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.GetVersionCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.GetVersionCommand.Companion.DEFAULT_UNIQUE_ID
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.AlarmStatusResponse
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.rx.retryWithBackoff
 import io.reactivex.Observable
+import io.reactivex.functions.Action
 import io.reactivex.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -42,33 +36,307 @@ class OmnipodDashManagerImpl @Inject constructor(
             }
         }
 
+    private val observePodReadyForActivationPart2: Observable<PodEvent>
+        get() = Observable.defer {
+            if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) && podStateManager.activationProgress.isBefore(
+                    ActivationProgress.COMPLETED
+                )) {
+                Observable.empty()
+            } else {
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
+            }
+        }
+
     private val observeConnectToPod: Observable<PodEvent>
-        get() = Observable.defer { bleManager.connect().retryWithBackoff(retries = 2, delay = 3, timeUnit = TimeUnit.SECONDS) } // TODO are these reasonable values?
+        get() = Observable.defer {
+            bleManager.connect().retryWithBackoff(retries = 2, delay = 3, timeUnit = TimeUnit.SECONDS)
+        } // TODO are these reasonable values?
+
+    private fun observeSendProgramBolusCommand(
+        units: Double,
+        rateInEighthPulsesPerSeconds: Byte,
+        confirmationBeeps: Boolean,
+        completionBeeps: Boolean
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramBolusCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(1229869870) // TODO
+                    .setNumberOfUnits(units)
+                    .setDelayBetweenPulsesInEighthSeconds(rateInEighthPulsesPerSeconds)
+                    .setProgramReminder(ProgramReminder(confirmationBeeps, completionBeeps, 0))
+                    .build()
+            )
+        }
+    }
+
+    private fun observeSendGetPodStatusCommand(type: ResponseType.StatusResponseType = ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                GetStatusCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setStatusResponseType(type)
+                    .build()
+            )
+        }
+    }
+
+    private val observeVerifyCannulaInsertion: Observable<PodEvent>
+        get() = Observable.defer {
+            observeSendGetPodStatusCommand()
+                .ignoreElements() //
+                .andThen(
+                    Observable.defer {
+                        if (podStateManager.podStatus == PodStatus.RUNNING_ABOVE_MIN_VOLUME) {
+                            Observable.empty()
+                        } else {
+                            Observable.error(IllegalStateException("Unexpected Pod status"))
+                        }
+                    }
+                )
+        }
+
+    private fun observeSendProgramAlertsCommand(
+        alertConfigurations: List<AlertConfiguration>,
+        multiCommandFlag: Boolean = false
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramAlertsCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(1229869870) // TODO
+                    .setAlertConfigurations(alertConfigurations)
+                    .build()
+            )
+        }
+    }
+
+    private fun observeProgramBasalCommand(basalProgram: BasalProgram): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramBasalCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(1229869870) // TODO
+                    .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0))
+                    .setBasalProgram(basalProgram)
+                    .setCurrentTime(Date())
+                    .build()
+            )
+        }
+    }
+
+    private val observeVerifyPrime: Observable<PodEvent>
+        get() = Observable.defer {
+            observeSendGetPodStatusCommand()
+                .ignoreElements() //
+                .andThen(
+                    Observable.defer {
+                        if (podStateManager.podStatus == PodStatus.CLUTCH_DRIVE_ENGAGED) {
+                            Observable.empty()
+                        } else {
+                            Observable.error(IllegalStateException("Unexpected Pod status"))
+                        }
+                    }
+                )
+        }
+
+    private val observeSendSetUniqueIdCommand: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.sendCommand(
+                SetUniqueIdCommand.Builder() //
+                    .setSequenceNumber(podStateManager.messageSequenceNumber) //
+                    .setUniqueId(podStateManager.uniqueId!!.toInt()) //
+                    .setLotNumber(podStateManager.lotNumber!!.toInt()) //
+                    .setPodSequenceNumber(podStateManager.podSequenceNumber!!.toInt())
+                    .setInitializationTime(Date())
+                    .build()
+            ) //
+        }
 
     private val observeSendGetVersionCommand: Observable<PodEvent>
         get() = Observable.defer {
-            bleManager.sendCommand(GetVersionCommand.Builder() //
-                .setSequenceNumber(podStateManager.messageSequenceNumber) //
-                .setUniqueId(DEFAULT_UNIQUE_ID) //
-                .build()) //
+            bleManager.sendCommand(
+                GetVersionCommand.Builder() //
+                    .setSequenceNumber(podStateManager.messageSequenceNumber) //
+                    .setUniqueId(DEFAULT_UNIQUE_ID) //
+                    .build()
+            ) //
         }
 
-    override fun activatePodPart1(): Observable<PodEvent> {
+    override fun activatePodPart1(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent> {
         return Observable.concat(
             observePodReadyForActivationPart1,
             observeConnectToPod,
-            observeSendGetVersionCommand
-            // ... Send more commands
-        ) //
+            observeActivationPart1Commands(lowReservoirAlertTrigger)
+        ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PHASE_1_COMPLETED))
             // TODO these would be common for any observable returned in a public function in this class
             .doOnNext(PodEventInterceptor()) //
             .doOnError(ErrorInterceptor())
             .subscribeOn(aapsSchedulers.io)
     }
 
-    override fun activatePodPart2(): Observable<PodEvent> {
-        // TODO
-        return Observable.empty()
+    private fun observeActivationPart1Commands(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent> {
+        val observables = createActivationPart1Observables(lowReservoirAlertTrigger)
+
+        return if (observables.isEmpty()) {
+            Observable.empty()
+        } else {
+            Observable.concat(observables)
+        }
+    }
+
+    private fun createActivationPart1Observables(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): List<Observable<PodEvent>> {
+        val observables = ArrayList<Observable<PodEvent>>()
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) {
+            observables.add(
+                observeVerifyPrime.doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIME_COMPLETED))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIMING)) {
+            observables.add(
+                observeSendProgramBolusCommand(
+                    podStateManager.firstPrimeBolusVolume!! * 0.05,
+                    podStateManager.primePulseRate!!.toByte(),
+                    confirmationBeeps = false,
+                    completionBeeps = false
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIMING))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT)) {
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    listOf(
+                        AlertConfiguration(
+                            AlertType.EXPIRATION,
+                            enabled = true,
+                            durationInMinutes = 55,
+                            autoOff = false,
+                            AlertTrigger.TimerTrigger(5),
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX5
+                        )
+                    )
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT))
+            )
+        }
+        if (lowReservoirAlertTrigger != null && podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS)) {
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    listOf(
+                        AlertConfiguration(
+                            AlertType.LOW_RESERVOIR,
+                            enabled = true,
+                            durationInMinutes = 0,
+                            autoOff = false,
+                            lowReservoirAlertTrigger,
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX
+                        )
+                    )
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) {
+            observables.add(
+                observeSendSetUniqueIdCommand.doOnComplete(ActivationProgressUpdater(ActivationProgress.SET_UNIQUE_ID))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.GOT_POD_VERSION)) {
+            observables.add(
+                observeSendGetVersionCommand.doOnComplete(ActivationProgressUpdater(ActivationProgress.GOT_POD_VERSION))
+            )
+        }
+
+        return observables.reversed()
+    }
+
+    override fun activatePodPart2(basalProgram: BasalProgram): Observable<PodEvent> {
+        return Observable.concat(
+            observePodReadyForActivationPart2,
+            observeConnectToPod,
+            observeActivationPart2Commands(basalProgram)
+        ).doOnComplete(ActivationProgressUpdater(ActivationProgress.COMPLETED))
+            // TODO these would be common for any observable returned in a public function in this class
+            .doOnNext(PodEventInterceptor()) //
+            .doOnError(ErrorInterceptor())
+            .subscribeOn(aapsSchedulers.io)
+    }
+
+    private fun observeActivationPart2Commands(basalProgram: BasalProgram): Observable<PodEvent> {
+        val observables = createActivationPart2Observables(basalProgram)
+
+        return if (observables.isEmpty()) {
+            Observable.empty()
+        } else {
+            Observable.concat(observables)
+        }
+    }
+
+    private fun createActivationPart2Observables(basalProgram: BasalProgram): List<Observable<PodEvent>> {
+        val observables = ArrayList<Observable<PodEvent>>()
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.CANNULA_INSERTED)) {
+            observables.add(
+                observeVerifyCannulaInsertion
+                    .doOnComplete(ActivationProgressUpdater(ActivationProgress.CANNULA_INSERTED))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.INSERTING_CANNULA)) {
+            observables.add(
+                observeSendProgramBolusCommand(
+                    podStateManager.secondPrimeBolusVolume!! * 0.05,
+                    podStateManager.primePulseRate!!.toByte(),
+                    confirmationBeeps = false,
+                    completionBeeps = false
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.INSERTING_CANNULA))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.UPDATED_EXPIRATION_ALERTS)) {
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    listOf(
+                        // FIXME use user configured expiration alert
+                        AlertConfiguration(
+                            AlertType.EXPIRATION,
+                            enabled = true,
+                            durationInMinutes = TimeUnit.HOURS.toMinutes(7).toShort(),
+                            autoOff = false,
+                            AlertTrigger.TimerTrigger(
+                                TimeUnit.HOURS.toMinutes(73).toShort()
+                            ), // FIXME use activation time
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX3
+                        ),
+                        AlertConfiguration(
+                            AlertType.EXPIRATION_IMMINENT,
+                            enabled = true,
+                            durationInMinutes = TimeUnit.HOURS.toMinutes(1).toShort(),
+                            autoOff = false,
+                            AlertTrigger.TimerTrigger(
+                                TimeUnit.HOURS.toMinutes(79).toShort()
+                            ), // FIXME use activation time
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX4
+                        )
+                    ),
+                    multiCommandFlag = true
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.UPDATED_EXPIRATION_ALERTS))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_BASAL)) {
+            observables.add(
+                observeProgramBasalCommand(basalProgram)
+                    .doOnComplete(ActivationProgressUpdater(ActivationProgress.PROGRAMMED_BASAL))
+            )
+        }
+
+        return observables.reversed()
     }
 
     override fun getStatus(): Observable<PodEvent> {
@@ -149,6 +417,10 @@ class OmnipodDashManagerImpl @Inject constructor(
                     podStateManager.uniqueId = event.uniqueId
                 }
 
+                is PodEvent.CommandSent -> {
+                    podStateManager.increaseMessageSequenceNumber()
+                }
+
                 is PodEvent.ResponseReceived -> {
                     podStateManager.increaseMessageSequenceNumber()
                     handleResponse(event.response)
@@ -179,7 +451,6 @@ class OmnipodDashManagerImpl @Inject constructor(
                 }
             }
         }
-
     }
 
     inner class ErrorInterceptor : Consumer<Throwable> {
@@ -187,6 +458,12 @@ class OmnipodDashManagerImpl @Inject constructor(
         override fun accept(throwable: Throwable) {
             logger.debug(LTag.PUMP, "Intercepted error in OmnipodDashManagerImpl: ${throwable.javaClass.simpleName}")
         }
-
     }
-}
\ No newline at end of file
+
+    inner class ActivationProgressUpdater(private val value: ActivationProgress) : Action {
+
+        override fun run() {
+            podStateManager.activationProgress = value
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt
index 866c65b922..3ca97e76b4 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt
@@ -22,7 +22,7 @@ data class Id(val address: ByteArray) {
 
     override fun toString(): String {
         val asInt = ByteBuffer.wrap(address).int
-        return "${asInt}/${address.toHex()}"
+        return "$asInt/${address.toHex()}"
     }
 
     companion object {
@@ -33,5 +33,4 @@ data class Id(val address: ByteArray) {
             return Id(ByteBuffer.allocate(4).putInt(v).array())
         }
     }
-
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt
index aa0b64e641..11e808ba73 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt
@@ -14,4 +14,4 @@ interface OmnipodDashBleManager {
     fun connect(): Observable<PodEvent>
 
     fun disconnect()
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
index be03f69525..53b2c1b1a0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -29,18 +29,34 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context, private val aapsLogger: AAPSLogger) : OmnipodDashBleManager {
+class OmnipodDashBleManagerImpl @Inject constructor(
+    private val context: Context,
+    private val aapsLogger: AAPSLogger
+) : OmnipodDashBleManager {
 
-    private val bluetoothManager: BluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+    private val bluetoothManager: BluetoothManager =
+        context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
     private val bluetoothAdapter: BluetoothAdapter = bluetoothManager.adapter
 
-    @Throws(FailedToConnectException::class, CouldNotSendBleException::class, InterruptedException::class, BleIOBusyException::class, TimeoutException::class, CouldNotConfirmWriteException::class, CouldNotEnableNotifications::class, DescriptorNotFoundException::class, CouldNotConfirmDescriptorWriteException::class)
+    @Throws(
+        FailedToConnectException::class,
+        CouldNotSendBleException::class,
+        InterruptedException::class,
+        BleIOBusyException::class,
+        TimeoutException::class,
+        CouldNotConfirmWriteException::class,
+        CouldNotEnableNotifications::class,
+        DescriptorNotFoundException::class,
+        CouldNotConfirmDescriptorWriteException::class
+    )
     private fun connect(podAddress: String): BleIO {
         // TODO: locking?
         val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
         val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>> =
-            mapOf(CharacteristicType.CMD to LinkedBlockingDeque(),
-                CharacteristicType.DATA to LinkedBlockingDeque())
+            mapOf(
+                CharacteristicType.CMD to LinkedBlockingDeque(),
+                CharacteristicType.DATA to LinkedBlockingDeque()
+            )
         val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Connecting to $podAddress")
         var autoConnect = true
@@ -74,7 +90,18 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
         TODO("not implemented")
     }
 
-    @Throws(InterruptedException::class, ScanFailException::class, FailedToConnectException::class, CouldNotSendBleException::class, BleIOBusyException::class, TimeoutException::class, CouldNotConfirmWriteException::class, CouldNotEnableNotifications::class, DescriptorNotFoundException::class, CouldNotConfirmDescriptorWriteException::class)
+    @Throws(
+        InterruptedException::class,
+        ScanFailException::class,
+        FailedToConnectException::class,
+        CouldNotSendBleException::class,
+        BleIOBusyException::class,
+        TimeoutException::class,
+        CouldNotConfirmWriteException::class,
+        CouldNotEnableNotifications::class,
+        DescriptorNotFoundException::class,
+        CouldNotConfirmDescriptorWriteException::class
+    )
     override fun connect(): Observable<PodEvent> = Observable.create { emitter ->
         // TODO: when we are already connected,
         //  emit PodEvent.AlreadyConnected, complete the observable and return from this method
@@ -86,7 +113,10 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
             val podScanner = PodScanner(aapsLogger, bluetoothAdapter)
             emitter.onNext(PodEvent.Scanning)
 
-            val podAddress = podScanner.scanForPod(PodScanner.SCAN_FOR_SERVICE_UUID, PodScanner.POD_ID_NOT_ACTIVATED).scanResult.device.address
+            val podAddress = podScanner.scanForPod(
+                PodScanner.SCAN_FOR_SERVICE_UUID,
+                PodScanner.POD_ID_NOT_ACTIVATED
+            ).scanResult.device.address
             // For tests: this.podAddress = "B8:27:EB:1D:7E:BB";
             emitter.onNext(PodEvent.BluetoothConnecting)
 
@@ -118,5 +148,4 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
         private const val CONNECT_TIMEOUT_MS = 7000
         const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
index 8ebde34478..280615adf2 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
@@ -4,7 +4,6 @@ import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CharacteristicNotFoundException
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ServiceNotFoundException
@@ -12,7 +11,11 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.Chara
 import java.math.BigInteger
 import java.util.*
 
-class ServiceDiscoverer(private val logger: AAPSLogger, private val gatt: BluetoothGatt, private val bleCallbacks: BleCommCallbacks) {
+class ServiceDiscoverer(
+    private val logger: AAPSLogger,
+    private val gatt: BluetoothGatt,
+    private val bleCallbacks: BleCommCallbacks
+) {
 
     /***
      * This is first step after connection establishment
@@ -29,8 +32,10 @@ class ServiceDiscoverer(private val logger: AAPSLogger, private val gatt: Blueto
             ?: throw CharacteristicNotFoundException(CharacteristicType.CMD.value)
         val dataChar = service.getCharacteristic(CharacteristicType.DATA.uuid) // TODO: this is never used
             ?: throw CharacteristicNotFoundException(CharacteristicType.DATA.value)
-        var chars = mapOf(CharacteristicType.CMD to cmdChar,
-            CharacteristicType.DATA to dataChar)
+        var chars = mapOf(
+            CharacteristicType.CMD to cmdChar,
+            CharacteristicType.DATA to dataChar
+        )
         return chars
     }
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
index 451a723296..8330b6b08c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
@@ -18,7 +18,10 @@ import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
-class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>>) : BluetoothGattCallback() {
+class BleCommCallbacks(
+    private val aapsLogger: AAPSLogger,
+    private val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>>
+) : BluetoothGattCallback() {
 
     private val serviceDiscoveryComplete: CountDownLatch = CountDownLatch(1)
     private val connected: CountDownLatch = CountDownLatch(1)
@@ -64,7 +67,10 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
 
     private fun confirmWritePayload(expectedPayload: ByteArray, received: CharacteristicWriteConfirmationPayload) {
         if (!expectedPayload.contentEquals(received.payload)) {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "Could not confirm write. Got " + received.payload.toHex() + ".Excepted: " + expectedPayload.toHex())
+            aapsLogger.warn(
+                LTag.PUMPBTCOMM,
+                "Could not confirm write. Got " + received.payload.toHex() + ".Excepted: " + expectedPayload.toHex()
+            )
             throw CouldNotConfirmWriteException(expectedPayload, received.payload)
         }
         aapsLogger.debug(LTag.PUMPBTCOMM, "Confirmed write with value: " + received.payload.toHex())
@@ -77,8 +83,11 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
         } else {
             CharacteristicWriteConfirmationError(status)
         }
-        aapsLogger.debug(LTag.PUMPBTCOMM, "OnCharacteristicWrite with status/char/value " +
-            status + "/" + byValue(characteristic.uuid.toString()) + "/" + characteristic.value.toHex())
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicWrite with status/char/value " +
+                status + "/" + byValue(characteristic.uuid.toString()) + "/" + characteristic.value.toHex()
+        )
         try {
             if (writeQueue.size > 0) {
                 aapsLogger.warn(LTag.PUMPBTCOMM, "Write confirm queue should be empty. found: " + writeQueue.size)
@@ -97,24 +106,34 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
         super.onCharacteristicChanged(gatt, characteristic)
         val payload = characteristic.value
         val characteristicType = byValue(characteristic.uuid.toString())
-        aapsLogger.debug(LTag.PUMPBTCOMM, "OnCharacteristicChanged with char/value " +
-            characteristicType + "/" +
-            payload.toHex())
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicChanged with char/value " +
+                characteristicType + "/" +
+                payload.toHex()
+        )
         incomingPackets[characteristicType]!!.add(payload)
     }
 
     @Throws(InterruptedException::class, CouldNotConfirmDescriptorWriteException::class)
     fun confirmWriteDescriptor(descriptorUUID: String, timeout_ms: Int) {
-        val confirmed: DescriptorWriteConfirmation = descriptorWriteQueue.poll(timeout_ms.toLong(), TimeUnit.MILLISECONDS)
+        val confirmed: DescriptorWriteConfirmation = descriptorWriteQueue.poll(
+            timeout_ms.toLong(),
+            TimeUnit.MILLISECONDS
+        )
             ?: throw TimeoutException()
         when (confirmed) {
             is DescriptorWriteConfirmationError -> throw CouldNotConfirmWriteException(confirmed.status)
-            is DescriptorWriteConfirmationUUID -> if (confirmed.uuid != descriptorUUID) {
-                aapsLogger.warn(LTag.PUMPBTCOMM, "Could not confirm descriptor write. Got ${confirmed.uuid}. Expected: $descriptorUUID")
-                throw CouldNotConfirmDescriptorWriteException(descriptorUUID, confirmed.uuid)
-            } else {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Confirmed descriptor write : " + confirmed.uuid)
-            }
+            is DescriptorWriteConfirmationUUID ->
+                if (confirmed.uuid != descriptorUUID) {
+                    aapsLogger.warn(
+                        LTag.PUMPBTCOMM,
+                        "Could not confirm descriptor write. Got ${confirmed.uuid}. Expected: $descriptorUUID"
+                    )
+                    throw CouldNotConfirmDescriptorWriteException(descriptorUUID, confirmed.uuid)
+                } else {
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "Confirmed descriptor write : " + confirmed.uuid)
+                }
         }
     }
 
@@ -128,10 +147,17 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
         }
         try {
             if (descriptorWriteQueue.size > 0) {
-                aapsLogger.warn(LTag.PUMPBTCOMM, "Descriptor write queue should be empty, found: ${descriptorWriteQueue.size}")
+                aapsLogger.warn(
+                    LTag.PUMPBTCOMM,
+                    "Descriptor write queue should be empty, found: ${descriptorWriteQueue.size}"
+                )
                 descriptorWriteQueue.clear()
             }
-            val offered = descriptorWriteQueue.offer(writeConfirmation, WRITE_CONFIRM_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
+            val offered = descriptorWriteQueue.offer(
+                writeConfirmation,
+                WRITE_CONFIRM_TIMEOUT_MS.toLong(),
+                TimeUnit.MILLISECONDS
+            )
             if (!offered) {
                 aapsLogger.warn(LTag.PUMPBTCOMM, "Received delayed descriptor write confirmation")
             }
@@ -144,4 +170,4 @@ class BleCommCallbacks(private val aapsLogger: AAPSLogger, private val incomingP
 
         private const val WRITE_CONFIRM_TIMEOUT_MS = 10 // the confirmation queue should be empty anyway
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/CharacteristicWriteConfirmation.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/CharacteristicWriteConfirmation.kt
index 31e3595050..575bd19c0f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/CharacteristicWriteConfirmation.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/CharacteristicWriteConfirmation.kt
@@ -4,4 +4,4 @@ sealed class CharacteristicWriteConfirmation
 
 data class CharacteristicWriteConfirmationPayload(val payload: ByteArray) : CharacteristicWriteConfirmation()
 
-data class CharacteristicWriteConfirmationError(val status: Int) : CharacteristicWriteConfirmation()
\ No newline at end of file
+data class CharacteristicWriteConfirmationError(val status: Int) : CharacteristicWriteConfirmation()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/DescriptorWriteConfirmation.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/DescriptorWriteConfirmation.kt
index fbbb5b7f1b..83fc9d41c8 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/DescriptorWriteConfirmation.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/DescriptorWriteConfirmation.kt
@@ -4,4 +4,4 @@ sealed class DescriptorWriteConfirmation
 
 data class DescriptorWriteConfirmationUUID(val uuid: String) : DescriptorWriteConfirmation()
 
-data class DescriptorWriteConfirmationError(val status: Int) : DescriptorWriteConfirmation()
\ No newline at end of file
+data class DescriptorWriteConfirmationError(val status: Int) : DescriptorWriteConfirmation()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandHello.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandHello.kt
index 03414989b2..d10ae85aa1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandHello.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandHello.kt
@@ -2,9 +2,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command
 
 import java.nio.ByteBuffer
 
-class BleCommandHello(controllerId: Int) : BleCommand(BleCommandType.HELLO,
+class BleCommandHello(controllerId: Int) : BleCommand(
+    BleCommandType.HELLO,
     ByteBuffer.allocate(6)
         .put(1.toByte()) // TODO find the meaning of this constant
         .put(4.toByte()) // TODO find the meaning of this constant
         .putInt(controllerId).array()
-)
\ No newline at end of file
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
index 5c096d4410..7953cbab4b 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
@@ -1,7 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command
 
 enum class BleCommandType(val value: Byte) {
-    RTS(0x00.toByte()), CTS(0x01.toByte()), NACK(0x02.toByte()), ABORT(0x03.toByte()), SUCCESS(0x04.toByte()), FAIL(0x05.toByte()), HELLO(0x06.toByte());
+    RTS(0x00.toByte()),
+    CTS(0x01.toByte()),
+    NACK(0x02.toByte()),
+    ABORT(0x03.toByte()),
+    SUCCESS(0x04.toByte()),
+    FAIL(0x05.toByte()),
+    HELLO(
+        0x06.toByte()
+    );
 
     companion object {
 
@@ -10,4 +18,4 @@ enum class BleCommandType(val value: Byte) {
             values().firstOrNull { it.value == value }
                 ?: throw IllegalArgumentException("Unknown BleCommandType: $value")
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BleIOBusyException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BleIOBusyException.kt
index 6029d66998..1fa748a391 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BleIOBusyException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BleIOBusyException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class BleIOBusyException : Exception()
\ No newline at end of file
+class BleIOBusyException : Exception()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CharacteristicNotFoundException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CharacteristicNotFoundException.kt
index 730b6eeda0..dedd9399ab 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CharacteristicNotFoundException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CharacteristicNotFoundException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class CharacteristicNotFoundException(cmdCharacteristicUuid: String) : FailedToConnectException("characteristic not found: $cmdCharacteristicUuid")
\ No newline at end of file
+class CharacteristicNotFoundException(cmdCharacteristicUuid: String) : FailedToConnectException("characteristic not found: $cmdCharacteristicUuid")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmDescriptorWriteException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmDescriptorWriteException.kt
index 75c9f82344..ffc37a29da 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmDescriptorWriteException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmDescriptorWriteException.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
 class CouldNotConfirmDescriptorWriteException(override val message: String?) : Exception(message) {
-    constructor(sent: String, confirmed: String) : this("Could not confirm write. Sent: {$sent} .Received: ${confirmed}")
-    constructor(status: Int) : this("Could not confirm write. Write status: ${status}")
-}
\ No newline at end of file
+    constructor(sent: String, confirmed: String) : this("Could not confirm write. Sent: {$sent} .Received: $confirmed")
+    constructor(status: Int) : this("Could not confirm write. Write status: $status")
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmWriteException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmWriteException.kt
index 9217668e77..85b1fb0c0c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmWriteException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotConfirmWriteException.kt
@@ -1,6 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
 class CouldNotConfirmWriteException(override val message: String?) : Exception(message) {
-    constructor(sent: ByteArray, confirmed: ByteArray) : this("Could not confirm write. Sent: {$sent} .Received: ${confirmed}")
-    constructor(status: Int) : this("Could not confirm write. Write status: ${status}")
-}
\ No newline at end of file
+    constructor(
+        sent: ByteArray,
+        confirmed: ByteArray
+    ) : this("Could not confirm write. Sent: {$sent} .Received: $confirmed")
+
+    constructor(status: Int) : this("Could not confirm write. Write status: $status")
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotEnableNotifications.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotEnableNotifications.kt
index b9987da037..1e982d21a0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotEnableNotifications.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotEnableNotifications.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType
 
-class CouldNotEnableNotifications(cmd: CharacteristicType) : Exception(cmd.value)
\ No newline at end of file
+class CouldNotEnableNotifications(cmd: CharacteristicType) : Exception(cmd.value)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt
index 5e10a0bb1e..816d062636 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 
 import info.nightscout.androidaps.utils.extensions.toHex
 
-class CouldNotParseMessageException(val payload: ByteArray) : Exception("Could not parse message payload: ${payload.toHex()}")
\ No newline at end of file
+class CouldNotParseMessageException(val payload: ByteArray) : Exception("Could not parse message payload: ${payload.toHex()}")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendBleException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendBleException.kt
index 63abcb9a68..83680ec002 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendBleException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendBleException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class CouldNotSendBleException(msg: String?) : Exception(msg)
\ No newline at end of file
+class CouldNotSendBleException(msg: String?) : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DescriptorNotFoundException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DescriptorNotFoundException.kt
index 202fcaf3b1..4a87e667e9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DescriptorNotFoundException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DescriptorNotFoundException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class DescriptorNotFoundException : Exception()
\ No newline at end of file
+class DescriptorNotFoundException : Exception()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DiscoveredInvalidPodException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DiscoveredInvalidPodException.kt
index a4f7b52f75..5606ceb3ad 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DiscoveredInvalidPodException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/DiscoveredInvalidPodException.kt
@@ -5,4 +5,4 @@ import android.os.ParcelUuid
 class DiscoveredInvalidPodException : Exception {
     constructor(message: String) : super(message)
     constructor(message: String, serviceUUIds: List<ParcelUuid?>) : super("$message service UUIDs: $serviceUUIds")
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt
index 8d6782aadb..4c138d0b2e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 open class FailedToConnectException : Exception {
     constructor() : super()
     constructor(message: String?) : super(message)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
index 5645cb009b..1deed2f63c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 class MessageIOException : Exception {
     constructor(msg: String) : super(msg)
     constructor(cause: Throwable) : super("Caught Exception during Message I/O", cause)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailException.kt
index 396cdffcf4..15b3432ec3 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailException.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 open class ScanFailException : Exception {
     constructor(message: String) : super(message)
     constructor(errorCode: Int) : super("errorCode$errorCode")
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt
index 002ecabf3d..88d678ab88 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt
@@ -8,4 +8,4 @@ class ScanFailFoundTooManyException(devices: List<BleDiscoveredDevice>) : ScanFa
     private val devices: List<BleDiscoveredDevice> = ArrayList(devices)
     val discoveredDevices: List<BleDiscoveredDevice>
         get() = Collections.unmodifiableList(devices)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailNotFoundException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailNotFoundException.kt
index 55b189baff..848331257a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailNotFoundException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailNotFoundException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class ScanFailNotFoundException : ScanFailException("No Pod found")
\ No newline at end of file
+class ScanFailNotFoundException : ScanFailException("No Pod found")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ServiceNotFoundException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ServiceNotFoundException.kt
index dc792f5825..16c19f65a9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ServiceNotFoundException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ServiceNotFoundException.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-class ServiceNotFoundException(serviceUuid: String) : FailedToConnectException("service not found: $serviceUuid")
\ No newline at end of file
+class ServiceNotFoundException(serviceUuid: String) : FailedToConnectException("service not found: $serviceUuid")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/UnexpectedCommandException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/UnexpectedCommandException.kt
index 149909032d..82a2950f2d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/UnexpectedCommandException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/UnexpectedCommandException.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.excepti
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand
 
-class UnexpectedCommandException(val cmd: BleCommand) : Exception("Unexpected command: ${cmd}")
\ No newline at end of file
+class UnexpectedCommandException(val cmd: BleCommand) : Exception("Unexpected command: $cmd")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
index 3340d1daf1..33e3068342 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
@@ -1,3 +1,5 @@
+@file:Suppress("WildcardImport")
+
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
 
 import android.bluetooth.BluetoothGatt
@@ -12,7 +14,13 @@ import java.util.concurrent.BlockingQueue
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
-class BleIO(private val aapsLogger: AAPSLogger, private val chars: Map<CharacteristicType, BluetoothGattCharacteristic>, private val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>>, private val gatt: BluetoothGatt, private val bleCommCallbacks: BleCommCallbacks) {
+class BleIO(
+    private val aapsLogger: AAPSLogger,
+    private val chars: Map<CharacteristicType, BluetoothGattCharacteristic>,
+    private val incomingPackets: Map<CharacteristicType, BlockingQueue<ByteArray>>,
+    private val gatt: BluetoothGatt,
+    private val bleCommCallbacks: BleCommCallbacks
+) {
 
     private var state: IOState = IOState.IDLE
 
@@ -41,7 +49,13 @@ class BleIO(private val aapsLogger: AAPSLogger, private val chars: Map<Character
      * @param payload the data to send
      * @throws CouldNotSendBleException
      */
-    @Throws(CouldNotSendBleException::class, BleIOBusyException::class, InterruptedException::class, CouldNotConfirmWriteException::class, TimeoutException::class)
+    @Throws(
+        CouldNotSendBleException::class,
+        BleIOBusyException::class,
+        InterruptedException::class,
+        CouldNotConfirmWriteException::class,
+        TimeoutException::class
+    )
     fun sendAndConfirmPacket(characteristic: CharacteristicType, payload: ByteArray) {
         synchronized(state) {
             if (state != IOState.IDLE) {
@@ -74,7 +88,13 @@ class BleIO(private val aapsLogger: AAPSLogger, private val chars: Map<Character
      * This will signal the pod it can start sending back data
      * @return
      */
-    @Throws(CouldNotSendBleException::class, CouldNotEnableNotifications::class, DescriptorNotFoundException::class, InterruptedException::class, CouldNotConfirmDescriptorWriteException::class)
+    @Throws(
+        CouldNotSendBleException::class,
+        CouldNotEnableNotifications::class,
+        DescriptorNotFoundException::class,
+        InterruptedException::class,
+        CouldNotConfirmDescriptorWriteException::class
+    )
     fun readyToRead() {
         for (type in CharacteristicType.values()) {
             val ch = chars[type]
@@ -97,4 +117,4 @@ class BleIO(private val aapsLogger: AAPSLogger, private val chars: Map<Character
 
         private const val DEFAULT_IO_TIMEOUT_MS = 1000
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt
index b5b10e6f9a..b09eb72bb2 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt
@@ -19,4 +19,4 @@ enum class CharacteristicType(val value: String) {
             values().firstOrNull { it.value == value }
                 ?: throw IllegalArgumentException("Unknown Characteristic Type: $value")
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IOState.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IOState.kt
index 4ef49f6586..b426f8420f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IOState.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IOState.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
 
 enum class IOState {
     IDLE, WRITING, READING
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
index 343e82cd52..11e80940b6 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
 import info.nightscout.androidaps.utils.extensions.toHex
 
 class CrcMismatchException(val expected: Long, val actual: Long, val payload: ByteArray) :
-    Exception("CRC mismatch. Actual: ${actual}. Expected: ${expected}. Payload: ${payload.toHex()}")
\ No newline at end of file
+    Exception("CRC mismatch. Actual: $actual. Expected: $expected. Payload: ${payload.toHex()}")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt
index d7248a6751..bb3846c853 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt
@@ -2,4 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
 
 import info.nightscout.androidaps.utils.extensions.toHex
 
-class IncorrectPacketException(val expectedIndex: Byte, val payload: ByteArray) : Exception("Invalid payload: ${payload.toHex()}. Expected index: ${expectedIndex}")
\ No newline at end of file
+class IncorrectPacketException(
+    val expectedIndex: Byte,
+    val payload: ByteArray
+) : Exception("Invalid payload: ${payload.toHex()}. Expected index: $expectedIndex")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt
index 0af9d00ece..5c2601311f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt
@@ -63,4 +63,4 @@ class MessageIO(private val aapsLogger: AAPSLogger, private val bleIO: BleIO) {
             throw MessageIOException(cause = e)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt
index 6a6d800823..836f55dc82 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt
@@ -21,7 +21,8 @@ data class MessagePacket(
     val gateway: Boolean = false,
     val sas: Boolean = false, // TODO: understand
     val tfs: Boolean = false, // TODO: understand
-    val version: Short = 0.toShort()) {
+    val version: Short = 0.toShort()
+) {
 
     fun asByteArray(): ByteArray {
         val bb = ByteBuffer.allocate(16 + payload.size)
@@ -90,7 +91,8 @@ data class MessagePacket(
             val priority = f2.get(1) != 0
             val lastMessage = f2.get(2) != 0
             val gateway = f2.get(3) != 0
-            val type = MessageType.byValue((f1.get(7) or (f1.get(6) shl 1) or (f1.get(5) shl 2) or (f1.get(4) shl 3)).toByte())
+            val type =
+                MessageType.byValue((f1.get(7) or (f1.get(6) shl 1) or (f1.get(5) shl 2) or (f1.get(4) shl 3)).toByte())
             if (version.toInt() != 0) {
                 throw CouldNotParseMessageException(payload)
             }
@@ -139,8 +141,7 @@ private class Flag(var value: Int = 0) {
             return 0
         }
         return 1
-
     }
 }
 
-internal fun Byte.toUnsignedInt() = this.toInt() and 0xff
\ No newline at end of file
+internal fun Byte.toUnsignedInt() = this.toInt() and 0xff
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt
index 6d4ce0314f..3f33cc52f7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt
@@ -12,4 +12,4 @@ enum class MessageType(val value: Byte) {
             MessageType.values().firstOrNull { it.value == value }
                 ?: throw IllegalArgumentException("Unknown MessageType: $value")
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoiner.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoiner.kt
index 2a6d772ac5..983a60d374 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoiner.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoiner.kt
@@ -45,7 +45,12 @@ class PayloadJoiner(private val firstPacket: ByteArray) {
                 throw IncorrectPacketException(0, firstPacket)
 
             else                                                                 -> {
-                fragments.add(firstPacket.copyOfRange(FirstBlePacket.HEADER_SIZE_WITH_MIDDLE_PACKETS, BlePacket.MAX_SIZE))
+                fragments.add(
+                    firstPacket.copyOfRange(
+                        FirstBlePacket.HEADER_SIZE_WITH_MIDDLE_PACKETS,
+                        BlePacket.MAX_SIZE
+                    )
+                )
             }
         }
     }
@@ -87,7 +92,12 @@ class PayloadJoiner(private val firstPacket: ByteArray) {
                     throw IncorrectPacketException(idx.toByte(), packet)
                 }
 
-                fragments.add(packet.copyOfRange(LastOptionalPlusOneBlePacket.HEADER_SIZE, LastOptionalPlusOneBlePacket.HEADER_SIZE + size))
+                fragments.add(
+                    packet.copyOfRange(
+                        LastOptionalPlusOneBlePacket.HEADER_SIZE,
+                        LastOptionalPlusOneBlePacket.HEADER_SIZE + size
+                    )
+                )
             }
         }
     }
@@ -103,7 +113,6 @@ class PayloadJoiner(private val firstPacket: ByteArray) {
         }
         return bytes.copyOfRange(0, bytes.size)
     }
-
 }
 
-internal fun Int.toUnsignedLong() = this.toLong() and 0xffffffffL
\ No newline at end of file
+internal fun Int.toUnsignedLong() = this.toLong() and 0xffffffffL
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitter.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitter.kt
index bd5e5811db..2f9e355f45 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitter.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitter.kt
@@ -15,51 +15,76 @@ internal class PayloadSplitter(private val payload: ByteArray) {
         val crc32 = payload.crc32()
         if (payload.size <= FirstBlePacket.CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET) {
             val end = min(FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS, payload.size)
-            ret.add(FirstBlePacket(
-                totalFragments = 0,
-                payload = payload.copyOfRange(0, end),
-                size = payload.size.toByte(),
-                crc32 = crc32,
-            ))
+            ret.add(
+                FirstBlePacket(
+                    totalFragments = 0,
+                    payload = payload.copyOfRange(0, end),
+                    size = payload.size.toByte(),
+                    crc32 = crc32,
+                )
+            )
             if (payload.size > FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS) {
-                ret.add(LastOptionalPlusOneBlePacket(
-                    index = 1,
-                    payload = payload.copyOfRange(end, payload.size),
-                    size = (payload.size - end).toByte(),
-                ))
+                ret.add(
+                    LastOptionalPlusOneBlePacket(
+                        index = 1,
+                        payload = payload.copyOfRange(end, payload.size),
+                        size = (payload.size - end).toByte(),
+                    )
+                )
             }
             return ret
         }
         val middleFragments = (payload.size - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS) / MiddleBlePacket.CAPACITY
-        val rest = ((payload.size - middleFragments * MiddleBlePacket.CAPACITY) - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS).toByte()
-        ret.add(FirstBlePacket(
-            totalFragments = (middleFragments + 1).toByte(),
-            payload = payload.copyOfRange(0, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS),
-        ))
+        val rest =
+            ((payload.size - middleFragments * MiddleBlePacket.CAPACITY) - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS).toByte()
+        ret.add(
+            FirstBlePacket(
+                totalFragments = (middleFragments + 1).toByte(),
+                payload = payload.copyOfRange(0, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS),
+            )
+        )
         for (i in 1..middleFragments) {
             val p = if (i == 1) {
-                payload.copyOfRange(FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + MiddleBlePacket.CAPACITY)
+                payload.copyOfRange(
+                    FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS,
+                    FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + MiddleBlePacket.CAPACITY
+                )
             } else {
-                payload.copyOfRange(FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + (i - 1) * MiddleBlePacket.CAPACITY, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + i * MiddleBlePacket.CAPACITY)
+                payload.copyOfRange(
+                    FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + (i - 1) * MiddleBlePacket.CAPACITY,
+                    FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + i * MiddleBlePacket.CAPACITY
+                )
             }
-            ret.add(MiddleBlePacket(
-                index = i.toByte(),
-                payload = p,
-            ))
+            ret.add(
+                MiddleBlePacket(
+                    index = i.toByte(),
+                    payload = p,
+                )
+            )
         }
         val end = min(LastBlePacket.CAPACITY, rest.toInt())
-        ret.add(LastBlePacket(
-            index = (middleFragments + 1).toByte(),
-            size = rest,
-            payload = payload.copyOfRange(middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS, middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + end),
-            crc32 = crc32,
-        ))
+        ret.add(
+            LastBlePacket(
+                index = (middleFragments + 1).toByte(),
+                size = rest,
+                payload = payload.copyOfRange(
+                    middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS,
+                    middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + end
+                ),
+                crc32 = crc32,
+            )
+        )
         if (rest > LastBlePacket.CAPACITY) {
-            ret.add(LastOptionalPlusOneBlePacket(
-                index = (middleFragments + 2).toByte(),
-                size = (rest - LastBlePacket.CAPACITY).toByte(),
-                payload = payload.copyOfRange(middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + LastBlePacket.CAPACITY, payload.size),
-            ))
+            ret.add(
+                LastOptionalPlusOneBlePacket(
+                    index = (middleFragments + 2).toByte(),
+                    size = (rest - LastBlePacket.CAPACITY).toByte(),
+                    payload = payload.copyOfRange(
+                        middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + LastBlePacket.CAPACITY,
+                        payload.size
+                    ),
+                )
+            )
         }
         return ret
     }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt
index 7ec6048aed..606705ca76 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt
@@ -19,20 +19,20 @@ class StringLengthPrefixEncoding {
             for ((index, key) in keys.withIndex()) {
                 when {
                     remaining.size < key.length                                     ->
-                        throw MessageIOException("Payload too short: ${payload.toHex()} for key: ${key}")
+                        throw MessageIOException("Payload too short: ${payload.toHex()} for key: $key")
                     !(remaining.copyOfRange(0, key.length).decodeToString() == key) ->
-                        throw MessageIOException("Key not found: ${key} in ${payload.toHex()}")
+                        throw MessageIOException("Key not found: $key in ${payload.toHex()}")
                     // last key can be empty, no length
                     index == keys.size - 1 && remaining.size == key.length          ->
                         return ret
 
                     remaining.size < key.length + LENGTH_BYTES                      ->
-                        throw MessageIOException("Length not found: for ${key} in ${payload.toHex()}")
+                        throw MessageIOException("Length not found: for $key in ${payload.toHex()}")
                 }
                 remaining = remaining.copyOfRange(key.length, remaining.size)
                 val length = (remaining[0].toUnsignedInt() shl 1) or remaining[1].toUnsignedInt()
                 if (length > remaining.size) {
-                    throw MessageIOException("Payload too short, looking for length ${length} for ${key} in ${payload.toHex()}")
+                    throw MessageIOException("Payload too short, looking for length $length for $key in ${payload.toHex()}")
                 }
                 ret[index] = remaining.copyOfRange(LENGTH_BYTES, LENGTH_BYTES + length)
                 remaining = remaining.copyOfRange(LENGTH_BYTES + length, remaining.size)
@@ -60,4 +60,4 @@ class StringLengthPrefixEncoding {
             return ret
         }
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt
index eb020c5b28..16ff9d61e5 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt
@@ -12,7 +12,12 @@ sealed class BlePacket {
     }
 }
 
-data class FirstBlePacket(val totalFragments: Byte, val payload: ByteArray, val size: Byte? = null, val crc32: Long? = null) : BlePacket() {
+data class FirstBlePacket(
+    val totalFragments: Byte,
+    val payload: ByteArray,
+    val size: Byte? = null,
+    val crc32: Long? = null
+) : BlePacket() {
 
     override fun asByteArray(): ByteArray {
         val bb = ByteBuffer
@@ -40,8 +45,10 @@ data class FirstBlePacket(val totalFragments: Byte, val payload: ByteArray, val
         internal const val HEADER_SIZE_WITHOUT_MIDDLE_PACKETS = 7 // we are using all fields
         internal const val HEADER_SIZE_WITH_MIDDLE_PACKETS = 2
 
-        internal const val CAPACITY_WITHOUT_MIDDLE_PACKETS = MAX_SIZE - HEADER_SIZE_WITHOUT_MIDDLE_PACKETS // we are using all fields
-        internal const val CAPACITY_WITH_MIDDLE_PACKETS = MAX_SIZE - HEADER_SIZE_WITH_MIDDLE_PACKETS // we are not using crc32 or size
+        internal const val CAPACITY_WITHOUT_MIDDLE_PACKETS =
+            MAX_SIZE - HEADER_SIZE_WITHOUT_MIDDLE_PACKETS // we are using all fields
+        internal const val CAPACITY_WITH_MIDDLE_PACKETS =
+            MAX_SIZE - HEADER_SIZE_WITH_MIDDLE_PACKETS // we are not using crc32 or size
         internal const val CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET = 18
     }
 }
@@ -92,4 +99,3 @@ data class LastOptionalPlusOneBlePacket(val index: Byte, val payload: ByteArray,
         internal const val HEADER_SIZE = 2
     }
 }
-
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
index cc76bd232f..8c4d78fc9d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
@@ -139,7 +139,10 @@ internal class LTKExchanger(private val aapsLogger: AAPSLogger, private val msgI
             throw MessageIOException("Invalid payload size")
         }
         if (!podConf.contentEquals(payload)) {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "Received invalid podConf. Expected: ${podConf.toHex()}. Got: ${payload.toHex()}")
+            aapsLogger.warn(
+                LTag.PUMPBTCOMM,
+                "Received invalid podConf. Expected: ${podConf.toHex()}. Got: ${payload.toHex()}"
+            )
             throw MessageIOException("Invalid podConf value received")
         }
     }
@@ -225,24 +228,25 @@ internal class LTKExchanger(private val aapsLogger: AAPSLogger, private val msgI
 
     companion object {
 
-        private val PUBLIC_KEY_SIZE = 32
-        private val NONCE_SIZE = 16
-        private val CONF_SIZE = 16
+        private const val PUBLIC_KEY_SIZE = 32
+        private const val NONCE_SIZE = 16
+        private const val CONF_SIZE = 16
 
-        private val CMAC_SIZE = 16
+        private const val CMAC_SIZE = 16
 
         private val INTERMEDIAR_KEY_MAGIC_STRING = "TWIt".toByteArray()
         private val PDM_CONF_MAGIC_PREFIX = "KC_2_U".toByteArray()
         private val POD_CONF_MAGIC_PREFIX = "KC_2_V".toByteArray()
 
-        private val GET_POD_STATUS_HEX_COMMAND = "ffc32dbd08030e0100008a" // TODO for now we are assuming this command is build out of constant parameters, use a proper command builder for that.
+        private const val GET_POD_STATUS_HEX_COMMAND =
+            "ffc32dbd08030e0100008a" // TODO for now we are assuming this command is build out of constant parameters, use a proper command builder for that.
 
-        private val SP1 = "SP1="
-        private val SP2 = ",SP2="
-        private val SPS1 = "SPS1="
-        private val SPS2 = "SPS2="
-        private val SP0GP0 = "SP0,GP0"
-        private val P0 = "P0="
+        private const val SP1 = "SP1="
+        private const val SP2 = ",SP2="
+        private const val SPS1 = "SPS1="
+        private const val SPS2 = "SPS2="
+        private const val SP0GP0 = "SP0,GP0"
+        private const val P0 = "P0="
         private val UNKNOWN_P0_PAYLOAD = byteArrayOf(0xa5.toByte())
     }
 }
@@ -253,4 +257,4 @@ private fun aesCmac(key: ByteArray, data: ByteArray, result: ByteArray) {
     mac.init(KeyParameter(key))
     mac.update(data, 0, data.size)
     mac.doFinal(result, 0)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt
index f36baea723..af705fd720 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt
@@ -17,4 +17,4 @@ data class PairMessage(
         sequenceNumber = sequenceNumber,
         sas = true // TODO: understand why this is true for PairMessages
     ),
-)
\ No newline at end of file
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
index bf3d3dd74c..05ba626765 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
@@ -15,16 +15,22 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
         val serviceUuids = scanRecord.serviceUuids
         if (serviceUuids.size != 9) {
             throw DiscoveredInvalidPodException("Expected 9 service UUIDs, got" + serviceUuids.size, serviceUuids)
-
         }
         if (extractUUID16(serviceUuids[0]) != MAIN_SERVICE_UUID) {
             // this is the service that we filtered for
-            throw DiscoveredInvalidPodException("The first exposed service UUID should be 4024, got " + extractUUID16(serviceUuids[0]), serviceUuids)
+            throw DiscoveredInvalidPodException(
+                "The first exposed service UUID should be 4024, got " + extractUUID16(
+                    serviceUuids[0]
+                ), serviceUuids
+            )
         }
         // TODO understand what is serviceUUIDs[1]. 0x2470. Alarms?
         if (extractUUID16(serviceUuids[2]) != UNKNOWN_THIRD_SERVICE_UUID) {
             // constant?
-            throw DiscoveredInvalidPodException("The third exposed service UUID should be 000a, got " + serviceUuids[2], serviceUuids)
+            throw DiscoveredInvalidPodException(
+                "The third exposed service UUID should be 000a, got " + serviceUuids[2],
+                serviceUuids
+            )
         }
     }
 
@@ -35,7 +41,10 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
         val hexPodId = extractUUID16(serviceUUIDs[3]) + extractUUID16(serviceUUIDs[4])
         val podId = hexPodId.toLong(16)
         if (this.podId != podId) {
-            throw DiscoveredInvalidPodException("This is not the POD we are looking for. " + this.podId + " found: " + this.podId, serviceUUIDs)
+            throw DiscoveredInvalidPodException(
+                "This is not the POD we are looking for. " + this.podId + " found: " + this.podId,
+                serviceUUIDs
+            )
         }
     }
 
@@ -79,4 +88,4 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
         lotNo = parseLotNo()
         sequenceNo = parseSeqNo()
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt
index e898b755fe..4a9932a4de 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt
@@ -45,4 +45,4 @@ class PodScanner(private val logger: AAPSLogger, private val bluetoothAdapter: B
         const val POD_ID_NOT_ACTIVATED = 0xFFFFFFFFL
         private const val SCAN_DURATION_MS = 5000
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
index 658f3b69ff..82c249d492 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
@@ -45,5 +45,4 @@ class ScanCollector(private val logger: AAPSLogger, private val podID: Long) : S
         }
         return Collections.unmodifiableList(ret)
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/status/ConnectionStatus.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/status/ConnectionStatus.kt
index 3f11ca87b5..8343887516 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/status/ConnectionStatus.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/status/ConnectionStatus.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.status
 enum class ConnectionStatus {
     CONNECTED,
     NOT_CONNECTED;
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
index 0bc6bf5125..b0429dd1d5 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
@@ -20,4 +20,3 @@ sealed class PodEvent {
     class CommandSent(val command: Command) : PodEvent()
     class ResponseReceived(val response: Response) : PodEvent()
 }
-
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt
index ec122495bc..06bdd2c698 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt
@@ -13,12 +13,14 @@ class DeactivateCommand private constructor(
 ) : NonceEnabledCommand(CommandType.DEACTIVATE, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-            .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-            .put(commandType.value) //
-            .put(BODY_LENGTH) //
-            .putInt(nonce) //
-            .array())
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                .put(commandType.value) //
+                .put(BODY_LENGTH) //
+                .putInt(nonce) //
+                .array()
+        )
 
     override fun toString(): String = "DeactivateCommand{" +
         "nonce=" + nonce +
@@ -31,7 +33,12 @@ class DeactivateCommand private constructor(
     class Builder : NonceEnabledCommandBuilder<Builder, DeactivateCommand>() {
 
         override fun buildCommand(): DeactivateCommand =
-            DeactivateCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!) // TODO this might crash if not all are set
+            DeactivateCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!
+            ) // TODO this might crash if not all are set
     }
 
     companion object {
@@ -39,4 +46,4 @@ class DeactivateCommand private constructor(
         private const val LENGTH: Short = 6
         private const val BODY_LENGTH: Byte = 4
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt
index ac9228125a..b5f262da17 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt
@@ -14,12 +14,14 @@ class GetStatusCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.GET_STATUS, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-            .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-            .put(commandType.value) //
-            .put(BODY_LENGTH) //
-            .put(statusResponseType.value) //
-            .array())
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                .put(commandType.value) //
+                .put(BODY_LENGTH) //
+                .put(statusResponseType.value) //
+                .array()
+        )
 
     class Builder : HeaderEnabledCommandBuilder<Builder, GetStatusCommand>() {
 
@@ -35,7 +37,6 @@ class GetStatusCommand private constructor(
 
             return GetStatusCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, statusResponseType!!)
         }
-
     }
 
     companion object {
@@ -43,4 +44,4 @@ class GetStatusCommand private constructor(
         private const val LENGTH: Short = 3
         private const val BODY_LENGTH: Byte = 1
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt
index a06a3624e6..26c480e999 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt
@@ -12,12 +12,14 @@ class GetVersionCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.GET_VERSION, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-            .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-            .put(commandType.value) //
-            .put(BODY_LENGTH) //
-            .putInt(uniqueId) //
-            .array())
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                .put(commandType.value) //
+                .put(BODY_LENGTH) //
+                .putInt(uniqueId) //
+                .array()
+        )
 
     override fun toString(): String {
         return "GetVersionCommand{" +
@@ -41,4 +43,4 @@ class GetVersionCommand private constructor(
         private const val LENGTH: Short = 6
         private const val BODY_LENGTH: Byte = 4
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt
index 44c8505a49..11191e8812 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt
@@ -67,4 +67,4 @@ class ProgramAlertsCommand private constructor(
     init {
         this.alertConfigurations = ArrayList(alertConfigurations)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt
index 9e9afdd3d3..2060528fce 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt
@@ -48,12 +48,19 @@ class ProgramBasalCommand private constructor(
             }
             val basalCommand = buffer.array()
             val interlockCommand = interlockCommand.encoded
-            val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (basalCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(basalCommand.size + interlockCommand.size + header.size) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(basalCommand) //
-                .array())
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (basalCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(basalCommand.size + interlockCommand.size + header.size) //
+                    .put(header) //
+                    .put(interlockCommand) //
+                    .put(basalCommand) //
+                    .array()
+            )
         }
 
     override fun toString(): String {
@@ -99,15 +106,33 @@ class ProgramBasalCommand private constructor(
             val pulsesPerSlot = ProgramBasalUtil.mapBasalProgramToPulsesPerSlot(basalProgram!!)
             val currentSlot = ProgramBasalUtil.calculateCurrentSlot(pulsesPerSlot, currentTime)
             val checksum = ProgramBasalUtil.calculateChecksum(pulsesPerSlot, currentSlot)
-            val longInsulinProgramElements: List<BasalInsulinProgramElement> = mapTenthPulsesPerSlotToLongInsulinProgramElements(ProgramBasalUtil.mapBasalProgramToTenthPulsesPerSlot(basalProgram!!))
-            val shortInsulinProgramElements = ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
-            val currentBasalInsulinProgramElement = ProgramBasalUtil.calculateCurrentLongInsulinProgramElement(longInsulinProgramElements, currentTime)
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!,
+            val longInsulinProgramElements: List<BasalInsulinProgramElement> =
+                mapTenthPulsesPerSlotToLongInsulinProgramElements(
+                    ProgramBasalUtil.mapBasalProgramToTenthPulsesPerSlot(basalProgram!!)
+                )
+            val shortInsulinProgramElements = ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(
+                pulsesPerSlot
+            )
+            val currentBasalInsulinProgramElement = ProgramBasalUtil.calculateCurrentLongInsulinProgramElement(
+                longInsulinProgramElements,
+                currentTime
+            )
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!,
                 shortInsulinProgramElements, checksum, currentSlot.index, currentSlot.eighthSecondsRemaining,
-                currentSlot.pulsesRemaining, ProgramInsulinCommand.DeliveryType.BASAL)
-            return ProgramBasalCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag,
-                longInsulinProgramElements, programReminder!!, currentBasalInsulinProgramElement.index,
-                currentBasalInsulinProgramElement.remainingTenthPulses, currentBasalInsulinProgramElement.delayUntilNextTenthPulseInUsec)
+                currentSlot.pulsesRemaining, ProgramInsulinCommand.DeliveryType.BASAL
+            )
+            return ProgramBasalCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                longInsulinProgramElements,
+                programReminder!!,
+                currentBasalInsulinProgramElement.index,
+                currentBasalInsulinProgramElement.remainingTenthPulses,
+                currentBasalInsulinProgramElement.delayUntilNextTenthPulseInUsec
+            )
         }
     }
 
@@ -118,4 +143,4 @@ class ProgramBasalCommand private constructor(
         this.remainingTenthPulsesInCurrentInsulinProgramElement = remainingTenthPulsesInCurrentInsulinProgramElement
         this.delayUntilNextTenthPulseInUsec = delayUntilNextTenthPulseInUsec
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt
index d9412e7363..47407d7504 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt
@@ -18,15 +18,17 @@ class ProgramBeepsCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.PROGRAM_BEEPS, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-            .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-            .put(commandType.value) //
-            .put(BODY_LENGTH) //
-            .put(immediateBeepType.value) //
-            .put(basalReminder.encoded) //
-            .put(tempBasalReminder.encoded) //
-            .put(bolusReminder.encoded) //
-            .array())
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                .put(commandType.value) //
+                .put(BODY_LENGTH) //
+                .put(immediateBeepType.value) //
+                .put(basalReminder.encoded) //
+                .put(tempBasalReminder.encoded) //
+                .put(bolusReminder.encoded) //
+                .array()
+        )
 
     class Builder : HeaderEnabledCommandBuilder<Builder, ProgramBeepsCommand>() {
 
@@ -61,7 +63,15 @@ class ProgramBeepsCommand private constructor(
             requireNotNull(tempBasalReminder) { "tempBasalReminder can not be null" }
             requireNotNull(bolusReminder) { "bolusReminder can not be null" }
 
-            return ProgramBeepsCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, immediateBeepType!!, basalReminder!!, tempBasalReminder!!, bolusReminder!!)
+            return ProgramBeepsCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                immediateBeepType!!,
+                basalReminder!!,
+                tempBasalReminder!!,
+                bolusReminder!!
+            )
         }
     }
 
@@ -70,4 +80,4 @@ class ProgramBeepsCommand private constructor(
         private const val LENGTH: Short = 6
         private const val BODY_LENGTH: Byte = 4
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt
index c02f1d3ef0..4a63d9f5ee 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt
@@ -31,12 +31,19 @@ class ProgramBolusCommand private constructor(
                 .putInt(0) // Delay between tenth extended pulses in usec
                 .array()
             val interlockCommand = interlockCommand.encoded
-            val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (bolusCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(header.size + interlockCommand.size + bolusCommand.size) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(bolusCommand) //
-                .array())
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (bolusCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + bolusCommand.size) //
+                    .put(header) //
+                    .put(interlockCommand) //
+                    .put(bolusCommand) //
+                    .array()
+            )
         }
 
     override fun toString(): String {
@@ -82,10 +89,28 @@ class ProgramBolusCommand private constructor(
 
             val numberOfPulses = Math.round(numberOfUnits!! * 20).toShort()
             val byte10And11 = (numberOfPulses * delayBetweenPulsesInEighthSeconds!!).toShort()
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, listOf(BolusShortInsulinProgramElement(numberOfPulses)), calculateChecksum(0x01.toByte(), byte10And11, numberOfPulses),
-                0x01.toByte(), byte10And11, numberOfPulses, ProgramInsulinCommand.DeliveryType.BOLUS)
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!,
+                listOf(BolusShortInsulinProgramElement(numberOfPulses)),
+                calculateChecksum(0x01.toByte(), byte10And11, numberOfPulses),
+                0x01.toByte(),
+                byte10And11,
+                numberOfPulses,
+                ProgramInsulinCommand.DeliveryType.BOLUS
+            )
             val delayUntilFirstTenthPulseInUsec = delayBetweenPulsesInEighthSeconds!! / 8 * 100000
-            return ProgramBolusCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag, programReminder!!, (numberOfPulses * 10).toShort(), delayUntilFirstTenthPulseInUsec)
+            return ProgramBolusCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                programReminder!!,
+                (numberOfPulses * 10).toShort(),
+                delayUntilFirstTenthPulseInUsec
+            )
         }
     }
 
@@ -94,12 +119,14 @@ class ProgramBolusCommand private constructor(
         private const val LENGTH: Short = 15
         private const val BODY_LENGTH: Byte = 13
         private fun calculateChecksum(numberOfSlots: Byte, byte10And11: Short, numberOfPulses: Short): Short {
-            return MessageUtil.calculateChecksum(ByteBuffer.allocate(7) //
-                .put(numberOfSlots) //
-                .putShort(byte10And11) //
-                .putShort(numberOfPulses) //
-                .putShort(numberOfPulses) //
-                .array())
+            return MessageUtil.calculateChecksum(
+                ByteBuffer.allocate(7) //
+                    .put(numberOfSlots) //
+                    .putShort(byte10And11) //
+                    .putShort(numberOfPulses) //
+                    .putShort(numberOfPulses) //
+                    .array()
+            )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt
index 0020407056..6aff972e18 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt
@@ -11,7 +11,8 @@ class ProgramInsulinCommand internal constructor(
     uniqueId: Int,
     sequenceNumber: Short,
     multiCommandFlag: Boolean,
-    nonce: Int, insulinProgramElements:
+    nonce: Int,
+    insulinProgramElements:
     List<ShortInsulinProgramElement>,
     private val checksum: Short,
     private val byte9: Byte,
@@ -66,4 +67,4 @@ class ProgramInsulinCommand internal constructor(
             ", multiCommandFlag=" + multiCommandFlag +
             '}'
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt
index c0179ed62e..da9d8b38ec 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt
@@ -56,13 +56,36 @@ class ProgramTempBasalCommand private constructor(
 
             val durationInSlots = (durationInMinutes!! / 30).toByte()
             val pulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToPulsesPerSlot(durationInSlots, rateInUnitsPerHour!!)
-            val tenthPulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToTenthPulsesPerSlot(durationInSlots.toInt(), rateInUnitsPerHour!!)
-            val shortInsulinProgramElements = ProgramTempBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
-            val insulinProgramElements = ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot)
-            val interlockCommand = ProgramInsulinCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!, shortInsulinProgramElements,
-                ProgramTempBasalUtil.calculateChecksum(durationInSlots, pulsesPerSlot[0], pulsesPerSlot), durationInSlots,
-                0x3840.toShort(), pulsesPerSlot[0], ProgramInsulinCommand.DeliveryType.TEMP_BASAL)
-            return ProgramTempBasalCommand(interlockCommand, uniqueId!!, sequenceNumber!!, multiCommandFlag, programReminder!!, insulinProgramElements)
+            val tenthPulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToTenthPulsesPerSlot(
+                durationInSlots.toInt(),
+                rateInUnitsPerHour!!
+            )
+            val shortInsulinProgramElements = ProgramTempBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(
+                pulsesPerSlot
+            )
+            val insulinProgramElements = ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(
+                tenthPulsesPerSlot
+            )
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!,
+                shortInsulinProgramElements,
+                ProgramTempBasalUtil.calculateChecksum(durationInSlots, pulsesPerSlot[0], pulsesPerSlot),
+                durationInSlots,
+                0x3840.toShort(),
+                pulsesPerSlot[0],
+                ProgramInsulinCommand.DeliveryType.TEMP_BASAL
+            )
+            return ProgramTempBasalCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                programReminder!!,
+                insulinProgramElements
+            )
         }
     }
 
@@ -73,10 +96,12 @@ class ProgramTempBasalCommand private constructor(
             val delayUntilNextTenthPulseInUsec: Int
             if (firstProgramElement.totalTenthPulses.toInt() == 0) {
                 remainingTenthPulsesInFirstElement = firstProgramElement.numberOfSlots.toShort()
-                delayUntilNextTenthPulseInUsec = ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT
+                delayUntilNextTenthPulseInUsec =
+                    ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT
             } else {
                 remainingTenthPulsesInFirstElement = firstProgramElement.totalTenthPulses
-                delayUntilNextTenthPulseInUsec = (firstProgramElement.numberOfSlots.toLong() * 1800.0 / remainingTenthPulsesInFirstElement * 1000000).toInt()
+                delayUntilNextTenthPulseInUsec =
+                    (firstProgramElement.numberOfSlots.toLong() * 1800.0 / remainingTenthPulsesInFirstElement * 1000000).toInt()
             }
             val buffer = ByteBuffer.allocate(getLength().toInt()) //
                 .put(commandType.value) //
@@ -90,11 +115,18 @@ class ProgramTempBasalCommand private constructor(
             }
             val tempBasalCommand = buffer.array()
             val interlockCommand = interlockCommand.encoded
-            val header: ByteArray = encodeHeader(uniqueId, sequenceNumber, (tempBasalCommand.size + interlockCommand.size).toShort(), multiCommandFlag)
-            return appendCrc(ByteBuffer.allocate(header.size + interlockCommand.size + tempBasalCommand.size) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(tempBasalCommand) //
-                .array())
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (tempBasalCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + tempBasalCommand.size) //
+                    .put(header) //
+                    .put(interlockCommand) //
+                    .put(tempBasalCommand) //
+                    .array()
+            )
         }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt
index 04d62e99ac..0e982c2c9f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt
@@ -16,17 +16,19 @@ class SetUniqueIdCommand private constructor(
 ) : HeaderEnabledCommand(CommandType.SET_UNIQUE_ID, uniqueId, sequenceNumber, multiCommandFlag) {
 
     override val encoded: ByteArray
-        get() = appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-            .put(encodeHeader(DEFAULT_UNIQUE_ID, sequenceNumber, LENGTH, multiCommandFlag)) //
-            .put(commandType.value) //
-            .put(BODY_LENGTH) //
-            .putInt(uniqueId) //
-            .put(0x14.toByte()) // FIXME ??
-            .put(0x04.toByte()) // FIXME ??
-            .put(encodeInitializationTime(initializationTime)) //
-            .putInt(lotNumber) //
-            .putInt(podSequenceNumber) //
-            .array())
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                .put(encodeHeader(DEFAULT_UNIQUE_ID, sequenceNumber, LENGTH, multiCommandFlag)) //
+                .put(commandType.value) //
+                .put(BODY_LENGTH) //
+                .putInt(uniqueId) //
+                .put(0x14.toByte()) // FIXME ??
+                .put(0x04.toByte()) // FIXME ??
+                .put(encodeInitializationTime(initializationTime)) //
+                .putInt(lotNumber) //
+                .putInt(podSequenceNumber) //
+                .array()
+        )
 
     override fun toString(): String {
         return "SetUniqueIdCommand{" +
@@ -65,7 +67,14 @@ class SetUniqueIdCommand private constructor(
             requireNotNull(lotNumber) { "lotNumber can not be null" }
             requireNotNull(podSequenceNumber) { "podSequenceNumber can not be null" }
             requireNotNull(initializationTime) { "initializationTime can not be null" }
-            return SetUniqueIdCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, lotNumber!!, podSequenceNumber!!, initializationTime!!)
+            return SetUniqueIdCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                lotNumber!!,
+                podSequenceNumber!!,
+                initializationTime!!
+            )
         }
     }
 
@@ -78,12 +87,12 @@ class SetUniqueIdCommand private constructor(
             val instance = Calendar.getInstance()
             instance.time = date
             return byteArrayOf( //
-                (instance[Calendar.MONTH] + 1).toByte(),  //
-                instance[Calendar.DATE].toByte(),  //
-                (instance[Calendar.YEAR] % 100).toByte(),  //
-                instance[Calendar.HOUR_OF_DAY].toByte(),  //
+                (instance[Calendar.MONTH] + 1).toByte(), //
+                instance[Calendar.DATE].toByte(), //
+                (instance[Calendar.YEAR] % 100).toByte(), //
+                instance[Calendar.HOUR_OF_DAY].toByte(), //
                 instance[Calendar.MINUTE].toByte() //
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt
index 1b3c531ee9..68d2738c89 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt
@@ -18,13 +18,15 @@ class SilenceAlertsCommand private constructor(
 
     override val encoded: ByteArray
         get() =
-            appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.value) //
-                .put(BODY_LENGTH) //
-                .putInt(nonce) //
-                .put(AlertUtil.encodeAlertSet(alertTypes)) //
-                .array())
+            appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                    .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                    .put(commandType.value) //
+                    .put(BODY_LENGTH) //
+                    .putInt(nonce) //
+                    .put(AlertUtil.encodeAlertSet(alertTypes)) //
+                    .array()
+            )
 
     override fun toString(): String {
         return "SilenceAlertsCommand{" +
@@ -57,4 +59,4 @@ class SilenceAlertsCommand private constructor(
         private const val LENGTH = 7.toShort()
         private const val BODY_LENGTH = 5.toByte()
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt
index 603a7ff09d..b7539cf855 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt
@@ -19,13 +19,15 @@ class StopDeliveryCommand private constructor(
 
     override val encoded: ByteArray
         get() {
-            return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.value) //
-                .put(BODY_LENGTH) //
-                .putInt(nonce) //
-                .put((beepType.value.toInt() shl 4 or deliveryType.encoded[0].toInt()).toByte()) //
-                .array())
+            return appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
+                    .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
+                    .put(commandType.value) //
+                    .put(BODY_LENGTH) //
+                    .putInt(nonce) //
+                    .put((beepType.value.toInt() shl 4 or deliveryType.encoded[0].toInt()).toByte()) //
+                    .array()
+            )
         }
 
     override fun toString(): String {
@@ -40,7 +42,12 @@ class StopDeliveryCommand private constructor(
             '}'
     }
 
-    enum class DeliveryType(private val basal: Boolean, private val tempBasal: Boolean, private val bolus: Boolean) : Encodable {
+    enum class DeliveryType(
+        private val basal: Boolean,
+        private val tempBasal: Boolean,
+        private val bolus: Boolean
+    ) : Encodable {
+
         BASAL(true, false, false), TEMP_BASAL(false, true, false), BOLUS(false, false, true), ALL(true, true, true);
 
         override val encoded: ByteArray
@@ -72,7 +79,14 @@ class StopDeliveryCommand private constructor(
             requireNotNull(deliveryType) { "deliveryType can not be null" }
             requireNotNull(beepType) { "beepType can not be null" }
 
-            return StopDeliveryCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, deliveryType!!, beepType!!, nonce!!)
+            return StopDeliveryCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                deliveryType!!,
+                beepType!!,
+                nonce!!
+            )
         }
     }
 
@@ -81,4 +95,4 @@ class StopDeliveryCommand private constructor(
         private const val LENGTH: Short = 7
         private const val BODY_LENGTH: Byte = 5
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt
index bbe29cb2e5..0b509a8ae1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt
@@ -6,4 +6,4 @@ import java.io.Serializable
 interface Command : Encodable, Serializable {
 
     val commandType: CommandType
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt
index 1cc50ff135..1cbcf8ae97 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt
@@ -6,12 +6,12 @@ enum class CommandType(val value: Byte) {
     GET_VERSION(0x07.toByte()),
     GET_STATUS(0x0e.toByte()),
     SILENCE_ALERTS(0x11.toByte()),
-    PROGRAM_BASAL(0x13.toByte()),  // Always preceded by 0x1a
-    PROGRAM_TEMP_BASAL(0x16.toByte()),  // Always preceded by 0x1a
-    PROGRAM_BOLUS(0x17.toByte()),  // Always preceded by 0x1a
+    PROGRAM_BASAL(0x13.toByte()), // Always preceded by 0x1a
+    PROGRAM_TEMP_BASAL(0x16.toByte()), // Always preceded by 0x1a
+    PROGRAM_BOLUS(0x17.toByte()), // Always preceded by 0x1a
     PROGRAM_ALERTS(0x19.toByte()),
-    PROGRAM_INSULIN(0x1a.toByte()),  // Always followed by one of: 0x13, 0x16, 0x17
+    PROGRAM_INSULIN(0x1a.toByte()), // Always followed by one of: 0x13, 0x16, 0x17
     DEACTIVATE(0x1c.toByte()),
     PROGRAM_BEEPS(0x1e.toByte()),
     STOP_DELIVERY(0x1f.toByte());
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt
index 10e91285a3..42e35e0317 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt
@@ -18,7 +18,12 @@ abstract class HeaderEnabledCommand protected constructor(
                 .putShort(MessageUtil.createCrc(command)) //
                 .array()
 
-        internal fun encodeHeader(uniqueId: Int, sequenceNumber: Short, length: Short, multiCommandFlag: Boolean): ByteArray =
+        internal fun encodeHeader(
+            uniqueId: Int,
+            sequenceNumber: Short,
+            length: Short,
+            multiCommandFlag: Boolean
+        ): ByteArray =
             ByteBuffer.allocate(6) //
                 .putInt(uniqueId) //
                 .putShort((sequenceNumber.toInt() and 0x0f shl 10 or length.toInt() or ((if (multiCommandFlag) 1 else 0) shl 15)).toShort()) //
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt
index ef905673e9..5d943a777f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt
@@ -6,4 +6,4 @@ abstract class NonceEnabledCommand protected constructor(
     sequenceNumber: Short,
     multiCommandFlag: Boolean,
     protected val nonce: Int
-) : HeaderEnabledCommand(commandType, uniqueId, sequenceNumber, multiCommandFlag)
\ No newline at end of file
+) : HeaderEnabledCommand(commandType, uniqueId, sequenceNumber, multiCommandFlag)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
index 1798f08ca8..3e7aa921de 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
@@ -5,4 +5,4 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.b
 interface CommandBuilder<R : Command> {
 
     fun build(): R
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt
index f6fc7151b8..046d990b5e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt
@@ -31,4 +31,4 @@ abstract class HeaderEnabledCommandBuilder<T : HeaderEnabledCommandBuilder<T, R>
     }
 
     protected abstract fun buildCommand(): R
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt
index 04ee98a2d3..04e14ac856 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt
@@ -15,4 +15,4 @@ abstract class NonceEnabledCommandBuilder<T : NonceEnabledCommandBuilder<T, R>,
         this.nonce = nonce
         return this as T
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt
index cb700d64f2..8e9f2eabb9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt
@@ -31,4 +31,4 @@ open class BasalInsulinProgramElement(
             ", delayBetweenTenthPulsesInUsec=" + delayBetweenTenthPulsesInUsec +
             '}'
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt
index f30c4a8170..5d84e12ca3 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt
@@ -5,15 +5,17 @@ import kotlin.experimental.and
 
 class BasalShortInsulinProgramElement(
     private val numberOfSlots: Byte, // 4 bits
-    private val pulsesPerSlot: Short, //10 bits
+    private val pulsesPerSlot: Short, // 10 bits
     private val extraAlternatePulse: Boolean
 ) : ShortInsulinProgramElement {
 
     override val encoded: ByteArray
         get() {
-            val firstByte = (numberOfSlots - 1 and 0x0f shl 4 //
-                or ((if (extraAlternatePulse) 1 else 0) shl 3) //
-                or (pulsesPerSlot.toInt() ushr 8 and 0x03)).toByte()
+            val firstByte = (
+                numberOfSlots - 1 and 0x0f shl 4 //
+                    or ((if (extraAlternatePulse) 1 else 0) shl 3) //
+                    or (pulsesPerSlot.toInt() ushr 8 and 0x03)
+                ).toByte()
             return ByteBuffer.allocate(2) //
                 .put(firstByte) //
                 .put((pulsesPerSlot and 0xff).toByte()) //
@@ -27,4 +29,4 @@ class BasalShortInsulinProgramElement(
             ", extraAlternatePulse=" + extraAlternatePulse +
             '}'
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt
index 6a2948404b..6527662b3c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt
@@ -8,4 +8,4 @@ class BolusShortInsulinProgramElement(
 
     override val encoded: ByteArray
         get() = ByteBuffer.allocate(2).putShort(numberOfPulses).array()
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt
index 04f27cf9bf..66d8efe3d7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt
@@ -13,4 +13,4 @@ class CurrentBasalInsulinProgramElement(
         ", delayUntilNextTenthPulseInUsec=" + delayUntilNextTenthPulseInUsec +
         ", remainingTenthPulses=" + remainingTenthPulses +
         '}'
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt
index 49b2af59dc..077318299d 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt
@@ -13,4 +13,4 @@ class CurrentSlot(
         ", eighthSecondsRemaining=" + eighthSecondsRemaining +
         ", pulsesRemaining=" + pulsesRemaining +
         '}'
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt
index 2ff92c2c24..ac7e66a81a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable
 import java.io.Serializable
 
-interface ShortInsulinProgramElement : Encodable, Serializable
\ No newline at end of file
+interface ShortInsulinProgramElement : Encodable, Serializable
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt
index 4c58755591..a1b5f9310b 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt
@@ -21,4 +21,4 @@ class TempBasalInsulinProgramElement(
             }
             return buffer.array()
         }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt
index 93b144787f..b784ebcdbc 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt
@@ -30,7 +30,13 @@ object ProgramBasalUtil {
                 previousTenthPulsesPerSlot = tenthPulsesPerSlot[i]
                 numberOfSlotsInCurrentElement = 1
             } else if (previousTenthPulsesPerSlot != tenthPulsesPerSlot[i] || (numberOfSlotsInCurrentElement + 1) * previousTenthPulsesPerSlot > 65534) {
-                elements.add(insulinProgramElementFactory(startSlotIndex, numberOfSlotsInCurrentElement, (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()))
+                elements.add(
+                    insulinProgramElementFactory(
+                        startSlotIndex,
+                        numberOfSlotsInCurrentElement,
+                        (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()
+                    )
+                )
                 previousTenthPulsesPerSlot = tenthPulsesPerSlot[i]
                 numberOfSlotsInCurrentElement = 1
                 startSlotIndex = (numberOfSlotsInCurrentElement + startSlotIndex).toByte()
@@ -38,7 +44,13 @@ object ProgramBasalUtil {
                 numberOfSlotsInCurrentElement++
             }
         }
-        elements.add(insulinProgramElementFactory(startSlotIndex, numberOfSlotsInCurrentElement, (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()))
+        elements.add(
+            insulinProgramElementFactory(
+                startSlotIndex,
+                numberOfSlotsInCurrentElement,
+                (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()
+            )
+        )
         return elements
     }
 
@@ -60,7 +72,13 @@ object ProgramBasalUtil {
                 if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
                     numberOfSlotsInCurrentElement++
                 } else {
-                    elements.add(BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse))
+                    elements.add(
+                        BasalShortInsulinProgramElement(
+                            numberOfSlotsInCurrentElement,
+                            previousPulsesPerSlot,
+                            extraAlternatePulse
+                        )
+                    )
                     previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
                     numberOfSlotsInCurrentElement = 1
                     extraAlternatePulse = false
@@ -82,7 +100,13 @@ object ProgramBasalUtil {
                             numberOfSlotsInCurrentElement++
                         } else {
                             // End of alternate pulse segment (no slots left in element)
-                            elements.add(BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse))
+                            elements.add(
+                                BasalShortInsulinProgramElement(
+                                    numberOfSlotsInCurrentElement,
+                                    previousPulsesPerSlot,
+                                    extraAlternatePulse
+                                )
+                            )
                             previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
                             numberOfSlotsInCurrentElement = 1
                             extraAlternatePulse = false
@@ -90,7 +114,13 @@ object ProgramBasalUtil {
                         }
                     } else {
                         // End of alternate pulse segment (new number of pulses per slot)
-                        elements.add(BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse))
+                        elements.add(
+                            BasalShortInsulinProgramElement(
+                                numberOfSlotsInCurrentElement,
+                                previousPulsesPerSlot,
+                                extraAlternatePulse
+                            )
+                        )
                         previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
                         numberOfSlotsInCurrentElement = 1
                         extraAlternatePulse = false
@@ -100,7 +130,13 @@ object ProgramBasalUtil {
                 }
             } else if (previousPulsesPerSlot != pulsesPerSlot[currentTotalNumberOfSlots.toInt()]) {
                 // End of segment (new number of pulses per slot)
-                elements.add(BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse))
+                elements.add(
+                    BasalShortInsulinProgramElement(
+                        numberOfSlotsInCurrentElement,
+                        previousPulsesPerSlot,
+                        extraAlternatePulse
+                    )
+                )
                 previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
                 currentTotalNumberOfSlots++
                 extraAlternatePulse = false
@@ -109,7 +145,13 @@ object ProgramBasalUtil {
                 throw IllegalStateException("Reached illegal point in mapBasalProgramToShortInsulinProgramElements")
             }
         }
-        elements.add(BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse))
+        elements.add(
+            BasalShortInsulinProgramElement(
+                numberOfSlotsInCurrentElement,
+                previousPulsesPerSlot,
+                extraAlternatePulse
+            )
+        )
         return elements
     }
 
@@ -117,7 +159,8 @@ object ProgramBasalUtil {
         val tenthPulsesPerSlot = ShortArray(NUMBER_OF_BASAL_SLOTS.toInt())
         for (segment in basalProgram.segments) {
             for (i in segment.startSlotIndex until segment.endSlotIndex) {
-                tenthPulsesPerSlot[i] = (roundToHalf(segment.getPulsesPerHour() / 2.0) * 10).toInt().toShort() // TODO Adrian: int conversion ok?
+                tenthPulsesPerSlot[i] = (roundToHalf(segment.getPulsesPerHour() / 2.0) * 10).toInt()
+                    .toShort() // TODO Adrian: int conversion ok?
             }
         }
         return tenthPulsesPerSlot
@@ -157,7 +200,10 @@ object ProgramBasalUtil {
         return CurrentSlot(index, (secondsRemaining * 8).toShort(), pulsesRemaining)
     }
 
-    fun calculateCurrentLongInsulinProgramElement(elements: List<BasalInsulinProgramElement>, currentTime: Date?): CurrentBasalInsulinProgramElement {
+    fun calculateCurrentLongInsulinProgramElement(
+        elements: List<BasalInsulinProgramElement>,
+        currentTime: Date?
+    ): CurrentBasalInsulinProgramElement {
         val instance = Calendar.getInstance()
         instance.time = currentTime
         val hourOfDay = instance[Calendar.HOUR_OF_DAY]
@@ -176,8 +222,10 @@ object ProgramBasalUtil {
                 }
                 val durationInSeconds = endTimeInSeconds - startTimeInSeconds
                 val secondsPassedInCurrentSlot = secondOfDay - startTimeInSeconds
-                val remainingTenThousandthPulses = ((durationInSeconds - secondsPassedInCurrentSlot) / durationInSeconds.toDouble() * totalNumberOfTenThousandthPulsesInSlot).toLong()
-                val delayBetweenTenthPulsesInUsec = (durationInSeconds * 1000000L * 1000 / totalNumberOfTenThousandthPulsesInSlot).toInt()
+                val remainingTenThousandthPulses =
+                    ((durationInSeconds - secondsPassedInCurrentSlot) / durationInSeconds.toDouble() * totalNumberOfTenThousandthPulsesInSlot).toLong()
+                val delayBetweenTenthPulsesInUsec =
+                    (durationInSeconds * 1000000L * 1000 / totalNumberOfTenThousandthPulsesInSlot).toInt()
                 val secondsRemaining = secondsPassedInCurrentSlot % 1800
                 var delayUntilNextTenthPulseInUsec = delayBetweenTenthPulsesInUsec
                 for (i in 0 until secondsRemaining) {
@@ -186,7 +234,8 @@ object ProgramBasalUtil {
                         delayUntilNextTenthPulseInUsec += delayBetweenTenthPulsesInUsec
                     }
                 }
-                val remainingTenthPulses = ((if (remainingTenThousandthPulses % 1000 != 0L) 1 else 0) + remainingTenThousandthPulses / 1000).toShort()
+                val remainingTenthPulses =
+                    ((if (remainingTenThousandthPulses % 1000 != 0L) 1 else 0) + remainingTenThousandthPulses / 1000).toShort()
                 return CurrentBasalInsulinProgramElement(index, delayUntilNextTenthPulseInUsec, remainingTenthPulses)
             }
             index++
@@ -205,4 +254,4 @@ object ProgramBasalUtil {
         }
         return MessageUtil.calculateChecksum(buffer.array())
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt
index 8c66abc626..83cdbf790e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt
@@ -10,7 +10,13 @@ import kotlin.math.roundToInt
 object ProgramTempBasalUtil {
 
     fun mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot: ShortArray): List<BasalInsulinProgramElement> {
-        return ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot) { startSlotIndex: Byte, numberOfSlots: Byte, totalTenthPulses: Short -> TempBasalInsulinProgramElement(startSlotIndex, numberOfSlots, totalTenthPulses) }
+        return ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot) { startSlotIndex: Byte, numberOfSlots: Byte, totalTenthPulses: Short ->
+            TempBasalInsulinProgramElement(
+                startSlotIndex,
+                numberOfSlots,
+                totalTenthPulses
+            )
+        }
     }
 
     fun mapTempBasalToTenthPulsesPerSlot(durationInSlots: Int, rateInUnitsPerHour: Double): ShortArray {
@@ -59,4 +65,4 @@ object ProgramTempBasalUtil {
 
     fun mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot: ShortArray?): List<ShortInsulinProgramElement> =
         ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt
index e43a277f2e..fc7f1f33fc 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt
@@ -8,10 +8,9 @@ enum class ActivationProgress {
     REPROGRAMMED_LUMP_OF_COAL_ALERT,
     PRIMING,
     PRIME_COMPLETED,
-    PROGRAMMED_USER_SET_EXPIRATION_ALERT,
     PHASE_1_COMPLETED,
     PROGRAMMED_BASAL,
-    PROGRAMMED_CANCEL_LOC_ETC_ALERT,
+    UPDATED_EXPIRATION_ALERTS,
     INSERTING_CANNULA,
     CANNULA_INSERTED,
     COMPLETED;
@@ -19,4 +18,4 @@ enum class ActivationProgress {
     fun isBefore(other: ActivationProgress): Boolean = ordinal < other.ordinal
 
     fun isAtLeast(other: ActivationProgress): Boolean = ordinal >= other.ordinal
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt
index 90f794a3cb..fdb6729124 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt
@@ -159,5 +159,4 @@ enum class AlarmType(override val value: Byte) : HasValue {
     ALARM_BLE_QN_EXCEED_MAX_RETRY(0xc1.toByte()),
     ALARM_BLE_QN_CRIT_VAR_FAIL(0xc2.toByte()),
     UNKNOWN(0xff.toByte());
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
index 4040ac5831..20536b6527 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
@@ -29,15 +29,17 @@ class AlertConfiguration(
             return ByteBuffer.allocate(6) //
                 .put(firstByte)
                 .put(durationInMinutes.toByte()) //
-                .putShort(when (trigger) {
-                    is AlertTrigger.ReservoirVolumeTrigger -> {
-                        trigger.thresholdInMicroLiters
-                    }
+                .putShort(
+                    when (trigger) {
+                        is AlertTrigger.ReservoirVolumeTrigger -> {
+                            trigger.thresholdInMicroLiters
+                        }
 
-                    is AlertTrigger.TimerTrigger           -> {
-                        trigger.offsetInMinutes
+                        is AlertTrigger.TimerTrigger           -> {
+                            trigger.offsetInMinutes
+                        }
                     }
-                }) //
+                ) //
                 .put(beepRepetition.value) //
                 .put(beepType.value) //
                 .array()
@@ -54,4 +56,4 @@ class AlertConfiguration(
             ", beepRepetition=" + beepRepetition +
             '}'
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt
index 48df9b25bf..7c76903127 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definiti
 sealed class AlertTrigger {
     class TimerTrigger(val offsetInMinutes: Short) : AlertTrigger()
     class ReservoirVolumeTrigger(val thresholdInMicroLiters: Short) : AlertTrigger()
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt
index ec6d472066..8ee60d2568 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt
@@ -20,4 +20,4 @@ enum class AlertType(val index: Byte) : HasValue {
         } else {
             (1 shl index.toInt()).toByte()
         }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt
index ef8f764f91..b003fba0d1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt
@@ -87,4 +87,4 @@ class BasalProgram(
     override fun hashCode(): Int {
         return segments.hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt
index 402141e875..0668852456 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt
@@ -10,5 +10,4 @@ enum class BeepRepetitionType(
     XXX3(0x05.toByte()), // Used in user pod expiration alert
     XXX4(0x06.toByte()), // Used in pod expiration alert
     XXX5(0x08.toByte()); // Used in imminent pod expiration alert
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt
index d997663b6f..ad41a53654 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt
@@ -5,4 +5,4 @@ enum class BeepType(val value: Byte) {
     SILENT(0x00.toByte()),
     FOUR_TIMES_BIP_BEEP(0x02.toByte()), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert
     LONG_SINGLE_BEEP(0x06.toByte()); // Used in stop delivery command
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt
index daaedab7db..db2a6b3710 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt
@@ -11,4 +11,4 @@ enum class DeliveryStatus(override val value: Byte) : HasValue {
     BOLUS_AND_BASAL_ACTIVE(0x05.toByte()),
     BOLUS_AND_TEMP_BASAL_ACTIVE(0x06.toByte()),
     UNKNOWN(0xff.toByte());
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt
index 28276e2abf..94f5798175 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt
@@ -3,4 +3,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definiti
 interface Encodable {
 
     val encoded: ByteArray
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt
index e3f110e565..c700c11388 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt
@@ -34,4 +34,4 @@ enum class NakErrorType(override val value: Byte) : HasValue {
     IGNORE_COMMAND(0x1c.toByte()),
     INVALID_CRC(0x1d.toByte()),
     UNKNOWN(0xff.toByte());
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt
index b5d0dadacf..9dca9d1c57 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt
@@ -23,4 +23,4 @@ enum class PodStatus(override val value: Byte) : HasValue {
     UNKNOWN(0xff.toByte());
 
     fun isRunning(): Boolean = this == RUNNING_ABOVE_MIN_VOLUME || this == RUNNING_BELOW_MIN_VOLUME
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt
index 09a63370f0..371f90d9e4 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt
@@ -10,7 +10,11 @@ class ProgramReminder(
 ) : Encodable, Serializable {
 
     override val encoded: ByteArray
-        get() = byteArrayOf(((if (atStart) 1 else 0) shl 7
-            or ((if (atEnd) 1 else 0) shl 6)
-            or ((atInterval and 0x3f).toInt())).toByte())
-}
\ No newline at end of file
+        get() = byteArrayOf(
+            (
+                (if (atStart) 1 else 0) shl 7
+                    or ((if (atEnd) 1 else 0) shl 6)
+                    or ((atInterval and 0x3f).toInt())
+                ).toByte()
+        )
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt
index 676bc85c07..d12ce055ea 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt
@@ -5,4 +5,4 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 abstract class ActivationResponseBase(
     val activationResponseType: ActivationResponseType,
     encoded: ByteArray
-) : ResponseBase(ResponseType.ACTIVATION_RESPONSE, encoded)
\ No newline at end of file
+) : ResponseBase(ResponseType.ACTIVATION_RESPONSE, encoded)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt
index 0ce01d962d..501033468a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt
@@ -5,4 +5,4 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 open class AdditionalStatusResponseBase internal constructor(
     val statusResponseType: StatusResponseType,
     encoded: ByteArray
-) : ResponseBase(ResponseType.ADDITIONAL_STATUS_RESPONSE, encoded)
\ No newline at end of file
+) : ResponseBase(ResponseType.ADDITIONAL_STATUS_RESPONSE, encoded)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt
index 847eaa903c..333af17c03 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt
@@ -84,5 +84,4 @@ class AlarmStatusResponse(
     }
 
     infix fun Byte.shr(i: Int): Int = toInt() shr i
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
index fde2951b31..1b64063954 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
@@ -15,11 +15,14 @@ class DefaultStatusResponse(
     val messageType: Byte = encoded[0]
     val deliveryStatus: DeliveryStatus = byValue((encoded[1].toInt() shr 4 and 0x0f).toByte(), DeliveryStatus.UNKNOWN)
     val podStatus: PodStatus = byValue((encoded[1] and 0x0f), PodStatus.UNKNOWN)
-    val totalPulsesDelivered: Short = ((encoded[2] and 0x0f shl 12 or (encoded[3].toInt() and 0xff shl 1) or (encoded[4].toInt() and 0xff ushr 7)).toShort())
+    val totalPulsesDelivered: Short =
+        ((encoded[2] and 0x0f shl 12 or (encoded[3].toInt() and 0xff shl 1) or (encoded[4].toInt() and 0xff ushr 7)).toShort())
     val sequenceNumberOfLastProgrammingCommand: Short = (encoded[4] ushr 3 and 0x0f).toShort()
     val bolusPulsesRemaining: Short = ((encoded[4] and 0x07 shl 10 or (encoded[5].toInt() and 0xff) and 2047).toShort())
-    val activeAlerts: EnumSet<AlertType> = AlertUtil.decodeAlertSet((encoded[6].toInt() and 0xff shl 1 or (encoded[7] ushr 7)).toByte())
-    val minutesSinceActivation: Short = (encoded[7] and 0x7f shl 6 or (encoded[8].toInt() and 0xff ushr 2 and 0x3f)).toShort()
+    val activeAlerts: EnumSet<AlertType> =
+        AlertUtil.decodeAlertSet((encoded[6].toInt() and 0xff shl 1 or (encoded[7] ushr 7)).toByte())
+    val minutesSinceActivation: Short =
+        (encoded[7] and 0x7f shl 6 or (encoded[8].toInt() and 0xff ushr 2 and 0x3f)).toShort()
     val reservoirPulsesRemaining: Short = (encoded[8] shl 8 or encoded[9].toInt() and 0x3ff).toShort()
 
     override fun toString(): String {
@@ -34,7 +37,6 @@ class DefaultStatusResponse(
             ", minutesSinceActivation=$minutesSinceActivation" +
             ", reservoirPulsesRemaining=$reservoirPulsesRemaining)"
     }
-
 }
 
 infix fun Byte.ushr(i: Int) = toInt() ushr i
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt
index 0cde181a8d..f2a6cfb1cd 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt
@@ -46,4 +46,4 @@ class NakResponse(
             ", encoded=" + encoded.contentToString() +
             '}'
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt
index 0f1a0f06a0..f64cca766c 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt
@@ -6,4 +6,4 @@ interface Response : Serializable {
 
     val responseType: ResponseType
     val encoded: ByteArray
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt
index 1df5c6f988..9eacc0d1ef 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt
@@ -6,5 +6,4 @@ abstract class ResponseBase(
 ) : Response {
 
     override val encoded: ByteArray = encoded.copyOf(encoded.size)
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt
index 10d355f380..283a1cd284 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt
@@ -30,4 +30,4 @@ enum class ResponseType(override val value: Byte) : HasValue {
         SET_UNIQUE_ID_RESPONSE(0x1b.toByte()),
         UNKNOWN(0xff.toByte());
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt
index e91b750a6a..6fc40336a1 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt
@@ -25,9 +25,42 @@ class SetUniqueIdResponse(
     val bleVersionInterim: Short = (encoded[14].toInt() and 0xff).toShort()
     val productId: Short = (encoded[15].toInt() and 0xff).toShort()
     val podStatus: PodStatus = byValue(encoded[16], PodStatus.UNKNOWN)
-    val lotNumber: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[17], encoded[18], encoded[19], encoded[20])).long
-    val podSequenceNumber: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[21], encoded[22], encoded[23], encoded[24])).long
-    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[25], encoded[26], encoded[27], encoded[28])).long
+    val lotNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[17],
+            encoded[18],
+            encoded[19],
+            encoded[20]
+        )
+    ).long
+    val podSequenceNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[21],
+            encoded[22],
+            encoded[23],
+            encoded[24]
+        )
+    ).long
+    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[25],
+            encoded[26],
+            encoded[27],
+            encoded[28]
+        )
+    ).long
 
     override fun toString(): String {
         return "SetUniqueIdResponse{" +
@@ -55,5 +88,4 @@ class SetUniqueIdResponse(
             ", encoded=" + encoded.contentToString() +
             '}'
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt
index 243c191efb..da963f0636 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt
@@ -21,11 +21,44 @@ class VersionResponse(
     val bleVersionInterim: Short = (encoded[7].toInt() and 0xff).toShort()
     val productId: Short = (encoded[8].toInt() and 0xff).toShort()
     val podStatus: PodStatus = byValue((encoded[9] and 0xf), PodStatus.UNKNOWN)
-    val lotNumber: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[10], encoded[11], encoded[12], encoded[13])).long
-    val podSequenceNumber: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[14], encoded[15], encoded[16], encoded[17])).long
+    val lotNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[10],
+            encoded[11],
+            encoded[12],
+            encoded[13]
+        )
+    ).long
+    val podSequenceNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[14],
+            encoded[15],
+            encoded[16],
+            encoded[17]
+        )
+    ).long
     val rssi: Byte = (encoded[18] and 0x3f)
     val receiverLowerGain: Byte = ((encoded[18].toInt() shr 6 and 0x03).toByte())
-    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(byteArrayOf(0, 0, 0, 0, encoded[19], encoded[20], encoded[21], encoded[22])).long
+    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[19],
+            encoded[20],
+            encoded[21],
+            encoded[22]
+        )
+    ).long
 
     override fun toString(): String {
         return "VersionResponse{" +
@@ -49,5 +82,4 @@ class VersionResponse(
             ", encoded=" + Arrays.toString(encoded) +
             '}'
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
index b0a069b5bc..8270e1cd18 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -21,7 +21,7 @@ interface OmnipodDashPodStateManager {
     val messageSequenceNumber: Short
     val sequenceNumberOfLastProgrammingCommand: Short?
     val activationTime: Long?
-    var uniqueId: Long?
+    var uniqueId: Long? // TODO make Int
     var bluetoothAddress: String?
 
     val bluetoothVersion: SoftwareVersion?
@@ -53,4 +53,4 @@ interface OmnipodDashPodStateManager {
     fun reset()
 
     data class TempBasal(val startTime: Long, val rate: Double, val durationInMinutes: Short) : Serializable
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
index add92d9567..becac57345 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -3,6 +3,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
 import com.google.gson.Gson
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.AlarmStatusResponse
@@ -18,7 +20,8 @@ import javax.inject.Singleton
 @Singleton
 class OmnipodDashPodStateManagerImpl @Inject constructor(
     private val logger: AAPSLogger,
-    private val sharedPreferences: SP
+    private val sharedPreferences: SP,
+    private val rxBus: RxBusWrapper
 ) : OmnipodDashPodStateManager {
 
     private var podState: PodState
@@ -158,17 +161,27 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
 
         podState.lastUpdated = System.currentTimeMillis()
         store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
     }
 
     override fun updateFromVersionResponse(response: VersionResponse) {
-        podState.bleVersion = SoftwareVersion(response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim)
-        podState.firmwareVersion = SoftwareVersion(response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim)
+        podState.bleVersion = SoftwareVersion(
+            response.bleVersionMajor,
+            response.bleVersionMinor,
+            response.bleVersionInterim
+        )
+        podState.firmwareVersion = SoftwareVersion(
+            response.firmwareVersionMajor,
+            response.firmwareVersionMinor,
+            response.firmwareVersionInterim
+        )
         podState.podStatus = response.podStatus
         podState.lotNumber = response.lotNumber
         podState.podSequenceNumber = response.podSequenceNumber
 
         podState.lastUpdated = System.currentTimeMillis()
         store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
     }
 
     override fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse) {
@@ -177,8 +190,16 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         podState.firstPrimeBolusVolume = response.numberOfPrimePulses
         podState.secondPrimeBolusVolume = response.numberOfEngagingClutchDrivePulses
         podState.podLifeInHours = response.podExpirationTimeInHours
-        podState.bleVersion = SoftwareVersion(response.bleVersionMajor, response.bleVersionMinor, response.bleVersionInterim)
-        podState.firmwareVersion = SoftwareVersion(response.firmwareVersionMajor, response.firmwareVersionMinor, response.firmwareVersionInterim)
+        podState.bleVersion = SoftwareVersion(
+            response.bleVersionMajor,
+            response.bleVersionMinor,
+            response.bleVersionInterim
+        )
+        podState.firmwareVersion = SoftwareVersion(
+            response.firmwareVersionMajor,
+            response.firmwareVersionMinor,
+            response.firmwareVersionInterim
+        )
         podState.podStatus = response.podStatus
         podState.lotNumber = response.lotNumber
         podState.podSequenceNumber = response.podSequenceNumber
@@ -186,10 +207,18 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
 
         podState.lastUpdated = System.currentTimeMillis()
         store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
     }
 
     override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) {
-        TODO("Not yet implemented")
+        // TODO
+        logger.error(
+            LTag.PUMP,
+            "Not implemented: OmnipodDashPodStateManagerImpl.updateFromAlarmStatusResponse(AlarmStatusResponse)"
+        )
+
+        store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
     }
 
     override fun reset() {
@@ -210,7 +239,10 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
     private fun load(): PodState {
         if (sharedPreferences.contains(R.string.key_omnipod_dash_pod_state)) {
             try {
-                return Gson().fromJson(sharedPreferences.getString(R.string.key_omnipod_dash_pod_state, ""), PodState::class.java)
+                return Gson().fromJson(
+                    sharedPreferences.getString(R.string.key_omnipod_dash_pod_state, ""),
+                    PodState::class.java
+                )
             } catch (ex: Exception) {
                 logger.error(LTag.PUMP, "Failed to deserialize Pod state", ex)
             }
@@ -251,4 +283,4 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
         var basalProgram: BasalProgram? = null
         var tempBasal: OmnipodDashPodStateManager.TempBasal? = null
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt
index 4a63fd91fa..9d5db05579 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt
@@ -20,9 +20,10 @@ object AlertUtil {
     }
 
     fun encodeAlertSet(alertSet: EnumSet<AlertType>): Byte =
-        alertSet.fold(0,
+        alertSet.fold(
+            0,
             { out, slot ->
                 out or (slot.value.toInt() and 0xff)
             }
         ).toByte()
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt
index 3794ddf850..0976efd028 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt
@@ -7,4 +7,4 @@ interface HasValue {
 
 inline fun <reified T> byValue(value: Byte, default: T): T where T : Enum<T>, T : HasValue {
     return enumValues<T>().firstOrNull { it.value == value } ?: default
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt
index b9ff49d4b3..ae08043294 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt
@@ -5,7 +5,264 @@ import kotlin.experimental.xor
 
 object MessageUtil {
 
-    private val crc16table = shortArrayOf(0, -32763, -32753, 10, -32741, 30, 20, -32751, -32717, 54, 60, -32711, 40, -32723, -32729, 34, -32669, 102, 108, -32663, 120, -32643, -32649, 114, 80, -32683, -32673, 90, -32693, 78, 68, -32703, -32573, 198, 204, -32567, 216, -32547, -32553, 210, 240, -32523, -32513, 250, -32533, 238, 228, -32543, 160, -32603, -32593, 170, -32581, 190, 180, -32591, -32621, 150, 156, -32615, 136, -32627, -32633, 130, -32381, 390, 396, -32375, 408, -32355, -32361, 402, 432, -32331, -32321, 442, -32341, 430, 420, -32351, 480, -32283, -32273, 490, -32261, 510, 500, -32271, -32301, 470, 476, -32295, 456, -32307, -32313, 450, 320, -32443, -32433, 330, -32421, 350, 340, -32431, -32397, 374, 380, -32391, 360, -32403, -32409, 354, -32477, 294, 300, -32471, 312, -32451, -32457, 306, 272, -32491, -32481, 282, -32501, 270, 260, -32511, -31997, 774, 780, -31991, 792, -31971, -31977, 786, 816, -31947, -31937, 826, -31957, 814, 804, -31967, 864, -31899, -31889, 874, -31877, 894, 884, -31887, -31917, 854, 860, -31911, 840, -31923, -31929, 834, 960, -31803, -31793, 970, -31781, 990, 980, -31791, -31757, 1014, 1020, -31751, 1000, -31763, -31769, 994, -31837, 934, 940, -31831, 952, -31811, -31817, 946, 912, -31851, -31841, 922, -31861, 910, 900, -31871, 640, -32123, -32113, 650, -32101, 670, 660, -32111, -32077, 694, 700, -32071, 680, -32083, -32089, 674, -32029, 742, 748, -32023, 760, -32003, -32009, 754, 720, -32043, -32033, 730, -32053, 718, 708, -32063, -32189, 582, 588, -32183, 600, -32163, -32169, 594, 624, -32139, -32129, 634, -32149, 622, 612, -32159, 544, -32219, -32209, 554, -32197, 574, 564, -32207, -32237, 534, 540, -32231, 520, -32243, -32249, 514)
+    private val crc16table = shortArrayOf(
+        0,
+        -32763,
+        -32753,
+        10,
+        -32741,
+        30,
+        20,
+        -32751,
+        -32717,
+        54,
+        60,
+        -32711,
+        40,
+        -32723,
+        -32729,
+        34,
+        -32669,
+        102,
+        108,
+        -32663,
+        120,
+        -32643,
+        -32649,
+        114,
+        80,
+        -32683,
+        -32673,
+        90,
+        -32693,
+        78,
+        68,
+        -32703,
+        -32573,
+        198,
+        204,
+        -32567,
+        216,
+        -32547,
+        -32553,
+        210,
+        240,
+        -32523,
+        -32513,
+        250,
+        -32533,
+        238,
+        228,
+        -32543,
+        160,
+        -32603,
+        -32593,
+        170,
+        -32581,
+        190,
+        180,
+        -32591,
+        -32621,
+        150,
+        156,
+        -32615,
+        136,
+        -32627,
+        -32633,
+        130,
+        -32381,
+        390,
+        396,
+        -32375,
+        408,
+        -32355,
+        -32361,
+        402,
+        432,
+        -32331,
+        -32321,
+        442,
+        -32341,
+        430,
+        420,
+        -32351,
+        480,
+        -32283,
+        -32273,
+        490,
+        -32261,
+        510,
+        500,
+        -32271,
+        -32301,
+        470,
+        476,
+        -32295,
+        456,
+        -32307,
+        -32313,
+        450,
+        320,
+        -32443,
+        -32433,
+        330,
+        -32421,
+        350,
+        340,
+        -32431,
+        -32397,
+        374,
+        380,
+        -32391,
+        360,
+        -32403,
+        -32409,
+        354,
+        -32477,
+        294,
+        300,
+        -32471,
+        312,
+        -32451,
+        -32457,
+        306,
+        272,
+        -32491,
+        -32481,
+        282,
+        -32501,
+        270,
+        260,
+        -32511,
+        -31997,
+        774,
+        780,
+        -31991,
+        792,
+        -31971,
+        -31977,
+        786,
+        816,
+        -31947,
+        -31937,
+        826,
+        -31957,
+        814,
+        804,
+        -31967,
+        864,
+        -31899,
+        -31889,
+        874,
+        -31877,
+        894,
+        884,
+        -31887,
+        -31917,
+        854,
+        860,
+        -31911,
+        840,
+        -31923,
+        -31929,
+        834,
+        960,
+        -31803,
+        -31793,
+        970,
+        -31781,
+        990,
+        980,
+        -31791,
+        -31757,
+        1014,
+        1020,
+        -31751,
+        1000,
+        -31763,
+        -31769,
+        994,
+        -31837,
+        934,
+        940,
+        -31831,
+        952,
+        -31811,
+        -31817,
+        946,
+        912,
+        -31851,
+        -31841,
+        922,
+        -31861,
+        910,
+        900,
+        -31871,
+        640,
+        -32123,
+        -32113,
+        650,
+        -32101,
+        670,
+        660,
+        -32111,
+        -32077,
+        694,
+        700,
+        -32071,
+        680,
+        -32083,
+        -32089,
+        674,
+        -32029,
+        742,
+        748,
+        -32023,
+        760,
+        -32003,
+        -32009,
+        754,
+        720,
+        -32043,
+        -32033,
+        730,
+        -32053,
+        718,
+        708,
+        -32063,
+        -32189,
+        582,
+        588,
+        -32183,
+        600,
+        -32163,
+        -32169,
+        594,
+        624,
+        -32139,
+        -32129,
+        634,
+        -32149,
+        622,
+        612,
+        -32159,
+        544,
+        -32219,
+        -32209,
+        554,
+        -32197,
+        574,
+        564,
+        -32207,
+        -32237,
+        534,
+        540,
+        -32231,
+        520,
+        -32243,
+        -32249,
+        514
+    )
 
     fun createCrc(sArr: ShortArray): Int {
         var i = 0
@@ -42,4 +299,4 @@ object MessageUtil {
         }
         return sum
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
index b5c1c5367d..f8db4c0751 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
@@ -22,10 +22,19 @@ class DashHistory @Inject constructor(
     private val historyMapper: HistoryMapper
 ) {
 
-    fun markSuccess(id: String, date: Long): Completable = dao.markResolved(id, ResolvedResult.SUCCESS, currentTimeMillis())
+    fun markSuccess(id: String, date: Long): Completable = dao.markResolved(
+        id,
+        ResolvedResult.SUCCESS,
+        currentTimeMillis()
+    )
 
-    fun markFailure(id: String, date: Long): Completable = dao.markResolved(id, ResolvedResult.FAILURE, currentTimeMillis())
+    fun markFailure(id: String, date: Long): Completable = dao.markResolved(
+        id,
+        ResolvedResult.FAILURE,
+        currentTimeMillis()
+    )
 
+    @Suppress("ReturnCount")
     fun createRecord(
         commandType: OmnipodCommandType,
         date: Long,
@@ -44,16 +53,18 @@ class DashHistory @Inject constructor(
                 return Single.error(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
         }
 
-        return dao.save(HistoryRecordEntity(
-            id = id,
-            date = date,
-            createdAt = currentTimeMillis(),
-            commandType = commandType,
-            tempBasalRecord = tempBasalRecord,
-            bolusRecord = bolusRecord,
-            initialResult = initialResult,
-            resolvedResult = resolveResult,
-            resolvedAt = resolvedAt)
+        return dao.save(
+            HistoryRecordEntity(
+                id = id,
+                date = date,
+                createdAt = currentTimeMillis(),
+                commandType = commandType,
+                tempBasalRecord = tempBasalRecord,
+                bolusRecord = bolusRecord,
+                initialResult = initialResult,
+                resolvedResult = resolveResult,
+                resolvedAt = resolvedAt
+            )
         ).toSingle { id }
     }
 
@@ -61,5 +72,4 @@ class DashHistory @Inject constructor(
         dao.all().map { list -> list.map(historyMapper::entityToDomain) }
 
     fun getRecordsAfter(time: Long): Single<List<HistoryRecordEntity>> = dao.allSince(time)
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
index 6344c9fcd7..a4f636c497 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
@@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
 
 sealed class Record
 
-data class BolusRecord(val amout: Double, val bolusType: BolusType): Record()
+data class BolusRecord(val amout: Double, val bolusType: BolusType) : Record()
 
-data class TempBasalRecord(val duration: Long, val rate: Double): Record()
+data class TempBasalRecord(val duration: Long, val rate: Double) : Record()
 
 enum class BolusType {
     DEFAULT, SMB
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
index 53dc608e60..8f0c353763 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
@@ -6,4 +6,4 @@ enum class InitialResult {
 
 enum class ResolvedResult {
     SUCCESS, FAILURE
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
index 2395695f1e..8d21ea751a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
@@ -31,4 +31,4 @@ class Converters {
 
     @TypeConverter
     fun fromOmnipodCommandType(omnipodCommandType: OmnipodCommandType) = omnipodCommandType.name
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
index 75b21716ba..3014f3eba0 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
@@ -5,7 +5,6 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 
 @Database(
     entities = [HistoryRecordEntity::class],
@@ -15,16 +14,19 @@ import androidx.room.migration.Migration
 @TypeConverters(Converters::class)
 abstract class DashHistoryDatabase : RoomDatabase() {
 
-    abstract fun historyRecordDao() : HistoryRecordDao
+    abstract fun historyRecordDao(): HistoryRecordDao
 
     companion object {
 
         const val VERSION = 1
 
         fun build(context: Context) =
-            Room.databaseBuilder(context.applicationContext, DashHistoryDatabase::class.java, "omnipod_dash_history_database.db")
+            Room.databaseBuilder(
+                context.applicationContext,
+                DashHistoryDatabase::class.java,
+                "omnipod_dash_history_database.db"
+            )
                 .fallbackToDestructiveMigration()
                 .build()
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
index e5c425dd24..93b292c067 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
@@ -32,5 +32,4 @@ abstract class HistoryRecordDao {
 
     @Query("UPDATE historyrecords SET resolvedResult = :resolvedResult, resolvedAt = :resolvedAt WHERE id = :id ")
     abstract fun markResolved(id: String, resolvedResult: ResolvedResult, resolvedAt: Long): Completable
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
index 4eea309c5a..18ff9c14d2 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
@@ -19,5 +19,5 @@ data class HistoryRecordEntity(
     @Embedded(prefix = "tempBasalRecord_") val tempBasalRecord: TempBasalRecord?,
     @Embedded(prefix = "bolusRecord_") val bolusRecord: BolusRecord?,
     val resolvedResult: ResolvedResult?,
-    val resolvedAt: Long?)
-
+    val resolvedAt: Long?
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
index e3eeb39320..57df60dfa3 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
@@ -21,7 +21,8 @@ class HistoryMapper {
         )
 
     fun entityToDomain(entity: HistoryRecordEntity): HistoryRecord =
-        HistoryRecord(id = entity.id,
+        HistoryRecord(
+            id = entity.id,
             createdAt = entity.createdAt,
             date = entity.date,
             initialResult = entity.initialResult,
@@ -30,5 +31,4 @@ class HistoryMapper {
             resolvedResult = entity.resolvedResult,
             resolvedAt = entity.resolvedAt
         )
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index 26aa52b5df..58779f9682 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -66,10 +66,13 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
         }
 
         binding.buttonDiscardPod.setOnClickListener {
-            OKDialog.showConfirmation(this,
-                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
-                // TODO discard Pod
-            })
+            OKDialog.showConfirmation(
+                this,
+                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation),
+                Thread {
+                    // TODO discard Pod
+                }
+            )
         }
 
         binding.buttonPlayTestBeep.setOnClickListener {
@@ -77,13 +80,24 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
             binding.buttonPlayTestBeep.isEnabled = false
             binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_playing_test_beep)
 
-            commandQueue.customCommand(CommandPlayTestBeep(), object : Callback() {
-                override fun run() {
-                    if (!result.success) {
-                        displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep), result.comment), false)
+            commandQueue.customCommand(
+                CommandPlayTestBeep(),
+                object : Callback() {
+                    override fun run() {
+                        if (!result.success) {
+                            displayErrorDialog(
+                                resourceHelper.gs(R.string.omnipod_common_warning),
+                                resourceHelper.gs(
+                                    R.string.omnipod_common_two_strings_concatenated_by_colon,
+                                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep),
+                                    result.comment
+                                ),
+                                false
+                            )
+                        }
                     }
                 }
-            })
+            )
         }
     }
 
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 223547e68a..66fbfbf27a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -107,38 +107,59 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         buttonBinding.buttonResumeDelivery.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandResumeDelivery(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery), true).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed)))
+            commandQueue.customCommand(
+                CommandResumeDelivery(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery),
+                    true
+                ).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed))
+            )
         }
 
         buttonBinding.buttonRefreshStatus.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.readStatus("REQUESTED BY USER",
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status), false))
+            commandQueue.readStatus(
+                "REQUESTED BY USER",
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status),
+                    false
+                )
+            )
         }
 
         buttonBinding.buttonSilenceAlerts.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandAcknowledgeAlerts(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts), false)
+            commandQueue.customCommand(
+                CommandAcknowledgeAlerts(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts),
+                    false
+                )
                     .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
-                    .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) })
+                    .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) }
+            )
         }
 
         buttonBinding.buttonSuspendDelivery.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandSuspendDelivery(),
-                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery)))
+            commandQueue.customCommand(
+                CommandSuspendDelivery(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery),
+                    true
+                )
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery))
+            )
         }
 
         buttonBinding.buttonSetTime.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandHandleTimeChange(true),
+            commandQueue.customCommand(
+                CommandHandleTimeChange(true),
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_set_time), true)
-                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated)))
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated))
+            )
         }
-
     }
 
     override fun onResume() {
@@ -147,23 +168,32 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         disposables += rxBus
             .toObservable(EventOmnipodDashPumpValuesChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
-                updateOmnipodStatus()
-                updatePodActionButtons()
-            }, fabricPrivacy::logException)
+            .subscribe(
+                {
+                    updateOmnipodStatus()
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
         disposables += rxBus
             .toObservable(EventQueueChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
-                updateQueueStatus()
-                updatePodActionButtons()
-            }, fabricPrivacy::logException)
+            .subscribe(
+                {
+                    updateQueueStatus()
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
         disposables += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({
-                updatePodActionButtons()
-            }, fabricPrivacy::logException)
+            .subscribe(
+                {
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
         updateUi()
     }
 
@@ -211,7 +241,11 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             podInfoBinding.uniqueId.text = podStateManager.uniqueId.toString()
             podInfoBinding.podLot.text = podStateManager.lotNumber.toString()
             podInfoBinding.podSequenceNumber.text = podStateManager.podSequenceNumber.toString()
-            podInfoBinding.firmwareVersion.text = resourceHelper.gs(R.string.omnipod_dash_overview_firmware_version_value, podStateManager.firmwareVersion.toString(), podStateManager.bluetoothVersion.toString())
+            podInfoBinding.firmwareVersion.text = resourceHelper.gs(
+                R.string.omnipod_dash_overview_firmware_version_value,
+                podStateManager.firmwareVersion.toString(),
+                podStateManager.bluetoothVersion.toString()
+            )
 
             // TODO
             /*
@@ -249,34 +283,45 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             // base basal rate
             podInfoBinding.baseBasalRate.text = if (podStateManager.basalProgram != null) {
-                resourceHelper.gs(R.string.pump_basebasalrate, omnipodDashPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(Date())))
+                resourceHelper.gs(
+                    R.string.pump_basebasalrate,
+                    omnipodDashPumpPlugin.model()
+                        .determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(Date()))
+                )
             } else {
                 PLACEHOLDER
             }
 
             // total delivered
-            podInfoBinding.totalDelivered.text = if (podStateManager.isActivationCompleted && podStateManager.pulsesDelivered != null) {
-                resourceHelper.gs(R.string.omnipod_common_overview_total_delivered_value, podStateManager.pulseRate)
-            } else {
-                PLACEHOLDER
-            }
+            podInfoBinding.totalDelivered.text =
+                if (podStateManager.isActivationCompleted && podStateManager.pulsesDelivered != null) {
+                    resourceHelper.gs(R.string.omnipod_common_overview_total_delivered_value, podStateManager.pulseRate)
+                } else {
+                    PLACEHOLDER
+                }
 
             // reservoir
             if (podStateManager.pulsesRemaining == null) {
-                podInfoBinding.reservoir.text = resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value_over50)
+                podInfoBinding.reservoir.text =
+                    resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value_over50)
                 podInfoBinding.reservoir.setTextColor(Color.WHITE)
             } else {
                 // TODO
-                //val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
+                // val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
                 //    ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
                 val lowReservoirThreshold: Short = 20
 
-                podInfoBinding.reservoir.text = resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value, podStateManager.pulsesRemaining)
-                podInfoBinding.reservoir.setTextColor(if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
-                    Color.RED
-                } else {
-                    Color.WHITE
-                })
+                podInfoBinding.reservoir.text = resourceHelper.gs(
+                    R.string.omnipod_common_overview_reservoir_value,
+                    podStateManager.pulsesRemaining
+                )
+                podInfoBinding.reservoir.setTextColor(
+                    if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
+                        Color.RED
+                    } else {
+                        Color.WHITE
+                    }
+                )
             }
 
             podInfoBinding.podActiveAlerts.text = if (podStateManager.activeAlerts!!.size > 0) {
@@ -345,11 +390,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
         }
 
-        val podStatusColor = if (!podStateManager.isActivationCompleted ||/* TODO podStateManager.isPodDead || */ podStateManager.isSuspended) {
-            Color.RED
-        } else {
-            Color.WHITE
-        }
+        val podStatusColor =
+            if (!podStateManager.isActivationCompleted || /* TODO podStateManager.isPodDead || */ podStateManager.isSuspended) {
+                Color.RED
+            } else {
+                Color.WHITE
+            }
         podInfoBinding.podStatus.setTextColor(podStatusColor)
     }
 
@@ -385,7 +431,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
             val minutesRunning = 0 // TODO
 
-            podInfoBinding.tempBasal.text = resourceHelper.gs(R.string.omnipod_common_overview_temp_basal_value, rate, dateUtil.timeString(startTime), minutesRunning, duration)
+            podInfoBinding.tempBasal.text = resourceHelper.gs(
+                R.string.omnipod_common_overview_temp_basal_value,
+                rate,
+                dateUtil.timeString(startTime),
+                minutesRunning,
+                duration
+            )
         } else {
             podInfoBinding.tempBasal.text = PLACEHOLDER
         }
@@ -417,12 +469,17 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateRefreshStatusButton() {
-        buttonBinding.buttonRefreshStatus.isEnabled = podStateManager.isUniqueIdSet && podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)
-            && isQueueEmpty()
+        buttonBinding.buttonRefreshStatus.isEnabled =
+            podStateManager.isUniqueIdSet && podStateManager.activationProgress.isAtLeast(
+                ActivationProgress.PHASE_1_COMPLETED
+            ) &&
+                isQueueEmpty()
     }
 
     private fun updateResumeDeliveryButton() {
-        if (podStateManager.isPodRunning && (podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class.java))) {
+        if (podStateManager.isPodRunning && (podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(
+                CommandResumeDelivery::class.java
+            ))) {
             buttonBinding.buttonResumeDelivery.visibility = View.VISIBLE
             buttonBinding.buttonResumeDelivery.isEnabled = isQueueEmpty()
         } else {
@@ -431,7 +488,9 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateSilenceAlertsButton() {
-        if (isAutomaticallySilenceAlertsEnabled() && podStateManager.isPodRunning && (podStateManager.activeAlerts!!.size > 0 || commandQueue.isCustomCommandInQueue(CommandAcknowledgeAlerts::class.java))) {
+        if (isAutomaticallySilenceAlertsEnabled() && podStateManager.isPodRunning && (podStateManager.activeAlerts!!.size > 0 || commandQueue.isCustomCommandInQueue(
+                CommandAcknowledgeAlerts::class.java
+            ))) {
             buttonBinding.buttonSilenceAlerts.visibility = View.VISIBLE
             buttonBinding.buttonSilenceAlerts.isEnabled = isQueueEmpty()
         } else {
@@ -441,9 +500,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
     private fun updateSuspendDeliveryButton() {
         // If the Pod is currently suspended, we show the Resume delivery button instead.
-        if (isSuspendDeliveryButtonEnabled() && podStateManager.isPodRunning && (!podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandSuspendDelivery::class.java))) {
+        if (isSuspendDeliveryButtonEnabled() && podStateManager.isPodRunning && (!podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(
+                CommandSuspendDelivery::class.java
+            ))) {
             buttonBinding.buttonSuspendDelivery.visibility = View.VISIBLE
-            buttonBinding.buttonSuspendDelivery.isEnabled = podStateManager.isPodRunning && !podStateManager.isSuspended && isQueueEmpty()
+            buttonBinding.buttonSuspendDelivery.isEnabled =
+                podStateManager.isPodRunning && !podStateManager.isSuspended && isQueueEmpty()
         } else {
             buttonBinding.buttonSuspendDelivery.visibility = View.GONE
         }
@@ -546,10 +608,18 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
     // FIXME ideally we should just have access to LocalAlertUtils here
     private fun getPumpUnreachableTimeout(): Duration {
-        return Duration.standardMinutes(sp.getInt(R.string.key_pump_unreachable_threshold_minutes, Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong())
+        return Duration.standardMinutes(
+            sp.getInt(
+                R.string.key_pump_unreachable_threshold_minutes,
+                Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES
+            ).toLong()
+        )
     }
 
-    inner class DisplayResultDialogCallback(private val errorMessagePrefix: String, private val withSoundOnError: Boolean) : Callback() {
+    inner class DisplayResultDialogCallback(
+        private val errorMessagePrefix: String,
+        private val withSoundOnError: Boolean
+    ) : Callback() {
 
         private var messageOnSuccess: String? = null
         private var actionOnSuccess: Runnable? = null
@@ -562,7 +632,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 }
                 actionOnSuccess?.run()
             } else {
-                displayErrorDialog(resourceHelper.gs(R.string.omnipod_common_warning), resourceHelper.gs(R.string.omnipod_common_two_strings_concatenated_by_colon, errorMessagePrefix, result.comment), withSoundOnError)
+                displayErrorDialog(
+                    resourceHelper.gs(R.string.omnipod_common_warning),
+                    resourceHelper.gs(
+                        R.string.omnipod_common_two_strings_concatenated_by_colon,
+                        errorMessagePrefix,
+                        result.comment
+                    ),
+                    withSoundOnError
+                )
             }
         }
 
@@ -576,5 +654,4 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             return this
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt
index 6f87bfd8f6..ad340053bf 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activatio
 
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
 
-class DashPodActivationWizardActivity : PodActivationWizardActivity()
\ No newline at end of file
+class DashPodActivationWizardActivity : PodActivationWizardActivity()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
index dd2daa8e3b..9dd37bd571 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
 import io.reactivex.Single
 import io.reactivex.rxkotlin.subscribeBy
 import javax.inject.Inject
@@ -26,8 +27,14 @@ class DashInitializePodViewModel @Inject constructor(
 
     override fun doExecuteAction(): Single<PumpEnactResult> =
         Single.create { source ->
-            val disposable = omnipodManager.activatePodPart1().subscribeBy(
-                onNext = { podEvent -> logger.debug(LTag.PUMP, "Received PodEvent in Pod activation part 1: $podEvent") },
+            // TODO use configured value for low reservoir trigger
+            val disposable = omnipodManager.activatePodPart1(AlertTrigger.ReservoirVolumeTrigger(200)).subscribeBy(
+                onNext = { podEvent ->
+                    logger.debug(
+                        LTag.PUMP,
+                        "Received PodEvent in Pod activation part 1: $podEvent"
+                    )
+                },
                 onError = { throwable ->
                     logger.error(LTag.PUMP, "Error in Pod activation part 1", throwable)
                     source.onSuccess(PumpEnactResult(injector).success(false).comment(throwable.message))
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index 0b5ef6bc66..cf0cc52d6f 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -5,12 +5,17 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
 import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
 import javax.inject.Inject
 
 class DashInsertCannulaViewModel @Inject constructor(
+    private val omnipodManager: OmnipodDashManager,
     private val profileFunction: ProfileFunction,
     injector: HasAndroidInjector,
     logger: AAPSLogger
@@ -22,11 +27,33 @@ class DashInsertCannulaViewModel @Inject constructor(
 
     override fun isPodDeactivatable(): Boolean = true // TODO
 
-    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(PumpEnactResult(injector).success(false).comment("TODO")) // TODO
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.create { source ->
+        val profile = profileFunction.getProfile()
+        if (profile == null) {
+            source.onError(IllegalStateException("No profile set"))
+        } else {
+            val disposable = omnipodManager.activatePodPart2(mapProfileToBasalProgram(profile)).subscribeBy(
+                onNext = { podEvent ->
+                    logger.debug(
+                        LTag.PUMP,
+                        "Received PodEvent in Pod activation part 2: $podEvent"
+                    )
+                },
+                onError = { throwable ->
+                    logger.error(LTag.PUMP, "Error in Pod activation part 2", throwable)
+                    source.onSuccess(PumpEnactResult(injector).success(false).comment(throwable.message))
+                },
+                onComplete = {
+                    logger.debug("Pod activation part 2 completed")
+                    source.onSuccess(PumpEnactResult(injector).success(true))
+                }
+            )
+        }
+    }
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_insert_cannula_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt
index dfad36eb91..36b00e5738 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt
@@ -12,4 +12,4 @@ class DashAttachPodViewModel @Inject constructor() : AttachPodViewModel() {
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_attach_pod_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt
index 88721268a9..de6d558662 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt
@@ -12,4 +12,4 @@ class DashPodActivatedViewModel @Inject constructor() : PodActivatedViewModel()
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_pod_activated_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt
index 0e7538b621..1bb7ae1a22 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt
@@ -12,4 +12,4 @@ class DashStartPodActivationViewModel @Inject constructor() : StartPodActivation
 
     @StringRes
     override fun getTextId(): Int = R.string.omnipod_dash_pod_activation_wizard_start_pod_activation_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt
index 0a45f38be8..adce6f5806 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivat
 
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.PodDeactivationWizardActivity
 
-class DashPodDeactivationWizardActivity : PodDeactivationWizardActivity()
\ No newline at end of file
+class DashPodDeactivationWizardActivity : PodDeactivationWizardActivity()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
index 8d7c393cf4..9d2ad3a869 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
@@ -14,7 +14,9 @@ class DashDeactivatePodViewModel @Inject constructor(
     logger: AAPSLogger
 ) : DeactivatePodViewModel(injector, logger) {
 
-    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(PumpEnactResult(injector).success(false).comment("TODO")) // TODO
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(
+        PumpEnactResult(injector).success(false).comment("TODO")
+    ) // TODO
 
     override fun discardPod() {
         // TODO
@@ -25,4 +27,4 @@ class DashDeactivatePodViewModel @Inject constructor(
 
     @StringRes
     override fun getTextId(): Int = R.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt
index 3496076606..a848db0bd6 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt
@@ -12,5 +12,4 @@ class DashPodDeactivatedViewModel @Inject constructor() : PodDeactivatedViewMode
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_text
-
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt
index 27fb8fd625..a7cce31cce 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt
@@ -12,4 +12,4 @@ class DashPodDiscardedViewModel @Inject constructor() : PodDiscardedViewModel()
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_discarded_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt
index 099ce1f53c..1f929af9ae 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt
@@ -12,4 +12,4 @@ class DashStartPodDeactivationViewModel @Inject constructor() : StartPodDeactiva
 
     @StringRes
     override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt
index 54ad9b345f..baa0ecf7c9 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt
@@ -60,4 +60,4 @@ fun mapProfileToBasalProgram(profile: Profile): BasalProgram {
     )
 
     return BasalProgram(entries)
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt
index 55dc2ff96e..45cb0d9d97 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt
@@ -17,4 +17,4 @@ class DeactivateCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("0242000114061C04494E532E001C"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt
index 4a73a9ebb4..e0ab87267d 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt
@@ -18,4 +18,4 @@ class GetStatusCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("024200023C030E0100024C"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt
index c092142361..9c4e963df8 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt
@@ -16,4 +16,4 @@ class GetVersionCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("FFFFFFFF00060704FFFFFFFF82B2"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt
index 63c5063c0e..b3bb3ba60d 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepRepetitionType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
 import org.apache.commons.codec.DecoderException
@@ -75,4 +75,4 @@ class ProgramAlertsCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("02420003280C190A494E532E7837000508020356"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt
index ce33402475..93fba68a72 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt
@@ -29,4 +29,4 @@ class ProgramBasalCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("0242000128241A12494E532E0005E81D1708000CF01EF01EF01E130E40001593004C4B403840005B8D80827C"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt
index cd5d06c451..8030767ab9 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt
@@ -22,4 +22,4 @@ class ProgramBeepsCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("024200022C061E0402000000800F"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt
index ce9ea9c24e..daface569f 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt
@@ -21,4 +21,4 @@ class ProgramBolusCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("02420001381F1A0E494E532E02010F01064000640064170D4003E800030D4000000000000080F6"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt
index f7875cf2b4..e4f8079b24 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt
@@ -33,4 +33,4 @@ class ProgramTempBasalCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("024200011C201A0E494E532E0100820A384000009000160EC000000A6B49D200000AEB49D20001DE"), command.encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt
index 4dda5f9a38..f98387cdbb 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt
@@ -20,4 +20,4 @@ class SetUniqueIdCommandTest {
 
         Assert.assertArrayEquals(Hex.decodeHex("FFFFFFFF18150313024200031404020A150E2908146CC1000A67278344"), encoded)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt
index 0f9c267578..63bf3e18cb 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt
@@ -22,4 +22,4 @@ class SilenceAlertsCommandTest {
     }
 
     // TODO capture more silence alerts commands
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt
index a9463e1785..ffa5737246 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt
@@ -35,4 +35,4 @@ class StopDeliveryCommandTest {
     }
 
     // TODO test cancel bolus
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt
index 06e6337afd..c57fb20a82 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt
@@ -41,4 +41,4 @@ class AlarmStatusResponseTest {
         Assert.assertEquals(PodStatus.UNINITIALIZED, response.podStatusWhenAlarmOccurred2)
         Assert.assertEquals(26378.toShort(), response.returnAddressOfPodAlarmHandlerCaller)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
index f925642d38..f24e02e87c 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
@@ -25,4 +25,4 @@ class DefaultStatusResponseTest {
         Assert.assertEquals(280.toShort(), response.minutesSinceActivation)
         Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt
index 206ac491aa..b5254eca1d 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
 import org.apache.commons.codec.DecoderException
 import org.apache.commons.codec.binary.Hex
 import org.junit.Assert
@@ -24,4 +23,4 @@ class NakResponseTest {
         Assert.assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.podStatus)
         Assert.assertEquals(0x00.toShort(), response.securityNakSyncCount)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt
index 6f627c5d80..311be2c08b 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt
@@ -36,4 +36,4 @@ class SetUniqueIdResponseTest {
         Assert.assertEquals(611540L, response.podSequenceNumber)
         Assert.assertEquals(37879809L, response.uniqueIdReceivedInCommand)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt
index 2ae37834d1..58e3585cae 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt
@@ -32,4 +32,4 @@ class VersionResponseTest {
         Assert.assertEquals(0.toByte(), response.receiverLowerGain)
         Assert.assertEquals(4294967295L, response.uniqueIdReceivedInCommand)
     }
-}
\ No newline at end of file
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt
index a046e21e17..0febb3f35a 100644
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt
@@ -26,11 +26,13 @@ class FunctionsTest {
         val value3 = Mockito.mock(ProfileValue::class.java)
         value3.timeAsSeconds = 50400
         value3.value = 3.05
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
-            value1,
-            value2,
-            value3
-        ))
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
+                value1,
+                value2,
+                value3
+            )
+        )
         val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
         val entries: List<BasalProgram.Segment> = basalProgram.segments
         assertEquals(3, entries.size)
@@ -69,8 +71,11 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = 1800
         value.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
-            value))
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
+                value
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -85,10 +90,12 @@ class FunctionsTest {
         val value2 = Mockito.mock(ProfileValue::class.java)
         value2.timeAsSeconds = 86400
         value2.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
-            value1,
-            value2
-        ))
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
+                value1,
+                value2
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -99,8 +106,11 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = -1
         value.value = 0.5
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
-            value))
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
+                value
+            )
+        )
         mapProfileToBasalProgram(profile)
     }
 
@@ -109,10 +119,13 @@ class FunctionsTest {
         val value = Mockito.mock(ProfileValue::class.java)
         value.timeAsSeconds = 0
         value.value = 0.04
-        PowerMockito.`when`(profile.basalValues).thenReturn(arrayOf(
-            value))
+        PowerMockito.`when`(profile.basalValues).thenReturn(
+            arrayOf(
+                value
+            )
+        )
         val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
         val basalProgramElement: BasalProgram.Segment = basalProgram.segments[0]
         assertEquals(5, basalProgramElement.basalRateInHundredthUnitsPerHour)
     }
-}
\ No newline at end of file
+}