Find a file
Johannes Mockenhaupt e7d49f2300
Merge branch 'no-history-for-you' into combo-scripter-v2
* no-history-for-you:
  When bolusing, only read history in case of error or cancellation.
  Cleanups.
  Remove lastBolus, reservoirLevel.
  Use timestamp for TBR, not pump minutes.
  Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
  ComboFragment: move forced history read to long-pressing the TDD button.
  More steps towards reducing comms amount.
  Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
  Remove last bolus, units display of reservoir level from Combo fragment.

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-05 00:34:22 +01:00
app Merge branch 'no-history-for-you' into combo-scripter-v2 2017-12-05 00:34:22 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
ruffy-spi Use timestamp for TBR, not pump minutes. 2017-12-05 00:08:42 +01:00
ruffyscripter Use timestamp for TBR, not pump minutes. 2017-12-05 00:08:42 +01:00
wear Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml fix build tools for travis 2017-12-03 21:36:24 +01:00
build.gradle try to fix travis 2017-12-03 21:31:06 +01:00
gradle.properties Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue." 2017-10-16 21:48:08 +02:00
gradlew permission access for travis 2016-12-28 16:10:06 +01:00
gradlew.bat Objectives design 2016-06-04 17:28:05 +02:00
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README-Combo.md Bug notes. 2017-11-27 11:46:17 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Testing-Combo.md Retry reading/writing basal profile, cleanups, notes. 2017-11-24 21:11:55 +01:00
TODO-Combo.md More bug notes. 2017-11-27 20:45:17 +01:00

AndroidAPS

Gitter Build status