Commit graph

  • 1b38c9cf5e
    Join pumps under Config.HWPUMPS switch. Johannes Mockenhaupt 2018-03-17 13:43:25 +0100
  • 8457cd3843
    Merge remote-tracking branch 'origin/dev' into combo-dev-merge Johannes Mockenhaupt 2018-03-17 13:39:38 +0100
  • de72fba92e
    Combo: update button spacing to match overview. Johannes Mockenhaupt 2018-03-17 12:08:32 +0100
  • 6a6359f1ee
    Combo: Show count of boluses delivered and TBRs set on pump. Johannes Mockenhaupt 2018-03-15 20:42:32 +0100
  • a7ca483565
    Rename isActiveBgSource -> isFromActiveBgSource. Johannes Mockenhaupt 2018-03-17 13:36:52 +0100
  • 8849df639f
    Invoke loop only for new BGs from active BG source. Johannes Mockenhaupt 2018-03-17 13:31:26 +0100
  • ad3bf19e4c
    Handle received EventNewBg depending on args. Johannes Mockenhaupt 2018-03-17 13:25:37 +0100
  • 7f45316a24
    Add isActiveBg to EventNewBg. Johannes Mockenhaupt 2018-03-17 13:22:12 +0100
  • 063505fdb3
    Only invoke the loop for new BGs. Johannes Mockenhaupt 2018-03-13 15:03:12 +0100
  • 1e359184a9 check for null profile Milos Kozak 2018-03-17 08:12:07 +0100
  • 1738aea4de
    Don't overlap time ticks with current time AdrianLxM 2018-03-16 23:57:58 +0100
  • a2ecfa89a0 history browser chart selection AdrianLxM 2018-03-16 23:32:17 +0100
  • 7c9824e37d
    Insulin button: allow negative presets, fix adding TT insulin. Johannes Mockenhaupt 2018-03-16 22:53:55 +0100
  • 194c7a2dbc
    Overview: symetric spacing. Johannes Mockenhaupt 2018-03-16 22:46:12 +0100
  • 8564cf172e
    Carbs button: send carbs to pump if pump supports carbs. Johannes Mockenhaupt 2018-03-16 22:09:30 +0100
  • 32108a7c2f
    Carbs button: fix visibility pref, input type, allow negative increments. Johannes Mockenhaupt 2018-03-16 21:29:41 +0100
  • 90f9bf373c
    Smallscreen fix AdrianLxM 2018-03-16 21:52:02 +0100
  • 47c6c2d9a8 chart menu 4 AdrianLxM 2018-03-16 19:26:18 +0100
  • 067b264ae8 chart menu 3 AdrianLxM 2018-03-16 19:16:47 +0100
  • 21c3853461 chart menu 2 AdrianLxM 2018-03-16 18:10:13 +0100
  • 32894a092e chart menu 1 AdrianLxM 2018-03-16 17:23:02 +0100
  • b6ce7c03c6 remove profile dependency from pump drivers, TRB optimalization Milos Kozak 2018-03-16 16:53:38 +0100
  • 0205dc40b3
    Combo: set SMB flag on bolus progress update for wear. Johannes Mockenhaupt 2018-03-16 15:56:31 +0100
  • 6bebb30da0
    Combo: use PrivacyFabric to align with dev. Johannes Mockenhaupt 2018-03-16 15:52:21 +0100
  • 30d522e1a8
    Combo: update PumpDescription to align with dev. Johannes Mockenhaupt 2018-03-16 15:49:12 +0100
  • db00404e43
    Merge commit 'origin/dev^' into combo-dev-merge Johannes Mockenhaupt 2018-03-16 15:44:54 +0100
  • 2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode Markus M. May 2018-03-15 23:00:08 +0100
  • 39aae28101 Disable profile switch if not in Engineering mode and on dev branch Markus M. May 2018-03-15 21:51:43 +0100
  • e38f10dba0 Merge jamoto/engineering-mode Markus M. May 2018-03-15 21:10:18 +0100
  • db7671cd23 split enacting TRB and SMB Milos Kozak 2018-03-15 18:30:18 +0100
  • 390e5d6d11
    Merge pull request #765 from AdrianLxM/dev190315 Milos Kozak 2018-03-15 18:19:32 +0100
  • 5fd05158ac cleanup AdrianLxM 2018-03-15 17:00:57 +0100
  • b481e77008 draw profile in dana profile viewer AdrianLxM 2018-03-15 16:56:59 +0100
  • d31c9a6ed6 optimize imports AdrianLxM 2018-03-15 14:13:21 +0100
  • 212a9dcc94 draw basal in profile viewer AdrianLxM 2018-03-15 14:05:13 +0100
  • e9313c5b28 BG autobackfill configurable Milos Kozak 2018-03-14 20:21:48 +0100
  • eb017e7793
    Merge pull request #761 from MilosKozak/travis Milos Kozak 2018-03-14 07:33:18 +0100
  • d25855295d travis 2nd try Milos Kozak 2018-03-13 23:48:14 +0100
  • 52d558388d
    Merge pull request #758 from triplem/travis_coverage Milos Kozak 2018-03-13 20:55:32 +0100
  • e92e05cfbd
    Merge pull request #759 from TebbeUbben/dev Milos Kozak 2018-03-13 20:31:38 +0100
  • 11295b1e96 Save new profile when updating it TebbeUbben 2018-03-13 20:15:58 +0100
  • b10f8f2fe1 Add environment variable to handle testCoverage Markus M. May 2018-03-13 19:24:08 +0100
  • a398d95bb4
    Add info to About dialog when engineering mode is enabled. Johannes Mockenhaupt 2018-03-12 23:03:14 +0100
  • 637b0c6189
    On start, show notification if on dev-branch, but not EM, so CL is disabled. Johannes Mockenhaupt 2018-03-10 09:58:47 +0100
  • 8219332a2c do not pass DIA to SMB determine_basal Milos Kozak 2018-03-12 22:23:15 +0100
  • 4ff09a0125 show Dana model properly after communication error Milos Kozak 2018-03-12 22:16:10 +0100
  • 5b064cd8f8
    Merge pull request #756 from TebbeUbben/dev Milos Kozak 2018-03-12 21:46:29 +0100
  • e134b94f13 fix deviation slope calculations Milos Kozak 2018-03-12 21:13:48 +0100
  • ffb7b068a8 Read maximum basal and bolus amount from pump TebbeUbben 2018-03-12 20:53:39 +0100
  • 30d12622f7 update maxIOB hard limits Milos Kozak 2018-03-12 17:59:42 +0100
  • eb2b6f9bd8 Allow bolus record only in new treatment dialog Milos Kozak 2018-03-12 17:52:52 +0100
  • fc070c95a7 use safeGetString Milos Kozak 2018-03-12 11:22:19 +0100
  • 601dbc1036 JsonHelper test Milos Kozak 2018-03-12 11:12:41 +0100
  • a5830cc452 Merge branch 'foodrefactor' into dev Milos Kozak 2018-03-12 10:56:14 +0100
  • 38999d6598 food code cleanup Milos Kozak 2018-03-12 10:53:23 +0100
  • c249fb1dc0
    Merge pull request #755 from TebbeUbben/dev Milos Kozak 2018-03-12 09:13:27 +0100
  • d4ede0a5b3
    Merge branch 'dev' into dev Tebbe Ubben 2018-03-11 22:59:11 +0100
  • 8fd68a082c Show bolus progress TebbeUbben 2018-03-11 22:53:18 +0100
  • ac6e519fc5
    Merge pull request #753 from andrew-warrington/watchsmb AdrianLxM 2018-03-11 21:29:55 +0100
  • d8d87e1ffd BaseWatchFace.java: Update chart with bolus and prediction data. (Affects AAPSv2 and Steampunk watch faces.) Andrew Warrington 2018-03-11 21:18:03 +0100
  • 21dbeb299e Missing import statement TebbeUbben 2018-03-11 21:00:08 +0100
  • d353a10187
    Merge pull request #1 from AdrianLxM/patch-19 Tebbe Ubben 2018-03-11 20:58:13 +0100
  • 3068089297
    Insight: add treatment to progress event AdrianLxM 2018-03-11 20:56:11 +0100
  • f2d6b92394
    Merge pull request #750 from TebbeUbben/dev AdrianLxM 2018-03-11 18:34:10 +0100
  • ccabb099f0 Improved rounding TebbeUbben 2018-03-11 17:52:53 +0100
  • 3ad783260b max_daily_basal min value 0.1 -> 0.05 Milos Kozak 2018-03-11 17:17:34 +0100
  • bd03c678d1
    Merge pull request #748 from TebbeUbben/dev Milos Kozak 2018-03-11 16:54:55 +0100
  • 46a1be97f7 Added some debug lines and missing digit in isThisProfileSet TebbeUbben 2018-03-11 16:42:47 +0100
  • 2c21571cf4 fix NPE Milos Kozak 2018-03-11 16:38:30 +0100
  • 6cf849ce76 allow 30min basal rates when pump supports it Milos Kozak 2018-03-11 16:03:21 +0100
  • 714abbbb6e
    Merge pull request #747 from PoweRGbg/patch-13 Milos Kozak 2018-03-11 09:10:10 +0100
  • 60c4986ffa
    Removed unneeded conversion to Md/dl which leads to a mgDl targets always Roumen Georgiev 2018-03-11 09:06:50 +0200
  • 2ac2006100
    Merge pull request #10 from MilosKozak/dev Roumen Georgiev 2018-03-11 08:24:16 +0200
  • 6117ac97cf
    Merge pull request #745 from TebbeUbben/dev Milos Kozak 2018-03-10 23:39:52 +0100
  • 1aaec9142c
    Merge pull request #746 from swissalpine/patch-3 AdrianLxM 2018-03-10 22:37:09 +0100
  • 13933e6bb7 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-03-10 22:19:27 +0100
  • 203288e93a
    Better layout of the Calculator Dialogue (German) swissalpine 2018-03-10 22:12:16 +0100
  • 51da08bf97 Undo history sync delay change TebbeUbben 2018-03-10 21:27:50 +0100
  • d47b067855 Updated SightParser library TebbeUbben 2018-03-10 21:25:14 +0100
  • 7329d3abff Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev TebbeUbben 2018-03-10 21:24:04 +0100
  • cd309780d1 Update to Asclepenius Ability to change basal profile TebbeUbben 2018-03-10 21:21:53 +0100
  • 2cd7a8e8df
    Merge pull request #738 from MilosKozak/unify-target Milos Kozak 2018-03-10 21:19:49 +0100
  • 39c2d690e4 CS translations Milos Kozak 2018-03-10 20:47:17 +0100
  • 8a197f41dc Merge branch 'dialogmmol' into dev Milos Kozak 2018-03-10 19:25:41 +0100
  • ec1c43b905 carbs dialog: defaults for mmol, i18n Milos Kozak 2018-03-10 19:22:31 +0100
  • 951ad26590 cleanup Milos Kozak 2018-03-10 17:58:45 +0100
  • f92669f364
    Merge pull request #740 from MilosKozak/AdrianLxM-patch-1 Milos Kozak 2018-03-08 19:11:09 +0100
  • 4e1dbd072d
    Donations Button AdrianLxM 2018-03-08 18:58:33 +0100
  • 6904cb8807
    Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true AdrianLxM 2018-03-08 15:17:28 +0100
  • 5a5e0ca8b6
    Merge pull request #734 from MilosKozak/watchsmb2 AdrianLxM 2018-03-08 15:10:53 +0100
  • b880a9bb10 unify target calculation 2 AdrianLxM 2018-03-08 15:02:11 +0100
  • 768f61bc07 unify target calculation AdrianLxM 2018-03-08 14:59:18 +0100
  • 5f614b4072 TT unify target calculation AdrianLxM 2018-03-08 14:52:02 +0100
  • 7bd85c5972 Use meal color parameter. Johannes Mockenhaupt 2018-03-06 20:32:53 +0100
  • e710ef81a4
    Merge pull request #736 from swissalpine/patch-2 AdrianLxM 2018-03-08 14:19:45 +0100
  • 3b18413eb6
    Merge pull request #733 from MilosKozak/treatmentdialog-smallscreen Milos Kozak 2018-03-06 22:15:22 +0100
  • 2d797e8ce3
    Update StatuslinePlugin.java swissalpine 2018-03-06 16:23:56 +0100
  • 237d55ee85
    Add whitespace to xDrip status line swissalpine 2018-03-06 11:21:44 +0100
  • 336578e87a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev unknown 2018-03-05 23:12:02 +0100
  • 090e1b13f8
    Add basic Engineering mode. Johannes Mockenhaupt 2018-03-05 22:30:48 +0100