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

567 commits

Author SHA1 Message Date
Johannes Mockenhaupt cce3a77a37
Log unhandled exception rather than printing to stdout. 2019-11-12 13:41:36 +01:00
boc-the-git b682432ca0 Change roundTo method to use BigDecimal rather than Double for more accurate comparison. Update tests to introduce more scenarios where without the code change, they'd fail. 2019-11-12 15:39:42 +11:00
AdrianLxM 3c4b16378b Merge branch 'master' into dev and update version 2019-11-01 00:22:06 +01:00
AdrianLxM d2b059fd6b
Update Tests for new versioning 2019-10-31 08:20:00 +01:00
Milos Kozak 0da6377687 SignatureVerifierPluginTest 2019-10-28 13:45:42 +01:00
Andy Rozman 6bdc01dded - commented out invalid "test" 2019-10-25 11:25:55 +01:00
Andy Rozman 9f8df64f45 Merge branch 'dev' into bug_2111_pump_stopped_when_not 2019-10-24 10:39:35 +01:00
Milos Kozak b5a1543b92 Merge branch 'dev' into signature 2019-10-22 15:24:44 +02:00
Milos Kozak ecbfd294a8 send hash to firebase 2019-10-22 15:24:37 +02:00
Milos Kozak d2a4aea9e2 remove MainApp::getSpecificPlugin 2019-10-18 13:12:45 +02:00
Andy Rozman 902422ddf0 Added BatteryChange event, as verification that pump is running. 2019-10-17 22:37:12 +01:00
Milos Kozak 7bbf30ec65 Merge branch 'dev' into survey 2019-10-15 23:49:17 +02:00
Milos Kozak 1c5b2c9858 remove failing test 2019-10-15 16:05:04 +02:00
Milos Kozak c42ef8e5ff Events to RxBus 2019-10-15 13:31:55 +02:00
Milos Kozak 64f16c5a7b Events to RxBus 2019-10-14 19:50:22 +02:00
Milos Kozak 450f4fabf0 Survey 2019-10-08 21:20:04 +02:00
Roumen Georgiev a81f607122 fix test 2019-10-07 11:09:34 +03:00
Roumen Georgiev 3f1f199690 renamed to TriggerPumpLastConnection 2019-10-07 10:45:26 +03:00
Milos Kozak b108f1fa78
Merge branch 'dev' into triggerPumpDisconnected 2019-10-04 19:34:54 +02:00
Roumen Georgiev c8443f1095 TriggerPumpDisconnected: Initial work 2019-10-04 15:16:57 +03:00
Roumen Georgiev e12217ae69 Copy&paste from ActionNotification 2019-10-04 10:55:33 +03:00
Milos Kozak 98f874d1fe use bolus size is DetailedBolusInfo search 2019-10-03 21:21:12 +02:00
Milos Kozak c44101ce76
Merge pull request #2089 from PoweRGbg/ChangeProfileAction 
Automation ActionCahangeProfile
 2019-10-02 16:33:58 +02:00
Milos Kozak ac69d1069e
Merge pull request #2017 from PoweRGbg/TriggerTOD 
Trigger for time of day
 2019-10-02 14:41:24 +02:00
Roumen Georgiev 7406577546 better test coverage & some cleanup 2019-10-02 14:37:00 +03:00
Roumen Georgiev 157028c4fd initial work 2019-10-02 10:54:04 +03:00
Milos Kozak 0139547499 fix test 2019-10-01 23:34:09 +02:00
Milos Kozak c1109a5b41 QuickWizard cleanup, -> kotlin 2019-10-01 15:00:19 +02:00
Milos Kozak 20a2d84a0a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-10-01 14:56:21 +02:00
Milos Kozak 2d395b625e Do not allow too low max basal 2019-10-01 11:46:54 +02:00
Milos Kozak 4642f0ab5b EventNewNotification, EventDismissNotification -> RxBus 2019-10-01 00:00:22 +02:00
Milos Kozak d2d4d5054f better check for finishing objectives 2019-09-30 14:39:57 +02:00
PoweRGbg b277fc872c passing long as lastrun 2019-09-27 15:56:40 +03:00
PoweRGbg 0cc3df589f another try to fix test 2019-09-27 15:25:47 +03:00
Roumen Georgiev f901c956e5 fixed problem with incorrect string values and test 
setTimeInMillis sets time in milliseconds after * January 1, 1970, 0:00:00 GMT., but our time contains timezone offsset
 2019-09-27 12:19:19 +03:00
Milos Kozak 2f1bfc8f66
Merge branch 'dev' into TriggerTOD 2019-09-25 15:00:56 +02:00
Roumen Georgiev e7953b33af fix tests 2019-09-16 12:31:51 +03:00
Roumen Georgiev 68b6591f42 fix tests 2019-09-12 12:08:36 +03:00
Roumen Georgiev d525c3f220
Merge branch 'dev' into TriggerTOD 2019-09-10 10:30:20 +03:00
Roumen Georgiev e3d7d4cb67 fixed name and tests 2019-09-10 10:01:36 +03:00
Milos Kozak a3bc942cd7 R: handle not received time, refactor to kotlin, unify SerialIOThread 2019-09-08 14:17:41 +02:00
Milos Kozak 99a8c94cff fix tests 2019-09-05 21:42:02 +02:00
Roumen Georgiev 2a80477bb5 tests 2019-09-04 16:48:32 +03:00
Milos Kozak a75312eea0 ObjectivesPlugin -> kotlin 2019-09-02 23:54:47 +02:00
Milos Kozak 0de7413427 use constants in objectives 2019-09-01 09:59:34 +02:00
Milos Kozak 66512dbe38 limit TT values 2019-08-27 20:16:51 +02:00
Milos Kozak e6ae4f03d5 fix limit values in InputBg 2019-08-27 19:07:05 +02:00
Milos Kozak 06d69ea252 fix test 2019-08-24 17:43:21 +02:00
Milos Kozak d467d679df
Merge pull request #1928 from triplem/firebase_events_test 
disable firebase for tests
 2019-08-08 19:27:37 +02:00
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak 9e962b953f eliminate PluginSwitcher 2019-08-06 02:34:57 +02:00
triplem c9f054bd47 disable firebase for tests 2019-08-01 21:20:17 +02:00
Milos Kozak 84ecb92771 lint recommendations 2019-07-27 19:56:07 +02:00
Milos Kozak c0116b744e remove failing test 2019-07-25 20:07:32 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Andy Rozman dbc527605b - disabled test 2019-07-25 14:49:43 +01:00
Milos Kozak e539dbc112 fix tests, use location form service 2019-07-22 16:58:25 +02:00
Milos Kozak 77d7f1ca65 Merge branch 'automation' of https://github.com/MilosKozak/AndroidAPS into automation 2019-07-22 16:28:57 +02:00
Milos Kozak 2ee8467243
Merge pull request #1880 from PoweRGbg/automationTests 
more Automation tests
 2019-07-22 09:54:59 +02:00
Roumen Georgiev 4cc556b1cb TriggerRecurringTime tests 2019-07-19 14:19:54 +03:00
Roumen Georgiev 04c3236258 increase coverage in TriggerTime 2019-07-19 11:57:30 +03:00
Roumen Georgiev 7b3d2d4372 TriggerLocation tests 2019-07-19 10:50:30 +03:00
Milos Kozak d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Andy Rozman 5379b1af88 - removed tests (they are not real tests yet) 2019-07-18 18:24:10 +01:00
Milos Kozak 1c8aae9757 fix tests 2019-07-16 22:35:46 +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 d7a28bf713 Session test 2019-07-14 16:11:27 +01:00
Andy Rozman 400a336137 - Removed test 2019-07-13 20:29:20 +01:00
Andy Rozman 2c07bc4c3b - Removed test 2019-07-13 19:55:14 +01:00
Andy Rozman 094d81c5ce - Fixed wrong UTest 2019-07-13 19:52:31 +01:00
Andy Rozman 675dcc1b5b Fixes: 
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
 2019-07-13 19:15:44 +01:00
Andy Rozman 0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Milos Kozak f5c22a33ff icons 2019-07-11 18:56:50 +01:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01: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 829ef9b6ad fix test import 2019-07-05 00:49:41 +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
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
AdrianLxM 45805ed410 BolusWizard privacy 2019-06-21 13:23:37 +02:00
Roumen Georgiev ca60ed9ca8 add L.class to test 2019-06-20 13:15:59 +03:00
Roumen Georgiev 046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev 453faf736d fix test 
moved the when().thenReturn to setReadings
 2019-06-19 16:59:34 +03:00
Roumen Georgiev 15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00
Roumen Georgiev f8b3878899 icon 2019-06-19 12:11:10 +03:00
Tebbe Ubben 5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00
Roumen Georgiev 3f86788eb4 Added DeltaType tests and negative delta values allowed 2019-06-18 14:47:44 +03:00
Roumen Georgiev b9ddbe7011 tests 2019-06-18 10:56:27 +03:00
Roumen Georgiev f15ead9c6f fixed tests and added DeltaType testing 2019-06-17 16:49:57 +03:00
Andy Rozman c460d1d3ef - Process Suspend delivery items 2019-06-16 20:12:10 +01: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
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
Andy Rozman 43c472da17 0.10.4-SNAPSHOT 
- fixed Tune up
- displaying power
 2019-06-01 22:18:30 +01:00
Andy Rozman 86ffc3370a Merge branch 'dev' into medtronic_andy 2019-06-01 17:34:30 +01:00
Roumen Georgiev 5c4910ed5b added trigger Delta 2019-05-30 12:16:42 +03:00
Roumen Georgiev 63d5ef4aa7
Autosens !=0 && IS_NOT_AVAILABLE doesn't exist enymore 2019-05-23 11:01:16 +03:00
Roumen Georgiev 27eb11e5df unavailable data and IS_NOT_AVAILABLE case 2019-05-20 11:21:51 +03:00
Milos Kozak a20efab567 remove deprecated calls 2019-05-16 19:54:35 +02:00
Roumen Georgiev ccd66d498c icon added 2019-05-16 16:03:05 +03:00
Roumen Georgiev 4aaca7acb1 Using InputDouble 2019-05-16 12:08:36 +03:00
Roumen Georgiev 3280f220ad fix for maxValue and tests 2019-05-15 17:11:47 +03:00
Roumen Georgiev 31224f894d fixed tests 2019-05-15 15:29:18 +03:00
Roumen Georgiev 8e9ef8cb6f adding tests 2019-05-15 14:52:30 +03:00
Roumen Georgiev 6e63d340cd reworked to use DBHelper 2019-05-13 14:18:10 +03:00
Milos Kozak 2505999a25
Merge pull request #1794 from MilosKozak/pumpcontrol-fix 
Pump control: Fix crash when opening Insight paring activity
 2019-05-12 14:56:56 +02:00
Milos Kozak 808a4177ca fix tests 2019-05-12 14:36:14 +02:00
Milos Kozak 62b2d83a18 cleanup (#68) 2019-05-10 09:47:32 +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
Andy Rozman b5da57e20f Merge branch 'dev' into medtronic_andy 2019-05-03 21:35:18 +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
Roumen Georgiev 85bf1fd6bd Fix + more tests 2019-04-30 15:07:43 +03:00
Milos Kozak 4336b47431 NPE fixes from Firebase 2019-04-29 11:36:30 +02:00
Roumen Georgiev 34969fdbfd WIP: adding tests 2019-04-25 16:57:50 +03: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 bef170699f
Merge pull request #1756 from schmitzn/automation-patch1 
Check value after setting unit
 2019-04-22 09:37:17 +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
Nico Schmitz 3fec2ce16c Check value after setting unit 
This makes sure that the value is in the range of minValue and maxValue. Also, it sets an inital value != 0 as it's called in the constructor.
 2019-04-21 20:01:29 +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 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 715a59bfba
Merge pull request #1749 from MilosKozak/update-checker 
Update checker
 2019-04-18 22:26:18 +02:00
Milos Kozak a08f01e69b more TriggerBg tests 2019-04-18 21:06:16 +02:00
Milos Kozak 46c6cdf98f Merge remote-tracking branch 'origin/dev' into automation 2019-04-18 19:48:51 +02:00
Milos Kozak 89ec81a850 UI and logic tweaking 2019-04-18 19:33:23 +02:00
AdrianLxM 6c6b23066b mocking the time 2019-04-18 00:33:24 +02:00
AdrianLxM 84573cc0cc refactor constraints checker 2019-04-17 21:29:16 +02:00
AdrianLxM 9be0ffffa9 verify static calls on mocked classes 2019-04-17 21:28:32 +02:00
Milos Kozak bfb39d81e7 fix test 2019-04-17 00:00:44 +02:00
Milos Kozak a6bd81a1b9 fix tests 2019-04-16 21:28:21 +02:00
Milos Kozak 4ae7efc75f Merge branch 'dev' into automation 2019-04-16 21:08:08 +02:00
Milos Kozak 952a6fe509 fix GlucoseStatus calculation 2019-04-16 20:36:18 +02:00
Milos Kozak 7e54db64be Glucose logging 2019-04-15 15:19:19 +02:00
AdrianLxM f739980988 testing and SP logic 2019-04-15 08:04:56 +02:00
Milos Kozak 0f6b05206f clear MidnightTime cache 2019-04-13 21:49:15 +02:00
AdrianLxM 04618156cc restructure and test version checker 2019-04-11 12:43:52 +02:00
Andy Rozman ad17c66b1b Merge branch 'dev' into medtronic_andy 2019-04-10 17:05:56 +01:00
Andy Rozman 7392eaeb58 - gradle fixes 
- remove formatting changes
- moved plugins/general/overview/Dialogs/ to plugins/general/overview/dialogs/
- fixing treatment changes that are received from NS, and extending copying of data to ignore pumpId
 2019-04-10 16:24:16 +01:00
Johannes Mockenhaupt cefee4827b
TDDing 2019-04-10 14:58:01 +02:00
Johannes Mockenhaupt 85cc61934c
add test 2019-04-10 14:51:50 +02:00
Milos Kozak 83e987f3c8 Fix DanaRS tests 2019-04-09 22:55:12 +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 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
Milos Kozak 5a555cdfba AutomationPlugin:processActions and some tweaking 2019-03-31 21:54:31 +02:00
Andy Rozman bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01: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
Milos Kozak 350e23647e ActionStartTempTargetTest 2019-03-31 00:03:31 +01:00
Milos Kozak 6a365b3483 ActionTest 2019-03-30 23:11:22 +01:00
Milos Kozak bad6edfb8b Action:applyTest 2019-03-30 23:08:25 +01:00
Milos Kozak e5dc655c64 ActionLoopResumeTest 2019-03-30 22:53:19 +01:00
Milos Kozak 77dd32a14f ActionLoopSuspendTest 2019-03-30 22:47:22 +01:00
Milos Kozak fe844b2dba ActionLoopEnableTest 2019-03-30 22:35:05 +01:00
Milos Kozak 1ba923b14d ActionLoopDisableTest 2019-03-30 22:32:28 +01:00
Milos Kozak 876c59a6fe ActionTest 2019-03-30 18:40:13 +01: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 474850c727 fix test 2019-03-30 09:21:22 +01:00
AdrianLxM d856b87703 rewrite DST logic 2019-03-28 19:38:58 +01:00
Nico Schmitz c6766c972c Fix AutomationEventTest 2019-03-26 22:56:17 +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
Nico Schmitz 4d98c44d74 Fix tests 2019-03-25 23:35:42 +01:00
Nico Schmitz fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +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
Milos Kozak 52482d112d typo 2019-03-21 22:31:44 +01:00
Milos Kozak fcc4a4edd3 SmsCommunicatorPluginTest 12 2019-03-21 21:54:46 +01:00
Milos Kozak 9e05ea8c8e ConstraintTest 2019-03-21 21:29:09 +01:00
Milos Kozak beb50bad44 SmsCommunicatorPluginTest 11 2019-03-21 21:03:34 +01:00
Milos Kozak a9992503f6 SmsCommunicatorPluginTest 10 2019-03-21 21:00:42 +01:00
Milos Kozak 30bfa1ca1f SmsCommunicatorPluginTest 9 2019-03-20 23:12:07 +01:00
Milos Kozak a37d04a8d9 SmsCommunicatorPluginTest 8 2019-03-20 22:49:35 +01:00
Milos Kozak 98eb3a1d73 SmsCommunicatorPluginTest 7 2019-03-20 22:12:25 +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 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 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
Milos Kozak a212ba7156 SmsCommunicatorPluginTest 2 2019-03-12 23:30:31 +01:00
Milos Kozak b24217491b SmsCommunicatorPluginTest 1 2019-03-12 22:58:04 +01:00
Milos Kozak 3ebd7dcdb8 AuthRequestTest 2 2019-03-12 20:03:41 +01:00
Milos Kozak bb22b00245 AuthRequestTest 2019-03-12 19:55:47 +01:00
Milos Kozak b7305f156f SmsActionTest 2019-03-12 19:14:15 +01:00
Milos Kozak a8a1bb793f SmsTest 2019-03-12 18:58:26 +01:00
Milos Kozak a32508a7ad move test to correct package 2019-03-12 18:41:20 +01: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