Commit graph

4691 commits

Author SHA1 Message Date
AdrianLxM 74d0c71712 remove direct access to sResources 7 2018-05-02 13:51:24 +02:00
AdrianLxM 545d1d1586 remove direct access to sResources 6 2018-05-02 13:50:31 +02:00
AdrianLxM 0e4e36f2b1 remove direct access to sResources 5 2018-05-02 13:49:24 +02:00
AdrianLxM 3979913a6d remove direct access to sResources 4 2018-05-02 13:46:38 +02:00
AdrianLxM 2af62d8e4e remove direct access to sResources 3 2018-05-02 13:42:50 +02:00
AdrianLxM a8382daefd remove direct access to sResources 2 2018-05-02 13:36:56 +02:00
AdrianLxM 81ad2779bc remove direct access to sResources 1 2018-05-02 13:32:41 +02:00
AdrianLxM cfaa26d337 remove one more gs helper 2018-05-02 13:28:58 +02:00
AdrianLxM 20263c9fe4 remove other gs helper methods 2018-05-02 13:17:57 +02:00
AdrianLxM 73b41a7162 some more gs 2018-05-02 13:12:08 +02:00
AdrianLxM 7b6402de09 use gs function in MainApp to get strings 2018-05-02 13:05:22 +02:00
Milos Kozak 6fa3c04db8
Merge pull request #959 from MilosKozak/cob-status
New COB status for external status and ongoing notifiaction
2018-05-02 11:08:49 +02:00
AdrianLxM 24bd509ec6 COB in ongoing notification 2018-05-02 08:30:37 +02:00
AdrianLxM c445c078e1 add g to default COB as well 2018-05-02 08:30:34 +02:00
AdrianLxM 915dac8ef3 COB in external status 2018-05-02 08:30:28 +02:00
AdrianLxM f75329f5dc move COB string representation to CobInfo 2018-05-02 08:30:23 +02: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
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
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
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
Winfried Kuiper d68f74bb68
Update strings.xml 2018-04-30 23:09:35 +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
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