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

4465 commits

Author SHA1 Message Date
Milos Kozak
dc0846eab9 ActionStopTempTarget 2019-04-01 22:36:15 +02:00
AdrianLxM
8604d41323
reformat code 2019-04-01 21:37:20 +02:00
AdrianLxM
98a3d64c41
Merge pull request #1704 from TebbeUbben/insight-fix 
Insight fix
 2019-04-01 09:36:10 +02:00
Milos Kozak
1e1c74f420 Fix SMS CAL command 2019-03-31 23:49:01 +02:00
Milos Kozak
5a555cdfba AutomationPlugin:processActions and some tweaking 2019-03-31 21:54:31 +02:00
Andy Rozman
3489f4a746 Merge branch 'medtronic_andy' of https://github.com/andyrozman/AndroidAPS into medtronic_andy 2019-03-31 20:13:14 +01:00
Andy Rozman
bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
Tebbe Ubben
2371034a49 Update basal profile precision handling in Insight driver v3 2019-03-31 20:26:31 +02:00
Tebbe Ubben
67fe402447 Update basal profile precision handling in Insight driver v2 2019-03-31 19:58:59 +02:00
Tebbe Ubben
e26f0fef3f Do not overwrite detailedBolusInfo.insulin 2019-03-31 19:38:31 +02:00
Tebbe Ubben
78a3224d05 Update basal profile precision handling in Insight driver 2019-03-31 19:36:58 +02:00
Tebbe Ubben
3894e44cc7 Fix Insight DST pump time update 2019-03-31 03:47:08 +02:00
rob
25950fc6cf Libre/miaomiao delta modifications 
* Remove hard limit of processing 9 records.  Processing will now stop
    at first value outside of time range of interest
  * Keep a list of all values within 2.5 minutes.  Average this value to use
    as the now value
  * Don't change the now value date.  Always use the time of the latest value
  * Added new test for data spaced at 1 minute intervals, to mimic libre data from glimp
  * Fix existing test results for average < 2.5 minute data. Deltas are different due to
    not updating the now value time
 2019-03-31 11:03:48 +10:00
Tebbe Ubben
4b86a07eac Set result.bolusDelivered in Insight driver 2019-03-31 01:39:08 +01:00
Tebbe Ubben
ae60d68719 Fix Insight limits 2019-03-31 01:37:28 +01:00
Tebbe Ubben
c12ec4817f Proper rounding for basal rate 2019-03-31 01:23:05 +01:00
Andy Rozman
4b144f282b Some compile fixes and translation problems. 2019-03-30 23:31:02 +00:00
Milos Kozak
350e23647e ActionStartTempTargetTest 2019-03-31 00:03:31 +01:00
Milos Kozak
bad6edfb8b Action:applyTest 2019-03-30 23:08:25 +01:00
Andy Rozman
eb85cd2588 Merge branch 'dev' into medtronic_andy 2019-03-30 22:06:43 +00:00
Milos Kozak
77dd32a14f ActionLoopSuspendTest 2019-03-30 22:47:22 +01:00
Andy Rozman
afcedc83d1 0.8.2 
- done some fixes according to Crashalytics (most common problem from last month)
- extended custom actions, to have enabled flag, and if entry is enabled=false button is not added. Added EventCustomActionsChanged event that can refresh custom actions
- #111 - do not put multiple statuses into queue
- #110 - set driver busy if wake up and tune is running
- #104 - when bolus is delivering driver is set to busy, and custom action was added to remove this block
 2019-03-30 18:36:50 +00:00
Milos Kozak
6357dd40d7 fix tests 2019-03-30 17:10:21 +01:00
Milos Kozak
cabdb1d2fb Merge branch 'dev' into automation 2019-03-30 15:47:23 +01:00
Milos Kozak
361ffa91c8 revert changes and disable test 2019-03-30 11:11:44 +01:00
Milos Kozak
bc23ca30e2 fix test 2 2019-03-30 10:04:22 +01:00
AdrianLxM
ebc8303cc6 isSuspended -> is NOT suspended 2019-03-28 22:13:57 +01:00
AdrianLxM
d856b87703 rewrite DST logic 2019-03-28 19:38:58 +01:00
Adrian AndroidAPS
cdd3c25929 only run DST helper on certain pumps 2019-03-28 17:25:57 +01:00
Nico Schmitz
9b19907388 Replace "lower" with "lesser" 2019-03-27 00:32:10 +01:00
Nico Schmitz
236349a063 Bugfixes. Add remove icon for actions. 2019-03-26 23:28:46 +01:00
Nico Schmitz
c6766c972c Fix AutomationEventTest 2019-03-26 22:56:17 +01:00
Nico Schmitz
dcb57ac11d Remove clone() for Trigger 2019-03-26 22:42:21 +01:00
Nico Schmitz
7b5c26bbb9 Remove clone() for AutomationEvent and Action 2019-03-26 22:37:19 +01:00
Nico Schmitz
e1523ee82d Introduce LayoutBuilder 2019-03-26 22:13:01 +01:00
Nico Schmitz
ba0625b03f Update to recent upstream/dev 2019-03-26 00:47:00 +01:00
Nico Schmitz
97a7a75c86 work on automation plugin 
- implement clone() methods for actions and triggers
- add AutomationEventTest
- improve ui
 2019-03-26 00:06:37 +01:00
Milos Kozak
0ee121d916
Merge pull request #1521 from MilosKozak/smsrefactor 
Smsrefactor
 2019-03-25 08:41:09 +01:00
Milos Kozak
a0bddbdec9
Merge pull request #1690 from jotomo/show-applied-max-iob-constraints 
OpenAPSSSMBPlugin: show applied max IOB constraints.
 2019-03-24 23:01:57 +01:00
Johannes Mockenhaupt
9dc02e3fa5
OpenAPSSSMBPlugin: show applied max IOB constraints. 2019-03-24 22:01:21 +01:00
Nico Schmitz
fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Milos Kozak
a060af8b0e SmsCommunicator separator 2019-03-22 22:53:16 +01:00
Milos Kozak
fdbb76cb92 SmsCommunicator show COB 2019-03-22 22:45:41 +01:00
Milos Kozak
ca3c6b4093 SmsCommunicator detect commands 2019-03-22 22:18:51 +01:00
Nico Schmitz
f017b7a7a2 Work on automation plugin. 
- Remove unused imports
- Add icons for actions and triggers
 2019-03-21 23:38:56 +01:00
Milos Kozak
b7b9e175eb Merge branch 'dev' into smsrefactor 2019-03-21 22:12:08 +01:00
Milos Kozak
fcc4a4edd3 SmsCommunicatorPluginTest 12 2019-03-21 21:54:46 +01:00
Milos Kozak
a9992503f6 SmsCommunicatorPluginTest 10 2019-03-21 21:00:42 +01:00
Milos Kozak
751e87ca5e
Merge pull request #1688 from AdrianLxM/dev-wear 
Dev wear
 2019-03-21 10:52:14 +01:00
Nico Schmitz
6dc87db73e Improve EditEventDialog 2019-03-21 00:38:06 +01:00
Milos Kozak
30bfa1ca1f SmsCommunicatorPluginTest 9 2019-03-20 23:12:07 +01:00
Nico Schmitz
87cf62e8f6 Refactoring. Fixes for screen rotation. 2019-03-20 23:09:46 +01:00
Nico Schmitz
c074ec36c4 Implement temp target dialog for automation action 2019-03-20 00:39:00 +01:00
Milos Kozak
381ae67829
Merge pull request #1420 from tanja3981/improvement/#1269 
[2.0] Improvement: Allow some objectives to go back.
 2019-03-19 23:42:38 +01:00
Nico Schmitz
91e4b01f10 Display actions and merge recent upstream/dev 
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
 2019-03-19 19:08:46 +01:00
AdrianLxM
d4d499587b Merge remote-tracking branch 'andyremote/wear_upgrade' into dev-wear 2019-03-18 23:51:20 +01:00
Milos Kozak
db1a6bc71e wait for finished calculations instead of acting on new BG 2019-03-18 20:59:39 +01:00
Milos Kozak
18ba5878d2 Fix1660 2019-03-17 18:51:16 +01:00
Milos Kozak
546f99f471 SmsCommunicatorPluginTest 6 2019-03-13 23:30:41 +01:00
Milos Kozak
74391eefdc SmsCommunicatorPluginTest 5 2019-03-13 21:10:52 +01:00
Milos Kozak
4c0554f61a SmsCommunicatorPluginTest 4 2019-03-13 19:35:48 +01:00
Milos Kozak
11ee9f54c3 Merge branch 'dev' into smsrefactor 2019-03-13 19:22:02 +01:00
Milos Kozak
826497c9f6 Fix superbolus test & allow APS plugin to be constraint 2019-03-13 18:50:37 +01:00
Milos Kozak
bb5cec95ea SmsCommunicatorPluginTest 3 2019-03-13 14:33:28 +01:00
Andy Rozman
b1baaf48f5 remove wear warning 2019-03-12 23:57:57 +00:00
Andy Rozman
f7c4db35b5 Merge branch 'dev' into wear_upgrade 2019-03-12 22:46:38 +00:00
Milos Kozak
b24217491b SmsCommunicatorPluginTest 1 2019-03-12 22:58:04 +01:00
Tanja Schmidt
dc89d0dfcf Fixed: Use bage instead of pgage variable for coloring the battery age. 2019-03-12 21:30:23 +01:00
Milos Kozak
bb22b00245 AuthRequestTest 2019-03-12 19:55:47 +01:00
Milos Kozak
f6d85bdd96 correct wakelock in iob calculation 2019-03-12 11:31:21 +01:00
Milos Kozak
e1a82cc78e SMS eleminate I and l from passcode 2019-03-11 18:33:43 +01:00
Milos Kozak
b9ea583d3d SMS read status after bolus 2019-03-11 18:29:43 +01:00
Andy Rozman
0c27b8c6e3 fixing OverviewFragment 2019-03-10 22:24:38 +00:00
Andy Rozman
6fcb1ce230 Medtronic 0.8.1-SNAPSHOT 
- wear changes
- refactoring of decoder
- started work on bolus, tbr, resumes
 2019-03-10 19:08:54 +00:00
Milos Kozak
c7c3506b53 SMS PROFILE command 2019-03-10 07:59:14 +01:00
Milos Kozak
f30f4cbee2 SMS code cleanup 2019-03-09 18:46:22 +01:00
Milos Kozak
53721d5d2c SMS Plugin extended bolus support 2019-03-09 09:52:58 +01:00
Andy Rozman
8594525d2c Merge branch 'dev' into ench_1455_custom_actions 2019-03-08 23:49:56 +00:00
Milos Kozak
79b6bc6c43 SMS Plugin allow duration in basal command 2019-03-08 23:56:35 +01:00
Milos Kozak
56f977df3c SMS Plugin allow basal in % 2019-03-08 23:48:41 +01:00
Milos Kozak
95da55724e SMS Plugin show ignored too 2019-03-08 23:30:25 +01:00
Milos Kozak
592d04af1d
Merge pull request #1669 from harispoljo/feature-TTRunLoop 
[Enhancement] Run loop when TemporyTarget is changed
 2019-03-08 23:16:09 +01:00
Milos Kozak
9e2cb7d047 allow any non letter for SMS to ignore command 2019-03-08 23:01:33 +01:00
Milos Kozak
1eea170ead SMS Plugin correct response for % TBR 2019-03-08 22:07:20 +01:00
Milos Kozak
6ea49f17bc SMS Plugin add missing fragment refresh 2019-03-08 21:08:21 +01:00
Milos Kozak
791d5dbd1b add missing files after merge 2019-03-08 19:42:48 +01:00
Milos Kozak
0051830b25 Merge branch 'dev' into smsrefactor 2019-03-08 19:41:32 +01:00
harispoljo
537c241e76
Made the intent easier to read. 2019-03-07 16:33:36 +01:00
Tebbe Ubben
286be1e78f Insight: Enforce using first profile 2019-03-07 15:22:51 +01:00
Milos Kozak
f7c6f60131 Low storage notification 2019-03-07 11:32:09 +01:00
Roumen Georgiev
2b10e0f9e9 initial work 2019-03-07 11:32:29 +02:00
Andy Rozman
a148f5d21d Fixed some files after merge. 2019-03-07 00:01:19 +00:00
Andy Rozman
6e500c1e75 On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out. 
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent

On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
 2019-03-06 23:38:18 +00:00
Tanja Schmidt
c40907b951 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Tanja Schmidt
a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Tanja Schmidt
92cbe45341 Fixed status noticication for charging/uncharging: check battery not power state. 2019-03-06 19:00:11 +01:00
harisp
605601bcc6 Run loop when TemporyTarget is changed 2019-03-06 12:10:28 +01:00
Milos Kozak
02db9b681d fix MidnightTime crash + tests 2019-03-05 23:12:35 +01:00
Milos Kozak
39ddde5844
Merge pull request #1664 from MilosKozak/AdrianLxM-patch-2 
fix version check
 2019-03-05 21:24:34 +01:00
AdrianLxM
7f3924a7cb
fix version check 2019-03-05 21:06:14 +01:00
Tebbe Ubben
6cd37520c3 Fix #1661 2019-03-04 23:21:26 +01:00
Andy Rozman
011aaf5336 Moved medtronic to correct package 2019-03-02 20:39:14 +00:00
Andy Rozman
f7395c7a2c Changes after merge, compilable, but medtronic is still in old structure. 2019-03-02 20:24:53 +00:00
AdrianLxM
5826084cf9 capitalization fix 2019-03-02 19:22:56 +01:00
Andy Rozman
289902633e Merge branch 'dev' into medtronic_andy 2019-03-02 18:20:37 +00: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
Andy Rozman
a441a7e35e Release 0.7 
- finished decoding DailyTotals records
- fixed some of most common bugs from Crashalytics
 2019-02-20 15:28:14 +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
Andy Rozman
5aa5d9f749 Merge branch 'dev' into medtronic_andy 2019-02-16 20:50:36 +00: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
Andy Rozman
72eae6e6b8 - refactored commands, removed version out of it 
- finished Medtronic History Dialog (middle button)
- refactored Set/Get Basal functionality
 2019-02-07 22:41:05 +00: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
Andy Rozman
78abf7299a 0.7.0 
- refactored BasalProfile functionality
- extended SetProfile command
- fixed processing of settings for 554
 2019-01-31 23:09:39 +00: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
Andy Rozman
9c08bfb8bf [0.6] 
- bolus finalized: added delay before bolus is delivered (configurable 5, 10, 15s) and if cancel is issued, after
delay, and bolus was already sent to pump, message is displayed saying that you need to manually stop the pump
to cancel bolus
- BLE Scanner refactored and finished (removed un-needed code)
- fixed 5 most common Crashalytics errors found
- fixed Basal Profile problem (I hope)
 2019-01-15 20:08:31 +00:00
Andy Rozman
8fc694e812 Merge branch 'dev' into medtronic_andy 2019-01-04 22:24:44 +01:00
Andy Rozman
8698e14076 Merge branch 'dev' into medtronic_andy 2019-01-04 22:12:14 +01:00
Andy Rozman
8935abf8a5 Some changes... 2019-01-04 22:08:22 +01:00
AdrianLxM
11b8b83651
ignore rounding deviations 2019-01-04 19:27:44 +01:00
Andy Rozman
56eaacb3a2 [0.6] 
Configuration:
- added delay for Bolus delivery
- added choice for decoding (done on RL or in software)

Code:
- encoding DailyTotals for 522 and 523
- some minor fixes reported by Crashalytics
- refactoring history
- added history display
- changes to delivering Bolus (canceling)
- started adding 6b4b hardware decoding
 2019-01-04 14:02:10 +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
Andy Rozman
adc80d5cc7 Medtronic 0.5 
- added DailyTotalsDTO and started with work on parsing (522 done)
- split encoding into 3 classes, and added exception when encoding fails
- added code for retries, when in communication with pump
- added analysis of history data for several occassions (profile changed, configuration changed, etc)
- little refactoring all arround
 2018-12-09 14:44:48 +00: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
Nico Schmitz
49b0e3ab71 Add EditTriggerDialog 2018-12-05 21:22:32 +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
Milos Kozak
bc41814946
Merge pull request #1358 from quizzmaster/fix1318 
Notifications about tbr suggestions. Fixes #1318
 2018-11-18 22:39:27 +01:00
Milos Kozak
8110bef68f
Merge pull request #1540 from jotomo/upstream-1480 
Profile switch name mangling for NS up/download
 2018-11-18 22:37:57 +01:00
Milos Kozak
6e1a01e9d3
Merge pull request #1543 from triplem/suspend_with_loop_disabled 
Allow disconnection/suspend of pump even while Loop is deactivated
 2018-11-18 21:24:39 +01:00
Grégory Beloncle
3310c6d618
Update PersistentNotificationPlugin.java 
-  remove double call from addMessage
- add comments
 2018-11-14 11:07:00 +01:00
Grégory Beloncle
7497eade82
Update PersistentNotificationPlugin.java 
add comments regarding intents
 2018-11-14 10:54:43 +01:00
gregorybel
9124788c4e first commit 2018-11-12 22:38:49 +01:00
Milos Kozak
abb1dd956c Fix sending SMS in Android 8 2018-11-12 19:00:06 +01:00
triplem
eea79c5d0f fixes PR#1550 2018-11-08 21:14:44 +01:00
Roumen Georgiev
4ac687cc72 change constraint to isLoopInvocationAllowed 2018-11-06 13:40:56 +02:00
Roumen Georgiev
f0b5643044 revert 2018-11-06 11:45:29 +02:00
Roumen Georgiev
707a9e62d8 revert dev changes 2018-11-06 11:40:08 +02:00
Roumen Georgiev
43a61f312a WIP DstHelper 2018-11-06 11:25:39 +02:00
Andy Rozman
b4ce95902b 0.5.1 
- Added history reading and parsing
- Added evaulation of history data (still work in progress)
- Added custom actions (#1455), so that we can manually do "Wake Up and Tune" (new button in actions)
- Started decoding DailyTotals records (need TDD for bolus and basal).
 2018-11-05 16:49:59 +00:00
Milos Kozak
d9b9c2f5f8
Merge pull request #1538 from triplem/prepare_db_update 
enable downgrading to enable future db updates
 2018-11-05 16:39:29 +01:00
Milos Kozak
0abdd1488f
Merge pull request #1539 from jotomo/overview-ui-blocking 
Overview: don't block the UI waiting for IobCob thread.
 2018-11-05 16:39:05 +01:00
triplem
6ef777f411 enable downgrading to enable future db updates 2018-11-04 20:50:55 +01:00
triplem
c2d1506451 allow to reconnect 2018-11-04 19:34:46 +01:00
triplem
4cd9b19868 REname pump reconnection 2018-11-04 19:29:44 +01:00
triplem
e524c43138 Show only one resume 2018-11-04 19:23:58 +01:00
triplem
7a77571803 update logic 2018-11-04 19:06:19 +01:00
triplem
c4bbb62d0b Initial implementation 2 2018-11-04 18:51:24 +01:00
Milos Kozak
fd2893e934
Merge pull request #1525 from MilosKozak/dev2_1 
[WIP] 2.1 code
 2018-11-03 21:25:34 +01:00
Milos Kozak
fda934c3cb
limit logging for 2.0 2018-11-02 23:24:57 +01:00
Milos Kozak
5a5d89563f Fix BolusProgressDialog 2018-11-02 19:04:16 +01:00
Milos Kozak
0a545dc92b
Merge pull request #1532 from MilosKozak/dev 
Dev
 2018-11-02 10:40:11 +01:00
Milos Kozak
23a58c2fc1 == -> equals 2018-11-01 07:54:29 +01:00
Milos Kozak
b73cbacbf5 fix NPE 2018-10-31 08:05:57 +01:00
Milos Kozak
ca27843dd7 fix NPE 2018-10-31 08:02:16 +01:00
Milos Kozak
ad3794d32f fix NPE 2018-10-31 07:59:04 +01:00
Milos Kozak
62aa49dd5b fix loading BGs <39 #2 2018-10-30 21:25:34 +01:00
Milos Kozak
871b9b6b3d fix loading BGs <39 2018-10-30 21:24:53 +01:00
Nico Schmitz
75d0bd9761 Fix tests 2018-10-29 21:34:03 +01:00
Nico Schmitz
04574d759f Improve dialogs. Add JSON serialization for actions and events. 2018-10-29 21:24:30 +01:00
AdrianLxM
667cbe0b12
Get device name before setting up the callback 
In case the callback is very quick, the name might not have been set yet?
 2018-10-28 20:35:37 +01:00
Milos Kozak
d54651e916 cache midnight time calculation 2018-10-28 12:21:35 +01:00
Milos Kozak
00349527e1 calculate IobCobThread execution time 2018-10-28 11:47:12 +01:00
Milos Kozak
05dcb58f0a check for future timestamp while loading history (RS,Rv2) 2018-10-28 11:24:59 +01:00
Andy Rozman
5b9bd2adfc [0.4.1-SNAPSHOT] 
- little change in scanning
- added error checking into RadioResponse and BasalProfile, also added events
- disabled quick scan
- synchronized RileyLink state changes
- proofed MedtronicConverter
- fixed 10 errors found on fabric
- fixed SetBasalProfile, after merge
 2018-10-27 14:04:46 +01:00
Nico Schmitz
0364d3c039 Refactor code. Some minor fixes. 2018-10-25 22:08:04 +02:00
Nico Schmitz
7698923fe8 Clean up code. Improve ux. 2018-10-25 21:12:26 +02:00
Andy Rozman
03e38158f4 [0.4.0] 
- refactored Broadcast receiving
- implementation of SetProfile finished
- added additional null checking in RadioResponse class
 2018-10-25 16:22:31 +01:00
Nico Schmitz
c40dc583a3 Fix trigger order when merging connectors 2018-10-25 01:01:50 +02:00
Nico Schmitz
8dc40fb795 Change trigger composition logic 2018-10-24 23:37:14 +02:00
Nico Schmitz
d863e39046 Add changeConnector() 2018-10-24 23:13:55 +02:00
triplem
43fcfaf5d6 solve #1449 2018-10-24 20:46:22 +02:00
Andy Rozman
43f2f69133 Changes needed after merge (sorry I didn't test merge after I did it and there were few problems) 2018-10-24 13:07:06 +01:00
Andy Rozman
07eef5adae
Added Notification types needed for Medtronic 
Added Notification types needed for Medtronic (reserving this two numbers)
 2018-10-24 12:45:54 +01:00
Andy Rozman
75d3f3b4bc Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018) 2018-10-24 12:18:20 +01:00
Andy Rozman
f228475617 Merge the code from RileyLinkAAPS 
- First real results with Pump History (not complete yet)
- Set Basal Profile changes (not complete yet)
- version set to medtronic-0.4.0-SNAPSHOT
 2018-10-24 11:25:18 +01:00
Andy Rozman
88b75d3496 [0.3] RELEASE 
- WakeAndTune fixed, it runs in separate thread (in task)
- Fixed Frequency scan results
- fixing connection statuses
- postprocessing fixed/extended with MedtronicUIResponseType
- Basal profile fixes
 2018-10-21 22:11:55 +01:00
Andy Rozman
ca536ee97e [0.3.1] 
- removed code that sends wakeup on every command
- added checking if device is present
- fixed reading data when no data present (PostProcessingUI)
- work done on showing hardware in configuration (added RileyLinkSelectPreference)
- fixing configuration (in wizard)
 2018-10-20 13:24:36 +01:00
AdrianLxM
5465e8f5aa try to catch bad devicenames 2018-10-19 10:31:57 +02:00
Milos Kozak
786a91f7e1
Merge pull request #1508 from jotomo/fabric-attributes 
Fabric: don't report disabled plugins.
 2018-10-17 22:33:59 +02:00
Johannes Mockenhaupt
eaf849e625
Fabric: don't report disabled plugins. 
Effectively reverts 91cbe1dd63.
 2018-10-17 15:54:33 +02:00
Nico Schmitz
7659f58776 Fix tests 2018-10-16 01:57:59 +02:00
Nico Schmitz
6fb4de6752 Bugfix json serialization 2018-10-16 01:49:11 +02:00
Nico Schmitz
3f5d795e15 Fix bug in TriggerConnector.shouldRun() 2018-10-16 01:33:08 +02:00
Nico Schmitz
2e4f18794f Add ChooseTriggerDialog 2018-10-16 00:07:13 +02:00
Nico Schmitz
f98d40f71b Work on automation plugin. 
- Add MainApp.dpToPx() helper function
- Remove trigger layout resources
- Generate trigger layout programmatically
- Improve ux (when composing trigger logic)
- Refactoring
 2018-10-15 23:20:06 +02:00
Milos Kozak
fee3b33d81
Merge pull request #1499 from jotomo/upstream-1482+1489 
Combo: allow records created by the combo to be merged with existing records.
 2018-10-14 23:33:08 +02:00
Milos Kozak
6ae98e5177 add comment 2018-10-14 22:55:21 +02:00
AdrianLxM
f9fa82f1ef
replace swedish minus sign with default minus sign 2018-10-14 20:47:00 +02:00
Johannes Mockenhaupt
c326e7a483
Overview: don't block the UI waiting for IobCob thread. 2018-10-14 16:24:07 +02:00
Johannes Mockenhaupt
b0fcbf3013
Update JavaDoc. 2018-10-14 14:36:05 +02:00
Milos Kozak
26cb25893e remove fabric logging for SMS 2018-10-14 12:01:14 +02:00
Milos Kozak
cc25520770 ignore SMS starting # 2018-10-14 11:58:19 +02:00
Milos Kozak
bedb79c461 Merge branch 'dev' into smsrefactor 2018-10-14 11:16:14 +02:00
Milos Kozak
a546586df1 fix asking for SMS permission 2018-10-14 11:10:12 +02:00
Milos Kozak
903504d72d SMSPlugin refactor & cleanup 2018-10-14 10:55:11 +02:00
Milos Kozak
94ef8f4a76 Merge branch 'dev' into smsrefactor 2018-10-14 09:55:51 +02:00
Johannes Mockenhaupt
4f896fccdb
Refactor and clean up. 2018-10-13 20:56:40 +02:00
Johannes Mockenhaupt
51315fc942
GH#1480: Improve conversion of incoming NS-PS name. 2018-10-13 20:38:26 +02:00
Milos Kozak
9309729ca1
Merge pull request #1502 from jotomo/upstream-1501 
[For review] Correct off-by-one error calculating average.
 2018-10-13 18:19:57 +02:00
Milos Kozak
c1bbaab8e1 allow UAM only if oref1 sensitivity plugin is selected 2018-10-13 18:07:01 +02:00
Milos Kozak
94233d28e1 fix sms command LOOP SUSPEND 2018-10-13 17:31:10 +02:00
Milos Kozak
ea1e78b169 prepare new classes 2018-10-13 16:50:47 +02:00
Milos Kozak
5c9baa31f3 fix different colors BG vs target range 2018-10-13 14:27:09 +02:00
Milos Kozak
9ee329b7db log bucketed_data(0) 2018-10-13 11:40:19 +02:00
Milos Kozak
20fa8ed371 fix fallback to createBucketedDataRecalculated 2018-10-13 09:59:25 +02:00
Johannes Mockenhaupt
682b56198a
Queue: correct removal of queued command by type. 2018-10-12 16:30:45 +02:00
Johannes Mockenhaupt
c17ed80a34
Correct off-by-one error calculating average. 2018-10-12 16:05:32 +02:00
Johannes Mockenhaupt
34182b81a1
Combo: allow records created by the combo to be merged with existing records. 2018-10-12 00:46:05 +02:00
Milos Kozak
a0a60ea2d6 log carbs to pastSensitivity 2018-10-11 18:39:23 +02:00
Milos Kozak
898d7ef134 typo 2018-10-11 17:48:19 +02:00
Milos Kozak
9a84dade9a Fix libre data, add more bucketed data test 2018-10-06 22:00:43 +02:00
Milos Kozak
817a89c39b Better autosens logging and COB bug fix 2018-10-05 00:49:04 +02:00
Milos Kozak
c68783afd3 maintenance strings cleanup 2018-10-04 23:19:29 +02:00
Milos Kozak
97cc9a6370 log language used to fabric 2018-10-04 23:04:32 +02:00
Nico Schmitz
fb4da4859a Simplify SWItem.generateLayout() 2018-10-03 22:36:21 +02:00
Milos Kozak
52e6f6bde5 fix Korean driver 2018-09-26 20:03:40 +02:00
AdrianLxM
126f3925e0 don't send carbs entered in the past to the pump 2018-09-26 13:59:04 +02:00
AdrianLxM
e9883dcc3a Revert "fix carb generator" 
This reverts commit 6403c5d997.
 2018-09-26 13:37:24 +02:00
AdrianLxM
95ea377d71 Revert "fix addToHistoryTreatment" 
This reverts commit d707ea7fb0.
 2018-09-26 13:37:05 +02:00
Nico Schmitz
c60aae8630 Work on implementation for automation plugin. 
- Use butterknife
- Import weekdays selector
- Implement layout for trigger connection and trigger time
- Implement view holders
- Implement adapters
- Implement dummy code for quick testings
- Refactor code
 2018-09-25 00:00:09 +02:00
Milos Kozak
794c80f7e3 Fix accesing wrong DanaRPump instance 2018-09-24 22:43:23 +02:00
Milos Kozak
d707ea7fb0 fix addToHistoryTreatment 2018-09-23 18:58:13 +02:00
Milos Kozak
1c44981494 Fix wrong message during refill 2018-09-22 21:25:07 +02:00
Milos Kozak
6403c5d997 fix carb generator 2018-09-21 23:24:50 +02:00
Julius de Bruijn
84e41122fc Fix TBR maximum for Animas Vibe 
Animas actually supports 300% TBR, but uses a different way of
displaying it:

0% is the same as 100% in AAPS.
-100% (OFF) is 0% in AAPS
200% therefore is 300% in AAPS.

Maybe there should be a better indicator for this in AAPS, but for now
this fix gives better control of the TBR values, if using the open loop.
 2018-09-21 11:09:41 +02:00
Andy Rozman
e2ddb48498 Some extension on VirtualPump for testing. 2018-09-20 18:04:06 +01:00
Andy Rozman
48e4a041f8 - First changes for CustomActions 
- changed PumpInterface to add CustomActions
  - added class CustomActions and CustomActionType
  - changed all PumpImplementations to use new methods
  - started changing ActionsFragment (most should be done)
 2018-09-20 17:23:36 +01:00
Nico Schmitz
b5f30a0f46 Add some content to automation plugin fragment 2018-09-19 22:29:35 +02:00
Nico Schmitz
4985864343 Add title. Generate getters. 2018-09-19 22:27:30 +02:00
Andy Rozman
70065c1343 - merge RileyLink2 support from RileyLinkAAPS 2018-09-19 20:51:40 +01:00
Nico Schmitz
e32050d565 Replace constants by comparator enum 2018-09-19 21:13:02 +02:00
Milos Kozak
3eee5b13c7 LocationService 2018-09-19 15:26:58 +02:00
Milos Kozak
efec01c6e5 Some Actions 2018-09-18 23:17:00 +02:00
Milos Kozak
2bf07eb0d4 TriggerBg 2018-09-18 20:17:45 +02:00
Milos Kozak
ca7e9d2a7f TriggerAnd-Or json saving, loading 2018-09-18 12:32:34 +02:00
Milos Kozak
4ba1adabf4 TriggerAnd, TriggerOr 2018-09-18 10:38:12 +02:00
Milos Kozak
d317ec94ad AutomationPlugin 2018-09-18 10:05:19 +02:00
Milos Kozak
9a96d29dc3 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-17 19:57:15 +02:00
Milos Kozak
a7e64c79f0 remove static MainApp.sConfigBuilder 2018-09-17 19:56:56 +02:00
Milos Kozak
924bc97e3b remove static ConfigBuilderPlugin.commandQueue 2018-09-17 19:29:01 +02:00
Milos Kozak
f6c113550f remove static ConfigBuilderPlugin.activeSensitivity 2018-09-17 18:30:57 +02:00
Milos Kozak
dc563df5f0 remove static ConfigBuilderPlugin.activeInsulin 2018-09-17 18:18:50 +02:00
Milos Kozak
1b086e6776 remove static ConfigBuilderPlugin.activeAPS 2018-09-17 17:59:44 +02:00
Milos Kozak
0b32431f9e remove static ConfigBuilderPlugin.activeProfile 2018-09-17 17:48:11 +02:00
Milos Kozak
bc19973ce0 remove static ConfigBuilderPlugin.activePump 2018-09-17 17:43:42 +02:00
Milos Kozak
dcbf093514
Merge pull request #1399 from MarkMpn/temp-target-units 
Assume md/dl units for temp targets created through Nightscout
 2018-09-17 16:46:33 +02:00
dmelliott20
167ed27659
Update PumpType.java 
Ammended the basebasalstep values fro the insight and the combo.

this was preventing AAPS from implementing zero basals where the basalstep was higher than the current running basal rate e.g. basal of 0.06u\hr running and a basalstep 0f 0.1u\hr resulted in no zero temp being enacted because of logic in the loop plugin.
 2018-09-17 12:26:00 +00:00
Sebastian Lenz
6323f2dd49 fixed typo 2018-09-16 18:32:51 +02:00
Andy Rozman
da75ed643d Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable 2018-09-14 18:14:45 +01:00
Milos Kozak
53389fea3b fix import settings 2018-09-14 17:54:32 +02:00
Milos Kozak
9d4674faff FillDialog formating fix 2018-09-14 14:29:25 +02:00
Milos Kozak
241d3f0c7c fix MsgSetExtendedBolusStart.java 2018-09-14 14:10:24 +02:00
Milos Kozak
bcda4c93bf
Merge pull request #1428 from PoweRGbg/dev 
DanaR.comm tests
 2018-09-14 14:08:55 +02:00
Milos Kozak
cc804ac36f
Merge pull request #1360 from MilosKozak/insightfix 
WIP Insightfix
 2018-09-14 14:06:18 +02:00
Milos Kozak
514bdcda31 copy pumpId when converting EB -> TRB 2018-09-14 10:04:48 +02:00
Milos Kozak
7025d021f5 Insight logging 2018-09-14 09:06:03 +02:00
PoweRGbg
3a078c4084 DanaR.comm tests 2018-09-14 10:00:00 +03:00
Milos Kozak
665958d59c false errors removed from DbAccessReceiver 2018-09-14 08:57:57 +02:00
Sebastian Lenz
b02921b23f use profilename of currently active profile 2018-09-14 01:00:19 +02:00
Milos Kozak
dd90051b97 Insight get rid of Date.class 2018-09-13 19:00:57 +02:00
Milos Kozak
57e7d63794 Insight EB handling 2018-09-13 18:53:16 +02:00