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

1475 commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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
Milos Kozak 3f7819937b split JSON arrays to 50 elements 2017-09-18 20:10:53 +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
Johannes Mockenhaupt cb3b472488
VirtualPump: set PumpEnactResult.enacted. 
(cherry picked from commit ec49bc3)
 2017-09-13 13:16:48 +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
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
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