Commit graph

123 commits

Author SHA1 Message Date
Milos Kozak
ea8b817e53 DanaRS: remove core dependency 2022-11-26 17:28:08 +01:00
Milos Kozak
7fae8335a6 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-11-26 00:22:00 +01:00
Milos Kozak
e47cdded0b pumpcommon: remove core dependency 2022-11-26 00:21:50 +01:00
Milos Kozak
da14175da4 DanaR: remove core dependency 2022-11-25 22:59:24 +01:00
Milos Kozak
b38bc5c830 modules cleanup 2022-11-25 22:14:46 +01:00
Milos Kozak
97433c7ace Dana: remove core dependency 2022-11-25 21:08:03 +01:00
Milos Kozak
d4c6759dd8
Merge pull request #2220 from nightscout/dependabot/gradle/dev/com.polidea.rxandroidble3-rxandroidble-1.17.2
chore(deps): bump rxandroidble from 1.17.0 to 1.17.2
2022-11-25 19:59:18 +01:00
Milos Kozak
963016ef5d ComboV2: UI improvements 2022-11-25 17:40:28 +01:00
Milos Kozak
c6d01f10bd ComboV2: remove core dependency 2022-11-25 15:08:02 +01:00
Milos Kozak
681fe52d80 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-11-25 14:21:44 +01:00
Milos Kozak
dcd86e26a4 Combo: remove core dependency 2022-11-25 14:06:48 +01:00
dependabot[bot]
b088c73ef5
chore(deps): bump rxandroidble from 1.17.0 to 1.17.2
Bumps [rxandroidble](https://github.com/dariuszseweryn/RxAndroidBle) from 1.17.0 to 1.17.2.
- [Release notes](https://github.com/dariuszseweryn/RxAndroidBle/releases)
- [Changelog](https://github.com/dariuszseweryn/RxAndroidBle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dariuszseweryn/RxAndroidBle/commits)

---
updated-dependencies:
- dependency-name: com.polidea.rxandroidble3:rxandroidble
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-25 08:02:20 +00:00
Carlos Rafael Giani
1131ad1195 comboctl-main: Refine waiting periods during long RT button press
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-25 00:26:32 +01:00
Carlos Rafael Giani
1e6b560199 combov2: Refer to correct comboctl source subdirectory in gradle script
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-25 00:26:30 +01:00
Carlos Rafael Giani
ede5ad1cda comboctl-main: Rename variables such that currentQuantity is not shadowed
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-25 00:26:21 +01:00
Milos Kozak
80f6050d04 suppress deprecation 2022-11-24 11:07:18 +01:00
Milos Kozak
a451c64a84 move ProfileStore 2022-11-23 20:43:15 +01:00
Milos Kozak
32bf2e592a move DialogAppCompatActivity 2022-11-23 16:13:39 +01:00
Milos Kozak
d444979603 DetailedBolusInfoStorage interface 2022-11-23 16:02:54 +01:00
Milos Kozak
37f9a942b2 TemporaryBasalStorage interface 2022-11-23 15:53:57 +01:00
Milos Kozak
8e8fbf1b6f UserEntryLogger interface 2022-11-23 15:32:06 +01:00
Milos Kozak
79f8ae11fb cleanup core 2022-11-23 14:36:06 +01:00
Milos Kozak
58a96ab6ce
New Crowdin updates (#2212)
* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Hungarian)

* 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 (Czech)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* 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 (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Russian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* New translations strings.xml (Irish)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* 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 (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Czech)

* New translations protection.xml (Czech)

* New translations exam.xml (Slovak)

* New translations protection.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Korean)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Danish)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Hungarian)

* New translations strings.xml (German)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Swedish)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (Japanese)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Catalan)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Irish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Croatian)

* 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 (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 (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Korean)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Danish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Croatian)

* 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 (Dutch)

* 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 (Korean)

* New translations strings.xml (Serbian (Latin))
2022-11-22 23:24:08 +01:00
Milos Kozak
a1c073a74c fix build 2022-11-22 22:13:37 +01:00
Milos Kozak
e0ea0ca56d
Merge pull request #2167 from dv1/comboctl-dev
Combo v2 : new Combo driver, written from scratch in Kotlin, does not need or use Ruffy
2022-11-22 22:06:29 +01:00
Milos Kozak
fda8498c8e :core:graph 2022-11-22 21:39:19 +01:00
Milos Kozak
94b1d0ce74 migrate BolusProgressDialog 2022-11-22 11:54:27 +01:00
Milos Kozak
9f5af9b80c protection interfaces 2022-11-22 10:16:07 +01:00
Milos Kozak
4513ae6947 move more code 2022-11-21 22:43:34 +01:00
Milos Kozak
33dcf6479d Sensitivity module 2022-11-21 20:26:06 +01:00
Carlos Rafael Giani
5745e95244 Update combov2 code to match recent changes in dev branch
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-21 19:58:29 +01:00
Carlos Rafael Giani
4ea6b48047 Merge branch 'dev' into comboctl-dev 2022-11-21 19:58:10 +01:00
Milos Kozak
6fa7877048 merge Config & BuildHelper 2022-11-21 13:51:47 +01:00
Milos Kozak
1cbfae2dc1 di cleanup 2022-11-21 10:46:56 +01:00
Milos Kozak
c2fb7811dd
New Crowdin updates (#2206)
* 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)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (French)

* New translations protection.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations validator.xml (Japanese)

* New translations objectives.xml (Japanese)

* New translations exam.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations exceptions.xml (Japanese)

* New translations alert_titles.xml (Japanese)

* New translations alert_descriptions.xml (Japanese)

* New translations alert_codes.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Romanian)

* New translations strings.xml (Danish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Serbian (Latin))

* New translations strings.xml (Russian)

* New translations strings.xml (Japanese)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations exam.xml (Spanish)
2022-11-21 10:13:59 +01:00
Carlos Rafael Giani
61519e43f2 combov2: Disable internal Pump.connect() connection attempt limiter
QueueThread already has a timeout; the limiter is redundant.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 23:05:24 +01:00
Carlos Rafael Giani
90480ab1d9 comboctl-main: Add more argument checks to Pump.connect()
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 23:04:30 +01:00
Carlos Rafael Giani
605fe04d74 comboctl-main: Check for unchanging screen type in navigateToRTScreen()
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 21:58:50 +01:00
Carlos Rafael Giani
5aeb401cc0 combov2: Autodetect reservoir and battery changes and insert them as events
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 21:04:53 +01:00
Carlos Rafael Giani
8bef914eac combov2: Store battery and reservoir levels as plain properties
This fixes https://github.com/dv1/AndroidAPS/issues/2

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 19:55:04 +01:00
Carlos Rafael Giani
2bde0f154d comboctl-main: Add and fix unit tests
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:21 +01:00
Carlos Rafael Giani
96c8145dc3 comboctl-main: During corrective short button presses check screens
After a long button press, short button presses may be necessary to
fix "overshoots". An alert screen may appear during those short button
presses, so look at the screens to make sure alerts are not missed.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:17 +01:00
Carlos Rafael Giani
8b2666ff74 comboctl-main: Only receive frames if long RT button press was skipped
The code in adjustQuantityOnScreen() needs an current quantity. This is
determined during the long button press. If no such long button press
happens, get the quantity by explicitly receiving parsed frames. But
don't read those parsed frames if a long button press happened; this
is redundant and just slows down the function.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:12 +01:00
Carlos Rafael Giani
03a32f09cf comboctl-main: Catch getParsedDisplayFrame() exceptions and rethrow later
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:59:08 +01:00
Carlos Rafael Giani
8d6171db49 comboctl-parser: Support main screens with ext/multiwave and TBR symbols
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:58:51 +01:00
Carlos Rafael Giani
e9294c59a0 comboctl-parser: Parse remaining duration in TBR percentage screen
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-20 18:58:47 +01:00
Carlos Rafael Giani
cc26eb8ed8 combov2: Also limit TBR percentage when AAPS sets absolute TBR
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 23:47:49 +01:00
Carlos Rafael Giani
d50feec302 comboctl-main: Correctly handle alerts after bolus was delivered
In particular, if a bolus brings the reservoir level below the low
threshold, a W1 warning shows up on the pump itself during bolus delivery.
Once delivery is done, the W1 shows up in the RT mode as well. Bolus
delivery is special in that the deliverBolus() function has to manually
switch back to RT mode to get the reservoir level post-bolus to update
the reservoirLevel value. When that is done, the aforementioned alert
screen can show up. Add code to handle alert screen handling to that
special post-bolus check.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 13:56:01 +01:00
Carlos Rafael Giani
20d4a0c692 comboctl-main: Fix computeShortRTButtonPress() cyclic quantity bug
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2022-11-19 11:22:10 +01:00
Milos Kozak
72505b6093 remove dependencies from setup wizard 2022-11-18 23:22:00 +01:00