caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Diaconn: remove core dependency

Browse source
This commit is contained in:
Milos Kozak 2022-11-26 22:19:52 +01:00
parent 1839c7513d
commit 7f4c2bd87f
142 changed files with 581 additions and 403 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
View file

@ -20,7 +20,6 @@ import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
@ -59,6 +58,7 @@ import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
import info.nightscout.pump.combo.ComboPlugin
import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventPreferenceChange
import info.nightscout.rx.events.EventRebuildTabs

2
app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
View file

@ -6,7 +6,6 @@ import dagger.android.AndroidInjectionModule
import dagger.android.AndroidInjector
import info.nightscout.androidaps.MainApp
import info.nightscout.androidaps.danar.di.DanaRModule
import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
import info.nightscout.androidaps.insight.di.InsightDatabaseModule
import info.nightscout.androidaps.insight.di.InsightModule
import info.nightscout.androidaps.plugin.general.openhumans.di.OpenHumansModule
@ -29,6 +28,7 @@ import info.nightscout.pump.common.di.PumpCommonModule
import info.nightscout.pump.dana.di.DanaHistoryModule
import info.nightscout.pump.dana.di.DanaModule
import info.nightscout.pump.danars.di.DanaRSModule
import info.nightscout.pump.diaconn.di.DiaconnG8Module
import info.nightscout.rx.di.RxModule
import info.nightscout.shared.di.SharedModule
import info.nightscout.shared.impl.di.SharedImplModule

2
app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
View file

@ -7,7 +7,6 @@ import dagger.multibindings.IntoMap
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
@ -62,6 +61,7 @@ import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.tidepool.TidepoolPlugin
import info.nightscout.pump.combo.ComboPlugin
import info.nightscout.pump.combov2.ComboV2Plugin
import info.nightscout.pump.diaconn.DiaconnG8Plugin
import info.nightscout.sensitivity.SensitivityAAPSPlugin
import info.nightscout.sensitivity.SensitivityOref1Plugin
import info.nightscout.sensitivity.SensitivityWeightedAveragePlugin

4
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
View file

@ -23,8 +23,6 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R
import info.nightscout.androidaps.activities.PreferencesActivity
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
import info.nightscout.core.activities.DaggerAppCompatActivityWithResult
@ -37,6 +35,7 @@ import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.database.impl.AppRepository
import info.nightscout.interfaces.AndroidPermission
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.maintenance.ImportExportPrefs
import info.nightscout.interfaces.maintenance.PrefFileListProvider
import info.nightscout.interfaces.maintenance.PrefFileNotFoundError
@ -50,6 +49,7 @@ import info.nightscout.interfaces.maintenance.PrefsStatus
import info.nightscout.interfaces.protection.PasswordCheck
import info.nightscout.interfaces.storage.Storage
import info.nightscout.interfaces.utils.MidnightTime
import info.nightscout.pump.diaconn.events.EventDiaconnG8PumpLogReset
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAppExit
import info.nightscout.rx.logging.AAPSLogger

2
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
View file

@ -9,7 +9,6 @@ import androidx.core.text.toSpanned
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
import info.nightscout.androidaps.insight.database.InsightDatabase
import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
@ -29,6 +28,7 @@ import info.nightscout.interfaces.pump.PumpSync
import info.nightscout.interfaces.sync.DataSyncSelector
import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.pump.dana.database.DanaHistoryDatabase
import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventPreferenceChange

2
core/core-main/src/main/res/values/strings.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- General-->
<string name="save">Save</string>
<string name="goingtodeliver">Going to deliver %1$.2f U</string>
<string name="waitingforpump">Waiting for pump</string>
<string name="androidaps_start">AAPS started</string>
@ -29,7 +28,6 @@
<string name="isf_long_label">Insulin Sensitivity Factor</string>
<string name="basal_long_label">Basal rate</string>
<string name="target_long_label">Blood Glucose Target</string>
<string name="initializing">Initializing ...</string>
<string name="shortgram">g</string>
<string name="shortpercent">%</string>
<string name="advancedsettings_title">Advanced Settings</string>

2
core/core-main/src/main/res/drawable/ic_diaconn_g8.xml → core/ui/src/main/res/drawable/ic_diaconn_g8.xml
View file

@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="1000"
android:viewportHeight="580"
android:width="150dp"

2
core/ui/src/main/res/values/strings.xml
View file

@ -22,6 +22,7 @@
<string name="reload">Reload</string>
<string name="mgdl">mg/dl</string>
<string name="mmol">mmol/l</string>
<string name="save">Save</string>
<!-- Pumps -->
<string name="battery_label">Battery</string>
@ -51,6 +52,7 @@
<string name="reading_pump_history">Reading pump history</string>
<string name="password_cleared">Password cleared!</string>
<string name="pairing">Pairing</string>
<string name="initializing">Initializing ...</string>
<!-- Constraints-->
<string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>

6
pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt
View file

@ -64,7 +64,7 @@ class BLEScanActivity : DaggerAppCompatActivity() {
override fun onResume() {
super.onResume()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
bluetoothAdapter?.safeEnable()
startScan()
} else {
@ -74,7 +74,9 @@ class BLEScanActivity : DaggerAppCompatActivity() {
override fun onPause() {
super.onPause()
stopScan()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
stopScan()
}
}
private fun startScan() =

5
pump/diaconn/build.gradle
View file

@ -14,7 +14,7 @@ apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
android {
namespace 'info.nightscout.androidaps.diaconn'
namespace 'info.nightscout.pump.diaconn'
defaultConfig {
kapt {
arguments {
@ -30,12 +30,11 @@ dependencies {
implementation project(':core:libraries')
implementation project(':core:interfaces')
implementation project(':core:utils')
implementation project(':core:core-main')
implementation project(':core:ui')
api "androidx.room:room-ktx:$room_version"
api "androidx.room:room-runtime:$room_version"
api "androidx.room:room-rxjava3:$room_version"
implementation project(path: ':core:ui')
kapt "androidx.room:room-compiler:$room_version"
api "com.squareup.okhttp3:okhttp:$okhttp3_version"

111
pump/diaconn/schemas/info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase/1.json Normal file
View file

@ -0,0 +1,111 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "d604d25c3edbdf18cc5a39121cf5a779",
"entities": [
{
"tableName": "diaconnHistory",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`timestamp` INTEGER NOT NULL, `code` INTEGER NOT NULL, `value` REAL NOT NULL, `bolusType` TEXT NOT NULL, `stringValue` TEXT NOT NULL, `duration` INTEGER NOT NULL, `dailyBasal` REAL NOT NULL, `dailyBolus` REAL NOT NULL, `alarm` TEXT NOT NULL, `lognum` INTEGER NOT NULL, `wrappingCount` INTEGER NOT NULL, `pumpUid` TEXT NOT NULL, PRIMARY KEY(`timestamp`))",
"fields": [
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "code",
"columnName": "code",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "value",
"columnName": "value",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "bolusType",
"columnName": "bolusType",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "stringValue",
"columnName": "stringValue",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "duration",
"columnName": "duration",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "dailyBasal",
"columnName": "dailyBasal",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "dailyBolus",
"columnName": "dailyBolus",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "alarm",
"columnName": "alarm",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "lognum",
"columnName": "lognum",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "wrappingCount",
"columnName": "wrappingCount",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "pumpUid",
"columnName": "pumpUid",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"timestamp"
],
"autoGenerate": false
},
"indices": [
{
"name": "index_diaconnHistory_code_timestamp",
"unique": false,
"columnNames": [
"code",
"timestamp"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_diaconnHistory_code_timestamp` ON `${TABLE_NAME}` (`code`, `timestamp`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd604d25c3edbdf18cc5a39121cf5a779')"
]
}
}

14
pump/diaconn/src/main/AndroidManifest.xml
View file

@ -8,17 +8,17 @@
<application android:supportsRtl="true">
<activity
android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity"
android:name=".activities.DiaconnG8HistoryActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity"
android:name=".activities.DiaconnG8UserOptionsActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity"
android:name=".activities.DiaconnG8BLEScanActivity"
android:exported="false"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
<category android:name="android.intent.category.DEFAULT" />
@ -26,7 +26,7 @@
</activity>
<service
android:name="info.nightscout.androidaps.diaconn.service.DiaconnG8Service"
android:name=".service.DiaconnG8Service"
android:enabled="true"
android:exported="false" />
</application>

10
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn
package info.nightscout.pump.diaconn
import android.annotation.SuppressLint
import android.content.Intent
@ -9,16 +9,16 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity
import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity
import info.nightscout.androidaps.diaconn.databinding.DiaconnG8FragmentBinding
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.pump.Pump
import info.nightscout.interfaces.pump.WarnColors
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity
import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity
import info.nightscout.pump.diaconn.databinding.DiaconnG8FragmentBinding
import info.nightscout.pump.diaconn.events.EventDiaconnG8NewStatus
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventExtendedBolusChange

22
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn
package info.nightscout.pump.diaconn
import android.content.ComponentName
import android.content.Context
@ -9,9 +9,6 @@ import android.text.format.DateFormat
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
import info.nightscout.core.events.EventNewNotification
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.constraints.Constraint
@ -35,8 +32,11 @@ import info.nightscout.interfaces.pump.defs.ManufacturerType
import info.nightscout.interfaces.pump.defs.PumpDescription
import info.nightscout.interfaces.pump.defs.PumpType
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.interfaces.utils.DecimalFormatter
import info.nightscout.interfaces.utils.Round
import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange
import info.nightscout.pump.diaconn.service.DiaconnG8Service
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventAppExit
@ -74,7 +74,8 @@ class DiaconnG8Plugin @Inject constructor(
private val temporaryBasalStorage: TemporaryBasalStorage,
private val fabricPrivacy: FabricPrivacy,
private val dateUtil: DateUtil,
private val aapsSchedulers: AapsSchedulers
private val aapsSchedulers: AapsSchedulers,
private val activityNames: ActivityNames
) : PumpPluginBase(
PluginDescription()
.mainType(PluginType.PUMP)
@ -212,23 +213,20 @@ class DiaconnG8Plugin @Inject constructor(
override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
val result = PumpEnactResult(injector)
if (!isInitialized()) {
val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pump_not_initialized_profile_not_set), Notification.URGENT)
rxBus.send(EventNewNotification(notification))
activityNames.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(R.string.pump_not_initialized_profile_not_set), Notification.URGENT)
result.comment = rh.gs(R.string.pump_not_initialized_profile_not_set)
return result
} else {
rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
}
return if (diaconnG8Service?.updateBasalsInPump(profile) != true) {
val notification = Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failed_update_basal_profile), Notification.URGENT)
rxBus.send(EventNewNotification(notification))
activityNames.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failed_update_basal_profile), Notification.URGENT)
result.comment = rh.gs(R.string.failed_update_basal_profile)
result
} else {
rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
val notification = Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
rxBus.send(EventNewNotification(notification))
activityNames.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)
result.success = true
result.enacted = true
result.comment = "OK"
@ -601,7 +599,7 @@ class DiaconnG8Plugin @Inject constructor(
diaconnG8Pump.bolusSpeed = intBolusSpeed
diaconnG8Pump.speed = intBolusSpeed
diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
sp.putBoolean(R.string.key_diaconn_g8_is_bolus_speed_sync, false)
true
}

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Pump.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn
package info.nightscout.pump.diaconn
import info.nightscout.interfaces.profile.Profile
import info.nightscout.interfaces.pump.PumpSync

33
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.activities
package info.nightscout.pump.diaconn.activities
import android.Manifest
import android.annotation.SuppressLint
@ -23,27 +23,29 @@ import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.TextView
import androidx.core.app.ActivityCompat
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.databinding.DiaconnG8BlescannerActivityBinding
import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.extensions.safeEnable
import info.nightscout.interfaces.pump.BlePreCheck
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.databinding.DiaconnG8BlescannerActivityBinding
import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange
import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.sharedPreferences.SP
import java.util.UUID
import javax.inject.Inject
class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
class DiaconnG8BLEScanActivity : DaggerAppCompatActivity() {
@Inject lateinit var sp: SP
@Inject lateinit var blePreCheck: BlePreCheck
@Inject lateinit var context: Context
@Inject lateinit var rxBus: RxBus
private val bluetoothAdapter: BluetoothAdapter? get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter
private var listAdapter: ListAdapter? = null
private val devices = ArrayList<BluetoothDeviceItem>()
private var bluetoothLeScanner: BluetoothLeScanner? = null
private val bluetoothAdapter: BluetoothAdapter? get() = (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter
private val bluetoothLeScanner: BluetoothLeScanner? get() = bluetoothAdapter?.bluetoothLeScanner
private val serviceUUID = UUID.fromString("6e400001-b5a3-f393-e0a9-e50e24dcca9e") // BLE GATT Service UUID
private lateinit var binding: DiaconnG8BlescannerActivityBinding
@ -58,8 +60,8 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
blePreCheck.prerequisitesCheck(this)
listAdapter = ListAdapter()
binding.blescannerListview.emptyView = binding.blescannerNodevice
binding.blescannerListview.adapter = listAdapter
binding.bleScannerListview.emptyView = binding.bleScannerNoDevice
binding.bleScannerListview.adapter = listAdapter
listAdapter?.notifyDataSetChanged()
}
@ -67,13 +69,10 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
super.onResume()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED) {
bluetoothAdapter?.let { bluetoothAdapter ->
bluetoothAdapter.safeEnable()
bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
startScan()
}
bluetoothAdapter?.safeEnable()
startScan()
} else {
ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission))
ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission))
}
}
@ -112,7 +111,7 @@ class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
) {
ToastUtils.errorToast(context, context.getString(info.nightscout.core.main.R.string.need_connect_permission))
ToastUtils.errorToast(context, context.getString(R.string.need_connect_permission))
return
}
if (device == null || device.name == null || device.name == "") {

20
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.activities
package info.nightscout.pump.diaconn.activities
import android.os.Bundle
import android.view.LayoutInflater
@ -9,27 +9,29 @@ import android.widget.ArrayAdapter
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.common.RecordTypes
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.androidaps.diaconn.databinding.DiaconnG8HistoryActivityBinding
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.profile.ProfileFunction
import info.nightscout.interfaces.queue.Callback
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.utils.DecimalFormatter
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.common.RecordTypes
import info.nightscout.pump.diaconn.database.DiaconnHistoryRecord
import info.nightscout.pump.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.pump.diaconn.databinding.DiaconnG8HistoryActivityBinding
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventPumpStatusChanged
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
class DiaconnG8HistoryActivity : DaggerAppCompatActivity() {
@Inject lateinit var profileFunction: ProfileFunction
@Inject lateinit var fabricPrivacy: FabricPrivacy
@ -38,6 +40,8 @@ class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
@Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var rxBus: RxBus
@Inject lateinit var rh: ResourceHelper
private val disposable = CompositeDisposable()

26
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt
View file

@ -1,27 +1,29 @@
package info.nightscout.androidaps.diaconn.activities
package info.nightscout.pump.diaconn.activities
import android.content.Context
import android.os.Bundle
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.queue.Callback
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import io.reactivex.rxjava3.disposables.CompositeDisposable
import java.text.DecimalFormat
import javax.inject.Inject
class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
class DiaconnG8UserOptionsActivity : DaggerAppCompatActivity() {
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var context: Context
@ -30,6 +32,8 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
@Inject lateinit var commandQueue: CommandQueue
@Inject lateinit var sp: SP
@Inject lateinit var activityNames: ActivityNames
@Inject lateinit var aapsLogger: AAPSLogger
@Inject lateinit var rh: ResourceHelper
private val disposable = CompositeDisposable()
@ -52,12 +56,12 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
setContentView(binding.root)
binding.saveAlarm.setOnClickListener { onSaveAlarmClick() }
binding.saveLcdOnTime.setOnClickListener { onSavelcdOnTimeClick() }
binding.saveLcdOnTime.setOnClickListener { onSaveLcdOnTimeClick() }
binding.saveLang.setOnClickListener { onSaveLangClick() }
binding.saveBolusSpeed.setOnClickListener { onSaveBolusSpeedClick() }
val spBolusSpeed = sp.getString("g8_bolusspeed", "5")
val spBolusSpeed = sp.getString(getString(R.string.key_diaconn_g8_bolusspeed), "5")
binding.bolusSpeed.setParams(spBolusSpeed.toDouble(), 1.0, 8.0, 1.0, DecimalFormat("1"), true, binding.saveBolusSpeed)
@ -107,7 +111,7 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
onSaveClick()
}
private fun onSavelcdOnTimeClick() {
private fun onSaveLcdOnTimeClick() {
diaconnG8Pump.setUserOptionType = DiaconnG8Pump.LCD
@ -141,8 +145,8 @@ class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
diaconnG8Pump.bolusSpeed = intSpeed
diaconnG8Pump.speed = intSpeed
diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
sp.putString("g8_bolusspeed", intSpeed.toString())
sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
sp.putString(R.string.key_diaconn_g8_bolusspeed, intSpeed.toString())
sp.putBoolean(R.string.key_diaconn_g8_is_bolus_speed_sync, false)
ToastUtils.okToast(context, "Save Success!")
}

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiResponse.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnApiResponse.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.api
package info.nightscout.pump.diaconn.api
import com.google.gson.annotations.SerializedName

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiService.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnApiService.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.api
package info.nightscout.pump.diaconn.api
import retrofit2.Call
import retrofit2.http.Body

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnLogUploader.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/api/DiaconnLogUploader.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.api
package info.nightscout.pump.diaconn.api
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/common/RecordTypes.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.common
package info.nightscout.pump.diaconn.common
object RecordTypes {
const val RECORD_TYPE_BOLUS = 0x01.toByte()

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/database/DiaconnHistoryDatabase.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.database
package info.nightscout.pump.diaconn.database
import android.content.Context
import androidx.room.Database

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/database/DiaconnHistoryRecord.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.database
package info.nightscout.pump.diaconn.database
import androidx.room.Entity
import androidx.room.Index

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/database/DiaconnHistoryRecordDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.database
package info.nightscout.pump.diaconn.database
import androidx.room.Dao
import androidx.room.Insert

10
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnG8ActivitiesModule.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Fragment
import info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity
import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity
import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity
import info.nightscout.pump.diaconn.DiaconnG8Fragment
import info.nightscout.pump.diaconn.activities.DiaconnG8BLEScanActivity
import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity
import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity
@Module
@Suppress("unused")

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnG8Module.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import dagger.Module

75
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnG8PacketModule.kt
View file

@ -1,8 +1,79 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.diaconn.packet.*
import info.nightscout.pump.diaconn.packet.AppCancelSettingPacket
import info.nightscout.pump.diaconn.packet.AppCancelSettingResponsePacket
import info.nightscout.pump.diaconn.packet.AppConfirmSettingPacket
import info.nightscout.pump.diaconn.packet.AppConfirmSettingResponsePacket
import info.nightscout.pump.diaconn.packet.BasalLimitInquirePacket
import info.nightscout.pump.diaconn.packet.BasalLimitInquireResponsePacket
import info.nightscout.pump.diaconn.packet.BasalPauseReportPacket
import info.nightscout.pump.diaconn.packet.BasalPauseSettingPacket
import info.nightscout.pump.diaconn.packet.BasalPauseSettingResponsePacket
import info.nightscout.pump.diaconn.packet.BasalSettingPacket
import info.nightscout.pump.diaconn.packet.BasalSettingReportPacket
import info.nightscout.pump.diaconn.packet.BasalSettingResponsePacket
import info.nightscout.pump.diaconn.packet.BatteryWarningReportPacket
import info.nightscout.pump.diaconn.packet.BigAPSMainInfoInquirePacket
import info.nightscout.pump.diaconn.packet.BigAPSMainInfoInquireResponsePacket
import info.nightscout.pump.diaconn.packet.BigLogInquirePacket
import info.nightscout.pump.diaconn.packet.BigLogInquireResponsePacket
import info.nightscout.pump.diaconn.packet.BigMainInfoInquirePacket
import info.nightscout.pump.diaconn.packet.BigMainInfoInquireResponsePacket
import info.nightscout.pump.diaconn.packet.BolusSpeedInquirePacket
import info.nightscout.pump.diaconn.packet.BolusSpeedInquireResponsePacket
import info.nightscout.pump.diaconn.packet.BolusSpeedSettingPacket
import info.nightscout.pump.diaconn.packet.BolusSpeedSettingReportPacket
import info.nightscout.pump.diaconn.packet.BolusSpeedSettingResponsePacket
import info.nightscout.pump.diaconn.packet.ConfirmReportPacket
import info.nightscout.pump.diaconn.packet.DiaconnG8Packet
import info.nightscout.pump.diaconn.packet.DisplayTimeInquirePacket
import info.nightscout.pump.diaconn.packet.DisplayTimeInquireResponsePacket
import info.nightscout.pump.diaconn.packet.DisplayTimeoutSettingPacket
import info.nightscout.pump.diaconn.packet.DisplayTimeoutSettingResponsePacket
import info.nightscout.pump.diaconn.packet.IncarnationInquirePacket
import info.nightscout.pump.diaconn.packet.IncarnationInquireResponsePacket
import info.nightscout.pump.diaconn.packet.InjectionBasalReportPacket
import info.nightscout.pump.diaconn.packet.InjectionBasalSettingPacket
import info.nightscout.pump.diaconn.packet.InjectionBasalSettingResponsePacket
import info.nightscout.pump.diaconn.packet.InjectionBlockReportPacket
import info.nightscout.pump.diaconn.packet.InjectionCancelSettingPacket
import info.nightscout.pump.diaconn.packet.InjectionCancelSettingResponsePacket
import info.nightscout.pump.diaconn.packet.InjectionExtendedBolusResultReportPacket
import info.nightscout.pump.diaconn.packet.InjectionExtendedBolusSettingPacket
import info.nightscout.pump.diaconn.packet.InjectionExtendedBolusSettingResponsePacket
import info.nightscout.pump.diaconn.packet.InjectionSnackInquirePacket
import info.nightscout.pump.diaconn.packet.InjectionSnackInquireResponsePacket
import info.nightscout.pump.diaconn.packet.InjectionSnackResultReportPacket
import info.nightscout.pump.diaconn.packet.InjectionSnackSettingPacket
import info.nightscout.pump.diaconn.packet.InjectionSnackSettingResponsePacket
import info.nightscout.pump.diaconn.packet.InsulinLackReportPacket
import info.nightscout.pump.diaconn.packet.LanguageInquirePacket
import info.nightscout.pump.diaconn.packet.LanguageInquireResponsePacket
import info.nightscout.pump.diaconn.packet.LanguageSettingPacket
import info.nightscout.pump.diaconn.packet.LanguageSettingResponsePacket
import info.nightscout.pump.diaconn.packet.LogStatusInquirePacket
import info.nightscout.pump.diaconn.packet.LogStatusInquireResponsePacket
import info.nightscout.pump.diaconn.packet.RejectReportPacket
import info.nightscout.pump.diaconn.packet.SerialNumInquirePacket
import info.nightscout.pump.diaconn.packet.SerialNumInquireResponsePacket
import info.nightscout.pump.diaconn.packet.SneckLimitInquirePacket
import info.nightscout.pump.diaconn.packet.SneckLimitInquireResponsePacket
import info.nightscout.pump.diaconn.packet.SoundInquirePacket
import info.nightscout.pump.diaconn.packet.SoundInquireResponsePacket
import info.nightscout.pump.diaconn.packet.SoundSettingPacket
import info.nightscout.pump.diaconn.packet.SoundSettingResponsePacket
import info.nightscout.pump.diaconn.packet.TempBasalInquirePacket
import info.nightscout.pump.diaconn.packet.TempBasalInquireResponsePacket
import info.nightscout.pump.diaconn.packet.TempBasalReportPacket
import info.nightscout.pump.diaconn.packet.TempBasalSettingPacket
import info.nightscout.pump.diaconn.packet.TempBasalSettingResponsePacket
import info.nightscout.pump.diaconn.packet.TimeInquirePacket
import info.nightscout.pump.diaconn.packet.TimeInquireResponsePacket
import info.nightscout.pump.diaconn.packet.TimeReportPacket
import info.nightscout.pump.diaconn.packet.TimeSettingPacket
import info.nightscout.pump.diaconn.packet.TimeSettingResponsePacket
@Module
@Suppress("unused")

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnG8ServiceModule.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
import info.nightscout.pump.diaconn.service.DiaconnG8Service
@Module
@Suppress("unused")

6
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnHistoryModule.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import android.content.Context
import dagger.Module
import dagger.Provides
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase
import info.nightscout.pump.diaconn.database.DiaconnHistoryRecordDao
import javax.inject.Singleton
@Module

5
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnLogUploaderModule.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/di/DiaconnLogUploaderModule.kt
View file

@ -1,9 +1,8 @@
package info.nightscout.androidaps.diaconn.di
package info.nightscout.pump.diaconn.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.androidaps.diaconn.api.DiaconnLogUploader
import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
import info.nightscout.pump.diaconn.api.DiaconnLogUploader
@Module
@Suppress("unused")

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8DeviceChange.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.events
package info.nightscout.pump.diaconn.events
import info.nightscout.rx.events.Event

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8NewStatus.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.events
package info.nightscout.pump.diaconn.events
import info.nightscout.rx.events.Event

2
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8PumpLogReset.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/events/EventDiaconnG8PumpLogReset.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.events
package info.nightscout.pump.diaconn.events
import info.nightscout.rx.events.Event

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppCancelSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/AppConfirmSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

11
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalLimitInquireResponsePacket.kt
View file

@ -1,12 +1,11 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.pumplog.PumplogUtil
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalPauseSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BasalSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BatteryWarningReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

12
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.pumplog.PumplogUtil
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import org.joda.time.DateTime
import javax.inject.Inject
@ -214,7 +214,7 @@ class BigAPSMainInfoInquireResponsePacket(
diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
//incarnation no 처리
diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""),2, 63)
diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""), 2, 63)
aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

74
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigLogInquireResponsePacket.kt
View file

@ -1,43 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import android.content.Context
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.api.ApiResponse
import info.nightscout.androidaps.diaconn.api.DiaconnApiService
import info.nightscout.androidaps.diaconn.api.DiaconnLogUploader
import info.nightscout.androidaps.diaconn.api.PumpLog
import info.nightscout.androidaps.diaconn.api.PumpLogDto
import info.nightscout.androidaps.diaconn.common.RecordTypes
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.androidaps.diaconn.pumplog.LOG_ALARM_BATTERY
import info.nightscout.androidaps.diaconn.pumplog.LOG_ALARM_BLOCK
import info.nightscout.androidaps.diaconn.pumplog.LOG_ALARM_SHORTAGE
import info.nightscout.androidaps.diaconn.pumplog.LOG_CHANGE_INJECTOR_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_CHANGE_NEEDLE_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_CHANGE_TUBE_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECTION_1DAY
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECTION_1DAY_BASAL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECTION_1HOUR_BASAL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECTION_DUAL_NORMAL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_DUAL_FAIL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_DUAL_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_MEAL_FAIL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_MEAL_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_NORMAL_FAIL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_NORMAL_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_SQUARE_FAIL
import info.nightscout.androidaps.diaconn.pumplog.LOG_INJECT_SQUARE_SUCCESS
import info.nightscout.androidaps.diaconn.pumplog.LOG_RESET_SYS_V3
import info.nightscout.androidaps.diaconn.pumplog.LOG_SET_DUAL_INJECTION
import info.nightscout.androidaps.diaconn.pumplog.LOG_SET_SQUARE_INJECTION
import info.nightscout.androidaps.diaconn.pumplog.LOG_SUSPEND_RELEASE_V2
import info.nightscout.androidaps.diaconn.pumplog.LOG_SUSPEND_V2
import info.nightscout.androidaps.diaconn.pumplog.LOG_TB_START_V3
import info.nightscout.androidaps.diaconn.pumplog.LOG_TB_STOP_V3
import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.interfaces.pump.DetailedBolusInfo
import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
@ -45,6 +9,42 @@ import info.nightscout.interfaces.pump.PumpSync
import info.nightscout.interfaces.pump.TemporaryBasalStorage
import info.nightscout.interfaces.pump.defs.PumpDescription
import info.nightscout.interfaces.pump.defs.PumpType
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.api.ApiResponse
import info.nightscout.pump.diaconn.api.DiaconnApiService
import info.nightscout.pump.diaconn.api.DiaconnLogUploader
import info.nightscout.pump.diaconn.api.PumpLog
import info.nightscout.pump.diaconn.api.PumpLogDto
import info.nightscout.pump.diaconn.common.RecordTypes
import info.nightscout.pump.diaconn.database.DiaconnHistoryRecord
import info.nightscout.pump.diaconn.database.DiaconnHistoryRecordDao
import info.nightscout.pump.diaconn.pumplog.LOG_ALARM_BATTERY
import info.nightscout.pump.diaconn.pumplog.LOG_ALARM_BLOCK
import info.nightscout.pump.diaconn.pumplog.LOG_ALARM_SHORTAGE
import info.nightscout.pump.diaconn.pumplog.LOG_CHANGE_INJECTOR_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_CHANGE_NEEDLE_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_CHANGE_TUBE_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_INJECTION_1DAY
import info.nightscout.pump.diaconn.pumplog.LOG_INJECTION_1DAY_BASAL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECTION_1HOUR_BASAL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECTION_DUAL_NORMAL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_DUAL_FAIL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_DUAL_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_MEAL_FAIL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_MEAL_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_NORMAL_FAIL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_NORMAL_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_SQUARE_FAIL
import info.nightscout.pump.diaconn.pumplog.LOG_INJECT_SQUARE_SUCCESS
import info.nightscout.pump.diaconn.pumplog.LOG_RESET_SYS_V3
import info.nightscout.pump.diaconn.pumplog.LOG_SET_DUAL_INJECTION
import info.nightscout.pump.diaconn.pumplog.LOG_SET_SQUARE_INJECTION
import info.nightscout.pump.diaconn.pumplog.LOG_SUSPEND_RELEASE_V2
import info.nightscout.pump.diaconn.pumplog.LOG_SUSPEND_V2
import info.nightscout.pump.diaconn.pumplog.LOG_TB_START_V3
import info.nightscout.pump.diaconn.pumplog.LOG_TB_STOP_V3
import info.nightscout.pump.diaconn.pumplog.PumplogUtil
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventPumpStatusChanged
import info.nightscout.rx.logging.LTag

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

12
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BigMainInfoInquireResponsePacket.kt
View file

@ -1,13 +1,13 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
import info.nightscout.interfaces.pump.defs.PumpDescription
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.interfaces.pump.defs.PumpType
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.pump.diaconn.pumplog.PumplogUtil
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import org.joda.time.DateTime
import javax.inject.Inject
@ -213,7 +213,7 @@ class BigMainInfoInquireResponsePacket(
diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
//incarnation no 처리
diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""),2, 63)
diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(rh.gs(R.string.pumpversion), ""), 2, 63)
aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.sharedPreferences.SP

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

9
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingReportPacket.kt
View file

@ -1,7 +1,8 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.sharedPreferences.SP
@ -31,8 +32,8 @@ class BolusSpeedSettingReportPacket(
val bufferData = prefixDecode(data)
diaconnG8Pump.speed = getByteToInt(bufferData) // speed result
sp.putBoolean("diaconn_g8_isbolusspeedsync", true)
aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed --> ${diaconnG8Pump.speed }")
sp.putBoolean(R.string.key_diaconn_g8_is_bolus_speed_sync, true)
aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed --> ${diaconnG8Pump.speed}")
}
override fun getFriendlyName(): String {

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/BolusSpeedSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/ConfirmReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8Packet.java
View file

@ -1,4 +1,4 @@
package info.nightscout.androidaps.diaconn.packet;
package info.nightscout.pump.diaconn.packet;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@ -6,9 +6,9 @@ import java.nio.ByteOrder;
import javax.inject.Inject;
import dagger.android.HasAndroidInjector;
import info.nightscout.shared.utils.DateUtil;
import info.nightscout.rx.logging.AAPSLogger;
import info.nightscout.rx.logging.LTag;
import info.nightscout.shared.utils.DateUtil;
public class DiaconnG8Packet {

3
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton

3
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

6
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/IncarnationInquireResponsePacket.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBasalSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionBlockReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionCancelSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

6
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import javax.inject.Inject
/**

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionMealSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

6
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackResultReportPacket.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import javax.inject.Inject
/**

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InjectionSnackSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/InsulinLackReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LanguageSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/LogStatusInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/RejectReportPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

9
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SerialNumInquireResponsePacket.kt
View file

@ -1,11 +1,10 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.androidaps.diaconn.R
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.R
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SneckLimitInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquirePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundInquireResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingPacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

4
pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt → pump/diaconn/src/main/java/info/nightscout/pump/diaconn/packet/SoundSettingResponsePacket.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.androidaps.diaconn.packet
package info.nightscout.pump.diaconn.packet
import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.diaconn.DiaconnG8Pump
import info.nightscout.pump.diaconn.DiaconnG8Pump
import info.nightscout.rx.logging.LTag
import javax.inject.Inject

Some files were not shown because too many files have changed in this diff Show more