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
Bart Sopers
e9d53eea52
Fix crash in OmnipodPumpPlugin.onStart()
2020-08-22 01:58:14 +02:00
Bart Sopers
c1e8a2026e
Merge PumpPluginAbstract code into OmnipodPumpPlugin
2020-08-22 01:47:38 +02:00
Bart Sopers
d9891f2427
Preliminary cleanup in OmnipodPumpStatus
2020-08-22 00:50:29 +02:00
bartsopers
155460c8c0
Merge pull request #153 from AAPS-Omnipod/omnipod_eros_dev_rl_cleanup
...
Some RileyLink cleanup
2020-08-21 23:05:00 +02:00
Bart Sopers
5b6ba9ea6d
Remove unused methods
2020-08-21 22:52:35 +02:00
Bart Sopers
883bdb660e
Remove unused import
2020-08-21 22:38:24 +02:00
Bart Sopers
28f1dbb47f
Correctly display Omnipod information in RL stats
2020-08-21 22:28:42 +02:00
Bart Sopers
53c27b8078
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_status
2020-08-21 21:28:09 +02:00
Bart Sopers
ea1be41a0d
Restore accidentally removed statement
2020-08-21 21:27:51 +02:00
Bart Sopers
bdccbf907e
Show '-' instead of nothing in Omnipod tab when no TBR is active
2020-08-21 21:22:55 +02:00
Bart Sopers
5d426bf697
Add some methods to RileyLinkPumpDevice interface to replace access to PumpStatus in RileyLink module
2020-08-21 21:16:24 +02:00
Bart Sopers
127a369cbb
Fix Omnipod tests and remove one unused and one inappropriate dependency from AapsPodStateManager
2020-08-21 17:53:59 +02:00
Philoul
7e9f79b5fb
And remove additional <br> at the end of ics, isfs and targets
2020-08-21 17:49:13 +02:00
Philoul
1e3999a9ab
Replace valueToUnitsToString by existing Profile.toUnitsString
2020-08-21 17:17:56 +02:00
Philoul
792ab88839
Unit selected for compare profile is AAPS units and not profile1.units
...
Modification limited to PROFILE_COMPARE mode
RUNNING_PROFILE and CUSTOM_PROFILE modes still show profiles in profile.units
2020-08-21 15:45:45 +02:00
Bart Sopers
90e429abb9
Omnipod: update upstream version info
2020-08-21 15:37:14 +02:00
Bart Sopers
1f3e8a4102
Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev
2020-08-21 15:34:47 +02:00
Philoul
d60d714f82
Compare Targets improvements in ProfileViewerDialog
...
Same units between profile 1 and profile 2
Presentation of both targets by hours (same than ICs, ISFs or basals)
2020-08-21 15:30:20 +02:00
Milos Kozak
7d5dc54656
Merge branch 'dev' into 2.7.0-rc4
2020-08-21 13:42:20 +02:00
Milos Kozak
e7627f4f6c
try to fix IllegalStateException
2020-08-21 13:41:48 +02:00
Milos Kozak
2177cfebdc
2.7.0-rc4
2020-08-21 12:55:16 +02:00
Milos Kozak
353c9641dc
New Crowdin updates ( #2905 )
...
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
2020-08-21 12:52:52 +02:00
Milos Kozak
8c987c8be9
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2020-08-21 10:30:41 +02:00
Milos Kozak
7282f460fc
better synchronize graph rendering
2020-08-21 10:29:23 +02:00
Milos Kozak
7854bb1ce4
Merge pull request #2908 from AAPS-Omnipod/dev
...
Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields
2020-08-21 09:43:20 +02:00
Bart Sopers
c22119bb85
Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields
2020-08-20 18:39:16 +02:00
