Commit graph

165 commits

Author SHA1 Message Date
Johannes Mockenhaupt 71dfb6d314
Set combo version. 2018-02-18 12:42:18 +01:00
Johannes Mockenhaupt 256bb09775
Set version. 2018-02-17 20:50:33 +01:00
Johannes Mockenhaupt 52aa27de05
Sanity check bolus timestamp on start, after bolusing. 2018-02-16 17:33:59 +01:00
Johannes Mockenhaupt 223d22795a
Set version 1.57-combo-csv2-beta-4. 2018-02-13 21:18:01 +01:00
Johannes Mockenhaupt 5b63008774
Set version 1.58-combo. 2018-02-08 22:47:41 +01:00
Johannes Mockenhaupt 0cbf65d2d4
Set version. 2018-02-08 22:19:26 +01:00
Johannes Mockenhaupt b435bb3cd5
Update version. 2018-02-06 00:51:40 +01:00
Johannes Mockenhaupt 4937018a9c
Add test options to build.gradle to unbreak unit tests. 2018-02-04 20:40:24 +01:00
Johannes Mockenhaupt 79f993cd26
Set version. 2018-01-31 15:13:43 +01:00
Johannes Mockenhaupt 47ce9d8561
Revert "Set custom version."
This reverts commit cd7af6c5fe.
2018-01-31 11:56:12 +01:00
Johannes Mockenhaupt cd7af6c5fe
Set custom version. 2018-01-28 22:31:43 +01:00
Johannes Mockenhaupt 34af5bc20b
Source code from ruffyscripter, ruffy-spi modules. 2018-01-28 22:03:32 +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
Johannes Mockenhaupt 3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +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
Milos Kozak bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00
Johannes Mockenhaupt 20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Overview: move checkboxes before label.
  fix pump unreachable for virtual pump
  getLastAutosensData improvement and logging
  remove readstatus prior every command
  bump 1.57-dev
  better log build verison to Fabric

# Conflicts:
#	app/build.gradle
2018-01-19 21:05:37 +01:00
Milos Kozak 44381288f4 bump 1.57-dev 2018-01-14 17:12:18 +01:00
Milos Kozak 89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Cleanup gradle build files
  Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
  Avoid race condition checking for an active TBR.
  Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).

# Conflicts:
#	app/build.gradle
2018-01-13 23:18:44 +01:00
Markus M. May f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +01:00
Johannes Mockenhaupt 61174d1b0a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Update build.gradle
  update badge
  more round tests
  coverage
2018-01-11 17:50:07 +01:00
AdrianLxM 51ca0e0d12
Update build.gradle 2018-01-11 14:14:53 +01:00
Milos Kozak a430a7d70d coverage 2018-01-10 23:31:31 +01:00
Johannes Mockenhaupt 9a74b0fb95
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  fix canceling temp in open loop mode. credits to @warstar2187
  prevent basal updated messages on virtual pump
  added BolusWizardTest
  prefill profile switch JSON from local store if not exists
  PARTIAL_WAKE_LOCK for NSClientService
2018-01-09 20:59:37 +01:00
kuchjir e5b21ccc3e added BolusWizardTest 2018-01-07 22:16:08 +01:00
Johannes Mockenhaupt ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging
* origin/dev:
  fix non smooth ratio graph
  fix of fix
  fix wrong button type
  fix doubled percentage when comming from NS
  proper select last used profile
  when using profile percentage limit basal rate to minimal value supported by pump
  SingleClickButton
  RS fix crash when pairing is not confirmed on pump
  Double -> double
  use joda-time
  Use autosensdata for wizard instead of  APSResult
2017-12-25 20:29:32 +01:00
Milos Kozak 31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Johannes Mockenhaupt 81bde2cbde
Set version to 1.56-combo-csv2-test 2017-12-07 18:20:11 +01:00
Johannes Mockenhaupt b548d092d1
Remove unneeded dependencies. 2017-12-06 11:50:44 +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 5a12d15c8c upgrade build tools 2017-12-03 21:15:12 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak b4187c84ed bump 1.56-dev 2017-11-28 20:51:54 +01:00
Milos Kozak bf4ffaed8f bump 1.55 2017-11-28 20:31:31 +01:00
Johannes Mockenhaupt cc6db3a059
Some ComboFragment cleanups. 2017-11-08 23:31:40 +01:00
Johannes Mockenhaupt dd98d9f7ae
wip 2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt 445392ee69
add pretty time dep. 2017-11-07 09:22:29 +01:00
Johannes Mockenhaupt 8b7725c076
add pretty time dep
(cherry picked from commit 8ac2aba)
2017-11-05 21:52:45 +01:00
Johannes Mockenhaupt f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2
* origin/dev2: (26 commits)
  add getPreferenceId to food plugin
  preferences update
  use DateUtil#agoString
  use DateUtil#untilString
  timeframe strings
  Show remaining time of TT
  NSTreatments NPE fix
  Cleanup.
  Revert "Debug: wider thread column in log to improve readability."
  Disable event logging by default.
  Log summary after 10s, then every 60s.
  Log receivers of event.
  Log source of event.
  Debug: wider thread column in log to improve readability.
  Better log messages for events.
  Group events in type hierarchy related to the LoopPlugin.
  Remove dead NSPingAck class.
  Let event classes extend Event(UpdageGui) classes.
  Add base event class.
  Log posted events.
  ...
2017-11-01 21:39:45 +01:00
Milos Kozak 440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt 394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (26 commits)
  fix RS response code
  use max absorption time for AAPS and weighted average sensitivity detection
  log.debug -> log.error on RS comm
  read status after bolus
  RS connectivity & bolus improvement
  Better bolusing with different speeds (R & Rv2)
  Detailed onscreen history logging
  Split to smaller pieces
  Update strings.xml
  Sensitivity logging optional
  RS synchronized change
  fix displaying XX:30 time intervals
  CS translations
  allow to use actual profile in wizard
  getUnits from active profile not interface
  Update strings.xml
  Update strings.xml
  Update dutch
  Update strings.xml
  Update strings.xml
  ...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt 8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 7b3f474b58
Upgrade to Android Studio 3.0. 2017-10-25 22:49:50 +02:00
Johannes Mockenhaupt e4901f292f
Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +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 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
AdrianLxM 2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA
Rhino ama
2017-10-15 22:39:54 +02:00