Andrei Vereha
ebb3030169
make it compile
2021-05-28 23:37:00 +02:00
Andrei Vereha
7ee7cdd83b
Merge remote-tracking branch 'upstream/dev' into avereha/merge-dev
2021-05-28 22:12:21 +02:00
Philoul
a06b799cd0
Revert "Fix Cancel Extended Bolus if TBR emulation is disabled in insight preferences"
...
This reverts commit eef50c82
2021-05-28 22:07:01 +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
AdrianLxM
841c49b770
fix medtronic merge
2021-05-28 11:34:41 +02:00
Milos Kozak
82cce81d0b
update duration requirement
2021-05-28 08:59:52 +02:00
Philoul
330728299d
Fix Extended Bolus in Overview
2021-05-28 08:56:58 +02:00
Milos Kozak
763c0bb766
fix Dana history parsing
2021-05-28 08:50:45 +02:00
Philoul
eef50c8290
Fix Cancel Extended Bolus if TBR emulation is disabled in insight preferences
2021-05-28 00:17:37 +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
Andy Rozman
3c7b5fd2b3
- fixed test
...
- add runtest for linux
- some refactorings
2021-05-27 18:10:35 +01:00
Milos Kozak
2845bc8714
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-27 13:37:06 +02:00
Milos Kozak
30eb339a88
Dana BLE error handling
2021-05-27 13:36:46 +02:00
Milos Kozak
355a9531f7
Merge pull request #533 from Philoul/FixSensScale
...
Fix Sens curve scale if alone on a graph
2021-05-27 09:48:36 +02:00
Philoul
93046d0354
Revert to val for ratio and dev slope Scale
2021-05-27 08:43:45 +02:00
Andy Rozman
16785838e9
- small change
2021-05-26 22:28:22 +01:00
Andy Rozman
8be367e156
- refctoring MedtronicCommandType
2021-05-26 22:19:03 +01: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
Andy Rozman
b40f8b79d1
- reverted change to remove check
2021-05-26 16:04:47 +01:00
Milos Kozak
867e205ab6
AutosensResult -> kt
2021-05-26 16:00:35 +02: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
309ce50518
Merge pull request #534 from nightscout/dependabot/gradle/dev/com.google.code.gson-gson-2.8.7
...
Bump gson from 2.8.6 to 2.8.7
2021-05-26 13:19:58 +02:00
Milos Kozak
546e2ac829
Merge pull request #537 from nightscout/dependabot/gradle/dev/dagger_version-2.36
...
Bump dagger_version from 2.35.1 to 2.36
2021-05-26 13:19:30 +02:00
Milos Kozak
8c66053ca3
Merge pull request #538 from nightscout/dependabot/gradle/dev/com.google.truth-truth-1.1.3
...
Bump truth from 1.1.2 to 1.1.3
2021-05-26 13:18:52 +02:00
Milos Kozak
43e6ba43b6
fix expiring intervals
2021-05-26 09:01:22 +02:00
dependabot[bot]
6193b137c5
Bump truth from 1.1.2 to 1.1.3
...
Bumps [truth](https://github.com/google/truth ) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/google/truth/releases )
- [Commits](https://github.com/google/truth/commits )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 05:56:02 +00:00
dependabot[bot]
8df7f38d6e
Bump dagger_version from 2.35.1 to 2.36
...
Bumps `dagger_version` from 2.35.1 to 2.36.
Updates `dagger-compiler` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36 )
Updates `dagger-android-processor` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36 )
Updates `dagger-android` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36 )
Updates `dagger-android-support` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases )
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 05:55:11 +00: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
30e04164ed
fix test
2021-05-25 21:24:23 +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
5ef92462a7
do not use last record in DetailedBolusInfoStorage
2021-05-25 18:31:01 +02:00
Milos Kozak
bee6d289c0
HistoryBrowseActivity
2021-05-25 17:42:21 +02:00
bubble_devteam
5f5df3424e
Add search device before Bluetooth connection
2021-05-25 18:42:03 +08:00
dependabot[bot]
464cdd7a91
Bump gson from 2.8.6 to 2.8.7
...
Bumps [gson](https://github.com/google/gson ) from 2.8.6 to 2.8.7.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.7 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-25 06:08:55 +00: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
Milos Kozak
92f0487db8
fix displayed BG
2021-05-23 21:05:21 +02:00
Milos Kozak
965a0cafaa
Dana BLE5 comm
2021-05-23 20:47:36 +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
b9a9a86739
Merge remote-tracking branch 'Nightscout/dev' into FixSensScale
2021-05-23 11:15:58 +02:00
Milos Kozak
1a72129a38
Revert "remove unused libs"
...
This reverts commit 158e9c65
2021-05-23 11:13:39 +02:00