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

2841 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
2eca4ba90c Merge pull request #423 from MilosKozak/revert-421-dev 
Revert "Rounding issues visible in nightscout insulin field"
 2017-09-18 21:24:39 +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
c53b5918ab Merge pull request #415 from jotomo/tt-in-wizard 
TT in wizard
 2017-09-18 20:56:26 +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
6b9d457b73 Merge pull request #422 from boysim/dev 
Dev
 2017-09-18 19:36:30 +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
samihusseingit
12b22ddc6d Merge pull request #3 from MilosKozak/dev 
Dev
 2017-09-18 09:53:28 +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
db4d203437 Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." 
This reverts commit 4bda222786.
 2017-09-16 20:02:08 -04: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
Dylan Leonard
4bda222786 Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. 2017-09-16 19:27:10 -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
boysim
9d62d498df Merge pull request #4 from MilosKozak/dev 
Dev
 2017-09-16 23:07:56 +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
boysim
c2dbed5174 Merge pull request #3 from MilosKozak/dev 
Dev
 2017-09-12 21:26:02 +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
Milos Kozak
1a986ce199 Merge pull request #414 from jotomo/logging-and-stuff 
Logging and stuff
 2017-09-11 10:14:15 +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