caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DanaRPump -> danars

Browse source
This commit is contained in:
Milos Kozak 2020-05-08 11:56:02 +02:00
parent 73d132649d
commit 61a077542c
6 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
View file

@ -1,6 +1,5 @@
package info.nightscout.androidaps.plugins.pump.danaR.comm package info.nightscout.androidaps.plugins.pump.danaR.comm
import info.nightscout.androidaps.MainApp
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
View file

@ -195,7 +195,7 @@ open class DanaRS_Packet_APS_History_Events(
status = "PRIMECANNULA " + dateUtil.timeString(datetime) status = "PRIMECANNULA " + dateUtil.timeString(datetime)
} }
else -> { else -> {
aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2) aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
status = "UNKNOWN " + dateUtil.timeString(datetime) status = "UNKNOWN " + dateUtil.timeString(datetime)
} }

2
app/src/main/res/values/strings.xml
View file

@ -557,7 +557,6 @@
<string name="key_nsclientinternal_url" translatable="false">nsclientinternal_url</string> <string name="key_nsclientinternal_url" translatable="false">nsclientinternal_url</string>
<string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string> <string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string>
<string name="key_danar_bt_name" translatable="false">danar_bt_name</string> <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
<string name="key_danar_password" translatable="false">danar_password</string>
<string name="clearlog">Clear log</string> <string name="clearlog">Clear log</string>
<string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string> <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
<string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string> <string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string>
@ -1758,7 +1757,6 @@
<string name="key_statuslights_copy_ns" translatable="false">statuslights_copy_ns</string> <string name="key_statuslights_copy_ns" translatable="false">statuslights_copy_ns</string>
<string name="copyexistingvalues">Copy NS settings (if exists)?</string> <string name="copyexistingvalues">Copy NS settings (if exists)?</string>
<string name="key_statuslights_overview_advanced" translatable="false">statuslights_overview_advanced</string> <string name="key_statuslights_overview_advanced" translatable="false">statuslights_overview_advanced</string>
<string name="key_danars_password">danars_password</string>
<string name="classic_desrciption">Original skin</string> <string name="classic_desrciption">Original skin</string>
<string name="buttonson_desrciption">Buttons are always displayed on bottom of screen</string> <string name="buttonson_desrciption">Buttons are always displayed on bottom of screen</string>
<string name="key_skin" translatable="false">skin</string> <string name="key_skin" translatable="false">skin</string>

1
app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
View file

@ -5,7 +5,6 @@ import org.junit.Assert
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.powermock.modules.junit4.PowerMockRunner import org.powermock.modules.junit4.PowerMockRunner
import kotlin.experimental.and
@RunWith(PowerMockRunner::class) @RunWith(PowerMockRunner::class)
class MsgSettingUserOptionsTest : DanaRTestBase() { class MsgSettingUserOptionsTest : DanaRTestBase() {

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt → danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.Constants import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.R import info.nightscout.androidaps.danars.R
import info.nightscout.androidaps.data.Profile import info.nightscout.androidaps.data.Profile
import info.nightscout.androidaps.interfaces.ProfileStore import info.nightscout.androidaps.interfaces.ProfileStore
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger

2
danars/src/main/res/values/strings.xml
View file

@ -2,6 +2,8 @@
<resources> <resources>
<string name="key_danars_address" translatable="false">danars_address</string> <string name="key_danars_address" translatable="false">danars_address</string>
<string name="key_danars_name" translatable="false">danars_name</string> <string name="key_danars_name" translatable="false">danars_name</string>
<string name="key_danar_password" translatable="false">danar_password</string>
<string name="key_danars_password">danars_password</string>
<string name="danars_pairing">Pairing</string> <string name="danars_pairing">Pairing</string>
<string name="danars_nodeviceavailable">No device found so far</string> <string name="danars_nodeviceavailable">No device found so far</string>