Commit graph

956 commits

Author SHA1 Message Date
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 0b28c92c2d
Merge pull request #1868 from andyrozman/medtronic_andy_merge
Medtronic driver merge
2019-07-25 16:15:17 +02:00
Milos Kozak 283fa0debf fix string 2019-07-25 15:17:58 +02:00
Milos Kozak 51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman da0b3c84f9 - added translatable="false" to all new keys 2019-07-24 16:42:10 +01:00
Andy Rozman b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Milos Kozak b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph
Insulin Activity in bg graph
2019-07-15 15:27:04 +02:00
Milos Kozak 7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +02:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak 72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Johannes Mockenhaupt 0e37228a07
Tidepool: remove category summary (is never displayed). 2019-07-14 11:54:03 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus 96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus 4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Andy Rozman a77f10dc94 - small fix for 0.11.8 2019-06-29 18:25:12 +01:00
Andy Rozman 32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Milos Kozak 7e8059c3d8
Merge branch 'automation' into triggerLastBolus 2019-06-21 15:34:06 +02:00
Milos Kozak a9d8420451
Merge branch 'automation' into deltaTrigger 2019-06-21 15:22:40 +02:00
Roumen Georgiev 046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev 15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00
Tebbe Ubben 5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00
Roumen Georgiev f15ead9c6f fixed tests and added DeltaType testing 2019-06-17 16:49:57 +03:00
Milos Kozak 09e4106182 BolusWizard -> kt, code consolidation 2019-06-16 09:00:47 +02:00
Andy Rozman a19d71df89 0.10.5-SNAPSHOT
- added custom comnand for reseting RL configuration
- removed guava Splitter and use my own code
- remove old unsused code
2019-06-09 16:58:23 +01:00
Milos Kozak 243e6c5801 pump manufacters etc 2019-06-09 14:02:33 +02:00
Milos Kozak c49da9a818 conditional upload 2019-06-08 23:39:14 +02:00
Milos Kozak 01006b32ce remove explicit enable checkbox, test login 2019-06-07 09:13:29 +02:00
Milos Kozak a0c00273bc remove window latency 2019-06-05 10:47:32 +02:00
Roumen Georgiev 116865896b
Automation (#69) (#70)
* Adding trigger AutosensValue

* new trigger and tests

* AS value in %

* adding tests

* fixed tests

* fix for maxValue and tests

* Using InputDouble

* icon added

* unavailable data and IS_NOT_AVAILABLE case

* Fixing after comments

* Autosens !=0 && IS_NOT_AVAILABLE doesn't exist enymore

* cleanup
2019-06-03 15:06:40 +03:00
Milos Kozak e2364561ed transform to kotlin, cleanup, sort 2019-06-02 16:24:51 +02:00
Andy Rozman 6d771d8918 - fixed string 2019-06-01 22:56:14 +01:00
Milos Kozak 9b1acf6958 add missing classes. convert to use AAPS data 2019-06-01 18:40:33 +02:00
Milos Kozak dd637021f7 tidepool xdrip port 2019-06-01 00:48:37 +02:00
Roumen Georgiev 5c4910ed5b added trigger Delta 2019-05-30 12:16:42 +03:00
Andy Rozman 67862d3385 - fix for task #126 - battery display, it will work for Alakaline and Lithium battery, but probably not for recharchargables 2019-05-26 14:44:33 +01:00
Roumen Georgiev 5d86ca742a AS value in % 2019-05-15 14:52:17 +03:00
Roumen Georgiev e898a8444c
Adding trigger AutosensValue 2019-05-14 16:47:37 +03:00
Andy Rozman 2ae7d0a292 - fixed problem with TDD
- added new command/action for Reset RileyLink (not working yet)
- added Hardware encoding for RileyLink
2019-05-05 17:22:10 +01:00
Milos Kozak a33e1f6d3c TriggerLocation 2019-05-03 07:37:49 +02:00
Milos Kozak 3ab2a142d1 Merge remote-tracking branch 'origin/dev' into automation 2019-05-02 22:27:54 +02:00
Andy Rozman 26f837397d Merge branch 'dev' into medtronic_andy 2019-05-02 20:51:55 +01:00
Tebbe Ubben 609309ab47 Signature Verifier 2019-05-01 16:08:47 +02:00
AdrianLxM 7c890f2129
Merge pull request #1757 from MilosKozak/update-checker
update logic version checker
2019-04-23 21:58:52 +02:00
Milos Kozak a678c6509c TriggerWifiSsid, UI tweaking 2019-04-22 22:47:59 +02:00
AdrianLxM 0361ee8589 update logic version checker 2019-04-22 14:10:12 +02:00
Milos Kozak 1840ddabb3 TriggerTempTarget 2019-04-22 12:42:19 +02:00
Milos Kozak 45312d9ffe ActionProfileSwitchPercent 2019-04-21 23:48:05 +02:00
Milos Kozak 42cd2ddaa3 TriggerProfilePercent 2019-04-21 22:32:06 +02:00
Milos Kozak e679f5eaff ActionNotification 2019-04-21 16:17:25 +02:00
Milos Kozak 5f32eea488
Merge branch 'dev' into automation 2019-04-21 10:39:24 +02:00
Milos Kozak 50a3b45f20 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-04-21 10:22:44 +02:00
Milos Kozak 619514e159 fix bugs in strings.xml 2019-04-21 10:22:27 +02:00
Milos Kozak 8ca3d7cba2 TriggerIob, refactoring, lint cleanup, tests 2019-04-21 10:04:30 +02:00
Milos Kozak 27783fe33e TriggerIob, more fixes 2019-04-19 09:20:59 +02:00
Milos Kozak 89ec81a850 UI and logic tweaking 2019-04-18 19:33:23 +02:00
AdrianLxM 092400f7a0 check regularly 2019-04-17 22:45:21 +02:00
AdrianLxM 4bde759a50 version checker plugin logic 2019-04-17 22:23:35 +02:00
Milos Kozak 4ae7efc75f Merge branch 'dev' into automation 2019-04-16 21:08:08 +02:00
AdrianLxM f739980988 testing and SP logic 2019-04-15 08:04:56 +02:00
Andy Rozman ad17c66b1b Merge branch 'dev' into medtronic_andy 2019-04-10 17:05:56 +01:00
AdrianLxM c34cf576e5 VersionCheckerPlugin nightly stub 2019-04-10 00:41:48 +02:00
Milos Kozak a1d93b0d68 LINT: fix errors in strings 2019-04-08 12:06:34 +02:00
Andy Rozman 03b3bf7388 Merge branch 'dev' into medtronic_andy 2019-04-07 23:48:20 +01:00
Milos Kozak 3636480c61 Answers -> Analytics migration 2019-04-05 00:32:26 +02:00
Tebbe Ubben e3f45aa6be Fix automatic careportal entries 2019-04-03 00:07:20 +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
Andy Rozman eb85cd2588 Merge branch 'dev' into medtronic_andy 2019-03-30 22:06:43 +00: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 cabdb1d2fb Merge branch 'dev' into automation 2019-03-30 15:47:23 +01:00
Milos Kozak ede3a4f0f4 typo 2019-03-29 08:32:54 +01:00
AdrianLxM d856b87703 rewrite DST logic 2019-03-28 19:38:58 +01:00
Nico Schmitz 9b19907388 Replace "lower" with "lesser" 2019-03-27 00:32:10 +01:00
Nico Schmitz ba0625b03f Update to recent upstream/dev 2019-03-26 00:47:00 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Milos Kozak 52482d112d typo 2019-03-21 22:31:44 +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
Nico Schmitz 6dc87db73e Improve EditEventDialog 2019-03-21 00:38:06 +01:00
Milos Kozak a37d04a8d9 SmsCommunicatorPluginTest 8 2019-03-20 22:49:35 +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
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
Milos Kozak 56f977df3c SMS Plugin allow basal in % 2019-03-08 23:48:41 +01:00
Milos Kozak 1eea170ead SMS Plugin correct response for % TBR 2019-03-08 22:07:20 +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
Tanja Schmidt a5d1905be8 Allow some objectives to go back. 2019-03-06 19:03:42 +01:00
Andy Rozman f7395c7a2c Changes after merge, compilable, but medtronic is still in old structure. 2019-03-02 20:24:53 +00:00
Andy Rozman 289902633e Merge branch 'dev' into medtronic_andy 2019-03-02 18:20:37 +00: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 c122618317 use key_smbmaxminutes instead of string 2019-02-25 20:08:34 +01:00
Tebbe Ubben 7e5c738d76
Update strings.xml 2019-02-24 14:33:23 +01: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 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
AdrianLxM c38d07950a
key not translatable 2019-02-17 21:01:06 +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 a4312acb3e Incremental recovery duration 2019-02-12 14:54:27 +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 6cb3b5fcac Change Insight driver strings 2019-02-09 22:01:11 +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
AdrianLxM 9df8273694
Merge pull request #1613 from TebbeUbben/dev-nico
Status lights with Insight support
2019-02-02 23:45:52 +01:00
Milos Kozak 5b462c4931
Merge pull request #1600 from tim2000s/dev
Upadted AMA Autosens string
2019-02-02 18:07:28 +01:00
TebbeUbben cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +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 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 85ae946296 Indicate in fragment if cartridge is not inserted 2019-01-19 00:41:29 +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
Tim Street 50f1049674
Updated Use AMA Autosens Features string
Updates the naming to remove AMA - line 441.
2019-01-13 21:45:51 +00:00
Andy Rozman 8fc694e812 Merge branch 'dev' into medtronic_andy 2019-01-04 22:24: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 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 b1606d2452
Merge pull request #1551 from triplem/pr_1550
Total Basal in NS Profile
2018-11-25 22:40:03 +01:00
Milos Kozak f600ff045f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-11-20 14:40:44 +01:00
Milos Kozak 864fe32626 Turkish 2018-11-20 14:40:38 +01:00
Milos Kozak b6cd214006
Merge pull request #1562 from MilosKozak/fixes
Fixes
2018-11-19 19:55:34 +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
Andy Rozman 3fdbc0400e Files missed on previous checkin. 2018-11-06 17:39:16 +00:00
Roumen Georgiev 43a61f312a WIP DstHelper 2018-11-06 11:25:39 +02:00
triplem 4cd9b19868 REname pump reconnection 2018-11-04 19:29:44 +01: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
Andy Rozman 75d3f3b4bc Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018) 2018-10-24 12:18:20 +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
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