Commit graph

5140 commits

Author SHA1 Message Date
Milos Kozak 3636480c61 Answers -> Analytics migration 2019-04-05 00:32:26 +02:00
Milos Kozak f4b2a88862 fix typo 2019-04-03 16:53:34 +02:00
Milos Kozak ec93045d84 fix parsin TT - missing duration 2019-04-03 16:43:56 +02:00
Milos Kozak 64c9196a5c
Merge pull request #1710 from TebbeUbben/insight-fix
Insight: Fix automatic Careportal entries
2019-04-03 16:10:03 +02:00
Tebbe Ubben e3f45aa6be Fix automatic careportal entries 2019-04-03 00:07:20 +02:00
Milos Kozak 78ecb80488
Merge pull request #1703 from rob-andy/wip/libre-delta-fixes
Calculate deltas correctly with 1 minute spaced data
2019-04-02 15:11:28 +02:00
Milos Kozak 1f62c820ca Automation: split recurring and nonrecurring time 2019-04-02 00:05:12 +02:00
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
Milos Kozak 65ffc3cdd2 Merge branch 'dev' into insightfix 2018-09-12 14:59:15 +02:00
Milos Kozak bbb6c5f3cc fix rounding in dialogs 2018-09-12 14:58:47 +02:00
Milos Kozak f51de7da81 fix wizard test 2018-09-12 10:55:34 +02:00
Milos Kozak 2fc9b40f9d Merge branch 'dev' into insihgtfix 2018-09-12 08:56:58 +02:00
Milos Kozak fb4582a888 request issue description in email with logs 2018-09-12 08:44:21 +02:00
Milos Kozak fd2b9bdf94 request time in email with logs 2018-09-12 08:40:56 +02:00
Milos Kozak 0a52bc9976 VirtualPump: do not cancel percent temp prior adding new 2018-09-11 23:23:59 +02:00
Milos Kozak 874be7ff48 openloop mode fix 2018-09-11 22:32:04 +02:00
Milos Kozak f7269a806d nsclient allow general preferences 2018-09-11 20:08:59 +02:00
Milos Kozak 98b8d67e3b Merge branch 'dev' into insightfix 2018-09-11 19:06:35 +02:00
Milos Kozak 37c384e1c9 better wizard and constraint logging 2018-09-11 19:03:36 +02:00
Milos Kozak 0563420996 Constraints logging 2018-09-11 14:56:42 +02:00
Milos Kozak 018a5f5e43 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-11 14:27:51 +02:00
Milos Kozak e9f8862776 maintenance plugin logging 2018-09-11 14:27:38 +02:00
Milos Kozak 48c8863ccb fix NPE 2018-09-11 10:09:29 +02:00
Milos Kozak d2c35173dc fix NPE 2018-09-11 00:19:34 +02:00
Milos Kozak 3416f77a04 fix EXTENDEDBOLUS search in db 2018-09-10 23:57:24 +02:00
Milos Kozak 2fbf4324d5 typo in logging 2018-09-10 23:55:52 +02:00
Milos Kozak 39f1b130b6 Insight proper removing TBR from NS 2018-09-10 23:20:31 +02:00
Milos Kozak 52c85501c6
Merge pull request #1407 from jwoglom/dev
update other "G5 Native" source reference for G6
2018-09-10 21:17:03 +02:00
Milos Kozak a97c66169b Merge branch 'dev' into insightfix 2018-09-10 20:31:33 +02:00
Milos Kozak 93a4afd567 Insight add 1 sec between cancel TBR and EB 2018-09-10 20:28:45 +02:00
Milos Kozak 7070c0a72b allign Insight logging with AAPS 2018-09-10 19:28:03 +02:00
James Woglom 1823371433 update other "G5 Native" source reference for G6 2018-09-10 11:56:33 -04:00
Milos Kozak 0f2a620ebe fix NewInsulinDialog message 2018-09-10 12:41:57 +02:00
Milos Kozak 6f53afbbe3 Objectives: remove static code, cleanup 2018-09-10 12:23:24 +02:00
Milos Kozak c380b3dcc7 catch exception in LoggingBus 2018-09-09 22:08:26 +02:00
Milos Kozak 640a7d3b87 fix NPE 2018-09-09 13:13:34 +02:00
Milos Kozak 3c8b7f10be fix NPE 2018-09-09 12:22:23 +02:00
Milos Kozak e577e8555d openloop mode min change threshold configurable 2018-09-09 12:15:44 +02:00
Milos Kozak 55d1dd0847
Merge pull request #1392 from MilosKozak/openloop
Openloop
2018-09-07 12:55:25 +02:00
Mark Carrington be7693a73d Assume md/dl units for temp targets created through Nightscout 2018-09-06 22:50:35 +01:00
Milos Kozak ecae6af151 reset autosens on profileswitch with zero duration 2018-09-06 16:30:57 +02:00
Milos Kozak f5873f9f87 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-06 11:18:27 +02:00
Milos Kozak e4f95c7a4e more logging for bucketed data 2018-09-06 11:18:15 +02:00
Milos Kozak a8bed0096d fix NPE 2018-09-04 22:34:36 +02:00
Milos Kozak 5499396661 fix NPE 2018-09-04 22:26:59 +02:00
Milos Kozak e36499f9d4 more tests 2018-09-04 22:08:35 +02:00
Milos Kozak 6f5332af0a Omnipod max tbr 30U 2018-09-04 20:42:33 +02:00
Milos Kozak 4ca9d22062 Virtual pump descriptions used for APS requests in open loop mode 2018-09-04 19:55:31 +02:00
Milos Kozak 42714afeb1 fix false constraint warning 2018-09-04 15:38:04 +02:00
Milos Kozak f5e7d28aa6 fix WizardInfoDialog 2nd 2018-09-01 23:34:35 +02:00
Milos Kozak 91695614f4 Merge branch 'andyrozman-virtual_pump_bug_1372' into dev 2018-09-01 22:46:16 +02:00
Milos Kozak 315c83069d apply bolus description settings in constraints 2018-09-01 22:45:15 +02:00
Milos Kozak 316f001cbc PumpUtil cleanup 2018-09-01 11:45:29 +02:00
triplem b9fda827bd Add version information to emails 2018-08-31 11:25:57 +02:00
Milos Kozak 7fd0d2fe56 Merge branch 'dev' into insightfix 2018-08-31 08:26:59 +02:00
Andy Rozman e2182528fd - changed calls of PumpUtil.setPumpDescription to use enums directly 2018-08-30 22:03:09 +01:00
Andy Rozman bbffa703df reverting some formater changes 2018-08-30 20:54:15 +01:00
Andy Rozman 679b4b2668 - added methods to return correct Extended bolus size
- using exetended bolus size
2018-08-30 16:22:25 +01:00
Roumen Georgiev c3e1dff345
also don't show UserOptions for pumps with code 3
until debugged
2018-08-30 12:08:45 +03:00
Milos Kozak 063ead4c17 RS text bolus error codes 2018-08-29 20:14:36 +02:00
Milos Kozak 178c2b90fe min_5m_carbimpact to AMA settings 2018-08-29 18:17:11 +02:00
Milos Kozak a172458e76 catch bus errors, enable only for dev 2018-08-29 08:10:06 +02:00
Milos Kozak 105485c9b6 do not use FEATURE_CUSTOM_TITLE 2018-08-29 08:00:15 +02:00
Andy Rozman 124f3d8ac1 - small bug in determineCorrectBasalSize 2018-08-28 22:41:31 +01:00
Milos Kozak 8c2ad32ad8 fix NPE 2018-08-28 23:33:09 +02:00
Andy Rozman 07495ccfdd - added bolus and basal amount rounding (rounding to pump specification) 2018-08-28 16:57:14 +01:00
Milos Kozak abc374193a Merge branch 'dev' into insightfix 2018-08-28 14:11:34 +02:00
Milos Kozak 980e4998e2 send HEAD to fabric 2018-08-27 20:19:30 +02:00
Milos Kozak bb18fad654
Merge pull request #1370 from jotomo/upstream-combo-fabric-removal
Upstream combo fabric removal
2018-08-27 20:09:13 +02:00
Johannes Mockenhaupt 3fd3d0f059
Combo: remove dead code. 2018-08-27 19:56:07 +02:00
Johannes Mockenhaupt 0eb08c2eaf
Combo: remove fabric logging. 2018-08-27 19:10:08 +02:00
Milos Kozak 4fd4d71187 fix min percent value in careportal 2018-08-27 16:05:30 +02:00
Milos Kozak e5d96e5c17 fix bucketed data 2018-08-25 20:03:48 +02:00
Milos Kozak 72f7b244c5
Merge pull request #1361 from MilosKozak/g6-xdrip-filtered
Also count "G6 Native" in xDrip as filtered
2018-08-25 19:27:56 +02:00
Milos Kozak ead57748aa more autosens logging 2018-08-25 19:22:45 +02:00
Milos Kozak 8c4c5a291e is5minData detection improvement 2018-08-25 18:13:32 +02:00
Milos Kozak 324ba072bb fix Dana password handling 2018-08-25 14:08:04 +02:00
AdrianLxM 972eeeda29
Also count "G6 Native" in xDrip as filtered 2018-08-24 20:57:52 +02:00
Milos Kozak d330764d9f Merge branch 'dev' into insightfix 2018-08-24 10:40:31 +02:00
Milos Kozak 7da4e4fd70 log (SITECHANGE) 2018-08-24 10:36:01 +02:00
Milos Kozak 2e9da51daf register VP plugin on start 2018-08-24 10:24:04 +02:00
Milos Kozak 9419b8c4d1 reuse predefined descriptions in real drivers 2018-08-23 19:36:56 +02:00
Milos Kozak b7950322c8 virtual pump lifecycle 2018-08-23 18:59:46 +02:00
Milos Kozak b0f8ab9922 extract key_virtualpump_type 2018-08-23 18:46:06 +02:00
Milos Kozak 243755d1b1 virtualpump: fix string, fix formatter 2018-08-23 18:41:55 +02:00
Milos Kozak 2c5837a235 Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863 2018-08-23 17:53:28 +02:00
Milos Kozak fa4934ba0e
Merge pull request #1357 from PoweRGbg/patch-3
don't show User oprtions if firmware is OLD
2018-08-23 17:33:44 +02:00
Milos Kozak 8a4e1d8efd fix ISE 2018-08-23 07:37:31 +02:00
Milos Kozak 8f9d0269c1 better TREATMENT logging 2018-08-22 22:04:47 +02:00
Sebastian Lenz 1935d5b011 send notification about tbr to watch if wearcontrol is false. Fixes #1318 2018-08-22 19:22:30 +02:00
Milos Kozak 15741b2a02 more logging on extended bolus 2018-08-22 15:49:22 +02:00
Milos Kozak 45321f889a Merge branch 'dev' into insihgtfix 2018-08-22 15:47:32 +02:00
Roumen Georgiev ca96791059
don't show User oprtions if firmware is OLD 2018-08-22 14:04:57 +03:00
Milos Kozak 653a98fd5b better layout for nsclient mode 2018-08-21 23:19:04 +02:00
Milos Kozak 5114335005 more logs 2018-08-21 19:53:59 +02:00
Milos Kozak 32d9a8b4d6 Fix connection handshake for DanaR pumps 2018-08-21 17:25:20 +02:00
Milos Kozak cd90bab877 fix NPE 2018-08-21 11:39:32 +02:00
Milos Kozak 8ec3649cea key_nsclient_localbroadcasts default to false 2018-08-20 23:01:11 +02:00
Milos Kozak 8fec60ea35 fix NPE 2018-08-20 22:13:01 +02:00
Milos Kozak 004a9193bb AUTOSENS logging on by default 2018-08-20 19:39:39 +02:00
Milos Kozak 414c3416dd WizardInfoDialog 2018-08-20 19:32:18 +02:00
Milos Kozak e9d7a917d2 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-08-20 14:46:20 +02:00
Milos Kozak 98b9a52a9a remove catch to get more data from people 2018-08-20 14:46:08 +02:00
Milos Kozak 28ff01978f fix NPE 2018-08-20 08:04:35 +02:00
Milos Kozak 200c75d421 fix NPE 2018-08-20 08:02:57 +02:00
Nico Schmitz 5386c7db4a Update to upstream/dev and resolve conflicts 2018-08-19 14:37:42 +02:00
Milos Kozak a6e25df543 log version check 2018-08-17 21:58:00 +02:00
Milos Kozak 1b6e54f8a8 iobplugin tests 2018-08-17 19:49:39 +02:00
Milos Kozak 4133bc9ad1 iobplugin tests 2018-08-17 19:00:35 +02:00
Milos Kozak d198de94c0 fix sending logs 2018-08-17 17:01:48 +02:00
Milos Kozak 94b1fa3552 fix bucketed data, add some tests, fix failing tests 2018-08-17 16:41:12 +02:00
Milos Kozak 1d67f124fc get rid of Date.class 2018-08-17 15:11:43 +02:00
Milos Kozak 15e69a478e RS,Rv2: thread safe history 2018-08-17 13:58:06 +02:00
Milos Kozak 9c1e52bd17 RS,Rv2: more logging on storing boluses 2018-08-17 13:28:37 +02:00
Milos Kozak 91cbe1dd63 update PluginStats 2018-08-17 10:27:46 +02:00
Milos Kozak b42d604606 false pump unreachable alert workaround 2018-08-16 22:46:20 +02:00
Milos Kozak c927b8f061 storing extended bolus fix for insight 2018-08-16 15:02:45 +02:00
Milos Kozak 54930fee02 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-08-15 22:44:31 +02:00
Milos Kozak 9642ff7cac use local broadcast for dbaccess 2018-08-15 22:09:13 +02:00
Milos Kozak e2896cbc5d SW: less aggressivity on nsclient connections 2018-08-14 18:33:29 +02:00
Milos Kozak 31e050be4a loop mode in setup wizard 2018-08-14 17:06:09 +02:00
Milos Kozak 04af3eb806 source selection in nsclient after dropping g5 uploader 2018-08-14 16:06:02 +02:00
Milos Kozak 17b9a4b951 add logging 2018-08-13 23:58:07 +02:00
Milos Kozak 7f17110d98 fix NPE 2018-08-13 23:57:16 +02:00
Milos Kozak d925011380 WATCHDOG_RECONNECT_IN = 15 2018-08-12 21:27:45 +02:00
Andy Rozman 6a73937b2a - merges of bug fixes from RileyLinkAAPS 2018-08-12 16:30:32 +01:00
Milos Kozak 1abeb51b4f fix NPE 2018-08-12 09:29:41 +02:00
Milos Kozak 26a24d384e fix NPE 2018-08-12 08:53:57 +02:00
Milos Kozak 0ab5981665
Roumen's Unit tests (#1325)
* initializer

* aading some tests

* ading some tests

* removed try-catch

but added testingMode boolean for the test to run

* update to latest dev

* formatting

* cleanup tests

* More test classes

* some more

* upd

* more coverage in comm

* 50% class coverage in comm

* Delete crashlytics-build.properties

* remove of crashlytics

* removed unneeded checks

* removet mocking of treatmentsService

* removed treatmentsService mock from newNSTreatmentTest

* more testing classes

* tests of _History_ packets

* tests of _Notify_ packets

* 64 / 65 classes covered

* 100% class coverage in comm
2018-08-10 22:17:44 +02:00
Andy Rozman c9d35696cf - various changes
- reformatting everything
2018-08-10 16:13:40 +01:00
Andy Rozman e62fbfb189 Merge branch 'virtual_pump_Bug863' of github.com:andyrozman/AndroidAPS into virtual_pump_Bug863 2018-08-09 15:16:13 +01:00
Andy Rozman fa1a08367f - Changed one string
- Removed one pump that was just wrongly named (553 doesn't exists, 523 is actually Revel one)
2018-08-09 15:11:34 +01:00
Milos Kozak 27bfab5e15 fix NPE 2018-08-08 00:41:31 +02:00
Milos Kozak 60d5567c91 verify plugins after import 2018-08-08 00:39:40 +02:00
Milos Kozak d793135339 fixed stack overflow 2018-08-07 23:50:43 +02:00
Milos Kozak 671a8030b5
Merge pull request #1313 from jotomo/revert-behavioral-change
[Regression] Only log about records with duplicate pump id.
2018-08-07 23:33:26 +02:00
Milos Kozak 8e83ff2390 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-08-07 21:45:56 +02:00
Milos Kozak fff2e84608 remove g5uploader flavor 2018-08-07 21:45:35 +02:00
Milos Kozak fcf47ecc03 NSClient2 flavor 2018-08-07 21:07:43 +02:00
Milos Kozak 9dde50f93f
Merge pull request #1316 from jotomo/fixingthefix
TT context menu fixes
2018-08-07 19:46:46 +02:00
Johannes Mockenhaupt 27cf03f39a
Context TT menu fixes.
Default values where previously correctly converted for mmol/l,
but user-defined settings in the prefs (in mmol/l) where not.
This works for default settings and user-defined preference
for both mg/dl as well as mmol/l.
2018-08-07 18:50:09 +02:00
Johannes Mockenhaupt 1c7777e5eb
Revert "Fix #1254 double mmol/l conversion."
This reverts commit 0b280ce
2018-08-07 18:35:31 +02:00
Johannes Mockenhaupt ca003fbdd7
Only log about records with duplicate pump id. 2018-08-07 14:17:47 +02:00
Johannes Mockenhaupt 9af0bc2976
Fix target line performance regression. 2018-08-06 17:34:09 +02:00
Milos Kozak 409acd0721
Merge pull request #1305 from triplem/fix_stackoverflow
Fix stackoverflow
2018-08-05 23:08:29 +02:00
triplem b7ffb2c847 Should fix stackoverflow 2018-08-05 22:11:30 +02:00
Milos Kozak aa97583daa fix NPE 2018-08-05 20:50:20 +02:00
Milos Kozak 2677f3cca7 fix NPE in NsClientService 2018-08-05 20:46:52 +02:00
Milos Kozak ab4ca5fa13 log wrong bundles 2018-08-04 12:08:43 +02:00
Milos Kozak a16fa7ee0f normalize bucketed data, fix doubled cob 2018-08-04 11:56:29 +02:00
Milos Kozak 9a2df7b04c fix #1145 non-consistent singleton-pattern in DanaRPump 2018-08-03 23:35:24 +02:00
Milos Kozak 294253797c fix NPE 2018-08-03 21:13:19 +02:00
Milos Kozak d2f8cfa6c2 fix logging, bolus delivered must not be only smb 2018-08-03 13:15:29 +02:00
Milos Kozak cbed615f90 fix typo in logging 2018-08-03 13:10:33 +02:00
Milos Kozak 8cc7fb03d1 UI log category, BolusProgressDialog detailed log 2018-08-03 12:32:10 +02:00
Milos Kozak 580e05e8eb close progress dialog when stop was pressed prior connection 2018-08-03 11:02:46 +02:00
Milos Kozak 3bcd656c14 Maintenance plugin cleanup 2018-08-02 15:19:13 +02:00
Milos Kozak ddff05da75
Merge pull request #1262 from triplem/logshipper
Logshipper
2018-08-02 14:40:54 +02:00
Mark Carrington 7be49571ae Get profile for specific time for percentage -> absolute conversion 2018-08-02 12:27:56 +01:00
Mark Carrington f9fb4c1bc5 Include rate property in temp basal records 2018-08-01 22:32:04 +01:00
Milos Kozak 6544191c78 fix state plugin change handling 2018-08-01 23:26:01 +02:00
Milos Kozak c0a3eb67ba check for new version on github 2018-08-01 23:03:01 +02:00
Markus M. May 47fa33c1a9 Use lambdas 2018-08-01 20:45:58 +02:00
Markus M. May 2bc462aa13 use correct methods for context handling 2018-08-01 20:44:16 +02:00
Markus M. May 3306e14ca1 Merge branch 'dev' into logshipper 2018-08-01 20:42:05 +02:00
Milos Kozak eee187a71f NSClient watchdog 2018-08-01 19:16:31 +02:00
Andy Rozman 5d4dc7ea61 Changes requested after review.
- added additional parameter for extended_note
- changed how extended_note is set
- created positional formatting
2018-08-01 16:19:57 +01:00
Andy Rozman bf34a3b41f Merge branch 'dev' into virtual_pump_Bug863 2018-08-01 15:16:43 +01:00
Milos Kozak 2859860d0d use EventConfigBuilderChange in xdrip status line 2018-08-01 14:54:35 +02:00
Milos Kozak e6fae87abf use EventAppInitialized in xdrip status line 2018-08-01 14:46:19 +02:00
Milos Kozak 796c1becc2 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-08-01 14:31:04 +02:00
Milos Kozak 22881e17a2 fix NPE on temp target sync 2018-08-01 14:30:32 +02:00
Milos Kozak c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863 2018-08-01 11:57:48 +02:00
Milos Kozak e26f33081a fix wrong merge 2018-08-01 11:41:36 +02:00
Milos Kozak 3ccf2e51f7 Merge branch 'tbr_wear_accept' of https://github.com/quizzmaster/AndroidAPS into quizzmaster-tbr_wear_accept 2018-08-01 11:28:58 +02:00
Milos Kozak 44c50804a8 resolve NPE on app start in xdrip status line 2018-08-01 11:16:46 +02:00
Milos Kozak 7c9b81fbbf
Merge branch 'dev' into tbr_wear_accept 2018-08-01 08:18:29 +02:00
Milos Kozak 9d686adf7e finish apllication after clicking Exit 2018-07-31 19:11:32 +02:00
Milos Kozak ce16dd747b remove ALARM logging 2018-07-31 18:00:31 +02:00
Markus M. May 5d1fc92e44 code cleanup - use lambdas 2018-07-30 23:10:58 +02:00
Markus M. May aca9b3ff65 reflect code revieww 2018-07-30 23:05:46 +02:00
Markus M. May 883bbf46e1 use fragment insteaad of activity, move pref im/export to maintenance plugin 2018-07-30 22:56:00 +02:00
Markus M. May 9f90d31f35 Merge latest dev changes 2018-07-30 19:39:38 +02:00
Markus M. May 93e0c72b17 Refactor logshipper to maintenance 2018-07-30 19:33:57 +02:00
Milos Kozak 073b522b93 user defined level of logging 2018-07-30 17:04:43 +02:00
Milos Kozak 35b51af09c logging cleanup 2018-07-30 15:46:20 +02:00
Milos Kozak 6a9bf04a98 move APS function from ConfigBuilder to Loop 2018-07-30 14:46:15 +02:00
Milos Kozak 4ec0ebfa74 move profile function from ConfigBuilder to extra class 2018-07-30 14:21:11 +02:00
Milos Kozak 188a9b6313 PROFILE logging 2018-07-29 15:37:28 +02:00
Milos Kozak 54c83dc374 L.class 2018-07-29 14:39:56 +02:00
Milos Kozak ce9e5b9165 APS logging 2018-07-29 11:10:06 +02:00
Milos Kozak 5ef9bc7948 cleanup 2018-07-29 00:20:41 +02:00
Milos Kozak 75bb38ba1f move activities to new package 2018-07-29 00:08:28 +02:00
Milos Kozak a4935b5d38 Services refactor 2018-07-29 00:00:48 +02:00
Milos Kozak 5efad35721 NSUpload refactor 2018-07-28 23:57:25 +02:00
Milos Kozak 6e902cb9ca PUMP logging 2018-07-28 23:38:39 +02:00
Markus M. May f70909d6c6 Refactore logshipper to maintenance, move funcs from menu to plugin 2018-07-28 22:45:40 +02:00
Milos Kozak 8a66b4db2e OBJECTIVES logging 2018-07-28 18:07:06 +02:00
Milos Kozak cfff357e6b NSCLIENT logging 2018-07-28 17:58:52 +02:00
Milos Kozak a7efa317be DATA logging & refactor 2018-07-28 16:26:36 +02:00
Milos Kozak b8a41e5f5b ALARM logging 2018-07-28 13:55:16 +02:00
Milos Kozak 8e60e07b7c Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-28 11:39:37 +02:00
Milos Kozak 15694a3b8b fix NPE 2018-07-28 11:31:37 +02:00
Milos Kozak 9141e0f66d OVERVIEW & NOTIFICATION logging cleanup 2018-07-27 14:01:56 +02:00
Milos Kozak 6a058f5036 BGSOURCE refactor & logging 2018-07-27 13:41:25 +02:00
Milos Kozak bfccda21cb QUEUE logging cleanup 2018-07-27 12:17:29 +02:00
Milos Kozak 3d57d52271 EVENTS logging cleanup 2018-07-27 11:40:27 +02:00
Milos Kozak 1e68165c82 AUTOSENS logging cleanup 2018-07-27 11:35:32 +02:00
Andy Rozman fcdb2f9708 - change to tunning 2018-07-26 23:34:28 +01:00
Andy Rozman 8e99482723 Some fixes in merge 2018-07-26 17:31:38 +01:00
Andy Rozman 1b8ceb83cf Merge branch 'dev' into medtronic_andy 2018-07-26 16:48:52 +01:00
Andy Rozman 318436f417 - some changes from RileyLinkAAPS project:
- refactored RfSpy and underlaying classes so that we can read Version (which is not encoded and has no CRC)
   - added functionality to be able to recover RL if BT is disabled and re-enabled
   - some minor refactorings here and there
- TBR enabled
- Bolus delivery
- Medtronic Pump Plugin is working (able to deliver TBRs and Bolus), there are still a lot of things to work on but we have base implementation here...
2018-07-26 16:31:23 +01:00
Sebastian Lenz ee06d1119d clear Notification if tbr is accepted from wearable 2018-07-26 13:07:08 +02:00
Sebastian Lenz 79abcdb0d7 moved tbr accepting to a new method of the LoopPlugin 2018-07-26 11:47:39 +02:00
Sebastian Lenz 971e258265 cancel TBR request notification on wearable if accepted or no longer valid 2018-07-25 23:48:54 +02:00
Sebastian Lenz 8c49119b15 processing the acceptance of the TBR request from the wearable 2018-07-25 23:47:59 +02:00
Sebastian Lenz e2ef8f2d74 send notification about TBR request to the wearable 2018-07-25 23:46:06 +02:00
Sebastian Lenz 5bb6635cab dismiss notification for TBR request if it's no longer requested 2018-07-25 23:32:23 +02:00
Sebastian Lenz 2db63d4be4 dismiss notification when accepting a TBR request 2018-07-25 23:28:15 +02:00
Tanja Schmidt 0a29e8a055 delete now value even if empty/deleted 2018-07-25 22:04:44 +02:00
Markus M. May c34104b906 move log shipment to own plugin 2018-07-25 22:00:58 +02:00
Milos Kozak 088c423208
Merge pull request #1253 from jotomo/hypo-tt-correction
NewCarbsDialog: correct situation where Hypo TT can't be unchecked.
2018-07-25 10:30:19 +02:00
Milos Kozak 87de4bce5b
Merge pull request #1257 from jotomo/1254
Fix #1242 double mmol/l conversion.
2018-07-25 10:29:13 +02:00
Markus M. May 60721c8395 First working version 2018-07-24 22:34:10 +02:00
Johannes Mockenhaupt 0b280ce4d4
Fix #1254 double mmol/l conversion. 2018-07-24 19:19:01 +02:00
Milos Kozak 96e101aa80 logging 2018-07-24 14:38:12 +02:00
Johannes Mockenhaupt 39dc914c2c
NewCarbsDialog: correct situation where Hypo TT can't be unchecked. 2018-07-24 12:48:50 +02:00
Milos Kozak 026c9f4788 fix ratio scale #2 2018-07-24 12:00:16 +02:00
Milos Kozak 9fc54f4e0c fix ratio scale 2018-07-24 11:01:33 +02:00
Milos Kozak 503d61e1be
Merge pull request #1227 from PoweRGbg/rotation
fix for carbs and wizard dialogs on screen rotation
2018-07-24 10:34:27 +02:00
Roumen Georgiev 166d58fa3e
fix for timeDisplayFormat in Dana RS 2018-07-24 10:39:46 +03:00
Milos Kozak 4052725096
Merge pull request #1249 from MilosKozak/hypoTT-checkable
react to HypoTT on first click
2018-07-24 09:26:10 +02:00
Milos Kozak 7e2d3fd8be historybrowser, rendering optimizations 2018-07-24 00:46:08 +02:00
Markus M. May 2090b3c7e1 First draft 2018-07-23 20:58:20 +02:00
AdrianLxM fa67aa69d5
react to HypoTT on first click
onClickListener, not OnCheckedListener was set for HypoTT
2018-07-23 18:43:26 +02:00
Milos Kozak 130fca4c2a RS onConnectionStateChangeSynchronized 2018-07-23 16:33:51 +02:00
Milos Kozak d7b29db626 fix NPE 2018-07-23 16:19:11 +02:00
Milos Kozak 90729cffe6 RS disconnect synchronized 2018-07-23 16:17:17 +02:00
Milos Kozak 49e8a0b7c4 some logging conditional 2018-07-22 21:19:59 +02:00
Milos Kozak cede7dd4b9 log JSON data with exception 2018-07-22 21:14:42 +02:00
Milos Kozak 0616c16e9f
Merge pull request #1243 from jotomo/patchpatchpatch
Abort APS run if AS requested but not yet available.
2018-07-22 18:09:02 +02:00
Johannes Mockenhaupt a2e17c05c6
So here's the thing ... 2018-07-22 18:06:11 +02:00
Milos Kozak a0f261ba0c fix NPE 2018-07-22 18:02:00 +02:00
Johannes Mockenhaupt 777542dbb8
Abort APS run if AS requested but not yet available.
Should only occur during startup or when something else is broken
already, so just return.
2018-07-22 17:57:17 +02:00
Andy Rozman 0b180d3d65 - tbr start is succesful, but tbr is not displayed 2018-07-22 16:45:26 +01:00
AdrianLxM b435c09771 preserve carbs 2018-07-22 14:26:56 +02:00
AdrianLxM 9824b45640 NSClient -> owl 2018-07-22 01:32:09 +02:00
Milos Kozak 213a45c1e5 unique autosens debug tag 2018-07-21 22:56:08 +02:00
AdrianLxM e3c4de8f7b
Merge pull request #1236 from MilosKozak/RShistory
Rshistory
2018-07-21 22:22:11 +02:00
AdrianLxM 77d2326331
remove debug toasts 2018-07-21 22:21:12 +02:00
AdrianLxM 983e9c3658
allow updated Treatments for insight 2 2018-07-21 19:21:40 +02:00
AdrianLxM bcbf432236
allow update for insight -> don't alarm 2018-07-21 18:34:48 +02:00
Milos Kozak b52c1f3aa6 postpone EventAutosensCalculationFinished 2018-07-20 22:40:44 +02:00
Milos Kozak ab70d5b67d use Thread.isAlive() 2018-07-20 17:52:31 +02:00
Milos Kozak cfee405914 use thread.join 2018-07-20 10:52:58 +02:00
Milos Kozak d17ffc334d autosens call refactor 2018-07-20 00:19:13 +02:00
Milos Kozak 8f8e91f2de report TreamtentClash to Fabric 2018-07-18 17:10:21 +02:00
Milos Kozak dd687fbb40 RS,Rv2: load only recent history 2018-07-18 17:02:28 +02:00
PoweRGbg bf22b88123 some work for all the CP dialogs 2018-07-18 13:52:15 +03:00
Milos Kozak b15da5a5cf
Merge pull request #1213 from MilosKozak/insight-constraints
insight constraints
2018-07-18 11:21:55 +03:00
Milos Kozak 048c1c6cfc
Merge pull request #1226 from jotomo/hb-is-wip
Disable history browser unless on dev-branch.
2018-07-18 11:20:55 +03:00
Milos Kozak e6baf3ff47 Merge branch 'dev' into last-2.0-something-stuff-update1 2018-07-17 23:05:08 +02:00
Milos Kozak ebb97be8c5 Dana pumps: better detect wrong profile in pump 2018-07-17 22:56:25 +02:00
Johannes Mockenhaupt 54be28388b
Disable history browser unless on dev-branch. 2018-07-17 21:57:06 +02:00
Milos Kozak 5f4db31e80 fix multiple code 2018-07-17 19:42:18 +02:00
Milos Kozak 7d6674267b
Merge branch 'dev' into last-2.0-something-stuff-update1 2018-07-17 19:53:43 +03:00
PoweRGbg 141bfda099 wizard is ready also 2018-07-17 15:04:07 +03:00
PoweRGbg edbeddf8b0 carbsDialog done also 2018-07-17 14:43:34 +03:00
PoweRGbg 15b9cb5b3c removed dummy message 2018-07-17 12:19:36 +03:00
Roumen Georgiev cd4e7c2d4f
Save & restore dialog state on screen rotate 2018-07-17 12:01:21 +03:00
AdrianLxM 6054501b5f
Merge pull request #1219 from jotomo/auto-hypo-tt
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-16 13:27:06 +02:00
Johannes Mockenhaupt f5ecb9811e
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-15 22:33:42 +02:00
Milos Kozak 97d9f7866c Rv2: prevent carbs x insulin 2018-07-15 19:48:33 +02:00
Milos Kozak 357b947c1d RS: prevent carbs x insulin 2018-07-15 19:45:51 +02:00
Milos Kozak 8f641f994f RSv3 firmware error reporting 2018-07-13 18:03:04 +03:00
Milos Kozak 695997ebb9 RS: delay before reading history 2018-07-13 09:50:04 +03:00
Milos Kozak 8a3d3d580f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-12 22:03:28 +03:00
AdrianLxM 5f5a2b6a0d
insight constraints 2018-07-12 20:30:19 +02:00
Milos Kozak efefe8ed18
Merge pull request #1211 from jotomo/pluginstats
PluginStats: used simple class named instead of translated name.
2018-07-12 21:30:12 +03:00
Milos Kozak 35e93ffafd more debug to autosens 2018-07-12 21:28:35 +03:00
AdrianLxM cb826da403
Revert "Fixed problem with Corr numberpicker when using Insightpump" 2018-07-12 19:37:21 +02:00
Johannes Mockenhaupt 5b9ede15ea
PluginStats: used simple class named instead of translated name. 2018-07-12 15:47:45 +02:00
Milos Kozak e8c1dd5e3b
Merge pull request #1209 from harispoljo/CorrInsight
Fixed problem with Corr numberpicker when using Insightpump
2018-07-12 16:10:10 +03:00
Milos Kozak ba945f334b
Merge pull request #1204 from jotomo/pluginstats
Fabric-log enabled plugins once a day.
2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt 6302769652
Log app usage type daily. 2018-07-11 20:51:09 +02:00
harispoljo 8b200ba9de
Fixed bug 2018-07-11 19:53:19 +02:00
harisp 395f2313fd Implemented feedback 2018-07-11 18:17:09 +02:00
Milos Kozak d97e195ad1 revert wrong autosens fix 2018-07-11 18:23:58 +03:00
Milos Kozak e4e0e64eef another fix of displaying ext bolus 2018-07-11 18:02:20 +03:00
Milos Kozak 613802b12c
Merge pull request #1183 from triplem/autosens_fix
Autosens fix
2018-07-11 17:30:29 +03:00
harisp b42ce70daa Fixed problem with corr numberpicker when using insight pump 2018-07-11 14:14:01 +02:00
Johannes Mockenhaupt 09a1d23bc8
Move logging of app start to Fabric class. 2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt ccaf68d043
Fabric-log enabled plugins once a day. 2018-07-10 13:00:20 +02:00
Milos Kozak 5a6b7f9dad Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-09 18:16:55 +03:00
Johannes Mockenhaupt 2cd3ec82de
Create note for eCarbs, so it's easier to see what amount/time was used.
Otherwise iterating on parameters is tedious with only the generated carbs.
2018-07-07 12:02:44 +02:00
Milos Kozak 506971292e cleanup 2018-07-05 15:36:13 +02:00
Markus M. May afaf729df1 Try to rework the ugly fix 2018-07-04 20:42:31 +02:00
Markus M. May c78117e356 recall getAutosensData, if it is null 2018-07-03 22:35:06 +02:00
Markus M. May a978225428 Cleanup Imports 2018-07-03 22:11:01 +02:00
Markus M. May 5422a8bc20 Cleanup Imports, added a TODO 2018-07-03 22:10:33 +02:00
AdrianLxM e5d8eb163b
Update Treatment.java 2018-07-03 19:25:23 +02:00
AdrianLxM 006528ae4c
Update TreatmentService.java 2018-07-03 19:24:44 +02:00
Milos Kozak 3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak 60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +02:00
Milos Kozak 4919986dc0 setup wizard for pumpcontrol 2018-07-02 12:18:49 +02:00
Milos Kozak bb30171777 fix typo in poctech driver 2018-07-02 10:53:09 +02:00
AdrianLxM 297fe487f7 update with data from pump 2018-07-02 06:54:02 +02:00
AdrianLxM b39fa514c2 alarm on clashes, not on identical treatments 2018-07-02 02:11:25 +02:00
Nico Schmitz 2ce38702e2
Merge branch 'dev' into dev-wip 2018-07-01 22:44:11 +02:00
Milos Kozak 98dedf117f
Merge pull request #1167 from triplem/date_util
Do calculations in a central place
2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt bf3b4502bf
log origin of offending call 2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt 21313bd418
obligatory format specifier fixes 2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt 290effcd7c
simplyify defaulting to hypo tt. 2018-07-01 18:53:45 +02:00
Johannes Mockenhaupt 5df054a999
more fixes 2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt 9b7d36ffed
bugfix 2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt 6ebb13d28d
alarm on failure to add treatment to db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 658af4bcfd
combo: don't attempt to add a bolus record if it already exists in db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt f12db81f96
treatmentservice: add method to check if record with pump id exists. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 780a4dda36
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-01 17:21:40 +02:00
Markus M. May 6bc60cd8a8 Rework to use already existing method 2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt 33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901"
This reverts commit 268dec0059, reversing
changes made to ab41541c69.
2018-06-29 22:43:54 +02:00
Milos Kozak 2291472b01
Merge pull request #1168 from MilosKozak/milosremote/dev
ask user if he switches to a HW pump for the first time
2018-06-29 15:43:48 +02:00
AdrianLxM 5a1d696ab1 ask user if he switches to a HW pump for the first time 2018-06-29 03:52:58 +02:00
Milos Kozak 268dec0059
Merge pull request #1131 from jotomo/901
Don't loop for values from non-active BG sources
2018-06-28 22:51:56 +02:00
Markus M. May 468b645486 Do calculations in a central place 2018-06-28 22:36:08 +02:00
Milos Kozak ab41541c69 fix NPE 2018-06-28 22:31:42 +02:00
Milos Kozak 720e938ebf allow longer lowtemp on RS an Rv2 2018-06-28 10:30:45 +02:00
Milos Kozak a99b478eea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-27 20:13:37 +02:00
Milos Kozak 29032e658f show predictions in nsclient mode 2018-06-27 20:13:25 +02:00
Milos Kozak 2b799d9f71 SW: ask for import after storage permission 2018-06-26 13:15:50 +02:00
Milos Kozak 4df3561b4b setup wizard cleanup 2018-06-26 12:53:43 +02:00
Milos Kozak 520f2e1518 plugin descritpions to setup wizard 2018-06-26 12:28:53 +02:00
Milos Kozak 77245c027e prevent NPE 2018-06-26 10:45:56 +02:00
Milos Kozak f7f4385d5d cleanup 2018-06-26 00:20:43 +02:00
Milos Kozak d55612b290 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-26 00:16:31 +02:00
Milos Kozak 44cf82abde fix iob graph axis labels 2018-06-26 00:16:26 +02:00
Johannes Mockenhaupt b6a621528a
Autosens: show 'u's for UAM in output. 2018-06-26 00:01:31 +02:00
Johannes Mockenhaupt 50ffebc679
BgReading.copyFrom: don't update local data.
Like the 'valid' flag, which is not copied and is not synced with
NS, don't sync sourcePlugin or isFiltered.
Otherwise there might be a race condition if the NS-roundtrip of a
locally received BG updates the sourcePlugin field to null,
thus leaving no values for the loop to loop with.
2018-06-25 23:02:58 +02:00
Johannes Mockenhaupt 069f0fb7b1
Fix method name. 2018-06-25 22:51:59 +02:00
Milos Kozak 81ad4c54f3 fix bug when uncomplete autosens was stored to the cache 2018-06-25 22:20:00 +02:00
Milos Kozak 6d1fa2ffda Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-25 20:04:03 +02:00
Milos Kozak 4b777f8dcc fix extendedBolusView 2018-06-25 20:03:54 +02:00
Johannes Mockenhaupt e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage. 2018-06-25 12:07:12 +02:00
AdrianLxM 619ba32840
configbuilder fix 2018-06-25 00:07:43 +02:00
Milos Kozak 385f0c7bfe
Merge pull request #1148 from triplem/1133
1133
2018-06-24 19:32:18 +02:00
Milos Kozak ee2d6b71d1 add delay to sms bolus command 2018-06-24 18:28:38 +02:00
Markus M. May 07f7c00d85 Move Algo to abstract class 2018-06-24 18:20:28 +02:00
Milos Kozak 15607dc9be follow autosens min/max for clearing cache 2018-06-24 17:54:23 +02:00
Milos Kozak cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix
Config builder cleanup
2018-06-24 17:29:29 +02:00
Milos Kozak eb9f489411
Merge pull request #1149 from jotomo/treatment-prefs
Treatments don't have settings.
2018-06-24 17:20:59 +02:00
Johannes Mockenhaupt dcdbe7791f
Treatments don't have settings.
Before this, treatments preferences opened preferencs of the
oref0 sensitivity plugin.
2018-06-24 16:39:56 +02:00
AdrianLxM 87d24b6e6e
re-initialize on time sync Rv2 2018-06-24 15:46:31 +02:00
AdrianLxM 54e647bbe1
re-initialize after time-sync 2018-06-24 15:43:42 +02:00
Markus M. May faca79d13e Add unit test to PR 2018-06-24 15:43:25 +02:00
TebbeUbben 2b5631e1e7 Config builder cleanup 2018-06-24 15:13:06 +02:00
AdrianLxM 02eceef134
De-initialize Rv2 if time is off by more than 1.5h 2018-06-24 15:03:46 +02:00
AdrianLxM 78949a34ab
De-initialize RS if time is off by more than 1.5h 2018-06-24 15:03:03 +02:00
Milos Kozak c5841063a2
Merge branch 'dev' into rs-sync-warn 2018-06-24 14:03:12 +02:00
Milos Kozak 8c695255d6
Merge pull request #1143 from jotomo/strings
Rename "Lock screen" -> "Keep screen on".
2018-06-24 13:58:35 +02:00
AdrianLxM 5f2f0fff40 time sync in Rv2 as in RS 2018-06-24 13:32:19 +02:00
AdrianLxM 3e53c66365 don't set time on large diff, just warn 2018-06-24 13:27:55 +02:00
AdrianLxM d72cb96d2b
Oref0 sensitivity 24 hours 2018-06-24 13:12:15 +02:00
Johannes Mockenhaupt a8d783874c
Rename "Lock screen" -> "Keep screen on". 2018-06-24 12:50:11 +02:00
Milos Kozak f7609317ba
Merge branch 'dev' into rs-sync-warn 2018-06-24 11:45:33 +02:00
Milos Kozak 2963f0a698
Merge pull request #1140 from triplem/issue_1130_backwards
Issue 1130 backwards
2018-06-24 11:44:41 +02:00
Johannes Mockenhaupt 784c071f53
Small oref1 sens corrections. 2018-06-24 01:03:38 +02:00
Markus M. May 8bdaddb389 Allow backwards compatibility to previous solution to add quotes 2018-06-23 22:41:01 +02:00
Markus M. May e32f33a8d3 fixes #1130 2018-06-23 21:36:18 +02:00
Milos Kozak de2273836e OpenAPS Offline visualization fix 2018-06-23 21:16:08 +02:00
Milos Kozak a4b3b7b2e9 Clean AndroidAPS started button 2018-06-23 20:28:20 +02:00
AdrianLxM 11b8587768
Warn on long time diffs on Rv2 2018-06-23 20:05:59 +02:00
AdrianLxM 1b047bba69
Warn on large time offsets RS 2018-06-23 20:05:05 +02:00
Milos Kozak 0d48cc8770 fix parsing SSID 2018-06-23 19:59:11 +02:00
Milos Kozak fb94c93ba6
Merge pull request #1110 from TebbeUbben/foreground-service
Use a foreground service for the ongoing notification and enforce using it on Oreo and up
2018-06-23 19:37:33 +02:00
Milos Kozak a3c3c52249 Merge branch 'dev' into sens-cutoff 2018-06-23 18:59:33 +02:00
Milos Kozak bbfe1d2f83 fix NPE in #1136 2018-06-23 18:52:58 +02:00
Milos Kozak f7309c9ff1 Merge branch 'dev' into sens-cutoff 2018-06-23 18:34:46 +02:00
Milos Kozak 470487375d
Merge pull request #1136 from TebbeUbben/profile-invalid-fix
Mark profile as invalid if high target < low target
2018-06-23 18:24:40 +02:00
Milos Kozak 586665e19f nsclient table mode improvements 2018-06-23 18:24:04 +02:00
TebbeUbben 8adc333ade Mark profile as invalid if high target < low target 2018-06-23 16:02:10 +02:00
AdrianLxM 064a8915a0 downweight Autosens if not enough data 2018-06-23 14:05:12 +02:00
Milos Kozak 53ba6d46d5 fix adding zero deviations 2018-06-23 12:27:18 +02:00
Milos Kozak 9c5e389afb move sensitivity plugins to one package 2018-06-23 12:19:55 +02:00
Johannes Mockenhaupt 6cb09d4fcb
Remove BgReading.noise for now, clashes with existing NS data.
I believe NS uses 'noise' to store the noise level (1 through 3?).
2018-06-23 11:41:03 +02:00
Johannes Mockenhaupt 73e8a0c876
Rename BgReading.filtered to BgReading.isFiltered and add to NS.
Avoids collision with 'filtered' value in NS data.
2018-06-23 11:36:23 +02:00
Johannes Mockenhaupt 6d437b4afa
Test stubs. 2018-06-23 11:35:01 +02:00
Johannes Mockenhaupt c18effd893
Fix detecting BG source from NS entry. 2018-06-23 11:27:56 +02:00
Johannes Mockenhaupt b4db98fa1d
Process xDrip noise data if provided (engineering mode only). 2018-06-23 11:21:05 +02:00
Johannes Mockenhaupt 34ee125666
Add message to constraints if BG is not filtered. 2018-06-23 11:07:16 +02:00
Johannes Mockenhaupt 79dec2e871
Fixes. 2018-06-23 02:59:11 +02:00
Johannes Mockenhaupt 986d9fb01c
Detect source from NSClient BG. 2018-06-23 01:33:13 +02:00
Johannes Mockenhaupt 906cc8a76a
Clean up assigning sourcePlugin, filtered properties. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt 53b9d5cae3
Fix column type. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt aab171932c
Have Bgsource.processNewData return added BGs. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt 922f9ff83d
Refactor DataService to delegate BG processing to BgSources. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 7a331e0c94
Don't loop with readings coming from non-active BG source. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 6abad56b1f
Replace BgSourceInterface.advancedFilteringSupported.
Replaced by 'filtered' property on BgReading.
2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 98c933af57
BgReading: add sourcePlugin and filtered fields. 2018-06-23 01:24:26 +02:00
Milos Kozak 4efb115209 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-22 22:52:23 +02:00
Milos Kozak 8e08a293c1 detect bg source in nsclient 2018-06-22 22:30:03 +02:00
Milos Kozak 8a74646b67 set positive deviations to zero if bg < 80 2018-06-22 21:18:59 +02:00
Milos Kozak c139942981 reset autosens on site change (AAPS,WA) 2018-06-22 20:11:45 +02:00
Milos Kozak 8237456030 reset autosens on site change 2018-06-22 20:05:49 +02:00
Milos Kozak 9360151100 Merge branch 'dev' into oref1 2018-06-22 17:55:38 +02:00
Milos Kozak 7bed827f4b
Merge pull request #1119 from jotomo/delete-future-treatments
Treatments tab: add button (if applicable) to delete future treatments.
2018-06-22 17:47:37 +02:00
Milos Kozak 9dc667817b
Merge pull request #1120 from schmitzn/sync-butterknife-eventbus
Synchronize Butterknife / Eventbus (#1090)
2018-06-22 17:45:55 +02:00
Milos Kozak a3cf7622b6
Merge pull request #1121 from jotomo/tt-context-menu
TT context menu
2018-06-22 17:28:20 +02:00
Johannes Mockenhaupt 9b4f3f6e0e
Don't apply loop result if a bolus is in progress.
While an SMB is rejected by the queue in this scenario, a temp basal
would still be applied, so don't apply loop results if a bolus is
progress or queued at this point.
2018-06-21 22:58:15 +02:00
Johannes Mockenhaupt 3eed0afe61
Move 'eating soon' TT to top (ordering of dialog). 2018-06-21 22:29:16 +02:00
Johannes Mockenhaupt 58d79892ed
Overview: TT context menu. 2018-06-21 22:06:39 +02:00
Nico Schmitz 4d853c1435 Check for unbound variables 2018-06-21 21:58:12 +02:00
Johannes Mockenhaupt 41ce9677df
Remove duplicate string. 2018-06-21 09:57:35 +02:00
Milos Kozak bd846e7526
Merge pull request #1117 from jotomo/1068-bolus-after-smb
WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.
2018-06-21 09:30:56 +02:00
AdrianLxM 809ad97cb9
Merge pull request #1118 from jotomo/1096
Disable slope deviation unless on dev branch, fixes #1096.
2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt 6002c747e6
Treatments tab: add button (if applicable) to delete future treatments. 2018-06-21 00:38:22 +02:00
Johannes Mockenhaupt 49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068. 2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt 8036f8bcde
Disable slope deviation unless on dev branch, fixes #1096. 2018-06-21 00:31:35 +02:00
Milos Kozak 5292e09535 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-20 23:56:50 +02:00
Milos Kozak a02961da61 check for NPE 2018-06-20 23:56:38 +02:00
Nico Schmitz c3050740a8 Synchronize Butterknife / Eventbus 2018-06-20 22:57:31 +02:00
Milos Kozak 3ed11f9002 oref1 autosens: count with extra deviations 2018-06-20 20:49:16 +02:00
Milos Kozak 6eef71c4c0
Merge pull request #1116 from TebbeUbben/cb-fix
Fix for #1115
2018-06-20 20:43:29 +02:00
TebbeUbben ed10c8cadc Fix for #1115 2018-06-20 20:12:22 +02:00
Milos Kozak 370008f41e oref 0.6.0 sens 2018-06-20 18:39:47 +02:00
Milos Kozak e913cfe454 prepare oref1 plugin 2018-06-19 20:41:40 +02:00
Milos Kozak df021a2dd2
Merge pull request #1111 from jotomo/combo-setup-notification
Combo setup notification
2018-06-19 18:41:43 +02:00
Johannes Mockenhaupt 3ed4aa468d
Combo: fix ReadQuickInfoCommand to handle empty bolus history. 2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt ef650b80a1
Combo: show notification on broken setup. 2018-06-18 20:19:30 +02:00
TebbeUbben ef237ed378 DummyService javadoc 2018-06-18 19:43:40 +02:00
Milos Kozak af8e1fb32f
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1
restrict local profile DIA to min of 5 on the GUI
2018-06-18 18:58:29 +02:00
TebbeUbben a590a8be42 Foreground service 2018-06-17 23:33:32 +02:00
Nico Schmitz d88b4da5a9 Don't show statuslight preferences in NSCLIENT build 2018-06-17 22:41:34 +02:00
Andy Rozman 47427ec68e - integration started
- states visible
- command framework added
- we get currect profile and compare it with AAPS profile
- setProfile command is disabled, if pumps profile is different we get warning
- bolus is enabled and working
- get remaining reservoir level
2018-06-16 18:13:29 +01:00
Milos Kozak f14ba554f0 RS ble cleanup 2018-06-16 13:18:00 +02:00
Nico Schmitz aa4f506961 Update to current upstream/dev branch 2018-06-16 02:51:33 +02:00
Nico Schmitz db36d6e3f5 Change colors and refactor code 2018-06-16 02:18:03 +02:00
Tebbe Ubben 1e4c7178f4
Merge branch 'dev' into dev 2018-06-15 21:10:33 +02:00
Nico Schmitz 14a17efecc Update colors 2018-06-15 19:36:49 +02:00
Milos Kozak 21b598edfa
Merge pull request #1100 from MilosKozak/rsoption
Rsoption
2018-06-15 00:19:08 +02:00
Nico Schmitz bf3ce735bc Set colors of profile view 2018-06-14 23:22:15 +02:00
Nico Schmitz 1604b53327 Fix bugs, refactor code and add preferences 2018-06-14 20:49:58 +02:00
Nico Schmitz d7db19bf2d Merge branch 'fix-careportalevent' into dev-wip 2018-06-14 13:01:14 +02:00
Nico Schmitz 43d787ff88 Simplify isOlderThan() 2018-06-14 12:38:15 +02:00
Nico Schmitz f82240a724 Fix bug in getHoursFromStart() 2018-06-14 12:34:42 +02:00
Nico Schmitz 217583d601 Use getBatteryLevel() for BAT status. Refactor code and layout. 2018-06-13 19:58:52 +02:00
Roumen Georgiev 904957d0d2
removing unneeded methods 2018-06-13 18:24:50 +03:00
PoweRGbg a64364de4e removed excessive debugging and unneeded source 2018-06-13 16:17:10 +03:00
PoweRGbg 5a197676fb IT WORKS!!! 2018-06-13 15:57:42 +03:00
PoweRGbg faab8fbc67 setting full userOptions 2018-06-13 11:43:44 +03:00
Milos Kozak 4d2e166620 try to fix crash 2018-06-13 10:41:15 +02:00
PoweRGbg 56651691a5 more more 2018-06-13 11:08:47 +03:00
PoweRGbg 64b5783e4a more 2018-06-13 11:07:03 +03:00
PoweRGbg 71c474ef5f danaR changes 2018-06-13 11:04:32 +03:00
PoweRGbg 5634aabd9f more 2018-06-13 11:02:52 +03:00
PoweRGbg 2cb3c15d61 more update 2018-06-13 11:01:43 +03:00
PoweRGbg cd337ecdc8 update to latest changes from Milos 2018-06-13 10:51:06 +03:00
PoweRGbg 434db333b1 reverting changes 2018-06-13 09:56:30 +03:00
PoweRGbg 87bc6ed798 Revert "more debugging output"
This reverts commit 1adf8718ae.
2018-06-13 09:49:58 +03:00
PoweRGbg 0f067ef3a7 Revert "more debugging output"
This reverts commit f1f8bae2d1.
2018-06-13 09:49:45 +03:00
PoweRGbg 90a3a66c30 Revert "Merge remote-tracking branch 'upstream/rsoption' into dev"
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
2018-06-13 09:49:37 +03:00
PoweRGbg 0e40d1e7ef Revert "Revert "more debugging output""
This reverts commit 209fb79396.
2018-06-13 09:49:35 +03:00
PoweRGbg 209fb79396 Revert "more debugging output"
This reverts commit f1f8bae2d1.
2018-06-13 09:34:57 +03:00
PoweRGbg 233fb33659 Merge remote-tracking branch 'upstream/rsoption' into dev 2018-06-13 09:14:46 +03:00
Roumen Georgiev f1f8bae2d1 more debugging output 2018-06-13 09:00:04 +03:00
Milos Kozak 082918c776 remove unneded code 2018-06-13 07:44:26 +02:00
Milos Kozak 6fa759a395 remove unneded code 2018-06-13 07:42:57 +02:00
Nico Schmitz a7aa4c2b5a Implement getBatteryLevel() in PumpInterface and for all pump plugins 2018-06-13 00:28:17 +02:00
Nico Schmitz f28fca668f Integrate info fields from swissalpine/dev-work 2018-06-13 00:07:13 +02:00
Milos Kozak ecdbe2ac37 setUserOptions cleanup 2018-06-12 23:43:04 +02:00
Nico Schmitz 5ba6f02b93 Remove reservoir TextView 2018-06-12 23:31:46 +02:00
Nico Schmitz 4ebc149783 Add changes of schmitzn/reservoir-view 2018-06-12 23:28:11 +02:00
Milos Kozak d051e081e2 Merge branch 'dev' into rsoption 2018-06-12 21:59:20 +02:00
Milos Kozak d4ed6539d8 poctech units mmol/L 2018-06-12 21:57:33 +02:00
Roumen Georgiev 1adf8718ae more debugging output 2018-06-12 13:30:07 +03:00
Roumen Georgiev 06507bab2c update method names 2018-06-12 12:41:40 +03:00
Roumen Georgiev 978d94499f update method names 2018-06-12 11:03:23 +03:00
Roumen Georgiev f044ab15c0 setting swithces in activity 2018-06-12 10:39:47 +03:00
Roumen Georgiev 01012d817c getting userOptions from v2 2018-06-12 10:29:47 +03:00
Milos Kozak e7eec8fe69 Poctech BG source 2018-06-11 17:26:31 +02:00
TebbeUbben 41a7f57b75 Update Objective views every minute 2018-06-11 16:35:47 +02:00
TebbeUbben 3ac10f4f7a Improved MinimumDurationTask visualization 2018-06-11 16:24:46 +02:00
TebbeUbben 31cb68240b Automatically scroll to currently active objective 2018-06-11 15:45:28 +02:00
Roumen Georgiev 2441214bb8 added SetUserOptions for DanaR 2018-06-11 11:36:32 +03:00
Andy Rozman 9bae53e53a - update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working)
- it will take some time until code is actually integrated into AAPS, but at least now all files are available
2018-06-10 21:50:50 +01:00
TebbeUbben 97984f8ef3 Improved leftover time display 2018-06-09 23:15:46 +02:00
TebbeUbben 6bc13d9cc0 Don't return false in isStarted if objective has been accomplished 2018-06-09 23:10:54 +02:00
TebbeUbben 0d21a0ab62 Fixed tests 2018-06-09 23:03:31 +02:00
TebbeUbben 005039effc Objectives styling 2018-06-09 22:07:41 +02:00
TebbeUbben 531a926d00 Close navigation drawer on click 2018-06-09 13:17:26 +02:00
Milos Kozak 30dbbb12a8
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3
Wizard: fully undo "ok" on constraints violation
2018-06-09 11:46:41 +02:00
TebbeUbben f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
2018-06-08 23:30:39 +02:00
TebbeUbben 2d94133175 Plugin descriptions 2018-06-08 21:19:46 +02:00
AdrianLxM bbf09a62f1
synchronize onDestroyView 2018-06-08 06:20:35 +02:00
AdrianLxM 97bbc00dcf
Don't set text onunbound gui elements 2018-06-08 06:19:02 +02:00
TebbeUbben 38526d64c6 These should not be changed 2018-06-07 23:24:10 +02:00
TebbeUbben e25ebbdafa Protection against callback looping 2018-06-07 23:23:10 +02:00
TebbeUbben aa86a49339 Use real plugin descriptions 2018-06-07 22:55:13 +02:00
TebbeUbben 13cb4c28ed ConfigBuilder styling 2018-06-07 22:54:27 +02:00
AdrianLxM d6184cc151
Wizard: fully undo "ok" on constraints violation
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
2018-06-07 22:44:09 +02:00
Roumen Georgiev 4b7f8615bf
Merge pull request #26 from MilosKozak/rsoption
update
2018-06-07 09:30:22 +03:00
Roumen Georgiev 9e2074433e remove button if pump is DanaR Korean 2018-06-07 09:26:33 +03:00