AndroidAPS/app/src/main/java/info/nightscout/androidaps/interfaces
Johannes Mockenhaupt ce2b1e4d10
Merge remote-tracking branch 'origin/dev' into smb
* origin/dev: (40 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/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
#	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
2017-09-20 13:02:31 +02:00
..
APSInterface.java log invoke() source 2017-01-08 00:38:53 +01:00
BgSourceInterface.java add source selection xdrip/nsclient 2016-06-21 00:34:36 +02:00
ConstraintsInterface.java most danar code there 2016-07-10 15:05:13 +02:00
DanaRInterface.java simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
InsulinInterface.java insulincurves - rapid and ultra both with adjustable dia 2017-08-14 15:24:30 +02:00
Interval.java tempbasal ns sync 2017-05-23 20:15:14 +02:00
PluginBase.java sensitivity plugins 2017-06-24 11:04:09 +02:00
ProfileInterface.java optimize getUnits() & detecting faked extended 2017-06-13 12:08:30 +02:00
PumpDescription.java temp basal dialog design 2017-05-30 18:10:05 +02:00
PumpInterface.java rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute 2017-08-12 13:36:35 +02:00
SensitivityInterface.java sensitivity plugins 2017-06-24 11:04:09 +02:00
TreatmentsInterface.java Merge remote-tracking branch 'origin/dev' into smb 2017-09-20 13:02:31 +02:00