caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
3648 commits 1 branch 20 tags 140 MiB
Commit graph

3056 commits

Author SHA1 Message Date
Johannes Mockenhaupt
ec4280bc2e
Fix creating a seconds-based bolus record based on minute and bolus. 
(cherry picked from commit f8848be)
 2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2 
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
 2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt
435c4dee85
Create Answer events when adding bolus to DB fails. 
(cherry picked from commit 947ea4f)
 2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt
6c9effd027
Minor cleanup to reduce merge noise. 
(cherry picked from commit 4015f73)
 2018-02-03 16:33:50 +01:00
Johannes Mockenhaupt
f49f3c7e4b
Clean up string resources. 
(cherry picked from commit 4adcffc)
 2018-02-03 16:33:40 +01:00
Johannes Mockenhaupt
a07a4beaf8
Combo: update timestampOfLastKnownPumpBolusRecord after bolusing. 2018-02-02 11:59:11 +01:00
Johannes Mockenhaupt
1f06d801a2
Combo: retry twice to establish connection before giving up. 
(cherry picked from commit a16560a)
 2018-02-02 10:06:04 +01:00
Johannes Mockenhaupt
26e7834093
Clean up, no behavioral changes and a bigger bed. 2018-02-02 00:40:24 +01:00
Milos Kozak
2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
Johannes Mockenhaupt
79f993cd26
Set version. 2018-01-31 15:13:43 +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
AdrianLxM
3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +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
Johannes Mockenhaupt
038ea06abc
Log history reads. 
(cherry picked from commit 7326f29)
 2018-01-29 10:08:28 +01:00
Johannes Mockenhaupt
2b995a8a73
RufyfScripter: log active/previous command in error routines. 2018-01-28 23:56:27 +01:00
Johannes Mockenhaupt
864100299d
Set activity indicator for refresh button. 2018-01-28 23:39:57 +01:00
Johannes Mockenhaupt
262fdf92c8
Check pump basal rate matches cached profile, force re-read otherwise. 2018-01-28 23:39:53 +01:00
Milos Kozak
f54452515b KO language cleanup 2018-01-28 23:29:33 +01:00
Johannes Mockenhaupt
9f5ffc6646
Actually do something with the basal rate profile after force-reading. 2018-01-28 23:23:44 +01:00
Johannes Mockenhaupt
eb7ec24335
Don't read pump TBR history. 2018-01-28 22:33:05 +01:00
Johannes Mockenhaupt
cd7af6c5fe
Set custom version. 2018-01-28 22:31:43 +01:00
Johannes Mockenhaupt
3fde47d283
Move ruffyscripter to combo plugin package. 2018-01-28 22:16:58 +01:00
Johannes Mockenhaupt
6c4c662c31
Remove RuffyCommandsV1Impl. 2018-01-28 22:14:31 +01:00
Johannes Mockenhaupt
10d2b8739f
Log commands to Fabric. 2018-01-28 22:10:11 +01:00
Johannes Mockenhaupt
34af5bc20b
Source code from ruffyscripter, ruffy-spi modules. 2018-01-28 22:03:32 +01:00
Johannes Mockenhaupt
6609eb6be5
Cleanup. 2018-01-28 21:56:56 +01:00
Johannes Mockenhaupt
302d3494d2
Covering 105% of all failure cases. 2018-01-28 19:53:44 +01:00
Johannes Mockenhaupt
9ba6f2144b
Strings fix-up. 2018-01-28 19:30:59 +01:00
Johannes Mockenhaupt
3b7045227e
Only check reservoir level before bolus if data is available. 2018-01-28 19:04:46 +01:00
Johannes Mockenhaupt
bd87a893c2
Best effort to handle multiple boluses within the same minute. 
(cherry picked from commit cc9094f)
 2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt
3a95c3c4d9
More work for bolusing with pump history records. 
(cherry picked from commit 4bc3e42)
 2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt
8c27b32d07
Let "Initializing" be a pump state, not an action. 2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt
cd385a3217
ComboFragment: deal with resevoir levels being available or not. 2018-01-28 15:43:50 +01:00
Johannes Mockenhaupt
e3abe04545
Bring back last bolus to combo fragment. 
(cherry picked from commit 108349e)
 2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt
5de588b540
Enable reading reservoir level units. 
This partially reverts commit b4998feee1.
 2018-01-28 15:27:59 +01:00
Johannes Mockenhaupt
b3a60eb5ab
Initial work on basing boluses on pump history. 2018-01-28 15:22:41 +01:00
warstar2187
c297ce88bb
Update strings.xml 2018-01-28 11:01:56 +09:00
warstar2187
76d606fddf
Update strings.xml 2018-01-28 10:51:09 +09:00
Radoslav Radev
d4fe03ac30
Bg translation 2018-01-27 16:12:51 +02:00
Milos Kozak
ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Milos Kozak
d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Milos Kozak
e5d20ca996 ButterKnife to Dana fragment 2018-01-26 17:18:40 +01:00
Johannes Mockenhaupt
3d1f8c0893
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Disable release build checks until wear lib upgrade (#620).
  Rv2,RS: use safe carb diff 30s
 2018-01-26 16:19:45 +01:00
Milos Kozak
a7a4693e9c
Merge pull request #621 from jotomo/disable-release-checks 
Disable release build checks until wear lib upgrade (#620).
 2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt
3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak
d8a6c0d111 Rv2,RS: use safe carb diff 30s 2018-01-26 15:47:45 +01:00
Johannes Mockenhaupt
61bb6aa1ba
Combo: declare as not supporting carb infos. 2018-01-26 13:53:50 +01:00
Johannes Mockenhaupt
372e435761
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
  travis accept license manually
  Push carbs only to pumps supporting storing carbs.
  travis to 27.0.2
  sdk27 & butterknife
 2018-01-26 13:53:42 +01:00
Johannes Mockenhaupt
4a1970926c
Cleanup. 2018-01-26 13:53:17 +01:00
Milos Kozak
6be2988e31
Merge pull request #619 from MilosKozak/sdk27 
Sdk27
 2018-01-26 10:14:21 +01:00
Milos Kozak
3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only 
Push carbs only to pumps supporting storing carbs.
 2018-01-26 10:10:16 +01:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt
5dcf214d08
Fix German translation. 2018-01-25 20:10:21 +01:00
Johannes Mockenhaupt
947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt
ed1226ae67
Push carbs only to pumps supporting storing carbs. 2018-01-25 13:22:01 +01:00
Milos Kozak
91bd21131d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-25 11:27:17 +01:00
Milos Kozak
ca01168474
Merge pull request #611 from MilosKozak/min_unreachable 
minimum of 30 min for unreachable alert
 2018-01-25 11:24:09 +01:00
Milos Kozak
1ba793304f
Merge pull request #616 from jotomo/check-that-box 
Overview: make checkbox labels toggle state as well.
 2018-01-25 11:23:06 +01:00
Milos Kozak
8d792a24db bump 1.57a-dev 2018-01-25 11:21:27 +01:00
Milos Kozak
893c64e2e4 fix not attached to the activity 2018-01-25 11:17:23 +01:00
Milos Kozak
a3e6794138 check for no profile 2018-01-25 11:09:58 +01:00
Milos Kozak
7be0bfb27e check for no profile 2018-01-25 11:06:35 +01:00
Johannes Mockenhaupt
c469edb5a3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-25 03:28:06 +01:00
Johannes Mockenhaupt
f7ed34532a
Fabric-Log combo init to get an idea of user count. 2018-01-25 03:28:06 +01:00
Milos Kozak
bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00
Milos Kozak
801182eccd fix cob calculation for history records 2018-01-24 17:03:45 +01:00
Johannes Mockenhaupt
0f98c49876
Fix namespace errors. 2018-01-24 16:54:29 +01:00