Commit graph

54 commits

Author SHA1 Message Date
AdrianLxM f0351834ff default DIA 2018-05-06 12:49:03 +02:00
AdrianLxM 00c05c0e23 totalMinCarbsImpact depending on sensitivty plugin 2018-04-19 12:57:13 +02:00
Markus M. May a5a0a27db6 Xchange activity and eating soon temp target mgdl 2018-04-05 20:38:49 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Milos Kozak 76ee3c51e4 applyMaxIOBConstraints refactor & tests 2018-03-22 21:13:26 +01:00
Milos Kozak 1aba9a2564 applyCarbsConstraints refactor & tests 2018-03-22 10:31:07 +01:00
Milos Kozak 15158fb5ea applyBolusConstraints refactor & tests 2018-03-21 23:01:30 +01:00
Milos Kozak e2ea44a8a8 applyBasalPercentConstraints reactor & tests part1 2018-03-21 20:24:02 +01:00
Milos Kozak 15ebfc1193 applyBasalConstraints reactor & tests 2018-03-20 22:09:22 +01:00
Johannes Mockenhaupt da014daec8
Merge branch 'dev' into remove-pre-bolus 2018-03-18 20:48:19 +01:00
Johannes Mockenhaupt b54a010614
CarbsButton: replace suspend option with 'hypo tt'. 2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
2018-03-16 15:44:54 +01:00
Milos Kozak ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
Milos Kozak 943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Johannes Mockenhaupt bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev: (68 commits)
  max connection time to 120 sec
  make chart zoomable again
  fix NPE
  lowest priority for background calculations
  wear timestamps long
  remove unneeded code
  fix landscape overview
  synchronized wait
  fix build tools for travis
  try to fix travis
  upgrade build tools
  R: resolve thread deadlock during bolus stop
  remove unsupported code from korean pump
  handle bolus stop prior to delivery correctly
  fix translations
  better logging
  Revert unnecessary change.
  Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
  gradle update
  parse more iso formats
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/info/nightscout/androidaps/Config.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
#	app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_others.xml
#	app/src/main/res/xml/pref_wear.xml
#	gradle/wrapper/gradle-wrapper.properties
#	wear/build.gradle
2017-12-05 00:32:47 +01:00
Milos Kozak bce6d976b0 max connection time to 120 sec 2017-12-04 20:26:57 +01:00
AdrianLxM 7777143b07 scrollable overview on Jelly 2017-12-03 17:30:20 +01:00
AdrianLxM 09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
Milos Kozak a5227fc773 add bolus sound 2017-11-11 16:20:34 +01:00
Milos Kozak 86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt 550ed57ca5
KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode. 2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt d423c8ae2a
Add pref to raise urgent alarms as system notifications. 2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt c53936a7ac
Revert inadvertent change to keepAlive interval. 2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt b47559647f
wip 2017-10-27 00:03:01 +02:00
AdrianLxM b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
Milos Kozak 082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Johannes Mockenhaupt 7eacd5021c
Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
AdrianLxM c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak 645bcdbb8a deviations < 2 as equal 2017-05-04 21:09:17 +02:00
AdrianLxM 0069f320f8 config builder smallscreen 2017-04-30 21:57:55 +02:00
Milos Kozak 25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak 8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak 71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak a75c62be35 show notification when aproaching daily limit 2017-02-14 19:47:45 +01:00
LadyViktoria b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
AdrianLxM 950b638e50 Advanced Settings 2017-01-24 10:28:42 +01:00
AdrianLxM 50b7e619fc Preference switches for Autosens 2017-01-21 01:35:15 +01:00
AdrianLxM 3f3d519c84 Merge branch 'dev' into tempt-pill 2017-01-19 21:57:42 +01:00
viktoria 6120add315 Add very Hard Limits to constants 2017-01-19 20:36:19 +01:00
AdrianLxM d36a515d45 temp target overview 2017-01-17 21:32:30 +01:00
viktoria f5f60bcd30 fix autosens adjust BG targets
regarding to that: 
https://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html
the autosens_adjust_targets setting is only for allow autosens to adjust the BG target not for enabling or disabling the wohle autosens feature
2017-01-10 01:01:11 +01:00
Milos Kozak 5f146f90de fix merge conflict 2017-01-09 10:17:27 +01:00
viktoria 4fe06e4ee1 refactor cpp
add safety values to constans class
2017-01-09 02:28:27 +01:00
Milos Kozak 25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak 6bee16919e optimize keepalive pump connection 2016-08-02 15:43:21 +02:00
Milos Kozak 73ef2d7684 danar history db support 2016-07-21 15:10:42 +02:00
Milos Kozak f01b03979d todos clean 2016-07-15 20:36:45 +02:00
Milos Kozak 90fee59e8a sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
Milos Kozak 47e130d246 KeepAliveReceiver 2016-07-07 00:56:31 +02:00
Milos Kozak f3c15aca75 plus minus controls 2016-06-28 11:19:27 +02:00