Milos Kozak
6649386c58
Merge branch 'dev' into gradleupdate
2021-08-06 11:03:26 +02:00
Milos Kozak
0e928bbb9c
compileSdkVersion 30
2021-08-06 00:08:49 +02:00
Milos Kozak
b995243947
Dana-i icon
2021-07-12 15:43:02 +02:00
Milos Kozak
581bb0af01
New Crowdin updates ( #588 )
...
* New translations strings.xml (Czech)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Italian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Irish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations alert_titles.xml (Korean)
* New translations alert_descriptions.xml (Korean)
* New translations alert_descriptions.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Korean)
* New translations strings.xml (Croatian)
* New translations exam.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations exam.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Korean)
* New translations exam.xml (Korean)
* New translations objectives.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (French)
2021-07-09 21:54:34 +02:00
Milos Kozak
444d5aeebd
Merge pull request #571 from andyrozman/mdt_new_fix_2
...
Fixes for medtronic driver refactoring
2021-07-01 12:38:51 +02:00
Milos Kozak
272cdbbb00
use package for nsclient broadcast
2021-06-27 12:39:42 +02:00
Andy Rozman
d5a8838cab
- changed/reverted change
2021-06-26 22:00:29 +01:00
Milos Kozak
cf006790b9
make automation profile switch based on last profile switch instead of profile store
2021-06-26 22:57:40 +02:00
Milos Kozak
dc90c6b140
fix switching to virtual pump
2021-06-26 22:52:51 +02:00
Andy Rozman
3288eb2966
Merge branch 'dev' into mdt_new_fix_2
2021-06-26 21:50:00 +01:00
Milos Kozak
62cb1bb506
reduce warnings amount
2021-06-26 19:53:09 +02:00
Milos Kozak
7bb03c4c13
Merge pull request #580 from nightscout/diaconn
...
Diaconn
2021-06-24 19:34:22 +02:00
Milos Kozak
a70f24a68a
fix TherapyEvent upload
2021-06-23 22:33:58 +02:00
Milos Kozak
884ecd9f2b
cleanup
2021-06-23 21:01:42 +02:00
Milos Kozak
e06ec0eba1
getProfile synchronized
2021-06-23 21:01:10 +02:00
Milos Kozak
90baf8e0ea
prevent failed requirement
2021-06-21 21:47:38 +02:00
Milos Kozak
62375cdcfe
New Crowdin updates ( #545 )
...
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (French)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
2021-06-21 07:59:08 +02:00
Andy Rozman
e30c5162ef
Merge branch 'dev' into mdt_new_fix_2
2021-06-20 19:45:03 +01:00
Milos Kozak
0af2cff26f
Merge pull request #557 from Philoul/NewTempFolderForLogExports
...
temp Dir for log export
2021-06-17 22:01:05 +02:00
Milos Kozak
b79d86f0b8
Merge pull request #561 from Philoul/FixDeleteLogs
...
Fix delete logs
2021-06-16 08:22:15 +02:00
Milos Kozak
c3aea16c72
reset cached data on db reset
2021-06-15 14:54:32 +02:00
Milos Kozak
fcf7faa3e0
queue independentConnect fix for DanaR pumps
2021-06-14 15:52:43 +02:00
Philoul
396cc3a1c5
Revert "Add setting"
...
This reverts commit 6fd6283e
2021-06-14 08:58:53 +02:00
Philoul
6fd6283ef6
Add setting
2021-06-11 21:43:53 +02:00
Philoul
c005243dfd
Fix DeleteLogs
2021-06-11 21:39:23 +02:00
Andy Rozman
95326a2894
- storage fix (new key)
2021-06-11 15:57:14 +01:00
Milos Kozak
62005b437a
Improve SMSCommunicator safety
2021-06-10 22:35:50 +02:00
Philoul
539ca3131d
temp Dir for log export
2021-06-10 08:33:15 +02:00
Milos Kozak
8e466be92c
Diaconn support
2021-06-08 23:27:14 +02:00
Milos Kozak
c0dba456d7
fix lst bolus query and smb pocessing
2021-06-02 22:40:30 +02:00
Milos Kozak
74dfe80433
immutable flag for PendingIntent
2021-06-02 16:56:13 +02:00
Milos Kozak
db95670be5
fix loop dialog
2021-06-01 22:34:18 +02:00
Milos Kozak
1d12883f95
fix receiving NOTEs form NS
2021-06-01 20:04:59 +02:00
Milos Kozak
4b017cd0ea
fix sendig logs
2021-06-01 19:48:25 +02:00
Milos Kozak
596012ab10
move logs, eng_mode to AAPS directory
2021-05-31 15:29:42 +02:00
Milos Kozak
67297d60d3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-30 14:52:30 +02:00
Milos Kozak
beb8ba7efc
enable MDT plugin
2021-05-30 14:51:57 +02:00
Milos Kozak
7ed7736b4f
Merge pull request #543 from Philoul/FixCancelExtendedBolus
...
Fix cancel extended bolus (Overview)
2021-05-29 23:47:15 +02:00
Milos Kozak
9d29cafbe6
remove old db code
2021-05-29 23:38:19 +02:00
Milos Kozak
91ad9a3ca9
New Crowdin updates ( #541 )
...
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Croatian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (Tamil)
* New translations validator.xml (Lithuanian)
* New translations validator.xml (Korean)
* New translations validator.xml (Greek)
* New translations validator.xml (Chinese Simplified)
* New translations validator.xml (Turkish)
* New translations validator.xml (Swedish)
* New translations validator.xml (Portuguese, Brazilian)
* New translations validator.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Korean)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (Danish)
* New translations validator.xml (Afrikaans)
* New translations validator.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations exam.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
2021-05-28 16:12:38 +02:00
Milos Kozak
8db5b808ac
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-28 16:11:31 +02:00
Milos Kozak
6735d22934
OfflineEvent -> room
2021-05-28 16:06:44 +02:00
Philoul
330728299d
Fix Extended Bolus in Overview
2021-05-28 08:56:58 +02:00
Milos Kozak
66a70fcd22
Merge pull request #531 from andyrozman/meallink-mdt
...
Medtronic driver changes - Kotlin and PumpSync
2021-05-27 23:23:03 +02:00
Philoul
93046d0354
Revert to val for ratio and dev slope Scale
2021-05-27 08:43:45 +02:00
Philoul
ede1468bbb
Modify shift
2021-05-26 22:04:42 +02:00
Philoul
506fbde587
Merge branch 'dev' into FixSensScale
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
2021-05-26 21:50:58 +02:00
Andy Rozman
766b2b4bea
- changes after comments
2021-05-26 20:16:17 +01:00
Milos Kozak
6e19d60796
Scale -> kt
2021-05-26 14:17:49 +02:00
Andy Rozman
029eb55f0e
- changes according to comment in PR
...
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
2021-05-26 13:14:17 +01:00
Milos Kozak
43e6ba43b6
fix expiring intervals
2021-05-26 09:01:22 +02:00
Philoul
3a24af1a4c
Merge branch 'dev' into FixSensScale
2021-05-25 22:56:00 +02:00
Milos Kozak
84cc4d0c00
fix setting din in profile
2021-05-25 22:10:12 +02:00
Milos Kozak
e170503f82
lint
2021-05-25 21:53:00 +02:00
Milos Kozak
3d1b7e8ded
fix updating non basal profile changes
2021-05-25 21:19:18 +02:00
Milos Kozak
3ed45fdd11
improve NS profile sync
2021-05-25 20:59:41 +02:00
Milos Kozak
bee6d289c0
HistoryBrowseActivity
2021-05-25 17:42:21 +02:00
Andy Rozman
e24af3934f
- refactorings kotlin !!
...
- moved 2 filed into pump-common module (newly created)
2021-05-24 16:57:54 +01:00
Milos Kozak
966f7b35f2
move treatments to upper right menu
2021-05-23 21:38:30 +02:00
Philoul
6532d9111e
Fix same curve on different graphs
2021-05-23 15:28:33 +02:00
Philoul
62c063a5bc
Fix Sens curve scale if alone on a graph
...
=> I also fix deviation slope curve if secondary behind Sens curve
2021-05-23 14:37:18 +02:00
Philoul
37bd7495fd
Convert status Message to Kotlin (+ associated null management in localInsightPlugin)
2021-05-23 10:50:37 +02:00
Milos Kozak
ea940ea165
remove redundant carbTime
2021-05-22 21:24:49 +02:00
Andy Rozman
4dcc8dc46f
- removed dropbox files
2021-05-22 10:26:32 +01:00
Milos Kozak
6e012ec75f
fix dbUpdate
2021-05-21 22:53:49 +02:00
Milos Kozak
bd8787c209
update iob regularly
2021-05-21 22:53:34 +02:00
Milos Kozak
0bb52acfe0
fix therapy event rendering
2021-05-21 17:24:33 +02:00
Milos Kozak
af3df53f10
fix receiving dexcom calibrations
2021-05-21 15:49:42 +02:00
Milos Kozak
11f00d1776
make it compile with kotlin 1.4
2021-05-20 19:42:44 +02:00
Milos Kozak
b548325059
lints
2021-05-18 22:31:08 +02:00
Milos Kozak
328ec9a9ff
Merge pull request #523 from Philoul/FIX_Extended_Remove
...
Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment
2021-05-18 21:40:15 +02:00
Milos Kozak
79833dbdf1
New Crowdin updates ( #490 )
...
* New translations strings.xml (Hebrew)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations objectives.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (French)
* New translations objectives.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Czech)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
2021-05-18 18:31:01 +02:00
Philoul
1606b8c274
Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment
...
More information in uel.log added and Fix information for Absolute / Percent values
2021-05-18 18:28:03 +02:00
Milos Kozak
a0c7e0352d
typo
2021-05-17 23:03:52 +02:00
Milos Kozak
219dfd375f
disable unfinished plugins
2021-05-17 21:17:15 +02:00
Milos Kozak
a1c1355ce6
MVVM like for overview
2021-05-17 21:05:24 +02:00
Andy Rozman
06f079d6fd
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-17 00:42:18 +01:00
Andy Rozman
fd5e7a3c5c
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-17 00:20:44 +01:00
Milos Kozak
3040be317c
TBR as live
2021-05-14 21:45:48 +02:00
Milos Kozak
1af0cc5aeb
NSClient sync improvement
2021-05-14 08:54:11 +02:00
Milos Kozak
6c851b5e7b
Merge pull request #517 from Philoul/LoopDialog_Improvement
...
Loop Dialog improvement
2021-05-13 17:47:33 +02:00
Milos Kozak
60cae5c2bd
Merge branch 'dev2_dana_combo_only' into Fix_NSClient_UseAbsolute
2021-05-13 17:46:10 +02:00
Milos Kozak
e83375f754
NSClient update
2021-05-13 17:44:07 +02:00
Andy Rozman
14b7895f20
- final changes on Bolus (checking if bolus entry was changed in last 35 minutes)
...
- added class for Dropbox support (not yet implemented)
2021-05-13 13:33:25 +01:00
Philoul
9d87dec574
NSClient Fix Use Absolute
2021-05-12 18:28:52 +02:00
Milos Kozak
bcd74897d4
Merge pull request #502 from Philoul/dev2_Insight_v2
...
Dev2 insight v2
2021-05-12 11:12:53 +02:00
Philoul
3b581dce49
uel.log Fix Source for Dexcom calibration and Sensor insertion
2021-05-12 01:24:03 +02:00
Philoul
8819859e7c
Merge remote-tracking branch 'Nightscout/dev2_dana_combo_only' into dev2_Insight_v2
2021-05-12 00:31:41 +02:00
Milos Kozak
50720b8497
NSClient mode sync
2021-05-11 21:24:39 +02:00
Philoul
afb16210ae
Remove old insight db tables
2021-05-09 17:02:20 +02:00
Philoul
dfd6c6e859
Move Insight database package outside plugins\pump
2021-05-07 11:33:51 +02:00
Philoul
f789888afd
Fix SMB
...
remove comment linked to previous version
2021-05-07 10:21:34 +02:00
Andy Rozman
9526e8228b
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-05 17:02:03 +01:00
Andy Rozman
3b35c01f22
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-05 16:59:01 +01:00
Andy Rozman
12a3609565
- started working TBR
...
- added Dropbox stuff (not part of project)
2021-05-05 16:57:48 +01:00
Milos Kozak
61d5565d18
2.8.2.1-dev-e4
2021-05-04 21:27:11 +02:00
Milos Kozak
0f2f5cd1fa
Profile sync, removed NSProfile
2021-05-04 21:07:47 +02:00
Milos Kozak
88f5eec306
do not run AcceptTemp on UI thread
2021-05-03 20:46:23 +02:00
Milos Kozak
e8ecf43894
ProfileSwitch improvements, resolve initial PS
2021-05-03 18:19:10 +02:00
Milos Kozak
5d55bdadf4
Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-03 14:59:20 +02:00
