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

4269 commits

Author SHA1 Message Date
AdrianLxM c2315b7bea restrict aproaching daily limit to once every 30 minutes R-Korean 2018-05-05 21:03:35 +02:00
AdrianLxM b43eff8e55 restrict aproaching daily limit to once every 30 minutes R 2018-05-05 21:02:31 +02:00
AdrianLxM 70b2b1502f restrict wrong password notification to once every 30 seconds 2018-05-05 20:59:11 +02:00
AdrianLxM c8c7e12056 Wrong password notification 2018-05-05 20:54:10 +02:00
AdrianLxM 246c8922df Korean wrong password notification 2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt 1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG. 
(cherry picked from commit 8bdafe3)
 2018-05-05 19:13:38 +02:00
AdrianLxM 260e259fb0
Update strings.xml 2018-05-05 15:17:03 +02:00
AdrianLxM d574c70471
Merge pull request #1011 from Heiner1/dev-strings 
Dev strings
 2018-05-05 10:12:20 +02:00
swissalpine fb04250c90
Elliminat syntax error 2018-05-05 10:00:30 +02:00
Heiner1 3a0c34e7b6
Update strings.xml 2018-05-05 09:45:10 +02:00
AdrianLxM 499edd7c05
swedish update 2018-05-05 09:20:29 +02:00
Radoslav Radev 9aeb2b6ede
Update strings.xml 2018-05-04 23:51:08 +03:00
Markus M. May e07aecd62d Further translations 2018-05-04 22:02:32 +02:00
Johannes Mockenhaupt d15ada5cd9
Combo: Fix visual glitch in fragment. 2018-05-04 21:27:54 +02:00
AdrianLxM 1646420c47
base basal -> Basal Base (was Base Temporal) 2018-05-04 20:17:55 +02:00
AdrianLxM 714eca483e
revert gradle to dev 2018-05-04 20:16:12 +02:00
pedroll 5ff86e9c34 Spanish translation 2018-05-04 19:54:21 +02:00
AdrianLxM 7190bccf20 release candidate 3 2018-05-04 19:24:05 +02:00
AdrianLxM 93c3a3d624 Merge branch 'dev' into aaps20_rc3 2018-05-04 19:21:39 +02:00
AdrianLxM f511b9ed39
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss 
IDEA: dismiss bolus progress dialog when Queue is empty
 2018-05-04 19:03:11 +02:00
Milos Kozak 57973d4d3a
Merge pull request #1001 from jotomo/carbs-gen-refactor 
Extract and deduplicate eCarbs generation
 2018-05-04 16:10:23 +02:00
Milos Kozak 61e6404bbe
Merge pull request #995 from MilosKozak/wear-wizard 
Wear eCarbs
 2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt 35a6bbb6a7
Set CareportalEvent.MEALBOLUS for eCarbs. 2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt 43cc3c4908
Extract CarbsGenerator class. 2018-05-04 14:18:55 +02:00
Milos Kozak 963f1e1abf
Merge branch 'dev' into startupwizard 2018-05-04 13:26:40 +02:00
swissalpine 10b67a0c11
Update GraphData.java 2018-05-04 12:31:11 +02:00
swissalpine 7312bf061a
Update colors.xml 2018-05-04 12:30:28 +02:00
AdrianLxM 5c8e99b191 dismiss bolus progress dialog when Queue is empty 2018-05-04 12:24:37 +02:00
Milos Kozak 91f3db782d SWButton rename option to text 2018-05-04 10:20:22 +02:00
Milos Kozak 55661ca7a0 SWButton 2018-05-04 10:17:50 +02:00
swissalpine 010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
Milos Kozak 88d964f135 SW reuse save, cleanup 2018-05-04 09:35:57 +02:00
AdrianLxM c34cc73b1e fix wear wizard 2018-05-03 23:08:16 +02:00
Radoslav Radev 52411f7afe
half of the Bulgarian translation 2018-05-03 23:34:50 +03:00
AdrianLxM 8d6997f519 ecarb ignore 0 carbs 2018-05-03 22:08:54 +02:00
AdrianLxM fb75346bcd ecarb make settings consistent 2018-05-03 22:08:50 +02:00
AdrianLxM 61f07da1a2 ecarb doECarb 2018-05-03 22:08:43 +02:00
AdrianLxM c69a541b75 ecarb ash first response 2018-05-03 22:08:27 +02:00
Milos Kozak 4539756455 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-03 22:02:12 +02:00
Milos Kozak dea5ff0080 styles cleanup 2018-05-03 22:01:59 +02:00
Milos Kozak d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Milos Kozak 02590ddd72 SW remove unneeded code 2018-05-03 21:29:34 +02:00
McHoffi 39e9448c67
Typo fix 2018-05-03 21:20:54 +02:00
Milos Kozak cc532b9107 SWRadioButton cleanup 2018-05-03 20:13:27 +02:00
Milos Kozak 94db444acb SW validator, language, cleanup 2018-05-03 20:06:13 +02:00
Milos Kozak 36265ab1c6 SWPlugin 2018-05-03 18:41:47 +02:00
AdrianLxM 43dc7d1846 wear cathegorize preferences 2018-05-03 17:49:31 +02:00
AdrianLxM 62a38ed537 wearwizard fix NPE when CobInfo not available - missing part 2018-05-03 17:49:22 +02:00
AdrianLxM b37b892eea wearwizard fix NPE when CobInfo not available 2018-05-03 17:49:17 +02:00
AdrianLxM fe0f2e3ce6 wearwizard settings on phone 2018-05-03 17:49:13 +02:00
AdrianLxM c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
AdrianLxM ec106726a7 wearwizard trend 2018-05-03 17:49:01 +02:00
AdrianLxM 24dd4e1710 wearwizard cob 2018-05-03 17:48:54 +02:00
Roumen Georgiev 515590cdf6 other screens 2018-05-03 17:04:56 +03:00
Roumen Georgiev 425ba77200 other screens 2018-05-03 16:59:23 +03:00
AdrianLxM 012593a480
Update NotificationStore.java 2018-05-03 12:18:48 +02:00
Roumen Georgiev 083730f476 WIP: BGSOURCE screen 2018-05-03 09:02:16 +03:00
Milos Kozak e5ed63a46f fix name on future profile switches 2018-05-03 00:13:49 +02:00
Milos Kozak a35c925930
Merge pull request #983 from jotomo/issue-939 
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
 2018-05-02 23:20:29 +02:00
Johannes Mockenhaupt 396268d9c8
Send invalid boluses (prime boluses) to watch. 2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt 599c87f794
Combo: better error message when initialization fails. 2018-05-02 22:48:57 +02:00
Milos Kozak a64bfe7a39
Merge pull request #977 from MilosKozak/persistent-text 
show bg missing not no profile
 2018-05-02 22:38:07 +02:00
Milos Kozak f9bbb72831
Merge pull request #979 from MilosKozak/lp-ps-always 
LP: Allow ProfileSwitch before pump is connected.
 2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt 79458a1c73
Ignore harmless errors (un)subscribing to the message bus. 2018-05-02 22:36:52 +02:00
Milos Kozak 28430cc757 fix cob calculation 2018-05-02 22:35:51 +02:00
Milos Kozak e2f28e0ae4 fix rounding on bolus delivery 2018-05-02 22:20:27 +02:00
Markus M. May 07c47a4ba7 Start de translation 2018-05-02 21:45:16 +02:00
AdrianLxM a3421316ac
Allow ProfileSwitch before pump is connected. 
https://github.com/MilosKozak/AndroidAPS/issues/969
 2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt 3b19db14fd
Clean up. 2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt 22e90743aa
Fix #939. 2018-05-02 21:24:06 +02:00
AdrianLxM eb594c1867
show bg missing not no profile 2018-05-02 21:09:04 +02:00
AdrianLxM f1736f048e
Update strings.xml 2018-05-02 20:20:13 +02:00
Milos Kozak 8419f8d0e9 update socket.io to 1.0.0 2018-05-02 18:49:40 +02:00
Milos Kozak a36b1b2a10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-02 18:39:47 +02:00
Milos Kozak 4cc952900d show progress reason from iobcobthread 2018-05-02 18:39:37 +02:00
Milos Kozak 5671b99f30
Merge pull request #974 from MilosKozak/swedish-update 
Swedis Update strings.xml
 2018-05-02 18:02:51 +02:00
CaroGo a768c03462
Update strings.xml 2018-05-02 17:43:17 +02:00
Milos Kozak a4ff9d29e2
Merge branch 'dev' into swedish-update 2018-05-02 17:10:01 +02:00
Milos Kozak e42d5f1204 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-02 17:05:32 +02:00
Milos Kozak 42164489c8 cs translations 2018-05-02 17:05:20 +02:00
AdrianLxM f52451085c
remove translation of language names 2018-05-02 16:41:56 +02:00
AdrianLxM fb61f3cde2
Update strings.xml 2018-05-02 16:39:28 +02:00
Johannes Mockenhaupt c51635dba4
Watch: colored preds. 2018-05-02 16:01:40 +02:00
Milos Kozak efff5d4e10
Merge pull request #966 from jotomo/greener-grass 
Brighter green for "treatment active" for better readability.
 2018-05-02 15:05:27 +02:00
Milos Kozak e562d0f437
Merge pull request #957 from triplem/charging_merged 
Charging merged
 2018-05-02 15:04:00 +02:00
Johannes Mockenhaupt 32323d673b
Brighter green for "treatment active" for better readability. 2018-05-02 15:01:49 +02:00
AdrianLxM 926ee535d5 use MainApp.gs instead of context 2 2018-05-02 14:28:16 +02:00
AdrianLxM d289c5c7d7 use MainApp.gs instead of context 2018-05-02 14:27:23 +02:00
AdrianLxM 3f3959f785 use MainApp.gs instead of getString from Activity/Dialog 2 2018-05-02 14:21:53 +02:00
AdrianLxM 611d761a41 use MainApp.gs instead of getString from Activity/Dialog 2018-05-02 14:16:40 +02:00
AdrianLxM 4a22fd355d Merge remote-tracking branch 'milosremote/dev' into use-gs 2018-05-02 14:11:45 +02:00
AdrianLxM 5aa3a88c7f remove direct access to sResources 9 2018-05-02 13:59:27 +02:00
AdrianLxM 166f2843df remove direct access to sResources 8 2018-05-02 13:58:52 +02:00
AdrianLxM de4643d16f remove direct access to sResources 8 2018-05-02 13:57:28 +02:00
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
AdrianLxM 2749c1c853 refactor cob string 2018-05-02 11:19:03 +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
Roumen Georgiev 15f4f64c4f using View.generateId() instead of fixed value 2018-05-02 09:22:26 +03: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
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
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
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
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
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
AdrianLxM ee0c811e0d
Merge pull request #912 from jotomo/display-cob 
Add IobCobCalculatorPlugin.getCobInfo().
 2018-04-26 23:52:52 +02:00
Roumen Georgiev 11dc20faca code cleanup 2018-04-26 16:59:56 +03:00
Roumen Georgiev ef171dbccd get SP value and check if it is already set 2018-04-26 16:13:08 +03:00
Roumen Georgiev 67ed699ca5 save() before showing next 2018-04-26 15:59:08 +03:00
Roumen Georgiev 59f654f918 show "NEXT" only when isValid() == true 2018-04-26 15:28:23 +03:00
Roumen Georgiev d75de2f645 show "NEXT" only when isValid() == true 2018-04-26 15:18:01 +03:00
AdrianLxM 3356004065 don't hide IOB behind COB 2018-04-26 03:43:43 +02:00
AdrianLxM c045a0a41e align failoverToMinAbsorbtionRate to cobtime 2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt f3bc59003e
Space-optimize COB on watch. 2018-04-26 01:33:09 +02:00
Johannes Mockenhaupt 8d4e9f0043
Add future carbs on watch. 2018-04-26 01:16:31 +02:00
Johannes Mockenhaupt 2f846bc417
WatchUpdaterService: use IobCob.getCobInfo(). 2018-04-26 01:10:27 +02:00
AdrianLxM 1eb2e59043 lastBolusTime - only treatments with insulin 2018-04-26 00:16:15 +02:00
AdrianLxM 3ec5eaea63 don't trigger loop on treatment 2018-04-26 00:14:51 +02:00
AdrianLxM b6cd56b90a cleanup logs 2018-04-25 23:31:15 +02:00
Markus M. May 55ea10e88f Catch NetworkState changes correctly 2018-04-25 22:22:37 +02:00
Markus M. May 3fb17e6869 First step to use network activity receiver 2018-04-25 20:49:03 +02:00
osodebailar 5a74087632 Change iob and cob color for a better uniform look. 
Insulin , iob etc. always in different blue colors,
Cob in orange (ocher) like color
 2018-04-25 16:51:49 +02:00
AdrianLxM e79ef7f018 always call callback on TBR-Request 2018-04-25 16:28:54 +02:00
AdrianLxM a14345bb1a synchronized loop invoke 2018-04-25 16:14:21 +02:00
Roumen Georgiev dc91e3a544 currentScreen not updating - fixed & center fields 2018-04-25 17:02:10 +03:00
Roumen Georgiev 8333fe8975 get radiobutton values from arrays.xml & no header 2018-04-25 16:45:15 +03:00
Roumen Georgiev ddf3c44928 rename show() to generateDialog() 2018-04-25 15:34:07 +03:00
Roumen Georgiev 7fb1b32188 moved show() method to SWItem classes 2018-04-25 15:29:20 +03:00
AdrianLxM 18fc03ec78 Merge remote-tracking branch 'milosremote/safety-loop' into safety-loop 2018-04-25 12:54:35 +02:00
AdrianLxM 85bb085188 rename safety to tempBasalFallback 2018-04-25 12:51:27 +02:00
AdrianLxM b5a6ef2ecc
make now part of the past 2018-04-25 12:15:29 +02:00
AdrianLxM ac23750942
lastBolusTime - only treatments with insulin 2018-04-25 11:52:01 +02:00
Roumen Georgiev dda7ca3f95 radio group is generated dynamically 2018-04-25 11:03:33 +03:00
AdrianLxM 2a50248ba5
travis re-invoke commit with cleanup 2018-04-25 01:37:48 +02:00
AdrianLxM a6a4a8837d safety run if SMB fails 2018-04-25 01:18:40 +02:00
Johannes Mockenhaupt da96b2d87c
Round up to be sure. 2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt 60fbb1eeba
Fix another NPE. 2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt f4bafc6260
Add IobCobCalculatorPlugin.getCobInfo(). 2018-04-24 23:09:07 +02:00
Milos Kozak 4217e82e0a
Merge pull request #884 from swissalpine/patch-1 
More generous values for colored iage warnings (careportal)
 2018-04-24 09:13:34 +02:00
Milos Kozak c490499d03 preferences cleanup 2018-04-24 00:11:52 +02:00
Roumen Georgiev eef4423109 basic navigation works 2018-04-23 17:03:22 +03:00
Milos Kozak c15a4b5efe fix wrong error dialog when only carbs are delivered (R,KoreanR) 2018-04-23 15:24:32 +02:00
Roumen Georgiev 76685c3cff WIP: initial work 2018-04-23 15:58:27 +03:00
Andreas Eggen 511b9c6819 Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into dev 2018-04-23 08:26:48 +02:00
Milos Kozak 545b4a51ee
Merge pull request #914 from jotomo/overview-extended-bolus-display 
Overview: hide ext. bolus line if none running; spacings, alignments.
 2018-04-22 23:13:10 +02:00
Milos Kozak a0036bfb79
Merge pull request #906 from jotomo/loop-invocations 
Don't loop with old BG value, don't loop twice for the same value.
 2018-04-22 22:43:37 +02:00
Johannes Mockenhaupt 896f919f37
Disable roaming (pref) when wifi-only is enabled. 2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt 47770e9c6c
Overview: hide ext. bolus line if none running; spacings, alignments. 2018-04-22 21:31:53 +02:00
osodebailar e97b35a030 Change headertext label size from large to medium 2018-04-22 19:48:56 +02:00
Milos Kozak 6851adbfd3 NSClient connection settings 2018-04-22 18:24:06 +02:00
Milos Kozak b81d2ec6da
Merge pull request #909 from TebbeUbben/dev 
Don't create TBR record when pump has been paused
 2018-04-22 15:42:30 +02:00
TebbeUbben 2844be85b5 Don't create TBR record when pump has been paused 2018-04-22 13:44:12 +02:00
Milos Kozak be5a989c5e
Merge pull request #908 from jotomo/fresh-cob 
Fix delay in COB calculation.
 2018-04-22 09:13:13 +02:00
Johannes Mockenhaupt 89a29d150f
Fix delay in COB calculation. 2018-04-22 00:08:41 +02:00
TebbeUbben 7c971197c7 Swapped pump started and paused strings inadvertently 2018-04-21 23:29:23 +02:00
Tebbe Ubben f4e02a4862
Merge branch 'dev' into dev 2018-04-21 23:22:02 +02:00
TebbeUbben fd776a2a0e Add 0%-TBR to history when pump has been started or stopped 2018-04-21 23:20:33 +02:00
TebbeUbben d82a24873f Use SightRemote's history broadcast permission 2018-04-21 22:47:38 +02:00
Milos Kozak c4db1c5e2d move quickwizard preferences under overview 2018-04-21 21:58:07 +02:00
Milos Kozak 1f55078aa3 extract strings from overview preferences 2018-04-21 21:37:50 +02:00
Milos Kozak cab592efb5 overview preferences cleanup 2018-04-21 21:31:42 +02:00
Milos Kozak fe762248a5 nsclient preferences cleanup 2018-04-21 21:14:09 +02:00
Milos Kozak 6ad0c1f1d3 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-21 20:47:15 +02:00
Milos Kozak ea59458383 nsclient preferences cleanup 2018-04-21 20:46:55 +02:00
Milos Kozak 3d7cdd3819 fix ns backfill bug 2018-04-21 19:51:52 +02:00
Milos Kozak 209623f9ea
Merge pull request #905 from jotomo/no-future-for-you 
Don't send future carbs to pumps.
 2018-04-21 18:13:33 +02:00
Johannes Mockenhaupt e4a4e07d21
Add javadoc. 2018-04-21 15:28:37 +02:00
Johannes Mockenhaupt d0405014b2
Don't loop with old BG value, don't loop twice for the same value. 
Loop is potentially triggered twice when BG reading sent to NS comes back.
This should also deal with backfilled data coming in, since any previous
reading will be older than 9m, for which DatabaseHelper.actualBg()
returns null.

The previous approach to solve multiple invocations for the same value
added a isNew flag to EventNewBG, but since
DatabaseHelper.scheduleBgChange() drops excessive updates the event
carrying that flag is not guarantued to be delivered, resulting in
missed loop invocations. The approach taken now lets the receiver
of the event fully decide how to deal with it.

Should fix, or at least improve, #901, #671.
 2018-04-21 14:28:47 +02:00
Johannes Mockenhaupt 9c6ee32586
Don't send future carbs to pumps. 2018-04-21 14:08:42 +02:00
Milos Kozak c40aaed52f allow to show dev slope in dev 2018-04-21 12:09:09 +02:00
Milos Kozak c0250dd62c show calculation cob progress on graph 2018-04-21 10:50:55 +02:00
Milos Kozak cb65bed0a7 alling code to xdrip changes 2018-04-21 10:20:49 +02:00
Milos Kozak c27ceb0a72 better bolus error handling for Dana pumps 2018-04-21 00:02:15 +02:00
Milos Kozak 883da922e5 1.60e-dev 2018-04-20 22:14:54 +02:00
Milos Kozak 870d23c08c fix bolus step for Dana pumps 2018-04-20 22:13:20 +02:00
Milos Kozak 2f299bc670
Merge pull request #898 from MilosKozak/cob-rework 
Please review: Cob rework
 2018-04-20 20:53:50 +02:00
AdrianLxM 69c8eea53b
Enforce TBRs on enforceNew 2018-04-20 18:05:37 +02:00
Milos Kozak b554d641a7 setupwizard template 2018-04-20 17:27:31 +02:00
Milos Kozak 41b5636c13 clear autosens cache on new preferences change 2018-04-20 12:44:19 +02:00
Milos Kozak fb71b64922 Merge branch 'cob-rework' of https://github.com/MilosKozak/AndroidAPS into cob-rework 2018-04-20 12:28:18 +02:00
Milos Kozak 0ab04c4d95 fix cob scaling 2018-04-20 12:28:07 +02:00
AdrianLxM d8180cc52b Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 23:54:36 +02:00
Milos Kozak 645e83b6e6 dismiss notification if pump is reachable 2018-04-19 23:42:37 +02:00
Milos Kozak 51530fbcf8 fix temptarget NS sync 2018-04-19 23:18:19 +02:00
Milos Kozak e1dc69cd4d visualize min carbs absorption 2018-04-19 22:31:07 +02:00
Milos Kozak 4f4f92ff76
Merge pull request #895 from triplem/mgdl_mmol_handling 
Cleanup mmol/mgdl TT handling in Dialogs
 2018-04-19 21:00:47 +02:00
AdrianLxM 11b88c7947 Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 20:22:14 +02:00
AdrianLxM dfa05711d3
Merge pull request #892 from MilosKozak/carbs-gen-pr 
Carbs gen pr
 2018-04-19 20:19:10 +02:00
AdrianLxM 9e9270bff7 cleanups 2018-04-19 19:34:38 +02:00
AdrianLxM ed24a129ae unify Default in settings xml and constants 2018-04-19 19:32:50 +02:00
AdrianLxM 6df614e7c6 Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 19:29:27 +02:00
AdrianLxM eac6f15881
XDrip source description extra 2018-04-19 17:49:18 +02:00
AdrianLxM 572b308f6c
cleanup 2018-04-19 17:47:34 +02:00
AdrianLxM a227a8b601
Push source to xDrip plugin 2018-04-19 17:45:52 +02:00
AdrianLxM 938040ae6b
xDrip plugin depend filtering on source 2018-04-19 17:44:52 +02:00
AdrianLxM d810be9b6a consider absorption time for carbs - not DIA 2018-04-19 14:03:30 +02:00
AdrianLxM 8d94acb051 more cleanups 2018-04-19 13:44:06 +02:00
AdrianLxM d7bf3c563a cleanup 2018-04-19 13:35:52 +02:00
AdrianLxM 09cc8c01b6 use min5min impact actually used for SMB 2018-04-19 13:31:34 +02:00
AdrianLxM f4dea97f36 cutoff at max absorption time 2018-04-19 13:04:21 +02:00
AdrianLxM 00c05c0e23 totalMinCarbsImpact depending on sensitivty plugin 2018-04-19 12:57:13 +02:00
AdrianLxM e8406320e0 COB settings 2018-04-19 11:48:00 +02:00