Milos Kozak
20e7020b07
Merge pull request #2917 from GermanBluefox/patch-3
...
Show time string instead of ms in JSON structures
2020-08-24 21:51:27 +02:00
Milos Kozak
cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab
...
Add Manual BG or Calibration in CarePortal Tab of Treatment
2020-08-24 21:45:56 +02:00
Milos Kozak
7e2e5be6bb
Dana options activity fix
2020-08-24 21:39:14 +02:00
Bart Sopers
c84798e368
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_state
2020-08-24 00:37:03 +02:00
Bart Sopers
ac922316a9
Improve fix for #149 by not trying to serialize non-serializable fields
2020-08-24 00:18:20 +02:00
Bart Sopers
78725ec013
Fix button state in Omnipod tab
2020-08-23 23:40:22 +02:00
Bart Sopers
15b0701d06
Add null check for total insulin delivered in Omnipod tab
2020-08-23 22:40:32 +02:00
Bart Sopers
8911bcd508
Small improvements and import order
2020-08-23 21:48:25 +02:00
bartsopers
f94c73a911
Merge pull request #156 from AAPS-Omnipod/show-total-dose-in-fragment
...
Show total dose in fragment
2020-08-23 19:41:35 +02:00
Steffen Müthing
85048c9a02
Simplify total delivered insulin display as suggested by Bart
2020-08-23 19:27:34 +02:00
Bart Sopers
ddd9687425
Reorganized packages and removed a few unused classes
2020-08-23 19:21:01 +02:00
Steffen Müthing
633767ad3d
Subtract setup units from displayed total insulin delivered
2020-08-23 18:28:51 +02:00
Steffen Müthing
f3a7a5a393
Add constant POD_SETUP_UNITS for the total number of units delivered during pod setup
2020-08-23 18:28:51 +02:00
Steffen Müthing
9ccee886c6
Add tests for getTicksDelivered()
2020-08-23 18:28:51 +02:00
Steffen Müthing
e66033ab1e
Show total dose delivered by pod in OmnipodFragment
...
This includes the units delivered during priming and cannula insertion, but it
gives a nice approximation of the remaining insulin if you remember what you
injected.
2020-08-23 18:28:51 +02:00
Steffen Müthing
61d6c638b7
Provide total insulin delivered from Pod available in PodStateManager
2020-08-23 18:28:51 +02:00
Steffen Müthing
00b9379b8c
Make delivered ticks available in status response
2020-08-23 18:28:51 +02:00
Bart Sopers
aede5648a9
Add/remove/update comments and TODOs in OmnipodPumpPlugin and rename a method
2020-08-23 17:35:12 +02:00
Bart Sopers
afd890a519
Remove redundant interface and split initPod into two separate methods
2020-08-23 17:12:49 +02:00
Bart Sopers
4a10a04f79
Remove OmnipodUiComm and OmnipodUiTask
2020-08-23 16:15:35 +02:00
Bart Sopers
887a1672dc
Don't force overview to refresh immediately in Omnipod events
2020-08-23 15:01:08 +02:00
Bart Sopers
91d0da9f51
More cleanup in OmnipodPumpPlugin
2020-08-23 14:55:12 +02:00
Bart Sopers
5cd46a90a0
Remove excessive RefreshOverview events
2020-08-23 14:37:21 +02:00
Bart Sopers
c70fedbc72
Improve button state handling in Omnipod tab, read Pod status on AAPS startup and some cleanup
2020-08-23 14:32:05 +02:00
Bart Sopers
219b1e02ba
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_state
2020-08-23 13:07:10 +02:00
Bart Sopers
c9dcac6368
Improve Pod Status display
2020-08-23 13:06:42 +02:00
Bart Sopers
fd53725163
Remove redundant interface
2020-08-23 11:46:26 +02:00
Bart Sopers
25b6ddcbc0
Minor improvements in OmnipodPumpPlugin
2020-08-23 11:30:45 +02:00
Bart Sopers
9bce1fdc6c
Small improvement in OmnipodPumpPlugin
2020-08-23 11:19:55 +02:00
Bart Sopers
b84296da14
Add missing @Override annotations
2020-08-23 11:05:07 +02:00
Bart Sopers
2745aed31a
Remove OmnipodPumpStatus
2020-08-23 10:58:48 +02:00
Milos Kozak
1e7a7a40bc
Merge pull request #2913 from AAPS-Omnipod/omnipod_eros_dev_merge_to_upstream
...
Omnipod updates
2020-08-22 19:34:05 +02:00
Milos Kozak
0f408e0e8f
fix rs & pumpcontrol build
2020-08-22 19:24:31 +02:00
Philoul
5bb9775aaa
Modify String name (mbg = Manual Bg and not only calibration)
2020-08-22 19:01:58 +02:00
Philoul
0d3d83806b
Add Calibration in Translator.kt
...
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
2020-08-22 18:33:13 +02:00
Milos Kozak
7b94b2fa21
fix nsclient layout
2020-08-22 17:49:10 +02:00
Bluefox
f224cb1af1
Show time string instead of ms in JSON structures
2020-08-22 17:17:43 +02:00
Bart Sopers
c52987ab6c
Remove empty if statement
2020-08-22 17:15:27 +02:00
Bart Sopers
0dab8965b4
Get rid of OmnipodPumpStatus in OmnipodFragment, OmnipodCommunicationManager, RileyLinkOmnipodService + some cleanup along the way
2020-08-22 17:02:35 +02:00
xJoe
d1ad8f5505
Wiki url
...
As wiki.AndroidAPS.org not available at present
2020-08-22 16:03:56 +02:00
Bart Sopers
0ef4099eaf
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_without_pump_plugin_abstract
2020-08-22 15:25:13 +02:00
Bart Sopers
4d30b96ed9
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_merge_to_upstream
2020-08-22 15:23:45 +02:00
Bart Sopers
ad1158061d
Add logging
2020-08-22 14:47:56 +02:00
Bart Sopers
0aa23c4ba0
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_without_pump_plugin_abstract
2020-08-22 11:20:16 +02:00
Bart Sopers
5f37a5a45f
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_merge_to_upstream
2020-08-22 11:19:55 +02:00
Bart Sopers
dc6c19fdeb
Restore accidentally removed codestyle settings
2020-08-22 11:19:27 +02:00
Bart Sopers
7c82dbdf93
Prepare Omnipod for upstream merge
2020-08-22 11:06:33 +02:00
Bart Sopers
fef12ae06b
Small cleanup in OmnipodPumpPlugin
2020-08-22 10:51:56 +02:00
Bart Sopers
f0041c2776
Remove unused method in PumpPluginAbstract
2020-08-22 02:25:44 +02:00
Bart Sopers
749851f249
OmnipodPumpPlugin formatting and ordering
2020-08-22 02:11:09 +02:00
