Commit graph

12949 commits

Author SHA1 Message Date
Andrei Vereha 1018a41346 Merge remote-tracking branch 'upstream/dev' into avereha/conn 2021-06-26 15:21:40 +02:00
Andrei Vereha 4755d749d1
Merge pull request #53 from 0pen-dash/avereha/fixes-v2
Avereha/fixes v2
2021-06-26 15:11:26 +02:00
Andrei Vereha cb45e51b99 add logging. try to prevent race condition 2021-06-26 15:06:57 +02:00
Andrei Vereha b9acc21633 update notifications 2021-06-26 11:40:01 +02:00
Andrei Vereha 2a35c60e81 notification on pod suspend. try to getpodstatus on activecommands 2021-06-26 11:10:27 +02:00
Andrei Vereha c803f6504b add both INSULIN and CANULA change 2021-06-25 23:34:38 +02:00
Andrei Vereha 80c24a23dc do not display last connection if the pod is not activated 2021-06-25 23:26:38 +02:00
Andrei Vereha 4e4cc4cdfa pumpSync on new pod 2021-06-25 22:39:05 +02:00
Andrei Vereha 8f5ecfd0d6 restart service discovery 2021-06-25 22:14:05 +02:00
Andrei Vereha a62b5f7f70 dismiss notifications 2021-06-25 21:50:25 +02:00
Andrei Vereha 989a20d023 less notifications on unconfirmed commands when switching profile 2021-06-25 21:38:01 +02:00
Andrei Vereha efd3acbb2a save tx after setting basal. save basal in pod state when the basal command is confirmed 2021-06-25 20:52:32 +02:00
Andrei Vereha d882428cc0 set timezone 2021-06-25 19:45:38 +02:00
Andrei Vereha 26de3376d2
Merge pull request #52 from vanelsberg/tvelsberg-fixes-v2
Fixing Podstate loading, expiry calculation, and Pos times on overview
2021-06-25 19:20:03 +02:00
Theo van Elsberg b82d9cf457 - Redo Pod expiry datetime based on activation time 2021-06-25 14:37:54 +02:00
Theo van Elsberg 3ed9cd0f78 - Fixed loading PodState (failed to serialize)
- Moved Pod expiry time calculation to Pod Manager/PodState
- Show local date/time in overview (TODO: handle TZ)
2021-06-25 13:40:32 +02:00
Milos Kozak 71ada7203a Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-06-25 07:57:47 +02:00
Milos Kozak 93b5701a89 add diaconn for translations 2021-06-25 07:54:35 +02:00
Andrei Vereha 19ff58ac95 fix timeOnPod 2021-06-24 23:08:32 +02:00
Andrei Vereha 22d78f356b recover pod activation status when lost during activation 2021-06-24 22:37:29 +02:00
Andrei Vereha a3cacc75fe typo 2021-06-24 22:06:56 +02:00
Andrei Vereha c50757a2d1 getPumpStatus only if requested by user while the pod is not activated 2021-06-24 22:06:08 +02:00
Andrei Vereha 3c222f0500 recover active commands on start. Display deaction button after SET_UNIQUE_ID 2021-06-24 21:57:34 +02:00
Milos Kozak 2c964194d3
Merge pull request #578 from nightscout/dependabot/gradle/dev/com.google.firebase-firebase-crashlytics-gradle-2.7.1
Bump firebase-crashlytics-gradle from 2.7.0 to 2.7.1
2021-06-24 19:39:43 +02:00
Milos Kozak 7bb03c4c13
Merge pull request #580 from nightscout/diaconn
Diaconn
2021-06-24 19:34:22 +02:00
dependabot[bot] 80fe38bf93
Bump firebase-crashlytics-gradle from 2.7.0 to 2.7.1
Bumps firebase-crashlytics-gradle from 2.7.0 to 2.7.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 08:05:42 +00:00
Milos Kozak 626a1d22a7
Merge pull request #576 from miyeongkim/diaconn
Some Error fixed
2021-06-24 08:44:59 +02:00
Milos Kozak 33047e478d 2.8.2.2-dev 2021-06-23 22:43:18 +02:00
Milos Kozak a70f24a68a fix TherapyEvent upload 2021-06-23 22:33:58 +02:00
Andrei Vereha a9f49704d9 compile 2021-06-23 21:53:50 +02:00
Andrei Vereha e916290687 compile 2021-06-23 21:52:57 +02:00
Andrei Vereha e1337f0fb8 update overview 2021-06-23 21:50:58 +02:00
Milos Kozak 76641649ed Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-06-23 21:01:52 +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
miyeongkim 0050857973 1. 변수 이름 변경
2. 확장볼러스 에러 처리.
3. 에러메시지 추가
4. TDD 조회시 정렬 처리.
2021-06-23 11:08:29 +09:00
Andrei Vereha 2aeff0e92d disable notifications sound 2021-06-22 22:49:26 +02:00
Andrei Vereha 44c7747405 remove test 'active command' 2021-06-22 22:43:14 +02:00
Andrei Vereha e7cc35a132 Merge branch 'avereha/bolus' into avereha/notifications 2021-06-22 22:42:16 +02:00
Andrei Vereha ab9a59591d Merge branch 'avereha/bolus' into avereha/notifications 2021-06-22 22:36:52 +02:00
Andrei Vereha 6ee4ec1ae3 format 2021-06-22 22:36:35 +02:00
Andrei Vereha e51d071181 add notifications 2021-06-22 22:27:29 +02:00
Milos Kozak 8c8bd6360c
Merge pull request #567 from nightscout/travis
gradle update
2021-06-22 19:02:32 +02:00
Milos Kozak be7694c860
Merge pull request #572 from nightscout/dependabot/gradle/dev/byteBuddyVersion-1.11.5
Bump byteBuddyVersion from 1.11.3 to 1.11.5
2021-06-22 19:01:40 +02:00
Andrei Vereha a1d5b9eba6
Merge pull request #51 from vanelsberg/tvelsberg
Updating DASH Overview for "Time On Pod" and "Pod Expires"
2021-06-22 18:52:20 +02:00
Theo van Elsberg d8b9ae1036 Updating DASH Overview for "Time On Pod" and "Pod Expires" 2021-06-22 13:30:08 +02:00
dependabot[bot] 9bcbfa514b
Bump mockito-core from 3.11.1 to 3.11.2
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.1...v3.11.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-22 08:06:19 +00:00
miyeongkim ab26919f54 펌프기준으로 상태 확인처리 2021-06-22 15:06:59 +09:00
miyeongkim 57ceb9993d 1. 임시기저 설정/취소 진행 시 펌프의 임시기저 상태를 먼저 확인 후 동작되도록 처리
2. 확장볼러스 설정/취소 진행 시 펌프의 임시기저 상태를 먼저 확인 후 동작되도록 처리
3. 펌프에서 듀얼볼러스 진행 후 aps에서 실행 탭에서 취소시 듀얼 명령이 취소되도록 처리(기존은 square취소명령)
4. 패킷 sendMessage 이후 2초 버퍼 제거 (test)
2021-06-22 15:05:51 +09:00
Milos Kozak d0365afe89 fix Dana BLE model detection 2021-06-21 22:50:50 +02:00