Commit graph

3631 commits

Author SHA1 Message Date
AdrianLxM 01e3dbaf44
Merge pull request #636 from MilosKozak/revert-633-patch-1
Revert "Update strings.xml"
2018-02-01 07:44:16 +01:00
AdrianLxM 0139047432
Revert "Update strings.xml" 2018-02-01 07:36:33 +01:00
Milos Kozak 2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
AdrianLxM 13bcff9207
Merge pull request #633 from CaroGo/patch-1
Update strings.xml
2018-01-31 23:06:44 +01:00
AdrianLxM 588cae4282
Merge pull request #627 from andrew-warrington/watchfaces
Watchfaces
2018-01-31 23:05:41 +01:00
Milos Kozak 035770f6d3
Merge pull request #631 from jotomo/issue-template
Add issue template.
2018-01-31 20:26:19 +01:00
CaroGo 815247dabb
Update strings.xml
I did a few changes...
2018-01-31 16:51:00 +01:00
Johannes Mockenhaupt 3978e44d04
Merge pull request #48 from jotomo/experimental
Switch to reading pump bolus history
2018-01-31 16:06:03 +01:00
Johannes Mockenhaupt 79f993cd26
Set version. 2018-01-31 15:13:43 +01:00
Johannes Mockenhaupt 1ea324d871
Add issue template. 2018-01-31 14:45:57 +01:00
Johannes Mockenhaupt bb04bd9b23
Update README-Combo.md 2018-01-31 14:41:37 +01:00
Johannes Mockenhaupt d336c176fb
Update some descriptions. 2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt c62ca89931
Fix adding a partial bolus to treatments. 2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt b32351145a
Fix 'last bolus' not being displayed on start. 2018-01-31 13:55:25 +01:00
Johannes Mockenhaupt 98d666098b
Remove now unused PumpState.delivered field. 2018-01-31 13:54:42 +01:00
Johannes Mockenhaupt 1ba3a85655
Add DetailedBolusInfo.copy() method. 2018-01-31 13:54:15 +01:00
Johannes Mockenhaupt 1aee181f62
RuffyScripter: fix reading basal rate when no TBR is active 2018-01-31 12:54:25 +01:00
Johannes Mockenhaupt 344984e201
Fix recording partially delivered boluses. 2018-01-31 12:36:41 +01:00
Johannes Mockenhaupt 5bb8bdde3e
BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now. 2018-01-31 11:59:30 +01:00
Johannes Mockenhaupt 47ce9d8561
Revert "Set custom version."
This reverts commit cd7af6c5fe.
2018-01-31 11:56:12 +01:00
Johannes Mockenhaupt 8be8f961ae
Answer ruffy warnings.
(cherry picked from commit b73a822)
2018-01-31 02:02:02 +01:00
Johannes Mockenhaupt 4defd40023
RuffyScripter: clean up answers.
(cherry picked from commit 0c30e1b)
2018-01-31 01:35:31 +01:00
Johannes Mockenhaupt 6108e9f17a
Fix basal rate check. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 1107d00571
Fix pump state display during init.
(cherry picked from commit 3967c4b)
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 6981c0fec6
Pump needs rest.
(cherry picked from commit 2e88fb9)
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 154902acdc
Fix ReadHistoryCommand not reading errors, TDDs. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt e790c87940
Cleanups and strings. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 34db941c29
Remove unused code to import TBRs from the pump. 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt 3db7aedb06
Fix activity indicator during on-connect-checks. 2018-01-31 00:09:38 +01:00
Johannes Mockenhaupt c7cccf3220
Read quick info first when checking history. 2018-01-31 00:08:39 +01:00
Johannes Mockenhaupt ecd16c26b8
ComboFragment: disable buttons when running. 2018-01-31 00:04:17 +01:00
Johannes Mockenhaupt d08958e43f
Remove dead ruffyscripter code. 2018-01-30 23:16:45 +01:00
Johannes Mockenhaupt a8cca7fcea
Remove duplication in ruffyscripter commands. 2018-01-30 23:16:27 +01:00
Milos Kozak fada51c380
Merge pull request #597 from triplem/test
Add a unit test for Insulin Plugin
2018-01-30 22:47:33 +01:00
Markus M. May a6f65f5d33 Enhance insulin plugin test 2018-01-30 19:52:57 +01:00
Milos Kozak 56451a67bf
Merge pull request #628 from MilosKozak/AdrianLxM-filter-null-btdevices
filter null BT devices
2018-01-30 09:24:03 +01:00
AdrianLxM 3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +01:00
Andrew Warrington 0f9273093a BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:34:03 +01:00
Andrew Warrington 44e6c874c0 BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:31:54 +01:00
Johannes Mockenhaupt 1e22599979
Fix format specifier. 2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt 33ad68d26a
Fix string. 2018-01-29 20:13:53 +01:00
Milos Kozak 9255b93800 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2018-01-29 20:06:16 +01:00
Milos Kozak b11e301391 ES translations 2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt 216359312a
Minor non-code tweaks. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 2468f23e97
ComboFragment: i18n last bolus. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 5fbd9097d8
Rename ReadReservoirLevelAndLastBolus to ReadQuickInfoCommand. 2018-01-29 20:02:17 +01:00
Johannes Mockenhaupt 739e52dc47
Remove CommandResult.lastBolus in favour of CR.history.bolusHistory. 2018-01-29 20:01:53 +01:00
Milos Kozak 1eba5b79b8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-29 13:28:36 +01:00
Johannes Mockenhaupt 3adda9bf6e
Clean up bolus delivery code. 2018-01-29 13:18:49 +01:00
Milos Kozak 4cef8db54b Dana plugin refactoring 2018-01-29 11:24:03 +01:00