Commit graph

115 commits

Author SHA1 Message Date
Milos Kozak a1c6704ae9 Merge branch 'dev2' into smb 2017-11-01 20:50:14 +01:00
Milos Kozak 440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
Milos Kozak e71ce02131 fix merge conflict 2017-10-26 21:23:23 +02:00
Johannes Mockenhaupt 8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
AdrianLxM 7ed7a2e8c4 Merge remote-tracking branch 'milosremote/dev' into smb-rhino 2017-10-21 17:06:57 +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
Johannes Mockenhaupt 7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.

This excludes all libBleCommandUtil ibs except those that match j2v8.

Revert this when we switch away from j2v8.

(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
AdrianLxM 7f2451934c first rhino 2017-10-15 02:52:57 +02:00
AdrianLxM 746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
Johannes Mockenhaupt fa1c282699
Merge remote-tracking branch 'origin/dev' into smb
* origin/dev: (28 commits)
  Singleton & Crashlytics logging part 2
  treatments in config builder
  Singleton & Crashlytics logging part 1
  checkboxes for NS-Client layouts
  overview checkboxes cutoff fix
  update NP value after manual entry
  restore preferences
  temp target presets
  Rv2 percent fix
  korean percent fix
  serialize reload of treatments
  getTempBasalFromHistory -> getRealTempBasalFromHistory
  Do not misinterpret a fake-extended as 0% temp.
  In one line
  Update danar_fragment.xml
  text identation
  Add files via upload
  Add files via upload
  Add files via upload
  Add files via upload
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
Milos Kozak 58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak ba54dacffb 1.54-dev 2017-09-25 19:51:05 +02:00
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
Milos Kozak fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak cd7c7733ea bump 1.53 2017-09-18 21:59:01 +02:00
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
Milos Kozak addd6c8232 fix conflict 2017-08-28 19:15:33 +02:00
Milos Kozak e4c98e6cd1 make dev 1.52 2017-08-26 21:28:08 +02:00
Milos Kozak 491378caf5 1.51 bump 2017-08-26 20:42:53 +02:00
Milos Kozak d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak 898e162300 initial work on SMB 2017-08-15 23:13:37 +02:00
Milos Kozak a40afd0948 1.5g 2017-08-06 14:28:01 +02:00
Milos Kozak 7a572d2341 1.5f 2017-07-25 22:53:55 +02:00
AdrianLxM e381d197cb 1.5e 2017-07-21 16:49:43 +02:00
Milos Kozak 2724e10c2f 1.5d 2017-07-07 18:39:31 +02:00
Milos Kozak 771ff0d781 1.5c 2017-07-02 11:47:16 +02:00
Milos Kozak 37055cd917 allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
Milos Kozak a8a4ffcab1 ver 1.5b 2017-06-30 10:24:45 +02:00
Milos Kozak ea06a90453 1.5a 2017-06-27 23:24:30 +02:00
Milos Kozak a3db05ec39 v 1.50 & fix conflict 2017-06-04 22:37:58 +02:00
Milos Kozak 32084094fd v 1.46 2017-06-01 18:59:39 +02:00
Milos Kozak 6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak 012b6a2c26 v 1.45 2017-05-20 20:42:10 +02:00
Milos Kozak 0a182fb022 v 1.44 2017-05-17 18:54:48 +02:00
Milos Kozak a03b5be189 v 1.43 2017-05-09 21:34:00 +02:00
Milos Kozak c44ea83165 1.42 bump 2017-04-30 21:36:47 +02:00
Milos Kozak 1abdadceca ver 1.41 2017-04-30 10:24:09 +02:00
Milos Kozak b8a8bed6c5 remove butterknife at all, remove unused code, overview graph optimalization 2017-04-23 13:45:49 +02:00
Milos Kozak c18fcfda62 revert sdk to 23 2017-04-22 10:18:31 +02:00
Milos Kozak 90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak 51439bbf33 upgrade libraries 2017-04-21 12:03:54 +02:00
Milos Kozak 25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak 402768cb87 1.33 app start logging optional 2017-04-14 15:33:39 +02:00
Milos Kozak 2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak 6e90b425f7 ver 1.31 bump 2017-04-09 21:50:53 +02:00
Milos Kozak a203591d44 ver 1.3 bump 2017-04-09 11:47:20 +02:00
Milos Kozak 5f0de38dfe 1.3rc2 2017-04-01 12:47:18 +02:00