caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
14845 commits 1 branch 20 tags 140 MiB
Commit graph

14845 commits

This branch
This branch
All branches
Author SHA1 Message Date
Carlos Rafael Giani
4bb163a633 comboctl-main: Support extended/multiwave bolus in Pump.deliverBolus() 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
83dce8bee3 comboctl-base: Handle ext/multiwave bolus in PumpIO.deliverCMDStandardBolus 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
05674ba552 comboctl-base: Support automatic extended/multiwave boluses in history 
When delivering extended and multiwave boluses through the command mode,
the boluses are marked as "automatic" by the Combo, and use different IDs
compared to extended/multiwave boluses that were initiated through the
remote terminal mode. Add support for these IDs, and extend the
CMDHistoryEventDetail subclasses for extended and multiwave boluses with
a field that specifies whether the bolus was manual or automatic.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
916b847b21 comboctl-base: Add support for creating extended/multiwave bolus packets 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
22a144416b comboctl-main: Parse ext bolus main screen instead of throwing exception 
To support extended and multiwave boluses in the future, it is necessary
to properly parse the main screen when it shows extended/multiwave
content. This requires some rework. Most notably, the code needs to be
changed to no longer throw ExtendedOrMultiwaveBolusActiveException.

One problem with extended/multiwave content on the main screen is that
it does not show TBR details (percentage & remaining duration). For this
reason, it is necessary to actually navigate to the TBR percentage screen
and read those value there. This means that the setTbr() call is slower
when an extended/multiwave bolus is ongoing, but better to be slower than
to omit post-setTbr checks that may catch rare errors.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
7f6f63bcf4 comboctl-main: Always move past skipped screens in navigateToRTScreen() 
Without this, navigation gets stuck if an unrecognized screen
is encountered.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
9af5499d70 comboctl-base: Rename CMDBolusType to CMDImmediateBolusType 
This name is less confusing, especially if another enum class for the
bolus delivery is about to be introduced.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
7598ae758c comboctl-parser: Fix battery in ExtendedAndMultiwaveBolusMainScreenParser 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:26 +01:00
Carlos Rafael Giani
8d9e5cc833 comboctl: Apply ktlint based fixes 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:22 +01:00
Carlos Rafael Giani
19871d8f52 combov2: Disable pairing UI and show message when driver is not initialized 
Without this check, AAPS crashes, because the code tries to access the
pairing flow, which depends on the pump manager. But that manager does
not exist until the user grants Bluetooth permissions.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2023-01-02 19:21:15 +01:00
Milos Kozak
ddba45622c DataSyncWorkerTest 2023-01-02 14:48:31 +01:00
Milos Kozak
ff1d3f1237 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2023-01-01 17:18:23 +01:00
Milos Kozak
823c26aa64 NSCv3: process GlucoseValue 2023-01-01 17:18:09 +01:00
Milos Kozak
4084d9faa2
Merge pull request #2316 from Philoul/Fix/WikiLinks 
Fix Wiki links for Crowdin
 2023-01-01 17:03:42 +01:00
Philoul
cba0f55254 Fix wiki links for crowdin 
I also replaced `Getting-Started/Screenshots.html#config-builder` by `Configuration/Config-Builder.html`
 2022-12-30 22:26:41 +01:00
Milos Kozak
7b8e5ece99
Merge pull request #2314 from Andries-Smit/wear/fixup-simple-ui-outdated 
Wear fixup simple UI outdated
 2022-12-30 19:07:04 +01:00
Andries Smit
819d0a5ae5 wear: fixup simple ui outdated logic 2022-12-29 23:25:30 +01:00
Milos Kozak
cc605efc93
New Crowdin updates (#2313) 
* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* 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 (Chinese Simplified)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Italian)

* 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 (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations exam.xml (Romanian)

* New translations objectives.xml (Romanian)

* New translations exam.xml (French)

* New translations objectives.xml (French)

* New translations exam.xml (Spanish)

* New translations objectives.xml (Spanish)

* New translations exam.xml (Afrikaans)

* New translations objectives.xml (Afrikaans)

* New translations exam.xml (Bulgarian)

* New translations objectives.xml (Bulgarian)

* New translations exam.xml (Catalan)

* New translations objectives.xml (Catalan)

* New translations exam.xml (Czech)

* New translations objectives.xml (Czech)

* New translations exam.xml (Danish)

* New translations objectives.xml (Danish)

* New translations exam.xml (German)

* New translations objectives.xml (German)

* New translations exam.xml (Greek)

* New translations objectives.xml (Greek)

* New translations exam.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations exam.xml (Italian)

* New translations objectives.xml (Italian)

* New translations exam.xml (Korean)

* New translations objectives.xml (Korean)

* New translations exam.xml (Lithuanian)

* New translations objectives.xml (Lithuanian)

* New translations exam.xml (Dutch)

* New translations objectives.xml (Dutch)

* New translations exam.xml (Norwegian)

* New translations objectives.xml (Norwegian)

* New translations exam.xml (Polish)

* New translations objectives.xml (Polish)

* New translations exam.xml (Portuguese)

* New translations objectives.xml (Portuguese)

* New translations exam.xml (Russian)

* New translations objectives.xml (Russian)

* New translations exam.xml (Slovak)

* New translations objectives.xml (Slovak)

* New translations exam.xml (Swedish)

* New translations objectives.xml (Swedish)

* New translations exam.xml (Turkish)

* New translations objectives.xml (Turkish)

* New translations exam.xml (Chinese Simplified)

* New translations objectives.xml (Chinese Simplified)

* New translations exam.xml (Portuguese, Brazilian)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations exam.xml (Croatian)

* New translations objectives.xml (French)
 2022-12-29 22:36:09 +01:00
Milos Kozak
228b2ddaca NSCv3: process ExtendedBolus 2022-12-29 21:33:37 +01:00
Milos Kozak
a2522eed9d UI: show always bucketed data 2022-12-29 18:51:36 +01:00
Milos Kozak
3df237f8e4 NSCv3: process OfflineEvent 2022-12-29 18:46:25 +01:00
Milos Kozak
04689da0e6 typo 2022-12-29 17:29:26 +01:00
Milos Kozak
570c0303f3 typo 2022-12-29 17:24:08 +01:00
Milos Kozak
ff35fe839a typo 2022-12-29 17:20:56 +01:00
Milos Kozak
30840a82b8 typo 2022-12-29 17:18:29 +01:00
Milos Kozak
582c28ef76
Merge pull request #2312 from nightscout/dependabot/gradle/dev/kotlin_version-1.8.0 
chore(deps): bump kotlin_version from 1.7.22 to 1.8.0
 2022-12-29 09:48:50 +01:00
Milos Kozak
b9486f6b86
Merge pull request #2308 from Andries-Smit/wear/extract-simple-ui 
Wear extract simple UI
 2022-12-29 09:31:31 +01:00
dependabot[bot]
1aa2e19769
chore(deps): bump kotlin_version from 1.7.22 to 1.8.0 
Bumps `kotlin_version` from 1.7.22 to 1.8.0.

Updates `kotlin-gradle-plugin` from 1.7.22 to 1.8.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

Updates `kotlin-allopen` from 1.7.22 to 1.8.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

Updates `kotlin-serialization` from 1.7.22 to 1.8.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

Updates `org.jetbrains.kotlin.android` from 1.7.22 to 1.8.0

Updates `kotlin-stdlib-jdk8` from 1.7.22 to 1.8.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

Updates `kotlin-reflect` from 1.7.22 to 1.8.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:kotlin-allopen
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:kotlin-serialization
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin.android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-29 08:06:47 +00:00
Milos Kozak
9324f6da81
Merge pull request #2310 from Andries-Smit/wear/i11n-complication-and-status 
wear: i11n complication and status message
 2022-12-29 09:02:32 +01:00
Milos Kozak
c235f18ad7
Merge branch 'dev' into wear/extract-simple-ui 2022-12-29 09:01:17 +01:00
Milos Kozak
91993a5c2e
Merge pull request #2307 from Andries-Smit/wear/unify-watchface-layout 
Wear: unify watch face round and square layout
 2022-12-29 08:59:14 +01:00
Milos Kozak
7e91b37d1d
Merge pull request #2311 from dv1/combov2-fixes-001 
combov2: Fixes to Bluetooth permission checks, identical basal profile handling, pump errors
 2022-12-29 08:58:41 +01:00
Andries Smit
3daae537f1 wear: chore fine tune wf big chart dimensions 2022-12-29 00:14:22 +01:00
Carlos Rafael Giani
3887cc90ae combov2: Set enacted to true even if the basal profiles are identical 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2022-12-28 23:59:21 +01:00
Andries Smit
0fa80b5ffe chore: wear wf ConstraintLayout and depended dimensions 2022-12-28 23:50:09 +01:00
Carlos Rafael Giani
e60e9a21cc combov2: Re-run Bluetooth connection attempts if permissions are missing 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2022-12-28 23:01:29 +01:00
Carlos Rafael Giani
6b989ec7aa combov2: Consider pump as uninitialized for a while after an error occurred 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 2022-12-28 23:01:29 +01:00
Andries Smit
b58588daea wear: i11n complication and status message 2022-12-28 22:00:17 +01:00
Milos Kozak
b39f5a3672 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2022-12-28 20:17:11 +01:00
Milos Kozak
d9c6cd6342 NSCv3: process Food, first load based on created_at 2022-12-28 20:17:04 +01:00
Milos Kozak
74c6d9c801
Merge pull request #2309 from Andries-Smit/docs/update-url 
chore: update docs base URL
 2022-12-28 19:27:10 +01:00
Andries Smit
5c432c350c chore: update docs base URL 2022-12-28 19:18:29 +01:00
Andries Smit
c287917a90 wear: chore extract simple UI in util class 2022-12-28 18:27:57 +01:00
Milos Kozak
87a0cb1923
Merge pull request #2303 from jbr7rr/fix-libre-recalc-sync 
Fix recalculated data time sync
 2022-12-28 17:55:19 +01:00
jbr7rr
b25204dfe1 Fix typo 2022-12-28 15:18:21 +01:00
jbr7rr
fc6cba93f3 Merge remote-tracking branch 'nightscout/dev' into fix-libre-recalc-sync 2022-12-28 14:27:06 +01:00
jbr7rr
07684a1e14 Moved tests for referenceTime to separate function. 
Added additional testcase
 2022-12-28 13:48:45 +01:00
jbr7rr
0e357d968c Better fix for adjustToReferenceTime() 2022-12-28 13:33:54 +01:00
jbr7rr
d863f5d660 Corrected calculation in assert 2022-12-28 13:02:36 +01:00
Milos Kozak
10e8e32e3b remove unused code 2022-12-28 13:01:25 +01:00