JamOrHam
|
bc2f749ef3
|
Merge branch 'dev' into dev
|
2018-02-21 13:43:18 +00:00 |
|
|
Jamorham
|
448ebbc7bf
|
Add FeatureRunning event triggered by activities
|
2018-02-18 14:27:30 +00:00 |
|
|
AdrianLxM
|
a23c76f473
|
Merge branch 'dev' into smb-wear2
|
2018-02-14 15:03:45 +01:00 |
|
|
AdrianLxM
|
7270b0b2f5
|
no wear vibrations on SMB
|
2018-02-14 14:59:26 +01:00 |
|
|
Milos Kozak
|
31d493d8ae
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-02-13 18:38:55 +01:00 |
|
|
Milos Kozak
|
3e06b6a4ed
|
Merge pull request #687 from jotomo/error-announcements
Create NS-anouncements for error dialogs and local alerts.
|
2018-02-13 18:08:14 +01:00 |
|
|
Johannes Mockenhaupt
|
f8075927f2
|
Make new behaviour configurable, default on.
|
2018-02-13 00:34:24 +01:00 |
|
|
Milos Kozak
|
a6a937ba20
|
IobCobCalculatorPlugin as a param for GraphData
|
2018-02-12 20:07:39 +01:00 |
|
|
Milos Kozak
|
0ab2d5ba38
|
unstatic IobCobCalculatorPlugin
|
2018-02-12 19:49:08 +01:00 |
|
|
Johannes Mockenhaupt
|
0df796d3f4
|
Create NS-anouncements for error dialogs and local alerts.
|
2018-02-12 15:42:58 +01:00 |
|
|
Johannes Mockenhaupt
|
b6c5326524
|
NotificationStore: clean up access to store, avoid potential deadlock.
|
2018-02-12 12:43:23 +01:00 |
|
|
Johannes Mockenhaupt
|
ee1efa4f7f
|
NotificationStore: add synchronisation when accessing internal store.
|
2018-02-12 11:15:59 +01:00 |
|
|
Milos Kozak
|
5c7c430ee4
|
Merge pull request #673 from jotomo/bolus-error-dialog-sound
Bolus error dialog / sound
|
2018-02-08 21:07:21 +01:00 |
|
|
Johannes Mockenhaupt
|
43755f071d
|
Add mute button to error dialog.
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
|
2018-02-07 20:32:09 +01:00 |
|
|
Johannes Mockenhaupt
|
b5c35dea71
|
Graph: fix rendering target line for ranges from profiles.
|
2018-02-04 22:01:30 +01:00 |
|
|
Johannes Mockenhaupt
|
f573265bc2
|
Add target line to graph.
Uses the middle if a range is specified to show what the loop
aims for.
|
2018-02-04 00:34:14 +01:00 |
|
|
Milos Kozak
|
d9cfe15b87
|
fix rendering absolute basal line
|
2018-02-02 14:44:56 +01:00 |
|
|
Johannes Mockenhaupt
|
6fa1badcdb
|
Clean up parsing of SMB result and applying the requests.
|
2018-01-29 03:13:57 +01:00 |
|
|
Milos Kozak
|
98e850b1b3
|
Merge branch 'dev' into smb060
|
2018-01-26 11:54:09 +01:00 |
|
|
Johannes Mockenhaupt
|
ed1226ae67
|
Push carbs only to pumps supporting storing carbs.
|
2018-01-25 13:22:01 +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 |
|
|
Johannes Mockenhaupt
|
3a02f01374
|
Overview: make checkbox labels toggle state as well.
|
2018-01-24 14:10:17 +01:00 |
|
|
Milos Kozak
|
d033407ba7
|
fix rendering treatments with duration
|
2018-01-22 19:12:22 +01:00 |
|
|
Milos Kozak
|
f5a2c5bcd2
|
cancel extending bolus on pump disconnection
|
2018-01-21 23:38:24 +01:00 |
|
|
Milos Kozak
|
e5ede788ba
|
Merge branch 'dev' into smb060
|
2018-01-21 13:38:21 +01:00 |
|
|
Milos Kozak
|
060895b33f
|
better handling of wrong profiles
|
2018-01-21 13:37:38 +01:00 |
|
|
Milos Kozak
|
7fdc146b91
|
getLastAutosensData improvement and logging
|
2018-01-16 19:28:25 +01:00 |
|
|
Milos Kozak
|
91a6c7a96c
|
Merge branch 'dev' into smb060
|
2018-01-15 12:46:50 +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 |
|
|
Milos Kozak
|
fbb120673f
|
Merge branch 'dev' into smb060
|
2018-01-07 15:32:14 +01:00 |
|
|
Milos Kozak
|
1ff99c4814
|
prefill profile switch JSON from local store if not exists
|
2018-01-07 15:29:50 +01:00 |
|
|
AdrianLxM
|
b9ad3a71fd
|
Dialogs usability tweaks
|
2018-01-06 06:52:30 +01:00 |
|
|
Milos Kozak
|
955ecc6d64
|
set defaults for display range
|
2018-01-04 21:33:18 +01:00 |
|
|
Milos Kozak
|
d7200d1e8e
|
warn if wrong profile is detected
|
2018-01-04 11:06:57 +01:00 |
|
|
Milos Kozak
|
230ec7177b
|
Merge branch 'dev' into smb060
|
2018-01-03 21:22:38 +01:00 |
|
|
Johannes Mockenhaupt
|
f09d68ad59
|
Check activity != null before drawing graph.
|
2018-01-03 20:58:49 +01:00 |
|
|
Milos Kozak
|
ff5d42522c
|
Merge branch 'dev' into smb060
|
2018-01-03 20:31:36 +01:00 |
|
|
Milos Kozak
|
094737adde
|
improve GUI response
|
2018-01-03 19:59:18 +01:00 |
|
|
Milos Kozak
|
d2753e0dad
|
another cob fix
|
2018-01-01 14:38:37 +01:00 |
|
|
Milos Kozak
|
cc50a6fb99
|
missing inheritance
|
2017-12-30 16:25:08 +01:00 |
|
|
Milos Kozak
|
162e73e64d
|
Merge branch 'dev' into smb060
|
2017-12-26 00:35:16 +01:00 |
|
|
Milos Kozak
|
8fdd16c305
|
QuickWizard detailed settings
|
2017-12-26 00:27:34 +01:00 |
|
|
Milos Kozak
|
dd58952b42
|
Merge pull request #548 from MilosKozak/COB-Wizard-idea
Use autosensdata for wizard instead of APSResult
|
2017-12-25 19:22:02 +01:00 |
|
|
Milos Kozak
|
7380065bd9
|
Merge branch 'dev' into smb060
|
2017-12-22 21:11:38 +01:00 |
|
|
Milos Kozak
|
93b954fffe
|
when using profile percentage limit basal rate to minimal value supported by pump
|
2017-12-22 20:17:31 +01:00 |
|
|
Milos Kozak
|
600e2ade1c
|
SingleClickButton
|
2017-12-22 19:50:16 +01:00 |
|
|
Milos Kozak
|
99e5a39b33
|
Merge branch 'dev' into smb060
|
2017-12-22 10:34:45 +01:00 |
|
|
Milos Kozak
|
74abdc0271
|
fix disconnecting pump
|
2017-12-22 01:35:52 +01:00 |
|
|
Johannes Mockenhaupt
|
c5089d821e
|
Merge branch 'disappearing-predections-checkbox' into 'smb060'
Overview: fix predictions checkbox disappearing after unchecking it.
See merge request MilosKozak/AndroidAPS!370
|
2017-12-20 16:58:12 +00:00 |
|