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

4025 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Milos Kozak c15a4b5efe fix wrong error dialog when only carbs are delivered (R,KoreanR) 2018-04-23 15:24:32 +02: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