Commit graph

466 commits

Author SHA1 Message Date
Milos Kozak
ac333f6968
Merge pull request #2623 from jbr7rr/medtrum-stage
Medtrum Nano
2023-08-09 13:46:46 +02:00
jbr7rr
9c34e15076 Revert "Overview model: RequireActivity instead of fragment"
This reverts commit d93cc51819.
2023-08-08 18:16:25 +02:00
jbr7rr
8647db878c Fix bolusStop(), some refactoring 2023-08-08 16:16:27 +02:00
jbr7rr
30c1c16cd0 disconnect on force deactivation when pump in error state 2023-08-06 14:21:21 +02:00
jbr7rr
826b0f3d8c Use medtrum icon 2023-08-05 15:58:10 +02:00
jbr7rr
fe9be2bbfa Only do connectNewPump() on sn change, only allow sn change when no patch is activated 2023-08-04 10:47:52 +02:00
Milos Kozak
bf97c405d7
Merge pull request #2647 from dv1/combov2-fixes-001
combov2: Set the bolusDelivered value when a bolus delivery is finished
2023-08-04 10:29:53 +02:00
jbr7rr
c738b1001f Implement tdd capability 2023-08-03 20:02:13 +02:00
Milos Kozak
d2711135db use SecureRamdom() 2023-08-03 16:14:12 +02:00
Milos Kozak
1d6a48d01d DanaR: reset status when CHECK_VALUE not received 2023-08-03 15:34:52 +02:00
Carlos Rafael Giani
d85fd9e8fe combov2: Set the bolusDelivered value when a bolus delivery is finished
Fixes https://github.com/nightscout/AndroidAPS/issues/2594
2023-08-03 14:58:13 +02:00
Milos Kozak
870aaa2032 gradle:8.1.0 2023-07-31 10:21:06 +02:00
jbr7rr
75f225fba2 Show toast when profile is not set 2023-07-21 08:54:30 +02:00
jbr7rr
1d58d85a71 Make incoming packets more readable in logs 2023-07-21 08:39:58 +02:00
jbr7rr
c0f1fcda0f Loosen time diff allowance 2023-07-21 06:42:56 +02:00
jbr7rr
3ce566ca7c Fix build 2023-07-21 06:42:15 +02:00
jbr7rr
f525c62410 Merge remote-tracking branch 'nightscout/dev' into medtrum-test1 2023-07-21 06:39:48 +02:00
Milos Kozak
4ff17a194c Gradle 8 2023-07-19 15:04:25 +02:00
Milos Kozak
8a458954a8 remove jacoco-android plugin in favor of jacoco-core 2023-07-19 13:53:43 +02:00
Milos Kozak
51b754e5b5
New Crowdin updates (#2618)
* New translations strings.xml (French)

* Update source file strings.xml

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations objectives.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations objectives.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 (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* New translations objectives.xml (Turkish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations objectives.xml (Portuguese, Brazilian)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Hebrew)

* 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 (French)
2023-07-18 11:13:07 +02:00
jbr7rr
da1319e7bf Add settings protection for change patch 2023-07-18 08:03:25 +02:00
jbr7rr
850f72924b Fix data comes from another pump after activation 2023-07-17 20:34:27 +02:00
jbr7rr
6a6af81ef7 Insert Announcement on pump alarm 2023-07-17 19:10:09 +02:00
jbr7rr
966939a9de Fix unit test, cleanup 2023-07-16 11:59:36 +02:00
jbr7rr
41f51d26c0 Revert unintended change 2023-07-16 11:11:33 +02:00
jbr7rr
3f88e05898 Merge remote-tracking branch 'nightscout/dev' into medtrum-test1 2023-07-16 11:08:21 +02:00
jbr7rr
c0819cda06 get correct serial number in password reset 2023-07-16 10:59:34 +02:00
Milos Kozak
36f15102fe Combov2: fix string 2023-07-15 11:37:23 +02:00
Milos Kozak
fc1a471412 lints, cleanup 2023-07-15 11:21:29 +02:00
Milos Kozak
e3207405e8 guava_version 2023-07-15 11:17:56 +02:00
jbr7rr
f66afc8c02 Confirmation dialog for activation/deactivation cancel 2023-07-13 09:35:40 +02:00
jbr7rr
d93cc51819 Overview model: RequireActivity instead of fragment 2023-07-13 08:30:28 +02:00
jbr7rr
f24c872415 Set expiry to 72 hours 2023-07-11 15:37:18 +02:00
jbr7rr
2d8288d8d9 Add disconnecting state to make sure we don't get commands during disconnect 2023-07-11 15:32:26 +02:00
jbr7rr
a7d7f373de Fix bolus not properly updating for short bolus 2023-07-11 14:54:40 +02:00
Milos Kozak
37df642c50
New Crowdin updates (#2595)
* New translations strings_alarm.xml (Norwegian)

* New translations strings_alarm.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings_alarm.xml (Russian)

* New translations strings_alarm.xml (Russian)

* New translations strings_alarm.xml (Russian)

* New translations strings.xml (Russian)
2023-07-11 12:05:51 +02:00
jbr7rr
dda7fa6086 Use correct message for patch start time and patch age 2023-07-10 19:58:34 +02:00
jbr7rr
fb62b0d90c Removed unused code 2023-07-10 19:09:14 +02:00
jbr7rr
b3a83a720d Only show reset alarms when it's needed 2023-07-09 16:47:23 +02:00
jbr7rr
592a45612c Fix calling syncStopTemporaryBasalWithPumpId() twice 2023-07-09 09:47:58 +02:00
miyeongkim
a3577304ba
Merge branch 'nightscout:dev' into dev 2023-07-06 17:48:43 +09:00
miyeongkim
44e878d33b bolus progress changes on pump version 3.52 above.
pump notify progress during bolus
2023-07-06 17:43:56 +09:00
miyeongkim
7e6da9323b tempbasal will be applied without confirm(otp) on pump version 3.52 above 2023-07-05 10:02:33 +09:00
jbr7rr
c941926a7e Workaround for 0 duration TBR end not syncing 2023-07-02 21:00:27 +02:00
jbr7rr
09aa78f1d1 Recovery option when patch activation process is interrupted 2023-07-01 20:46:29 +02:00
jbr7rr
af7e38a6db Buttons with Icons in overview 2023-07-01 17:35:43 +02:00
jbr7rr
f52726128a Minor fixes;
Allow set of fake TBR when 0 temp is already running,
Automatically force deactivation when patch is in error state
2023-07-01 12:28:01 +02:00
jbr7rr
93dee4eb3c Only update time when diff 2023-06-27 20:19:49 +02:00
jbr7rr
345ae0f9b2 Early return on setBolus failure 2023-06-27 13:27:21 +02:00
jbr7rr
94e6189ab3 Add sendMessage retry counter, cleanup old comments 2023-06-27 12:56:54 +02:00
jbr7rr
ef2cc13dd8 Fix unit tests, small improvements 2023-06-26 20:44:14 +02:00
jbr7rr
19b9ca1da4 Automatic timeZone and DST handling 2023-06-25 21:52:01 +02:00
jbr7rr
201fb5768a Cleanup 2023-06-25 12:29:49 +02:00
jbr7rr
ac8b5b4a05 Confirmation dialog before activation 2023-06-25 10:51:12 +02:00
jbr7rr
895cf54a17 Implemented proper activation and deactivation screens 2023-06-25 10:21:47 +02:00
jbr7rr
3ffb78a7e8 Fix ANR, optimize write delay 2023-06-23 11:42:45 +02:00
jbr7rr
e9964604a1 Sync bolus initially when bolus command is accepted by pump 2023-06-22 18:55:58 +02:00
jbr7rr
17aecd912a Remove SynchronizePacket from some operations to improve stability 2023-06-22 16:02:19 +02:00
jbr7rr
bc8876b6dd BLEComm: Synchronize read and writes better 2023-06-20 12:00:04 +02:00
jbr7rr
2302711cdf Additional Notifications, handling sync of percentage TBR 2023-06-20 09:30:41 +02:00
jbr7rr
057b2e386e Add alarm states, show active alarms in overview 2023-06-18 20:36:44 +02:00
jbr7rr
996ef8e5ef Implement getJSONStatus() and shortStatus() 2023-06-17 15:29:35 +02:00
jbr7rr
082b365520 Added more info to overview 2023-06-17 08:44:04 +02:00
jbr7rr
c0138ffad8 Add lastConnection and expiry to overview 2023-06-16 21:12:33 +02:00
jbr7rr
7b53630947 Add Clear alarms, new overview layout 2023-06-16 21:12:33 +02:00
jbr7rr
cbc5a51f2c Merge remote-tracking branch 'nightscout/dev' into medtrum-test1 2023-06-16 21:02:26 +02:00
jbr7rr
3a33f46e2f Fix wrong notifications, and error on load 2023-06-15 18:52:55 +02:00
Milos Kozak
a5774b6e2e EOPATCH: rollback specialEnableCondition change 2023-06-14 18:13:09 +02:00
Milos Kozak
e27c510f75
New Crowdin updates (#2571)
* New translations strings.xml (Korean)

* New translations strings_alarm.xml (Romanian)

* New translations strings_alarm.xml (French)

* New translations strings_alarm.xml (Spanish)

* New translations strings_alarm.xml (Afrikaans)

* New translations strings_alarm.xml (Bulgarian)

* New translations strings_alarm.xml (Catalan)

* New translations strings_alarm.xml (Czech)

* New translations strings_alarm.xml (Danish)

* New translations strings_alarm.xml (German)

* New translations strings_alarm.xml (Greek)

* New translations strings_alarm.xml (Irish)

* New translations strings_alarm.xml (Hebrew)

* New translations strings_alarm.xml (Hungarian)

* New translations strings_alarm.xml (Italian)

* New translations strings_alarm.xml (Japanese)

* New translations strings_alarm.xml (Korean)

* New translations strings_alarm.xml (Lithuanian)

* New translations strings_alarm.xml (Dutch)

* New translations strings_alarm.xml (Norwegian)

* New translations strings_alarm.xml (Polish)

* New translations strings_alarm.xml (Portuguese)

* New translations strings_alarm.xml (Russian)

* New translations strings_alarm.xml (Slovak)

* New translations strings_alarm.xml (Swedish)

* New translations strings_alarm.xml (Turkish)

* New translations strings_alarm.xml (Chinese Simplified)

* New translations strings_alarm.xml (Portuguese, Brazilian)

* New translations strings_alarm.xml (Croatian)

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

* New translations strings_alarm.xml (Spanish)

* New translations strings_alarm.xml (Czech)

* New translations strings_alarm.xml (French)

* New translations strings_alarm.xml (French)

* New translations strings_alarm.xml (Slovak)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

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

* New translations strings.xml (Slovak)

* New translations strings.xml (Turkish)

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings_alarm.xml (Turkish)

* New translations strings_alarm.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings_alarm.xml (Italian)
2023-06-14 11:47:51 +02:00
jbr7rr
49de6a9c32 Add settings, and setting sync with pump 2023-06-13 21:42:05 +02:00
jbr7rr
419def7f6b Notifications and fake TBR on state changes 2023-06-13 13:35:08 +02:00
jbr7rr
8caeb4a3e0 add loadEvents(), small improvements 2023-06-11 13:37:59 +02:00
jbr7rr
e568ab399f Force always to go to prepare patch on activation 2023-06-10 08:10:07 +02:00
dependabot[bot]
880029713e
chore(deps): bump com.google.guava:guava from 32.0.0-jre to 32.0.1-jre
Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.0-jre to 32.0.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-09 08:57:12 +00:00
jbr7rr
0ce25c1190 Make sure patch can be primed when already filled before activation 2023-06-08 22:22:42 +02:00
jbr7rr
ecb2c977ec Alarm on pump suspended states 2023-06-08 15:48:32 +02:00
jbr7rr
3ae145524c Don't move patchStep when there is no connection 2023-06-08 14:25:25 +02:00
jbr7rr
bad4d7a7f4 Improve activation flow 2023-06-08 11:27:55 +02:00
Milos Kozak
306406733c
New Crowdin updates (#2563)
* New translations strings.xml (French)

* New translations objectives.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations protection.xml (Russian)

* Update source file strings.xml

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Korean)

* 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 (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 (Portuguese, Brazilian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Hebrew)

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

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)
2023-06-05 13:07:08 +02:00
jbr7rr
6ccfb734d7 Only update lastDataTime on successful readStatus 2023-06-04 17:33:33 +02:00
jbr7rr
9860c7aac3 Improve tbr syncing 2023-06-02 21:27:45 +02:00
Milos Kozak
cd9f5e4723
Merge pull request #2549 from jbr7rr/dash-handle-tbr-out-of-sync
DASH: handle tbr out of sync
2023-06-01 14:32:44 +02:00
Milos Kozak
29410ecb03
Merge pull request #2554 from jbr7rr/dash-fix-race-condition-on-disconnect
DASH: Fix race condition on dash disconnect
2023-06-01 14:31:42 +02:00
jungsomyeonggithub
c07a155424 bug fix 2023-06-01 19:23:31 +09:00
jbr7rr
4a1eded8e5 Added extra checks and logging 2023-06-01 08:54:40 +02:00
jbr7rr
aadf40b6fb Fix time in getHourlyBasalFromMedtrumProfileArray() 2023-05-30 13:05:32 +02:00
jbr7rr
cd65639abb Only update basal from Notification when it has changed 2023-05-29 20:05:21 +02:00
jbr7rr
3c8faa6723 Use timeout in connect states, other minor changes 2023-05-29 14:40:08 +02:00
dependabot[bot]
c9fcdb13b2
chore(deps): bump com.google.guava:guava from 31.1-jre to 32.0.0-jre
Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-29 08:57:53 +00:00
jbr7rr
37a6a4f271 Update unit tests, cleanup 2023-05-28 19:50:00 +02:00
jbr7rr
d8427c6d56 Rescan when connection is lost during connecting 2023-05-28 10:27:13 +02:00
jbr7rr
5a6d5b41d4 Added some stuff to the overview 2023-05-25 20:14:51 +02:00
jbr7rr
404365aed2 Merge remote-tracking branch 'nightscout/dev' into medtrum-activate-patch2 2023-05-25 15:48:13 +02:00
jbr7rr
c2e1017d73 Moved sequence counter to BLEComm 2023-05-25 14:53:53 +02:00
jbr7rr
3027c2ffa5 Initial bolus implementation, further connection improvements 2023-05-25 13:32:24 +02:00
jbr7rr
a9ebdcfe68 Connection improvements, TBR sync improved 2023-05-23 10:20:22 +02:00
jbr7rr
d5647ce021 Fix race condition on dash disconnect 2023-05-22 20:06:59 +02:00
Yury Pshenichny
a76d2f97e2 Skipped creation of "dummy cancel temp basal" records for temp basals which are already paired with real cancels 2023-05-22 18:09:05 +03:00
jbr7rr
0d8f07ad0a Initial TBR implementation and pumpSync for basals etc 2023-05-20 20:40:55 +02:00
jbr7rr
cd3869ea07 Move verifyPumpState to its own function, cleanup 2023-05-19 16:54:32 +02:00