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

2686 commits

Author SHA1 Message Date
Johannes Mockenhaupt
22bac709fb
Cleanups around ComboPlugin.refreshDataFromPump. 2017-10-25 18:17:19 +02:00
Johannes Mockenhaupt
5ba68a86f0
Log full class name (not just filename), so logs can be filtered by package name. 2017-10-25 18:17:18 +02:00
Johannes Mockenhaupt
68a3dbbf33
Start KeepAliveService after pump init. 2017-10-25 18:16:38 +02:00
Johannes Mockenhaupt
ec383bb082
Remove the alerter and related prefs. 2017-10-25 16:27:55 +02:00
Johannes Mockenhaupt
e09d337c02
ComboFragment: colours and text for last connection. 2017-10-25 15:42:38 +02:00
Johannes Mockenhaupt
fa81f57d9f
ComboPlugin.deliverTreatment: don't update progress dialog for non-interactive SMBs. 2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
34861960ea
Bolus command: ensure the progress dialog is always closed. 2017-10-25 15:11:27 +02:00
Milos Kozak
4f0bbda847 Merge branch 'dev' into dev2 2017-10-25 11:38:12 +02:00
Milos Kozak
7c99157d89 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-25 11:37:19 +02:00
Milos Kozak
606973d4ad use max absorption time for AAPS and weighted average sensitivity detection 2017-10-25 11:37:05 +02:00
Milos Kozak
f673d3a721 Merge branch 'dev' into dev2 2017-10-24 21:08:54 +02:00
Milos Kozak
8b020d72cd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-24 21:08:13 +02:00
Milos Kozak
2fb707b9ed log.debug -> log.error on RS comm 2017-10-24 21:08:03 +02:00
Milos Kozak
441c2beffc read status after bolus 2017-10-24 09:19:03 +02:00
Milos Kozak
1ad409754f move preparing graph series to extra class #2 2017-10-23 22:41:12 +02:00
Milos Kozak
d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
Johannes Mockenhaupt
2d8b3a7cb8
wip 2017-10-22 10:40:24 +02:00
Johannes Mockenhaupt
300a4609f8
Clean up prefs. 2017-10-21 20:24:17 +02:00
Milos Kozak
3cdca93b30 RS connectivity & bolus improvement 2017-10-21 20:09:21 +02:00
Johannes Mockenhaupt
73d5db43ed
Nitpicky symmetry. 2017-10-21 19:17:04 +02:00
Milos Kozak
7dd678c917 Better bolusing with different speeds (R & Rv2) 2017-10-21 18:55:56 +02:00
Milos Kozak
8e82e341fd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-21 18:07:30 +02:00
Milos Kozak
39af399ea4 Merge pull request #478 from RadoslavR/patch-48 
Update strings.xml
 2017-10-21 18:06:44 +02:00
Milos Kozak
a8751bf35a Detailed onscreen history logging 2017-10-21 18:05:19 +02:00
Johannes Mockenhaupt
fc60edc15a
wip 2017-10-21 17:44:16 +02:00
McHoffi
986eab041d Merge pull request #1 from MilosKozak/dev 
Dev
 2017-10-21 17:43:33 +02:00
McHoffi
9c7c583aed Split to smaller pieces 2017-10-21 17:41:01 +02:00
Radoslav Radev
075b74ec84 Update strings.xml 2017-10-21 17:11:25 +03:00
Johannes Mockenhaupt
cb438934b6
WIP: Pairing 2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt
015a852ab5
Custom: Disable Crashlytics. 
(cherry picked from commit 7890f6b)

(cherry picked from commit 1374739)
 2017-10-21 13:37:42 +02:00
Milos Kozak
dbf5a5e577 Sensitivity logging optional 2017-10-21 13:14:06 +02:00
Johannes Mockenhaupt
6cb1d5c0bd
ComboFragment, set "Initializing" as initial status. 2017-10-21 11:22:40 +02:00
Milos Kozak
881a745e32 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-20 21:36:56 +02:00
Johannes Mockenhaupt
e2d684ac33
PersistentNotification unregister workaround. 2017-10-20 20:15:37 +02:00
Johannes Mockenhaupt
950d1b62db
Undo "explicit pump initalization." 2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt
87c1c4b112
More sync prototyping. 2017-10-20 18:51:15 +02:00
Milos Kozak
01d6f1594a RS synchronized change 2017-10-20 17:37:06 +02:00
Johannes Mockenhaupt
1aa2ce48a1
First steps to syncing full pump state with AAPS. 2017-10-20 15:24:11 +02:00
Johannes Mockenhaupt
491caadd71
Check for active alerts on the pump, confirm and re-raise in AAPS. 2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt
57be9bb9b1
Explicit pump initialization. 
(cherry picked from commit d8b244a)
 2017-10-20 15:10:24 +02:00
Milos Kozak
e545f75d69 fix displaying XX:30 time intervals 2017-10-20 11:34:33 +02:00
Johannes Mockenhaupt
8b8a135804
Add (back) last bolus to ComboFragment. 2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt
4517736122
Add back TBR to ComboFragment. 2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt
c04d746cfc
Remove duplicated code. 2017-10-19 23:30:44 +02:00
Johannes Mockenhaupt
4e978656f5
Trim down ComboFragment. 
Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview
and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.
 2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt
3d6c8ee2a5
Combo Fragment misc. 2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt
71eff7ec79
Add space between number and minute for 'x min ago' template. 2017-10-19 22:59:03 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...). 2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
e1c1f4b996
Revert string danar_stats. 2017-10-19 21:31:10 +02:00
Milos Kozak
b76cb755e0 CS translations 2017-10-19 20:37:37 +02:00
Milos Kozak
c258b41f11 allow to use actual profile in wizard 2017-10-19 19:35:35 +02:00
Milos Kozak
65cb095dfd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-19 19:23:52 +02:00
Milos Kozak
0b7832ec60 getUnits from active profile not interface 2017-10-19 19:23:19 +02:00
Milos Kozak
2e32fe51e2 Merge pull request #475 from diabetesdt1/patch-3 
Update strings.xml
 2017-10-19 18:11:52 +02:00
diabetesdt1
51caffa591 Update strings.xml 2017-10-19 16:40:36 +02:00
Milos Kozak
e7fb045f04 Merge pull request #474 from boysim/dev 
dutch translation update
 2017-10-19 16:16:27 +02:00
Johannes Mockenhaupt
4de010b1a2
Strings reuse for pumps. 2017-10-19 16:11:36 +02:00
diabetesdt1
17eec803f4 Update strings.xml 2017-10-19 16:03:31 +02:00
Johannes Mockenhaupt
8fe72e1474
WIP notes, combo fragement expansion 2017-10-19 13:24:18 +02:00
Johannes Mockenhaupt
5fc9da885a
Pairing stub. 2017-10-19 12:16:07 +02:00
Johannes Mockenhaupt
07253b59a0
Refactoring. 2017-10-19 02:56:29 +02:00
Johannes Mockenhaupt
413464f1f1
Overview: add space between insulin and unit letter. 2017-10-19 02:46:06 +02:00
Johannes Mockenhaupt
7797cbd69e
Remove accidential debug wait. 2017-10-19 02:45:39 +02:00
Johannes Mockenhaupt
64c3d452a8
Some ui polish. 2017-10-19 02:45:29 +02:00
Johannes Mockenhaupt
0a67bb73a4
Fix displaying reservoir level on startup. 2017-10-19 00:04:01 +02:00
Milos Kozak
19f107fe53 move preparing graph series to extra class #2 2017-10-18 23:56:13 +02:00
Johannes Mockenhaupt
52d3803275
Source ruffy@eb659b3aa47a1ed699789df7e50e0d80c4640cc3, with pumpdata hackery. 2017-10-18 21:37:11 +02:00
Simon Pauwels
28430d117d Update dutch 2017-10-18 21:19:12 +02:00
Johannes Mockenhaupt
dca219d900
Fix initializing ruffy service, read reservoir level on init. 2017-10-18 20:53:44 +02:00
Milos Kozak
55b1dcb992 Merge branch 'dev' into dev2 2017-10-18 20:14:14 +02:00
Milos Kozak
fe9fefa601 Update strings.xml 2017-10-18 20:06:35 +02:00
Milos Kozak
d65a2d8f8c move preparing graph series to extra class 2017-10-18 19:01:39 +02:00
Johannes Mockenhaupt
ab4f46471b
Add RuffyCommands.readPumpState, cleanup, fix. 2017-10-18 18:29:29 +02:00
Johannes Mockenhaupt
e4901f292f
Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt
e5eba342ba
SPI first draft. 2017-10-18 14:00:47 +02:00
Radoslav Radev
f0ee2b8bed Update strings.xml 2017-10-18 14:25:34 +03:00
McHoffi
434f4474b5 DE_translations 2017-10-18 11:11:41 +02:00
warstar2187
e3d3664ac2 Update strings.xml 2017-10-18 16:39:55 +09:00
warstar2187
a35262840f Update strings.xml 2017-10-18 13:49:17 +09:00
Milos Kozak
6ff3d00f3c Merge remote-tracking branch 'origin/dev' into food 2017-10-17 20:55:55 +02:00
Milos Kozak
13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt
4a91b68ed7
Package refactoring. 2017-10-17 19:45:37 +02:00
Johannes Mockenhaupt
f33d55b092
Trim combo prefs. 2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt
64ecf84174
Cleaning up. 2017-10-17 19:08:56 +02:00
Johannes Mockenhaupt
5ab7e4dbd6
Connect to IRuffyService in RuffyScripter, rather than ComboPlugin. 2017-10-17 19:05:55 +02:00
Johannes Mockenhaupt
142f9cf6a3
Extract SPI. 2017-10-17 18:59:41 +02:00
Johannes Mockenhaupt
5131b8b62f
Remove combo hacks outside of combo plugin. 2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt
357c84e2e2
ComboPlugin singletion. 2017-10-17 12:20:12 +02:00
Johannes Mockenhaupt
41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2 
* origin/dev: (126 commits)
  ConfigBuilder: hide disabled plugins by default.
  sum on name for LP
  log to debug not error
  logger reformat
  logging
  rhinoAMA first full run
  rhinoAMA first crashfree call
  rhino some more cleanups
  rhino logging and cleanups
  rhino MA looping
  rhino first real detemine-basal call
  rhino small refactor
  NDK filters to work around j2v8 vs. libBleCommandUtil issue.
  NewTreatmentDialog: sanitize inputs, fixes #417.
  rhino complex parameter passing
  rhino first parameter passing
  rhino function passing
  first rhino
  location permission for BLE scanning
  use customized name only for LocalProfile
  ...
 2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt
d123e7b7c0
Remove duplicate values in strings.xml. 2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt
60c9a984b5
Refactor, clean out stuff, add RuffyCommands interface. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
960586b79d
ExperimentalBolusCommand: update progress when starting to programm the pump. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
cb24d13cae
Remove GetReservoirLevelCommand, will be a method in the future. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
f4f91c0b85
Add TODO. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
09f834d990
Make access to RuffyScripter.currentMenu safer. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
dc7dd15571
Update pref descriptions. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
882f400d1e
Disable incomplete parts in ExperimentalBolusCommand. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
5d10956900
Declare RuffyScripter.currentMenu nullable. 
(cherry picked from commit fb0c829)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
15bac4d386
Wait for currentMenu to be != null 
(cherry picked from commit 13b96ec)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
fd7f4ae145
Option to ignore TBR failures: also ignore errors when reading pump state. 
(cherry picked from commit 82052e8)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a33d7db471
Refactorings and notes. 
(cherry picked from commit 8c77f0e)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
0fda86dffa
A little less broken CancellableBolusCommand. 
(cherry picked from commit 9d56f23)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
add3011e4b
Update pref descriptions 
(cherry picked from commit 13e358a)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a76fbefee8
Add pref to disable all pump comm alerts. 
(cherry picked from commit f074a5b)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
516a8c044b
Move RuffyScripter to PumpCombo package. 
(cherry picked from commit 7875ac0)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c8c445c608
Add option to skip small TBR changes, add summaries to prefs. 
(cherry picked from commit a76b03a)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
58757735f8
Refactor. 
(cherry picked from commit 06a454d)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c96122cbed
Move confirmAlert method to scripter. 
(cherry picked from commit f018d42)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
b1d000eae3
SetTbrCommand: extract confirrmAlert method. 
(cherry picked from commit 329ff14)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
9b6cd23cdd
Experimental options: for specifc prefs, always check experimental options are turned on. 
While the specific prefs are disabled when disabling experimental options, they can still be turned on.

(cherry picked from commit 6270239)
 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
81b97b5278
Add option to ignore setting a TBR as long as it does't occur twice in a row. 
(cherry picked from commit 238e85c)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
6019323740
Work around curentMenu being null, maybe. 
(cherry picked from commit da49be0)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
4aac46f2bc
Cleanup. 
(cherry picked from commit e7fe202)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
17dd6df527
Move config options to preferences. 
(cherry picked from commit 24657ed)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
21a37c9247
Add experimental option to avoid one vibration after bolusing. 
(cherry picked from commit 104777c)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9649682ae3
Don't raise alerts if loop is disabled. 
(cherry picked from commit dc7fd2b)
 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9d6ff73b34
SetTbrCommand: extract method refactoring and minor cleanup. 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
bf9369babc
Move readDuration method to SetTbrCommand. 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
fee19db501
ConfigBuilder: hide disabled plugins by default. 2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt
f7a46d386e
Remove j2v8. 2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt
d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue." 
This reverts commit 7c04787004.
 2017-10-16 21:48:08 +02:00
Milos Kozak
d1a9398451 Merge pull request #463 from AdrianLxM/mr-profileRhino 
sum on name for LP
 2017-10-16 14:58:41 +02:00
AdrianLxM
414cb5fd8d sum on name for LP 2017-10-16 12:54:17 +02:00
Milos Kozak
5172a91ca1 Merge pull request #458 from jotomo/gh-417-new-treatment-validation 
NewTreatmentDialog: sanitize inputs, fixes #417.
 2017-10-16 08:38:30 +02:00
AdrianLxM
dbc5657003 log to debug not error 2017-10-15 23:21:55 +02:00
AdrianLxM
2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA 
Rhino ama
 2017-10-15 22:39:54 +02:00
AdrianLxM
3e7b7ced06 logger reformat 2017-10-15 22:34:03 +02:00
AdrianLxM
c499e5977c logging 2017-10-15 22:27:08 +02:00
AdrianLxM
1c49362415 rhinoAMA first full run 2017-10-15 20:42:36 +02:00
AdrianLxM
1494b7f5b3 rhinoAMA first crashfree call 2017-10-15 19:36:31 +02:00
AdrianLxM
564c882754 rhino some more cleanups 2017-10-15 16:19:29 +02:00
AdrianLxM
d32a874baa rhino logging and cleanups 2017-10-15 16:10:58 +02:00
AdrianLxM
e65b4bf858 rhino MA looping 2017-10-15 14:06:13 +02:00
AdrianLxM
190305c6df rhino first real detemine-basal call 2017-10-15 13:00:10 +02:00
AdrianLxM
124ec6e992 rhino small refactor 2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt
7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue. 
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.

This excludes all libBleCommandUtil ibs except those that match j2v8.

Revert this when we switch away from j2v8.

(cherry picked from commit 09036dc)
 2017-10-15 11:19:34 +02:00
Johannes Mockenhaupt
a9adcee974
NewTreatmentDialog: sanitize inputs, fixes #417. 
Inputs are now check as they're being made and cleared if they
exceed constraints. This is the same behaviour the Calculator
dialog shows.
 2017-10-15 10:45:12 +02:00
AdrianLxM
9008ef6f6f rhino complex parameter passing 2017-10-15 03:55:03 +02:00
AdrianLxM
303d35118e rhino first parameter passing 2017-10-15 03:50:18 +02:00
AdrianLxM
81b611ad92 rhino function passing 2017-10-15 03:21:32 +02:00
AdrianLxM
7f2451934c first rhino 2017-10-15 02:52:57 +02:00
Milos Kozak
1db158670a location permission for BLE scanning 2017-10-14 13:36:38 +02:00
Milos Kozak
1994cd707c use customized name only for LocalProfile 2017-10-14 10:39:32 +02:00
Milos Kozak
3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
Milos Kozak
02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak
c99830968a adjust enforcing new temp basal on user request 2017-10-13 12:39:34 +02:00
Milos Kozak
f235b5fb02 use basalStep instead of fixed value 2017-10-13 12:07:33 +02:00
Milos Kozak
9a4e457d2b fix RS events parsing 2017-10-13 11:54:50 +02:00
Milos Kozak
e40033dcb8 formated=false 2017-10-13 09:24:02 +02:00
Milos Kozak
bee60eb0e3 CS translations 2017-10-13 09:16:15 +02:00
Milos Kozak
1f3c54eb73 split sgvs before broadcast 2017-10-13 08:35:29 +02:00
Milos Kozak
6124ef25a4 report wrong alarm data #2 2017-10-13 08:21:37 +02:00
Milos Kozak
91e286b2ae report wrong alarm data 2017-10-13 08:11:30 +02:00
Milos Kozak
45a2eba0c2 fix NPE 2017-10-13 08:06:27 +02:00
AdrianLxM
71d95bea92 fix ic isf 2017-10-13 02:56:49 +02:00
AdrianLxM
869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM
746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM
944e334231 migrate CPP->LP working 2017-10-12 12:44:17 +02:00
AdrianLxM
6f97e52a07 migrate CPP->LP partial 2017-10-12 12:36:06 +02:00
AdrianLxM
45c07d4106 U/h -> U 2017-10-11 23:38:08 +02:00
AdrianLxM
4667a047ea add sum to basal in lp 2017-10-11 20:57:43 +02:00
AdrianLxM
39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM
339c33bd75 Spinner - selection events only after first touch 2017-10-11 19:25:09 +02:00
AdrianLxM
374983e1ae only inflate elements when needed 2017-10-11 07:59:41 +02:00
AdrianLxM
c181aaaf34 Basal sum in label 2017-10-11 02:32:17 +02:00
AdrianLxM
e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
AdrianLxM
02369b952b a little safer< 2017-10-10 22:54:24 +02:00
AdrianLxM
398e950f8e fix percentage concatenation on profile names 2017-10-10 22:11:06 +02:00
AdrianLxM
549b72b032 fix percentage/shift from watch 2017-10-10 21:51:58 +02:00
AdrianLxM
b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
AdrianLxM
36784b983e remove cpp import 2017-10-10 20:42:29 +02:00
AdrianLxM
1410b2e706 wear cpp -> general profile 2017-10-10 20:32:43 +02:00
Milos Kozak
982e46d958 prepare profileswitch function for watch 2017-10-10 19:25:21 +02:00
Milos Kozak
77ec52ff23 fix sending profile switch to pump 2017-10-10 19:19:39 +02:00
Milos Kozak
da71cdfca0 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 19:15:07 +02:00
Milos Kozak
24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak
50de4a5979 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 18:03:50 +02:00
Milos Kozak
d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak
c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak
9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak
230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned 
Overview: align checkboxes and labels vertically.
 2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt
e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt
62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt
70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak
4687b001e0 more cpp functionality to Profile 2017-10-08 14:41:51 +02:00
Milos Kozak
a617d591b0 fix NPE 2017-10-07 22:29:55 +02:00
Milos Kozak
8f259042d6 fix NPE 2017-10-07 22:24:42 +02:00
Milos Kozak
6618d2fef2 fix negative timeshift 2017-10-07 20:42:56 +02:00
Milos Kozak
60086dac8d Merge remote-tracking branch 'origin/dev' into profile 2017-10-07 18:30:55 +02:00
Milos Kozak
a54b9e52d8 Merge pull request #446 from AdrianLxM/numberpicker-update 
overview checkboxes cutoff fix
 2017-10-07 18:29:56 +02:00
Milos Kozak
c56ecfced6 Merge pull request #447 from AdrianLxM/treatments-configbuilder2 
treatments in config builder
 2017-10-07 18:29:44 +02:00
Milos Kozak
9e7c81613c Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-07 18:28:59 +02:00
Milos Kozak
ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
Milos Kozak
d6fb912ff9 Singleton & Crashlytics logging part 2 2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt
da3f02648c
Use SpinnerHelper in TimeListEdit. 
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
 2017-10-07 16:37:24 +02:00
AdrianLxM
046c28856c treatments in config builder 2017-10-07 01:18:28 +02:00
Milos Kozak
0e763724f6 Singleton & Crashlytics logging part 1 2017-10-06 16:39:59 +02:00
Milos Kozak
a1ca4677c0 log exception 2017-10-06 16:07:41 +02:00
AdrianLxM
10d273dac8 checkboxes for NS-Client layouts 2017-10-06 15:48:32 +02:00
AdrianLxM
333b131c1e overview checkboxes cutoff fix 2017-10-06 13:53:55 +02:00
Milos Kozak
4db82fd275 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-06 13:15:57 +02:00
Milos Kozak
32d6e06b07 Merge pull request #444 from AdrianLxM/temptarget-presets 
Temptarget presets
 2017-10-06 13:15:06 +02:00
Milos Kozak
a670a43346 Merge pull request #445 from AdrianLxM/numberpicker-update 
update NP value after manual entry
 2017-10-06 12:41:34 +02:00
AdrianLxM
1b5ef50eb2 update NP value after manual entry 2017-10-06 03:24:35 +02:00
AdrianLxM
7f403166c7 restore preferences 2017-10-06 03:05:36 +02:00
AdrianLxM
bd93fc1adb temp target presets 2017-10-06 02:53:23 +02:00
Milos Kozak
e0794a6e7f fix time shifting 2017-10-05 00:54:35 +02:00
Milos Kozak
f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak
3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
AdrianLxM
d6089bef73 Rv2 percent fix 2017-10-04 19:39:41 +02:00
AdrianLxM
7ce282dc4e korean percent fix 2017-10-04 19:38:42 +02:00
Milos Kozak
9f6962cee5 serialize reload of treatments 2017-10-04 18:04:34 +02:00
AdrianLxM
3d2647321b getTempBasalFromHistory -> getRealTempBasalFromHistory 2017-10-04 16:51:54 +02:00
AdrianLxM
9e2968f21a Do not misinterpret a fake-extended as 0% temp. 2017-10-04 16:00:48 +02:00
Milos Kozak
8bf5933c88 refactor TimeListEdit 2017-10-04 15:46:23 +02:00
Milos Kozak
6d08a608a2 dana layout 2017-10-03 22:37:53 +02:00
Milos Kozak
58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak
067494fae1 RS hightempbasal 2017-10-03 22:27:06 +02:00
Milos Kozak
2a98a7e9ba RS bolus code 2017-10-03 21:47:36 +02:00
Milos Kozak
f5dfff7491 RS APS messages 2017-10-03 20:58:09 +02:00
Milos Kozak
3a014949e9 remove firmware check 2017-10-03 18:45:54 +02:00
Milos Kozak
a5730cb982 initialize only with proper protocol 2017-10-02 22:44:10 +02:00
Milos Kozak
97f69c50fd store pairing key per pump 2017-10-02 22:21:11 +02:00
Milos Kozak
8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Milos Kozak
1a5b72f745 Fix time parsing 2017-10-02 17:38:45 +02:00
Roumen Georgiev
ef803d6a41 In one line 2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60 Update danar_fragment.xml 2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa text identation 2017-09-29 09:47:29 +03:00
Roumen Georgiev
2e61bc136f Add files via upload 2017-09-29 09:44:25 +03:00
Roumen Georgiev
3c0a509541 Add files via upload 2017-09-29 09:43:42 +03:00
Roumen Georgiev
a152f94f53 Add files via upload 2017-09-29 09:42:42 +03:00
Roumen Georgiev
cb982477cd Add files via upload 2017-09-29 09:41:32 +03:00
Roumen Georgiev
271534a64b Add files via upload 2017-09-29 09:40:58 +03:00
Roumen Georgiev
92e2008692 Adding button Icons 2017-09-29 09:40:11 +03:00
Milos Kozak
ba54dacffb 1.54-dev 2017-09-25 19:51:05 +02:00
Milos Kozak
8bbee37b70 fix TB & EB is not set 2017-09-25 19:38:27 +02:00
Milos Kozak
73687442c8 Merge branch 'dev' into rs 2017-09-25 19:36:01 +02:00
Milos Kozak
dc6cbadbdf fix TB & EB is not set 2017-09-25 19:34:49 +02:00
Milos Kozak
d9f59840b6 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food 2017-09-24 22:47:50 +02:00
Milos Kozak
4fbe7d1000 food database support 2017-09-24 22:47:18 +02:00
Milos Kozak
91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Milos Kozak
3c7abff88d remove unused imports 2017-09-24 14:28:26 +02:00
Milos Kozak
1823cd3f24 extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
Milos Kozak
547f09ffbd allow to view profile from overview 2017-09-24 11:45:32 +02:00
Milos Kozak
c79b750a9c reactor OptionsToShow 2017-09-24 11:08:04 +02:00
Milos Kozak
082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
Milos Kozak
6393ee5e10 CPP functionality to Profile.class 2017-09-23 23:12:08 +02:00
Milos Kozak
b3bcb778e0 check for NPE in posted dialogs 2017-09-23 20:12:53 +02:00
Milos Kozak
c3a0f5ddad split BLE to separate class 2017-09-23 15:03:07 +02:00
Milos Kozak
144a227d14 more progress logging on R 2017-09-23 12:53:41 +02:00
Milos Kozak
8cd8c6b5d9 more progress logging on RS 2017-09-23 12:28:11 +02:00
Milos Kozak
4ed2896f76 remove duplicated code 2017-09-23 10:56:00 +02:00
Milos Kozak
1eeb1c6f7a RS history OK 2017-09-22 14:57:23 +02:00
SMUSTAF1
81fe9ebdcc Clear the SMS text field if the user removes the old number. 2017-09-20 13:54:05 +02:00
Milos Kozak
e1903840dd handle received foods in nsclient 2017-09-20 10:20:50 +02:00
Johannes Mockenhaupt
99c2f797ea
Fix imports. 2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt
1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
 2017-09-18 22:54:35 +02:00
Milos Kozak
fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak
cd7c7733ea bump 1.53 2017-09-18 21:59:01 +02:00
Milos Kozak
b797530c9d BG & IOB contribution on by default in wizard 2017-09-18 21:57:35 +02:00
Milos Kozak
d2815e4045 check for NaN 2017-09-18 21:52:06 +02:00
Milos Kozak
d7f8d75d06 Revert "Rounding issues visible in nightscout insulin field" 2017-09-18 21:24:22 +02:00
Milos Kozak
a98d2e846f Merge pull request #419 from dylanleonard/feature_time_spinner_fix 
Time Spinner Local Profile Fix
 2017-09-18 21:06:34 +02:00
Dylan Leonard
d8590fe8f1 Clarified boolean logic with parentheses :) 2017-09-18 15:04:46 -04:00
Milos Kozak
bf748f3d4b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-18 20:56:42 +02:00
Milos Kozak
8785bc63d5 loadEvents after bolus in separate thread 2017-09-18 20:54:53 +02:00
Milos Kozak
c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +02:00
Milos Kozak
42ee7c668e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-18 20:43:24 +02:00
Milos Kozak
8daf9e5c2c use notification for bolus delivery failed message when window has been destroyed 2017-09-18 20:40:03 +02:00
Milos Kozak
17fa2617f7 fix null pointer exception 2017-09-18 20:23:05 +02:00
Dylan Leonard
4f5987b72a Added cases to accept both a.m./p.m. and AM/PM 2017-09-18 14:20:28 -04:00
Milos Kozak
3f7819937b split JSON arrays to 50 elements 2017-09-18 20:10:53 +02:00
Milos Kozak
aa89e8f886 Merge pull request #421 from wouterla/dev 
Rounding issues visible in nightscout insulin field
 2017-09-18 19:46:40 +02:00
Milos Kozak
04994924c5 GUI tweaking, small fixes 2017-09-18 18:41:45 +02:00
Milos Kozak
7f4888978e warn if basal step is not 0.01 2017-09-18 13:28:00 +02:00
Milos Kozak
6cee6c0f51 RS extended disabled warning 2017-09-18 12:59:56 +02:00
Milos Kozak
e3ad396f65 more work on service 2017-09-18 12:57:07 +02:00
Milos Kozak
ee4d8b7748 some work on history 2017-09-18 09:10:27 +02:00
boysim
81aadcc1be Update strings.xml 2017-09-17 17:02:27 +02:00
Wouter Lagerweij
02c2213545 Changed rounding to use BigDecimals to avoid noisy long doubles in output 2017-09-17 14:27:49 +02:00
Dylan Leonard
91f0c21306 Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called 2017-09-16 19:30:07 -04:00
Wouter Lagerweij
aaa3f648d0 Removed unused imports 2017-09-17 00:56:00 +02:00
Wouter Lagerweij
e350c8c3c3 Rounding fix 2017-09-17 00:53:16 +02:00
Milos Kozak
6662c9dd6c bolus ok 2017-09-15 13:52:28 +02:00
Milos Kozak
08fca41b5f partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
Milos Kozak
01002f11e7 Merge pull request #416 from jotomo/vpump-enact 
VirtualPump: set PumpEnactResult.enacted.
 2017-09-14 10:06:01 +02:00
Milos Kozak
13fd6136c3 refactor connectivity notifications 2017-09-14 00:29:34 +02:00
Johannes Mockenhaupt
cb3b472488
VirtualPump: set PumpEnactResult.enacted. 
(cherry picked from commit ec49bc3)
 2017-09-13 13:16:48 +02:00
Milos Kozak
ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt
07b04b8abf
Use correct units for low/high from TT. 2017-09-12 01:23:38 +02:00
Milos Kozak
69b04fdf26 Merge pull request #413 from samihusseingit/dev 
Dev
 2017-09-11 20:12:51 +02:00
Johannes Mockenhaupt
936ce42cc0
Remove duplicate logging. 2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt
612efa6a13
Revert "Make the BolusProgress dialog a bit more self-contained." 
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).

This reverts commit c11455dff1.
 2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt
c11455dff1
Make the BolusProgress dialog a bit more self-contained. 
(cherry picked from commit 75db72a)
 2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt
c227e0e5fa
Dead code be gone. 
(cherry picked from commit bb626ce)
 2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt
5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep. 
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
 2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt
c50fad81bb
Log exceptions in catch blocks rather than printing to console. 
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
 2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt
627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false. 
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
 2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt
b1e3b45ce9
Add temp target to Wizard dialog 
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
 2017-09-09 16:30:17 +02:00
Milos Kozak
e3ae7bbeaf Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-05 22:47:37 +02:00
Milos Kozak
98848b61ec send max 30 at once to NS 2017-09-05 22:47:10 +02:00
SMUSTAF1
1fd99a9582 changing the color of the bolus value, for visual clarify and confirmation. Reducing errors. 2017-09-05 13:29:43 +02:00
Milos Kozak
90496d0a02 Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh 
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
 2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt
3bebea37ae
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab. 2017-09-03 01:53:30 +02:00
Milos Kozak
fa24368701 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-02 10:26:07 +02:00
Milos Kozak
7801db5a29 fix danar bolus step 2017-09-02 10:25:46 +02:00
AdrianLxM
15a40cba80 Split treatments into smaller packages before broadcasting 2017-09-01 14:02:47 +02:00
fedor apanasenko
ed8582b36a update russian 2017-09-01 10:37:59 +03:00
Milos Kozak
46f111076f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-31 22:01:25 +02:00
Milos Kozak
db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak
c312b51fcf consolidate DanaR fragments 2017-08-31 19:32:28 +02:00
Radoslav Radev
e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03:00
Milos Kozak
7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak
13b8a9ecf2 Merge pull request #404 from kakoni/master 
Adding out_units support for determine-basal.js
 2017-08-29 18:23:36 +02:00
Milos Kozak
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Karri Niemelä
034faa4f6e Adding support out_units 2017-08-29 15:06:53 +03:00
Johannes Mockenhaupt
448f527525
Splitted boluses: add a wait, so that boluses are delivered with 40s between them. 2017-08-28 21:02:37 +02:00
Johannes Mockenhaupt
f903b83315
Simplify. 2017-08-28 20:32:41 +02:00
Johannes Mockenhaupt
7d5571ffd2
SetTbrCommand: rewrite inputing duration. 
Inputs all steps at once, including 'alignment' step, thereby removing a wait
between the initial step and subsequent step where a bad timing could
break the command.
 2017-08-28 20:13:20 +02:00
Johannes Mockenhaupt
4c313a6a14
Small cleanup. 
(cherry picked from commit b0b533e)
 2017-08-28 12:43:12 +02:00
Johannes Mockenhaupt
6f8e0fc257
Remove hack to cancel a request for a TBR that is already running (localized issue). 
(cherry picked from commit a671536)
 2017-08-28 12:43:11 +02:00
Johannes Mockenhaupt
cff4bc1abe
Add temporary fix for edge case resulting in SetTbrCommand failing to set TBR_DURATION, where duration is not correctly pumped up to a multiple of 15. 
(cherry picked from commit df9952f)
 2017-08-28 12:43:09 +02:00
Johannes Mockenhaupt
a53564fcae
Add wait in loop to check for update from pump. 
(cherry picked from commit fe8d09e)
 2017-08-28 12:43:08 +02:00
Johannes Mockenhaupt
11332391b8
Clean up (Cancellable)BolusCommands, to use dynamic scroll wait as well. 
(cherry picked from commit 711cc58)
 2017-08-28 12:43:06 +02:00
Johannes Mockenhaupt
03ff15d533
Remove unused test class. 2017-08-28 00:57:47 +02:00
Johannes Mockenhaupt
381a26119b
Crap, don't enable experimental bolus by default. 2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt
a42b671965
Update version. 2017-08-27 20:40:29 +02:00
Johannes Mockenhaupt
e3a732d53d
Small refactoring. 2017-08-27 20:30:58 +02:00
Johannes Mockenhaupt
b85f5324de
Restore bolus splitting hack. 2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt
ecd05bef2d
Make new BolusCommand configurable. 2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt
b53db22ae1
Report bolus delivered if the pump raised a warning/error during delivery. 
Most likely this is due to a low cartridge warning, but might also be an occlusion alert.
This lets the alarm ring and asks the user to check it. The treatment is also recorded in
the db as enacted.

(cherry picked from commit 6cc017a)
 2017-08-27 19:08:27 +02:00
Johannes Mockenhaupt
fea1309fa3
Cleanup merge. 2017-08-27 19:05:33 +02:00
Johannes Mockenhaupt
3d2732a68e
Restore bolus comands alongside. 2017-08-27 19:05:08 +02:00
Johannes Mockenhaupt
95fda165a3
Merge fixes without changes to behaviour. 2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt
e399fac8dc
Try to be clever about slow screen updates when scrolling. 2017-08-27 18:45:25 +02:00
Johannes Mockenhaupt
ad44b356c4
Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0" 
This reverts commit 8720c08cdd4a7f89b77816d849da9c585fb8f1ef.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
f70cbbc6c0
Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
7bd7c7d035
Workaound for #27 (TBR issued twice). 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
0705755368
Revert "Retry with current ruffy." 
This reverts commit f9281c1f996679a2c8065aa52cbb8cb4698353bc.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
2a80111034
Retry with current ruffy. 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt
40941996c2
Don't provide status JSON until we can provide it properly. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
ff088ddd3f
ComboPlugin: don't implement ConstraintsInterface, ProfileInterface. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
1d53305ff9
Use string resource. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
c2ae0b7289
Cleanup. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
fdab7daf2c
Only display Extended Bolus tab in Treatments if pump supports them. 
(cherry picked from commit e862c35)
 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
4046305380
Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
bc68f2cc1b
Better log output. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
99b98f1dec
Set custom version 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
fce696b51d
Cleanup, fix merge issues. 2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt
4d2fa19ad4
Merge branch 'bolus-progress' into rework 
* bolus-progress:
  wip
  wip
  wip
  more
  more
  Remove TODOs for extended bolus.
  wip cancelling
  Initial take on bolus cancellation.
  Initial take on bolus progress reporting.
  Add alternative SetTbrCommand for pumps with different behaviour.
  Formatting.
 2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt
e6ba99b02f
Fix reading blinking values, use alternate SetTbrCommand by default, 
cleanups
 2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt
37523fbdd1
ComboPlugin: Extract fields into ComboPump. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
3fdac4b23e
Small refactoring. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9f57f82b6a
Remove wait for carb-only treatment. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
c301d6585c
ComboPlugin: implement Constraint, ProfileInterface. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
eb74a24e54
Misc cleanups. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
5eea6d7b8d
Fix waiting between reconnects. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7a41117a64
Experiments. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
6b19759a9f
Command stubs. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
de693c0f76
Add reservoirLevel to PumpState. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
785a01a056
Extract methods to read blinking values. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7537048a96
Finish injecting scripter. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
3238cf9c35
Remove pumpState arg from Command.execute. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
fe7f831429
Inject scripter into commands. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
04a03dedc3
Extract BaseCommand. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment. 
(cherry picked from commit 4078c23)
 2017-08-27 12:36:28 +02:00
Milos Kozak
03bf1abdd4 add WakeLock#isHeld() 2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb add WakeLock#isHeld() 2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93 Merge pull request #396 from warstar2187/dev 
KR translation update
 2017-08-27 00:38:44 +02:00
warstar2187
761f9f5075 Update strings.xml 2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03:00
Milos Kozak
e4c98e6cd1 make dev 1.52 2017-08-26 21:28:08 +02:00
Milos Kozak
b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak
491378caf5 1.51 bump 2017-08-26 20:42:53 +02:00
Milos Kozak
3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a fix strings 2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
boysim
196e0bb309 Update strings.xml 2017-08-24 23:18:21 +02:00
Milos Kozak
4e8d92a74b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02 better handling DetailedBolusInfo in v2 driver 2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt
d100509648
Log action about to be performed before the operation. 2017-08-23 16:38:28 +02:00
Johannes Mockenhaupt
6b99bb8ed1
Log ruffy messages on debug level, see if that helps debug things. 2017-08-23 16:36:31 +02:00
Johannes Mockenhaupt
fdf974cb3c
Better error message on connect attempt failure. 2017-08-23 16:36:20 +02:00
Johannes Mockenhaupt
52d2b425b8
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (21 commits)
  1.5h
  Don't change schema.
  Fix comparing non-primitives.
  Generify MainApp.getSpecificPlugin.
  Fix some warnings / simplify a bit.
  Remove now unused dia, insulinInterfaceId from Treatment.
  correct supercall
  Use bolusstep granularity in fill dialog
  bugfix: fill as invalid treatments if triggered from phone
  add invalid treatments to charts in "invalid" colour
  Use bolusstep as step for insulin correction in wizard
  Update strings.xml
  fix of fix :(
  small refactoring
  Multiply time passed instead of divide dia.
  Update strings.xml
  Fix initalizing profile with default values.
  moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
  Update strings.xml
  Update strings.xml
  ...
 2017-08-23 16:36:06 +02:00
Milos Kozak
d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak
c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume 
Delay in bg update on resume
 2017-08-22 20:33:56 +02:00
Milos Kozak
0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview 
Fill treatments in Overview
 2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586 Merge pull request #389 from jotomo/cleanups 
Cleanups
 2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema. 2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment. 2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08 correct supercall 2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97 Use bolusstep granularity in fill dialog 2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4 bugfix: fill as invalid treatments if triggered from phone 2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197 add invalid treatments to charts in "invalid" colour 2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c Use bolusstep as step for insulin correction in wizard 2017-08-22 00:41:23 +02:00
Johannes Mockenhaupt
2eb86e1bd8
wip 2017-08-21 18:33:40 +02:00
Patrik Nilsson
c91988081f Update strings.xml 
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
 2017-08-21 00:01:12 +02:00
Johannes Mockenhaupt
6cc73dcc1c
wip 2017-08-20 23:15:24 +02:00
Milos Kozak
33cf707d45 Merge pull request #380 from MilosKozak/dia-divisor-fix 
Dia divisor / bolussnooze fix
 2017-08-20 21:52:42 +02:00
Milos Kozak
ab035e3949 Merge pull request #371 from diabetesdt1/patch-2 
Update strings.xml
 2017-08-20 21:44:21 +02:00
Johannes Mockenhaupt
b162fcce01
wip 2017-08-20 20:47:58 +02:00
Milos Kozak
a18e2b4641 fix of fix :( 2017-08-20 19:42:41 +02:00
Milos Kozak
86d791d93f Merge pull request #378 from jotomo/profile-default-values 
Fix initalizing profile with default values.
 2017-08-20 19:08:55 +02:00
Johannes Mockenhaupt
bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
 2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt
387ceff525
Add config options: 
* alternate SetTbrCommand impl (original impl)
* split bolus (quick hack) to split up boluses to slow delivery
 2017-08-19 22:29:48 +02:00
AdrianLxM
9c2808bf6f small refactoring 2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c Multiply time passed instead of divide dia. 2017-08-19 20:12:37 +02:00
warstar2187
36c25cbd45 Update strings.xml 2017-08-19 21:35:03 +09:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values. 2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a moved the code of the bg update to the top before all the loop logic happens, so there would be no delay 2017-08-18 20:58:54 +02:00
Johannes Mockenhaupt
d851637d4f
more 2017-08-18 11:55:19 +02:00
Milos Kozak
6b8dd5868d fix displaying target in mmol 2017-08-18 11:46:04 +02:00
diabetesdt1
efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1
ef42193d95 Update strings.xml 
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
 2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog. 2017-08-17 22:01:59 +02:00
AdrianLxM
5d6327bfaa static variables -> object variables 2017-08-17 21:34:30 +02:00
AdrianLxM
5769915f8c Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer 2017-08-17 21:29:15 +02:00
AdrianLxM
0cc9ee4193 Avoid npe if no string is assigned to the profile switch 2017-08-17 21:24:31 +02:00
Milos Kozak
ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt
fabaf7c2ef
more 2017-08-17 19:04:43 +02:00
AdrianLxM
92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
diabetesdt1
64446f07c5 Update strings.xml 
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
 2017-08-17 12:40:14 +02:00
Johannes Mockenhaupt
738dd72f5b
Remove TODOs for extended bolus. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
22e3517cd6
wip cancelling 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a664bdeaaa
Initial take on bolus cancellation. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
c1ecad1ed6
Initial take on bolus progress reporting. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a230501f74
Add alternative SetTbrCommand for pumps with different behaviour. 2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt
f41d597c07
Formatting. 2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt
b000824b8a
Merge branch 'remove-cmd-retry-with-reconnect' into develop 
* remove-cmd-retry-with-reconnect:
  Don't rebind ruffy and retry command in case of failure.
 2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt
a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (27 commits)
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  Overview: format target using unit specific format.
  Dutch language
  insulincurves - notification on short DIA
  insulincurves - forgotten string updated
  insulincurves - rename peak to peak time
  insulincurves - remove unused base fragment
  insulincurves - i18n
  insulincurves - ActivityGraph fix double plotting
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
 2017-08-17 10:08:15 +02:00
AdrianLxM
47e295b3c1 Check for tempbasal not RealTempbasla 2017-08-17 00:42:26 +02:00
AdrianLxM
776ae3f424 Overlapping interval - regard first element on cut 2017-08-16 23:56:14 +02:00
AdrianLxM
8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
Milos Kozak
6ca44fce84 Merge pull request #367 from MilosKozak/profile-switch-buttons 
show notification on toast alarm
 2017-08-16 22:58:34 +02:00
AdrianLxM
e61d7a4442 show notification on toast alarm 2017-08-16 21:37:33 +02:00
Milos Kozak
b93a153b23 parse 12h format properly 2017-08-16 19:33:41 +02:00