Commit graph

3603 commits

Author SHA1 Message Date
Milos Kozak
f25334273a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-03 17:34:58 +01:00
Milos Kozak
0101bc0a81 parse more iso formats 2017-12-03 17:34:29 +01:00
AdrianLxM
7777143b07 scrollable overview on Jelly 2017-12-03 17:30:20 +01:00
AdrianLxM
7958dc9dce jelly overview 2017-12-03 13:55:54 +01:00
AdrianLxM
0a8d89db8a Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview 2017-12-03 11:48:14 +01:00
AdrianLxM
eb1683d291
Merge pull request #518 from andrew-warrington/dev
watchfaces andrew
2017-12-02 21:46:17 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev 2017-12-02 21:45:39 +01:00
Milos Kozak
38ecd88f6c
Merge pull request #513 from AdrianLxM/btwatchdog-pr 2017-12-02 16:19:46 +01:00
Milos Kozak
02f3bc52f9
Merge pull request #515 from MilosKozak/pumpalarm-NoAPS-NPEfix 2017-12-02 16:13:40 +01:00
AdrianLxM
14bb0e6ac4
Only do pump alarms in APS mode 2017-12-02 10:21:42 +01:00
Milos Kozak
8a7f0f22d9 min NS version 0.10.2 2017-12-01 22:51:25 +01:00
Andrew Warrington
a0a5768dea
Merge pull request #1 from AdrianLxM/watchworks
delta granularity and NPE fix
2017-12-01 20:51:12 +01:00
AdrianLxM
98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak
faea3a5147 RS proper evaluate extended bolus result 2017-12-01 17:37:49 +01:00
AdrianLxM
1a5852271d
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:04:49 +01:00
AdrianLxM
090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM
09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
AdrianLxM
4b063a7766 fix SP for long with string-ressource-id 2017-12-01 13:49:50 +01:00
Milos Kozak
aa210970ec Merge branch 'g5' into dev 2017-12-01 10:18:53 +01:00
Milos Kozak
77e855ec61 fix NPE 2017-12-01 10:18:27 +01:00
Roumen Georgiev
ecbac7ea96
Make ProfileSwitch text 20% larger 2017-12-01 10:30:18 +02:00
Andreas
29d9d20605
Update strings.xml
Add german text for local alerts
2017-12-01 08:03:33 +01:00
Andreas
e07c5fb50d
Update strings.xml
Change "Temp basal" to "Temp Basal"
2017-11-30 15:04:40 +01:00
Roumen Georgiev
d683ea2f0c
All labes scaled
COB is not here
2017-11-30 11:28:26 +02:00
Roumen Georgiev
24b9326602
Update PointsWithLabelGraphSeries.java 2017-11-30 09:57:16 +02:00
Roumen Georgiev
418a7f7094
ProfileSwitch depending on ScreenSize
Text size in ProfileSwitch events depends on screen resolution
2017-11-30 09:45:18 +02:00
Milos Kozak
04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak
b73e12b731 G5: accept arrays 2017-11-29 17:22:45 +01:00
Milos Kozak
7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Roumen Georgiev
c56330cae7
Less than, not moreThan15 2017-11-29 09:21:55 +02:00
Milos Kozak
a62140c9d3
Merge branch 'dev' into dev 2017-11-28 21:53:34 +01:00
Milos Kozak
b1a214b9e7
Merge branch 'dev' into dev 2017-11-28 21:50:32 +01:00
Milos Kozak
d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Andrew Warrington
ff0607d010 Update following testing! Bug fixes:
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 21:33:43 +01:00
Milos Kozak
7d5d327c5d fix compile 2017-11-28 21:06:50 +01:00
Milos Kozak
9b135cc4e4 Merge branch 'queue' into dev 2017-11-28 20:52:49 +01:00
Milos Kozak
694e90960e reenable RS driver 2017-11-28 20:52:24 +01:00
Milos Kozak
b4187c84ed bump 1.56-dev 2017-11-28 20:51:54 +01:00
Milos Kozak
2a62b47be7
Merge pull request #507 from MilosKozak/dev
1.55 release
2017-11-28 20:38:45 +01:00
Milos Kozak
bf4ffaed8f bump 1.55 2017-11-28 20:31:31 +01:00
Milos Kozak
70621837d9 disable RS driver 2017-11-28 20:29:30 +01:00
Milos Kozak
b8df1fcec4 Merge branch 'dev' into queue 2017-11-28 20:27:58 +01:00
Milos Kozak
b314fcdd46
Merge pull request #504 from jotomo/show-hide-ext-bolus-treatments
Treatments tab: display extended bolus tab if active pump supports it…
2017-11-28 20:19:01 +01:00
Roumen Georgiev
542cedff9d
check for sgv older than 15 mins 2017-11-28 16:29:18 +02:00
Roumen Georgiev
723cb33497
Disabling staledata alarm on new sgv values fromNSClient 2017-11-28 16:15:25 +02:00
Roumen Georgiev
eb593a4557
Update Notification.java 2017-11-28 16:09:23 +02:00
Andrew Warrington
dcf79c710c Update following testing! Bug fixes:
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt
7a2df05f5d
More bug notes. 2017-11-27 20:45:17 +01:00
Johannes Mockenhaupt
b03202f3d3
Bug notes.
(cherry picked from commit c553626)
2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt
8487364aa0
Update TODO-Combo.
(cherry picked from commit baf3e3f)
2017-11-26 21:51:54 +01:00