AdrianLxM
76cc6199c6
make day 24 hours
2017-11-23 00:28:01 +01:00
Johannes Mockenhaupt
0558e23eb4
SetBasalCommand: actually confirm entered values.
2017-11-23 00:11:45 +01:00
Andrew Warrington
d1fbaa29c9
Ready for review. Summary of all changes to date: New watch faces AAPSv2 and AAPS(Cockpit) work on both round and rectangular screens. Tested on Asus Zenwatch 3, Moto 360 42mm, and Sony Smart Watch 3. New watch settings included, to add/remove individual data items from the display. WatchUpdaterService and BaseWatchFace both updated to enable switching on and off of individual data items.
2017-11-22 22:46:43 +01:00
Johannes Mockenhaupt
61d1028011
Update local basal profile after setting it on pump.
2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt
1a8c0fcf52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Cancel ongoing notification when plugin is disabled.
Fix typo in fragment name.
Nitpicky symmetry.
PersistentNotification unregister workaround.
Make PumpEnactResult fluent.
Minor code cleanup.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt
118cffc8bb
Some doc updates.
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
83be0a8315
Setting basal rate on pump (combo side).
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
1f14f37373
Make code more robust against sluggish screen updates.
...
Pump might take longer than a screen refresh to react to a button press,
so call waitForScreenUpdate() until we see the next desired screen has
actually arrived (used to work previously with fixed times, but that's
even less desirable).
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
1897051782
Fix taking over low* alerts on connect.
2017-11-22 22:16:28 +01:00
Johannes Mockenhaupt
f3bbf861f3
In Stop mode pump shows menus not supported by ruffy, thus require run mode for most commands.
2017-11-22 22:16:28 +01:00
Milos Kozak
a13661400f
DanaRv2 queue & pump autodection
2017-11-22 22:09:58 +01:00
AdrianLxM
681add11a9
remove translations without english default
2017-11-22 21:06:31 +01:00
AdrianLxM
898324397e
add google repo
2017-11-22 21:02:09 +01:00
Milos Kozak
8818afe033
KoreanDanaR queue
2017-11-22 20:11:25 +01:00
Milos Kozak
dfd0218a6a
Merge branch 'dev' into queue
2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
...
Combo extractions
2017-11-22 19:36:59 +01:00
Milos Kozak
d3288da468
Merge pull request #503 from jotomo/disabling-ongoing-notification
...
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:36:28 +01:00
Johannes Mockenhaupt
e28e5685f6
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt
0972521c20
AS tooling upgrade.
2017-11-22 15:20:16 +01:00
Johannes Mockenhaupt
d2b84c8fcf
Update README-Combo.
2017-11-22 15:20:07 +01:00
Johannes Mockenhaupt
9f946229bc
Slightly improve the dialogs.
2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt
cf430b84cf
Extract some string resources.
2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name.
2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt
5690772946
Nitpicky symmetry.
2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt
d202976251
PersistentNotification unregister workaround.
2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt
9442c56eb8
Make PumpEnactResult fluent.
2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt
60324ac6c6
Minor code cleanup.
2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt
cc6c34e46c
Revert inadvertent changes to wear activities.
2017-11-22 11:29:12 +01:00
Johannes Mockenhaupt
c6ad1b59f3
Clean up string resources.
2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt
813f857306
Rename fragment 'error history' -> 'alert history'.
2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt
2861509d07
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
BolusProgressDialog: hide stop button once pressed.
fix RU translation
use MIN_DIA instead of DEFAULT_DIA
2017-11-22 10:56:57 +01:00
Milos Kozak
62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
...
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak
63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
...
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt
4c66199142
Cleanups based on Android Studio analysis.
2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt
8b81925ccb
Only raise notification to check pump time when the latter could be read.
2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt
b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts.
2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt
bb2e885b95
RuffyScripter: fix pump state check before running command.
2017-11-22 00:41:52 +01:00
Johannes Mockenhaupt
a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed.
2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt
28b80697f9
Make RuffyScripter.returnToRootMenu more robust.
2017-11-22 00:05:59 +01:00
Johannes Mockenhaupt
a3fe804c3d
Fix overshoot navigating to menu (again).
2017-11-22 00:05:59 +01:00
Johannes Mockenhaupt
b27ee06ebe
Fix issues during history read.
2017-11-22 00:05:59 +01:00
Milos Kozak
252c0b3db9
DanaR queue driver
2017-11-21 23:00:53 +01:00
Milos Kozak
f134163a76
Merge branch 'dev' into queue
2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt
066d138e59
Double comparisons.
2017-11-21 22:31:28 +01:00
Milos Kozak
a6bf18244a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-11-21 22:31:22 +01:00
Milos Kozak
ca44ae9a0b
fix RU translation
2017-11-21 22:31:02 +01:00
Milos Kozak
4007049118
use MIN_DIA instead of DEFAULT_DIA
2017-11-21 22:29:50 +01:00
Milos Kozak
d2cba61354
allign dana plugin code
2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt
bf52352224
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing return
log profiles if different
fix setting of TRB when low basal rate is running
fix format and add test for fromISODateString
use mills from status if available
2017-11-21 10:57:11 +01:00
