Johannes Mockenhaupt
ffb5ee3b22
Show min/avg/max in Combo TDD dialog.
...
(cherry picked from commit 348b53a)
2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt
b46165e52a
Abort reading all pump data if history read fails.
...
(cherry picked from commit 9f679bc)
2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt
9ce57e7076
Fix bolus verification.
2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt
a0ba857279
Move WarningOrErrorCode class to parent package.
...
(cherry picked from commit 38922ba)
2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt
c36eac1ff3
More logging around bolusing.
...
(cherry picked from commit df89b7f)
2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt
0f8442d65c
Issue a history read when bolusing fails.
...
(cherry picked from commit cafed14)
2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt
1d83abc0d2
Fix rejecting multiple TBRs.
...
(cherry picked from commit c1e9800)
2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt
1e9d0d08c3
Reject requents to enact TBRs if one was already started within this minute.
...
(cherry picked from commit 3805413)
2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt
32112597bc
Document soft TBR cancel, other docs updates.
2017-11-25 11:05:32 +01:00
Johannes Mockenhaupt
e13f29e615
Use correct key in prefs.
2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt
b148b334b2
Adhere to 'Sync to profile' setting in ConfigBuilder.
2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt
ac935b19de
SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead.
2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt
63afb7bd84
SetBasalProfileCommand: fix waiting for input scrolling to complete.
2017-11-24 23:06:21 +01:00
Johannes Mockenhaupt
71b32ac078
Fix RuffyScripter.navigateToMenu one last time.
2017-11-24 23:05:46 +01:00
Johannes Mockenhaupt
5bd010d8f1
When recovering from connection loss, return to main menu to be ready for the net command.
2017-11-24 23:04:37 +01:00
Johannes Mockenhaupt
5e79900411
Small robustness improvements.
2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt
a95a00377b
RuffyScripter: extract and extend runPreCommandChecks().
2017-11-24 23:03:06 +01:00
Johannes Mockenhaupt
b8e320ae6f
Increase timeouts.
...
* Disconnect timeout: back from 2.5 to 5s.
* Overall command timeout: 4 to 10m (setting basal profile toke 5.5m
shifting by 12h and increasing from 100% to 200%.
2017-11-24 23:00:29 +01:00
Johannes Mockenhaupt
1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.
2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt
44ccbc06a0
Retry reading/writing basal profile, cleanups, notes.
2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt
2d7a8a2e4d
SetBasalProfileCommand, calculating steps: revert to Adrian's simpler version, add clarifying comments.
2017-11-24 21:03:49 +01:00
Johannes Mockenhaupt
9698863f90
SetBasalProfileCommand: step calculation for all ranges.
2017-11-24 08:55:36 +01:00
Johannes Mockenhaupt
e216bfcb12
Readme/Testing updates.
2017-11-23 20:54:28 +01:00
Johannes Mockenhaupt
28f31414ba
Update pump profile during Combo init.
2017-11-23 20:54:28 +01:00
Johannes Mockenhaupt
90611a1792
Fix menu overshoots hopefully finally.
2017-11-23 20:54:28 +01:00
AdrianLxM
5b9fd6fd78
set basal rate overview notifications
2017-11-23 03:06:10 +01:00
AdrianLxM
b3f0951d1f
isThisProfileSet - same behaviour on uninitialized pump as DanaR
2017-11-23 02:19:29 +01:00
AdrianLxM
3f10c316a4
combo set basal: account for different granularity > 1 U/h
2017-11-23 01:47:14 +01:00
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