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

3618 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 80f13553dc
Add missing placeholder in Dutch translation. 2018-01-23 12:45:47 +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
Johannes Mockenhaupt 17d7eaa883
Fix missing/extra string resources. 2018-01-21 20:28:43 +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 e4ad33659b
Add missing formatters in Dutch translation. 
(cherry picked from commit 90dcc9d)
 2018-01-21 12:12:58 +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 c070d47736
Merge pull request #610 from jotomo/overview-checkboxes 
Overview: move checkboxes before label.
 2018-01-19 21:00:39 +01:00
Johannes Mockenhaupt 8109900e9b
Overview: move checkboxes before label. 
(cherry picked from commit 4825e16)
 2018-01-19 20:13:53 +01:00
Johannes Mockenhaupt 316428c290
Add note on Android 8.1 issues. 2018-01-19 14:01:40 +01:00
Johannes Mockenhaupt dfb78f5f89
Commands: only check inputs for sanity, not therapy limits. 
Updated README to ask the user to configure the pump to enforce limits
and only make sure inputs to the command are sane since there's
no facility in place to report errors back, which is fine given this
proactively guards against bugs, not a valid usage scenario.

(cherry picked from commit 033ace4)
 2018-01-19 14:01:40 +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 fcd7c91b82
Typo. 2018-01-15 21:57:08 +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 44381288f4 bump 1.57-dev 2018-01-14 17:12:18 +01:00
Milos Kozak 89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt ad54c67c23
README-Combo: ruffy tips & tricks. 2018-01-13 23:36:01 +01:00
Johannes Mockenhaupt 2e0d052209
Merge remote-tracking branch 'MasterPlexus/combo-scripter-v2' into combo-scripter-v2 
* MasterPlexus/combo-scripter-v2:
  Update Readme-Combo.md
 2018-01-13 23:23:08 +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
Milos Kozak 4f9df99ffb
Merge pull request #601 from jotomo/combo-strings 
Add strings for the Combo pump, including some renames.
 2018-01-13 22:29:46 +01:00
Milos Kozak f8ff076c59
Merge pull request #602 from triplem/pr_gradle 
Cleanup gradle build files
 2018-01-13 22:29:08 +01:00
Markus M. May f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +01:00
MasterPlexus 8cd3e3ec9f
Update Readme-Combo.md 
Add recommendation for ruffy to put screen rotation off,and an additional way for possible pairing.
 2018-01-12 21:36:14 +01:00
Johannes Mockenhaupt 7d4d6374be
Merge branch 'combo-strings' into combo-scripter-v2 
* combo-strings:
  Add strings for the Combo pump, including some renames.

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-01-11 21:48:01 +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