caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
3480 commits 1 branch 20 tags 140 MiB
Commit graph

2417 commits

Author SHA1 Message Date
Johannes Mockenhaupt 947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Milos Kozak ca01168474
Merge pull request #611 from MilosKozak/min_unreachable 
minimum of 30 min for unreachable alert
 2018-01-25 11:24:09 +01:00
Milos Kozak 1ba793304f
Merge pull request #616 from jotomo/check-that-box 
Overview: make checkbox labels toggle state as well.
 2018-01-25 11:23:06 +01:00
Milos Kozak 893c64e2e4 fix not attached to the activity 2018-01-25 11:17:23 +01:00
Milos Kozak a3e6794138 check for no profile 2018-01-25 11:09:58 +01:00
Milos Kozak 7be0bfb27e check for no profile 2018-01-25 11:06:35 +01:00
Johannes Mockenhaupt c469edb5a3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-25 03:28:06 +01:00
Johannes Mockenhaupt f7ed34532a
Fabric-Log combo init to get an idea of user count. 2018-01-25 03:28:06 +01:00
Milos Kozak 801182eccd fix cob calculation for history records 2018-01-24 17:03:45 +01:00
Johannes Mockenhaupt 3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt 01d49f9e52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix storing food to the database
  remove forgotten log
  delete all dbrequests from query
 2018-01-24 02:15:45 +01:00
Johannes Mockenhaupt ae1707ead3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  log RS history
  RS: reset isConnected & isConnecting on error
  RS BLE modifications
 2018-01-24 02:06:02 +01:00
Milos Kozak 8a45422135 Merge branch 'dev' into cobthread 2018-01-24 00:00:23 +01:00
Milos Kozak b6f3fae487 fix storing food to the database 2018-01-23 23:14:39 +01:00
Milos Kozak 9663dd499e remove forgotten log 2018-01-23 23:01:04 +01:00
Milos Kozak d4ddfbb942 Merge branch 'dev' into cobthread 2018-01-23 22:04:42 +01:00
Milos Kozak c2a7747167 use getAutosensData(toTime) in oref0 sensitivity 2018-01-23 22:02:17 +01:00
Milos Kozak de7789bec0 delete all dbrequests from query 2018-01-23 21:43:48 +01:00
Milos Kozak 48211aaa30 cob calculation thread 2018-01-23 20:58:48 +01:00
Milos Kozak 9c78595c80 log RS history 2018-01-23 18:19:18 +01:00
Milos Kozak d6201eec17
Merge pull request #563 from MilosKozak/jellyRS 
WIP: RS BLE modifications
 2018-01-23 13:58:47 +01:00
Milos Kozak 4d474ddbdb RS: reset isConnected & isConnecting on error 2018-01-23 13:59:33 +01:00
Johannes Mockenhaupt 0eba153d8a
Combo: add 'base basal rate' to fragment. 
(cherry picked from commit 2873da5)
 2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Careportal DB browser
  fix rendering treatments with duration
  more autosens logging
  cancel extending bolus on pump disconnection
  set maxiob=0 only for objective 4
  fix stopping bolus connection error
 2018-01-23 02:04:02 +01:00
Milos Kozak 52e4496add Careportal DB browser 2018-01-22 21:49:01 +01:00
Milos Kozak d033407ba7 fix rendering treatments with duration 2018-01-22 19:12:22 +01:00
Milos Kozak f835c272ad more autosens logging 2018-01-22 17:18:18 +01:00
Milos Kozak f5a2c5bcd2 cancel extending bolus on pump disconnection 2018-01-21 23:38:24 +01:00
Milos Kozak ef2a565c18 set maxiob=0 only for objective 4 2018-01-21 23:20:41 +01:00
Milos Kozak 1c65a88e49 fix stopping bolus connection error 2018-01-21 22:51:30 +01:00
AdrianLxM 3962808626 minimum of 30 min for unreachable alert 2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt 0553754d8f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  synchronized access to basal_v
 2018-01-21 17:01:27 +01:00
Milos Kozak eedc38fbcf synchronized access to basal_v 2018-01-21 15:56:07 +01:00
Johannes Mockenhaupt 8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  better handling of wrong profiles
 2018-01-21 14:13:46 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +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 97e0aaa380 fix pump unreachable for virtual pump 2018-01-16 23:28:09 +01:00
Milos Kozak 7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
Johannes Mockenhaupt 723bcc4ee3
Remove 'queued activities' from ComboFragment. 
(cherry picked from commit 57a4449)
 2018-01-15 11:11:58 +01:00
Milos Kozak 5a00b68f68 remove readstatus prior every command 2018-01-14 21:42:36 +01:00
Milos Kozak 99d83a60f4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-14 17:12:35 +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
Milos Kozak fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition 
Avoid race condition checking for an active TBR.
 2018-01-13 22:43:41 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames. 
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
 2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt 27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
Johannes Mockenhaupt b4998feee1
Disable reading reservoir level units. 2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt 06d949cd82
Avoid race condition checking for an active TBR. 2018-01-10 10:48:44 +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
Milos Kozak bdd1a85d26 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:44:42 +01:00