Commit graph

4214 commits

Author SHA1 Message Date
AdrianLxM
5826084cf9 capitalization fix 2019-03-02 19:22:56 +01:00
Milos Kozak
987b3d9dd0 move dstPlugin to contraints package 2019-03-02 15:13:42 +01:00
Milos Kozak
e27c0c4b8b Merge branch 'DstHelperPlugin' of https://github.com/PoweRGbg/AndroidAPS into PoweRGbg-DstHelperPlugin 2019-03-02 15:07:48 +01:00
Milos Kozak
e67e431526
Merge pull request #1649 from TebbeUbben/patch-1
Disable engineering mode for Insight
2019-03-02 14:44:43 +01:00
Milos Kozak
5938c5659b Pumpcontrol icon 2019-03-02 14:37:53 +01:00
Tebbe Ubben
82bbf17f0e
Update MainApp.java 2019-03-02 12:18:06 +01:00
Milos Kozak
d9a9c933bc package refactor 2019-02-28 23:16:50 +01:00
Milos Kozak
fa3d66ff8e
Merge pull request #1645 from jotomo/smb-parent-pref
Bugfix: only allow SMB if parent preference is enabled.
2019-02-28 16:30:56 +01:00
Johannes Mockenhaupt
9c14e4eadd
Bugfix: only allow SMB if parent preference is enabled. 2019-02-28 12:41:51 +01:00
Milos Kozak
395faa7dc9 pumps package refactor 2019-02-26 20:38:27 +01:00
Milos Kozak
e3e0a44d72 fix TBR formating in fragment 2019-02-25 20:18:10 +01:00
Milos Kozak
3287129eef SP::putDouble 2019-02-25 20:17:02 +01:00
Milos Kozak
3d3fcde35d Query for profile only once 2019-02-25 20:12:31 +01:00
Milos Kozak
86b494229e Fix graph scale with no data 2019-02-25 20:11:21 +01:00
Milos Kozak
94d96cbc80 Use memory records for glucose data instead of DB 2019-02-25 20:10:38 +01:00
Milos Kozak
c122618317 use key_smbmaxminutes instead of string 2019-02-25 20:08:34 +01:00
Milos Kozak
337d350ce2 Use memory record for lastBg instead of DB query 2019-02-25 20:04:29 +01:00
Milos Kozak
b0dd2f464b Insight driver (Sight remote) removal 2019-02-25 19:33:01 +01:00
Milos Kozak
c94dda1f0a
Merge branch 'dev' into ench_1455_custom_actions 2019-02-22 15:27:00 +01:00
Andy Rozman
b0fe8fc5aa Merge branch 'dev' into ench_1455_custom_actions 2019-02-20 23:41:09 +00:00
Andy Rozman
8b3b1e67ea First implementation 2019-02-20 22:57:31 +00:00
Milos Kozak
582101a3e9
Merge pull request #1639 from MilosKozak/fixes
Fix applying basal constraints in non APS mode
2019-02-19 18:24:16 +01:00
Milos Kozak
95297a6292 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-02-19 16:26:35 +01:00
Milos Kozak
1f3696608e Tomato BGSource plugin 2019-02-19 16:26:16 +01:00
TebbeUbben
71f73210c9 Send dismiss event in main thread 2019-02-17 22:02:51 +01:00
TebbeUbben
8f7a29bd7a Only show notification after three timeouts during handshake 2019-02-17 22:01:01 +01:00
TebbeUbben
5fb0fe62f4 Remove timeout during handshake notification when connection was successful 2019-02-17 21:58:17 +01:00
TebbeUbben
361cc158e8 Timeout during handshake notification 2019-02-16 20:28:49 +01:00
TebbeUbben
d2b0665af1 Merge branch 'master' into insight-dev2 2019-02-12 15:01:29 +01:00
TebbeUbben
e49cc10e1c Log exceptions that occur in alert service 2019-02-12 14:57:14 +01:00
TebbeUbben
a4312acb3e Incremental recovery duration 2019-02-12 14:54:27 +01:00
TebbeUbben
c564cc2214 Reuse socket of failed connection 2019-02-12 14:36:56 +01:00
TebbeUbben
ee704c3988 Merge branch 'master' into insight-dev 2019-02-10 00:05:43 +01:00
TebbeUbben
4a11723a61 Fix zero-temp for pump stopped periods 2019-02-10 00:03:59 +01:00
TebbeUbben
7a4d721c29 Fix bolus progress dialog with bolus cancel 2019-02-09 23:50:12 +01:00
TebbeUbben
4146c8a770 Don't send final bolus event after bolus cancel 2019-02-09 23:14:57 +01:00
TebbeUbben
a8a182dc9d Change way of checking operating mode during bolus delivery 2019-02-09 23:12:36 +01:00
TebbeUbben
0b1e181662 Quick wizard fix 2 2019-02-09 23:06:11 +01:00
TebbeUbben
05aa369bae Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
2019-02-09 22:52:01 +01:00
TebbeUbben
f5d65e044c Fix wear bolus for Insight 2019-02-09 22:49:38 +01:00
TebbeUbben
7035b9a5f2 Fix Quick Wizard for Insight pump 2019-02-09 22:47:45 +01:00
TebbeUbben
2ad4670f07 Refresh overview when pump is unpaired 2019-02-09 22:43:05 +01:00
TebbeUbben
7a7bebc5fe Return false in isConnected and isConnecting when connection lock is not held. 2019-02-09 22:30:41 +01:00
TebbeUbben
317f171286 Fetch pump status after pairing 2019-02-09 22:25:07 +01:00
TebbeUbben
baac836d64 Don't read past history events when pump is newly paired. 2019-02-09 22:14:10 +01:00
TebbeUbben
e4fd293027 Stop fetching bolus progress when pump has switched operating mode
(e.g. because of an empty cartridge)
2019-02-09 22:08:49 +01:00
TebbeUbben
c5241b6cad Remove unneeded variable 2019-02-09 22:04:09 +01:00
Milos Kozak
f540c70f22 Merge branch 'dev' into G6 2019-02-08 19:11:38 +01:00
TebbeUbben
c730d3244f Log app error codes 2019-02-04 23:56:24 +01:00
TebbeUbben
183e9a321e Add getReservoirLevel() and getBatteryLevel() to LocalInsightPlugin 2019-02-02 17:02:03 +01:00
TebbeUbben
cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +01:00
Milos Kozak
5988910d2c Merge branch 'insight' into dev 2019-02-02 12:56:33 +01:00
AdrianLxM
3c029906db
Merge pull request #1593 from MilosKozak/AdrianLxM-patch-1
Wear bug with Insight-pump: ignore rounding deviations
2019-02-02 12:31:37 +01:00
TebbeUbben
71c4c411b2 Fix race condition for bolus cancel 2019-02-02 11:41:16 +01:00
TebbeUbben
a282124497 Return pump enact failure when base basal ist 0 duration execution of setTempBasalAbsolute 2019-02-02 01:38:01 +01:00
TebbeUbben
1ffd63c83a Hide operating mode button by default 2019-02-02 01:14:27 +01:00
TebbeUbben
b0f72fc736 Only update first basal profile 2019-02-02 01:11:26 +01:00
TebbeUbben
9b45c6b291 Only enable Insight driver in engineering mode 2019-01-31 13:09:40 +01:00
TebbeUbben
d1f7086651 Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
2cde70e584 Update status of final bolusing event as well 2019-01-30 20:37:35 +01:00
TebbeUbben
827d26a39a Insight history fix 2019-01-30 20:25:48 +01:00
TebbeUbben
e23657bfe5 Set alertActivity to null onDestroy 2019-01-27 23:02:57 +01:00
TebbeUbben
68f4a20c2b Final bolusing event 2019-01-27 16:40:56 +01:00
TebbeUbben
0c93679ed2 Fix initial EventOverviewBolusProgress 2019-01-26 09:32:29 +01:00
TebbeUbben
5475d9bceb Withdraw connection request when deleting pairing 2019-01-25 22:55:15 +01:00
TebbeUbben
53f7cf0dcf Revert "Improve connection routine"
This reverts commit 8116a24
2019-01-25 22:53:35 +01:00
TebbeUbben
8116a24fc6 Improve connection routine 2019-01-25 22:32:22 +01:00
TebbeUbben
ffc1db3c95 Add short status 2019-01-25 22:28:36 +01:00
TebbeUbben
6ac02f96cb Fix NullPointerException 2019-01-22 13:55:38 +01:00
TebbeUbben
f6d829e575 Fix silent alert canceling 2019-01-19 15:18:41 +01:00
TebbeUbben
7724092843 Fix TBR logging 2019-01-19 15:15:56 +01:00
TebbeUbben
eb96209950 Disable old Insight driver 2019-01-19 11:59:17 +01:00
TebbeUbben
258034ca8d Don't refresh status twice when setting TBR
Return duration in TBR PumpEnactResult
2019-01-19 11:54:05 +01:00
TebbeUbben
2a126783b7 Upload JSON status 2019-01-19 06:31:11 +01:00
TebbeUbben
356feb5be0 Only cancel TBR if needed 2019-01-19 06:09:11 +01:00
TebbeUbben
f0a2307517 Fix race condition in alert service 2019-01-19 05:36:02 +01:00
TebbeUbben
437dee288e Make TBR emulation setting working 2019-01-19 05:02:00 +01:00
TebbeUbben
65400560dd Properly show TBR duration in fragment 2019-01-19 03:08:14 +01:00
TebbeUbben
4d213eae7d Fix disconnect routine 2019-01-19 00:58:08 +01:00
TebbeUbben
cc364a0cec Read configuration for getting active basal profile instead of using status result 2019-01-19 00:47:32 +01:00
TebbeUbben
f27ace7568 Fix PumpStoppedException while fetching status 2019-01-19 00:43:58 +01:00
TebbeUbben
85ae946296 Indicate in fragment if cartridge is not inserted 2019-01-19 00:41:29 +01:00
TebbeUbben
58a8845ec3 Don't update fragment of destroying view 2019-01-18 23:44:26 +01:00
TebbeUbben
2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
AdrianLxM
11b8b83651
ignore rounding deviations 2019-01-04 19:27:44 +01:00
Milos Kozak
2b9b3b4f16 Eversense support 2018-12-11 21:56:57 +01:00
Nico Schmitz
9e03f0f8ca Update to current dev branch 2018-12-11 14:51:26 +01:00
Milos Kozak
8610dcc21d G5 2018 app version support 2018-12-10 19:35:01 +01:00
Milos Kozak
40ad066346 Fix applying basal constraints in non APS mode 2018-12-09 10:45:56 +01:00
triplem
2693797bbd fix duplication of resume and reconnect 2018-12-07 22:36:22 +01:00
TebbeUbben
e075a73c87 Add unit to Careportal bgcheck entries 2018-12-01 16:52:46 +01:00
TebbeUbben
dfe1e032be Complete G6 plugin 2018-12-01 16:51:12 +01:00
Milos Kozak
a4c690e7c2 G6 register plugin 2018-12-01 10:51:53 +01:00
Milos Kozak
d664136b6e G6 overview button support 2018-12-01 00:26:04 +01:00
Milos Kozak
946b2bfd12 Initial G6 support 2018-12-01 00:16:15 +01:00
Milos Kozak
d750438cd3
Merge pull request #1488 from schmitzn/fix-switem
Simplify SWItem.generateLayout()
2018-11-29 15:25:38 +01:00
Milos Kozak
b8a83216a7
Merge pull request #1556 from gregorybel/gregorybel-android-auto3
Gregorybel: Add android auto
2018-11-29 15:24:31 +01:00
Milos Kozak
b1606d2452
Merge pull request #1551 from triplem/pr_1550
Total Basal in NS Profile
2018-11-25 22:40:03 +01:00
gregorybel
a23b820f3e create 3 special lines for android auto in order to simplify view and give a more natural text to speech 2018-11-19 22:16:47 +01:00
Milos Kozak
b6cd214006
Merge pull request #1562 from MilosKozak/fixes
Fixes
2018-11-19 19:55:34 +01:00