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

2297 commits

Author SHA1 Message Date
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
bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +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
Milos Kozak
d7dfe8942e prevent basal updated messages on virtual pump 2018-01-08 14:27:27 +01:00
Milos Kozak
6ebd6bcdc0 Merge branch 'nsc' into dev 2018-01-08 14:09:02 +01:00
Milos Kozak
1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt
968431d931
i18n reservoir unit. 2018-01-07 13:02:50 +01:00
Milos Kozak
ab89e16acd PARTIAL_WAKE_LOCK for NSClientService 2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt
d72c243140
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  check 30min interval only for basal rates
 2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt
117b79619b
Check reservoir level before bolus and abort if not enough left. 2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt
836abd74ab
Read reservoir level. 2018-01-07 11:21:56 +01:00
Milos Kozak
8cf69006b2 check 30min interval only for basal rates 2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt
3369d84de8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  basal updated notification
  Dialogs usability tweaks
 2018-01-06 16:27:02 +01:00
AdrianLxM
6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif 
basal updated notification
 2018-01-06 09:10:00 +01:00
AdrianLxM
4dd238097f basal updated notification 2018-01-06 07:37:39 +01:00
AdrianLxM
b9ad3a71fd Dialogs usability tweaks 2018-01-06 06:52:30 +01:00
Johannes Mockenhaupt
3aafcc9854
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cockpit watch face: Double-tap opens MainMenuActivity
  prevent processing incomplete profiles
  set defaults for display range
  actual bg in objective 1
  warn if wrong profile is detected
 2018-01-06 00:30:04 +01:00
Milos Kozak
144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
Milos Kozak
aff0e6f5a8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-04 23:12:40 +01:00
Milos Kozak
b7df21c7d0 prevent processing incomplete profiles 2018-01-04 23:12:35 +01:00
Johannes Mockenhaupt
ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  allow old data on the wf
  request new data on preference change
  accept local NS data broadcast even when ns_upload_only is selected
  remove logging
 2018-01-04 21:38:19 +01:00
Milos Kozak
955ecc6d64 set defaults for display range 2018-01-04 21:33:18 +01:00
AdrianLxM
95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
AdrianLxM
468426bd31
Merge pull request #581 from MilosKozak/watchfaces-steampunk 
request new data on preference change
 2018-01-04 17:41:30 +01:00
AdrianLxM
c3d14b506d allow old data on the wf 2018-01-04 16:20:49 +01:00
Milos Kozak
d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak
4643cdc3b9 accept local NS data broadcast even when ns_upload_only is selected 2018-01-04 09:45:17 +01:00
Milos Kozak
de1475dbba remove logging 2018-01-03 22:28:48 +01:00
Johannes Mockenhaupt
bf25af8c42
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Check activity != null before drawing graph.
 2018-01-03 21:18:12 +01:00
Johannes Mockenhaupt
f09d68ad59
Check activity != null before drawing graph. 2018-01-03 20:58:49 +01:00
Johannes Mockenhaupt
abdad220f6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  improve GUI response
  narrower temp basal line for steampunk watchface
  darker and gracile steampunk-chart
  Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
  Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
  move steampunk md to main dir
  Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit.
  Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
  Steampunk watch face - unit testing complete.
  Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low").
  Steampunk watchface (moto360 support - ignores the chin)
  Steampunk watchface (mmol support) Includes delta granularity in the watch preferences.
  Steampunk watchface (interim commit)
  Steampunk watch face addition of mmol/L drawable
  Steampunk watch face layout changes
  Steampunk watch face (for testing)
  Steampunk watch face (not yet functional)
  Steampunk watch face (not yet functional)
 2018-01-03 20:16:50 +01:00
AdrianLxM
0b76290091
Merge pull request #578 from andrew-warrington/watchfaces 
Steampunk watch face
 2018-01-03 19:58:40 +01:00
Milos Kozak
094737adde improve GUI response 2018-01-03 19:59:18 +01:00
Johannes Mockenhaupt
fd8f2c0801
Clean up unintended diversions from upstream. 2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt
53a8cd4eac
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  missing file
  illegalState crash fix
  combo-bolus-fix
 2018-01-03 18:28:17 +01:00
AdrianLxM
e0abd1b816 Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk 2018-01-03 13:53:38 +01:00
AdrianLxM
28a52b3ab7
Merge pull request #574 from MilosKozak/illegalstate-fix 
illegalState crash fix
 2018-01-03 13:45:31 +01:00
Andrew Warrington
8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00
AdrianLxM
1bbd9012cb
Merge pull request #37 from jotomo/the-clock-strikes-midnight 
Correctly infer pump date when crossing midnight. Fixes #35.
 2018-01-02 13:28:30 +01:00
Milos Kozak
cc1cd675c7
Merge pull request #573 from MilosKozak/combo-bolus-fix 
combo-bolus-fix
 2018-01-02 10:05:20 +01:00
Andrew Warrington
7475b1ba3a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-01 22:36:07 +01:00
Johannes Mockenhaupt
cbf005a11e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  another cob fix
 2018-01-01 15:07:34 +01:00
Milos Kozak
d2753e0dad another cob fix 2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt
1617d6698d
Update ComboPlugin for updated ContstraintsInterface. 2018-01-01 13:26:16 +01:00
Johannes Mockenhaupt
8fb8182f4f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Objectives update
 2018-01-01 13:25:36 +01:00
AdrianLxM
3bfffdb1b0
brackets on string format 2018-01-01 01:23:30 +01:00
AdrianLxM
4a01b14b35 missing file 2017-12-31 16:51:44 +01:00
AdrianLxM
e190f1b9ef illegalState crash fix 2017-12-31 16:44:13 +01:00
Milos Kozak
d27d1b1821 Objectives update 2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt
8ee95077a8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix objective 1
  upload aps status and iob when loop is suspended
  fully offline CP
  Queue: synchronize creating queue thread to avoid multiple threads.
  Wear: No guard for RS
 2017-12-31 11:41:41 +01:00
Milos Kozak
458d812e2e fix objective 1 2017-12-31 11:07:21 +01:00
Milos Kozak
fcbe8555a6 upload aps status and iob when loop is suspended 2017-12-31 10:22:18 +01:00
AdrianLxM
d3127bc97b
Merge pull request #571 from MilosKozak/offline-treatments 
fully offline CP
 2017-12-31 09:52:29 +01:00
AdrianLxM
3a7fe56f64 combo-bolus-fix 2017-12-31 09:50:51 +01:00
Milos Kozak
7b0a4d2ce7
Merge pull request #570 from jotomo/queue-starts 
Queue: synchronize creating queue thread to avoid multiple threads.
 2017-12-31 09:27:27 +01:00
Johannes Mockenhaupt
a6b938d98a
Correctly infer pump date when crossing midnight. Fixes #35. 
(cherry picked from commit bda2551)
 2017-12-31 00:27:41 +01:00
AdrianLxM
937872e80c fully offline CP 2017-12-30 23:01:25 +01:00