Roumen Georgiev
15f4f64c4f
using View.generateId() instead of fixed value
2018-05-02 09:22:26 +03:00
Milos Kozak
55db89b547
Merge pull request #958 from triplem/refix_objectives
...
Fixes wrong algo
2018-05-02 07:38:03 +02:00
Markus M. May
2d3d39d1dc
Use common helper method for day calculation
2018-05-01 23:43:18 +02:00
Markus M. May
a46b038381
use correct number format
2018-05-01 23:34:40 +02:00
Markus M. May
de92125967
Fixes wrong algo
2018-05-01 22:49:44 +02:00
Markus M. May
8a627603ea
Revert lib change
2018-05-01 22:23:24 +02:00
Markus M. May
306d45bb3e
Fix Boolean thingy
2018-05-01 22:15:22 +02:00
Markus M. May
02e9ce105c
Add boolean thingie from Adrian ;-)
2018-05-01 22:01:08 +02:00
Markus M. May
12d80e96ef
Merge latest dev version
2018-05-01 21:56:33 +02:00
Markus M. May
e91fd00836
Add Unit-Test, as well as fixtures for SSID handling
2018-05-01 21:46:37 +02:00
AdrianLxM
6755df4482
Merge pull request #954 from soko78/patch-1
...
Update strings.xml
2018-05-01 20:33:50 +02:00
soko78
183f2cd6b3
Update strings.xml
...
line 177 & 178 changed "temoräres ziel" into "temporäres ziel"
2018-05-01 20:30:53 +02:00
Milos Kozak
dbca668afd
Merge pull request #952 from jotomo/rainbow
...
Fix missing predictions in graph, color them.
2018-05-01 20:10:59 +02:00
Milos Kozak
537be09493
Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance
...
Make persistent notification not peak on every update on Oreo.
2018-05-01 20:08:17 +02:00
Milos Kozak
eb7b67781c
Merge pull request #947 from jotomo/issue-940
...
Don't create empty future carbs records. Fixes #940 .
2018-05-01 20:07:46 +02:00
Milos Kozak
c991673de1
Merge pull request #948 from MilosKozak/zerotempiob
...
fix zeroTempIOB
2018-05-01 20:06:32 +02:00
Milos Kozak
cc8d950ca6
Merge pull request #951 from TebbeUbben/dev
...
Compat for SR 1.6.0
2018-05-01 20:06:16 +02:00
Johannes Mockenhaupt
a362eeb31b
Fix unit tests for added Combo plugin w/o engineering mode.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
af563474d5
Skip predictions below 40.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
1e80ca22c6
Don't draw invalidated SMBs.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
ee61a71181
Sort predictions so they're properly displayed in the graph.
...
GraphView library requires a series to be ordered by the x-value.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
5ef7506e5f
Clean up prediction colors.
2018-05-01 19:16:28 +02:00
AdrianLxM
e70791dc2f
gradle rc2
2018-05-01 18:07:08 +02:00
TebbeUbben
60d3cde0d3
Compat for SR 1.6.0
2018-05-01 17:29:21 +02:00
Johannes Mockenhaupt
4d1515769f
Make persistent notification not peak on every update on Oreo.
2018-05-01 14:59:40 +02:00
AdrianLxM
3d5fb96d7d
fix zeroTempIOB
2018-05-01 13:47:26 +02:00
AdrianLxM
55077d3ad8
Merge remote-tracking branch 'milosremote/dev' into aaps20_rc2
2018-05-01 13:29:23 +02:00
AdrianLxM
4789ac0616
fix zeroTempIOB
2018-05-01 13:29:15 +02:00
Johannes Mockenhaupt
7fbab357e8
Fix unit tests for added Combo plugin w/o engineering mode.
2018-05-01 13:25:12 +02:00
Johannes Mockenhaupt
8c3df40fdf
Don't create empty future carbs records. Fixes #940 .
...
When very few carbs are stretched out (e.g. 10g over 4h), there are
gaps, so that 1g is generated only every 30m. Don't create empty
records in between.
2018-05-01 12:22:01 +02:00
Milos Kozak
73d7d98354
Merge pull request #944 from winni67/patch-1
...
Update strings.xml
2018-05-01 09:20:00 +02:00
Andy Rozman
1da5fb2030
Merge pull request #2 from MilosKozak/master
...
merge master
2018-04-30 23:11:44 +01:00
Andy Rozman
904a3d5028
Merge pull request #1 from MilosKozak/dev
...
Merge dev from origin
2018-04-30 23:06:33 +01:00
Winfried Kuiper
d68f74bb68
Update strings.xml
2018-04-30 23:09:35 +02:00
Roumen Georgiev
3f0c2958c7
WIP: change of language works
2018-04-30 16:41:40 +03:00
Markus M. May
099cb6c4e4
add battery charging state
2018-04-29 22:49:43 +02:00
AdrianLxM
faa09f8505
2.0 rc1
2018-04-28 19:49:55 +02:00
AdrianLxM
81037cde5c
Merge pull request #935 from jotomo/calculator-carb-only
...
Calculator: carb-only handling.
2018-04-28 19:29:13 +02:00
AdrianLxM
c8ca904709
Merge pull request #936 from jotomo/ext-combo-carbs
...
Extended Combo carbs
2018-04-27 20:06:07 +02:00
Johannes Mockenhaupt
4813c9c163
Combo: minor cleanup.
2018-04-27 19:51:12 +02:00
Johannes Mockenhaupt
5746e37553
Enable Combo & extended carbs without engineering mode as well.
2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt
21f231e2b3
Calculator: carb-only handling.
...
If only carbs where entered/calculated, send them to the pump only
if the pump supports it, otherwise just add it to the DB.
2018-04-27 19:49:50 +02:00
Roumen Georgiev
a0463742fa
WIP: language set and validation
2018-04-27 17:04:08 +03:00
Roumen Georgiev
bb38d7644b
move onClick in SWRadioButton
2018-04-27 13:30:45 +03:00
Milos Kozak
8577a94571
Merge pull request #925 from MilosKozak/safety-loop
...
Safety loop
2018-04-27 11:00:18 +02:00
Milos Kozak
e951a924c4
Merge pull request #931 from MilosKozak/cobchart
...
align failoverToMinAbsorbtionRate to cobtime
2018-04-27 10:54:39 +02:00
Milos Kozak
584b0f7824
Merge pull request #934 from MilosKozak/future-iob-array
...
For review: Future iob array
2018-04-27 10:52:21 +02:00
AdrianLxM
3631f685e2
cleanup
2018-04-27 00:03:08 +02:00
AdrianLxM
9889d34512
Treat future IOB as if the current TBR was cancelled
2018-04-26 23:59:04 +02:00
AdrianLxM
5df59d8fe3
Merge pull request #927 from MilosKozak/lastBolusTime
...
lastBolusTime - only treatments with insulin
2018-04-26 23:57:54 +02:00
