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

4022 commits

Author SHA1 Message Date
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
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
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
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
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
AdrianLxM
542cc9ac7f
Update Overview on Profile Switch 2018-04-19 01:38:27 +02:00
Markus M. May
83da3447ac Cleanup mmol/mgdl handling in Dialogs 2018-04-18 22:11:32 +02:00
AdrianLxM
38a0dc5c05
Merge branch 'carbs-gen-pr' into carbsgen0418 2018-04-18 16:55:19 +02:00
Milos Kozak
2fb199ae6c fix insulin dialog TT & TT sync from NS 2018-04-18 16:34:46 +02:00
AdrianLxM
dd8d907f4f fix TT units 2018-04-18 16:23:40 +02:00
AdrianLxM
2561c3f8b6 Carbs only treatments in Queue 2018-04-18 16:13:02 +02:00
Johannes Mockenhaupt
49a836eda9
NewNSTreatmentDialog: add Hypo TT preset. 2018-04-18 16:03:23 +02:00
AdrianLxM
2cf438a064 Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418 2018-04-18 16:00:00 +02:00
Johannes Mockenhaupt
5d1c6cd118
Move "show notes ..." pref into Buttons submenu. 2018-04-17 21:03:16 +02:00
AdrianLxM
00a0bf2f1a local profile icons 2018-04-17 20:41:43 +02:00
AdrianLxM
eb2f628f1f unify names of same icon with different resolution 2018-04-17 20:41:33 +02:00
Alessya
05a1b35ccb Rename Icon files 2018-04-17 20:41:21 +02:00
Alessya
8dd589c5fe New icons added for local profile screen 2018-04-17 20:41:07 +02:00
swissalpine
ca5001e3a4
Update CareportalFragment.java 2018-04-17 14:42:41 +02:00
Milos Kozak
7063f4de8b
Merge pull request #879 from MilosKozak/temptargetfix 
NewNSTreatment dialog cleanup
 2018-04-17 07:45:08 +02:00
Milos Kozak
abadcd4eaa fix test 2018-04-16 23:29:53 +02:00
swissalpine
7ef5b4fb28
More realistic colored IAGE warnings 
Normaly Insulin should be stable at least 4-5 days. So I think a warning after two days and a red alarm after three is two early. I changed the default values to 72 hours for the yellow and 86 hours for the red warning.
 2018-04-16 20:31:37 +02:00
Johannes Mockenhaupt
c7c90ea919
Proper fix. 2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt
0ef8af262f
NewInsulinDialog: fix botched notes field reference. 2018-04-16 01:40:52 +02:00
Johannes Mockenhaupt
58aa4f1323
Unbreak wizard xml, small fixes. 2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt
447bd9b6a3
Alignments. 
(cherry picked from commit a63c388)
 2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt
9b80221752
Set inputType for notes fields. 
(cherry picked from commit af0807d)
 2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt
5d66ecc767
NewCarbsDialog: use correct 'constraint applied' messages. 
(cherry picked from commit a9e290e)
 2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt
10604299e7
Cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
f420491611
NewCarbsDialog: cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
efcc02775b
FillDialog: add missed validation, notes field, align style. 2018-04-13 21:35:25 +02:00
AdrianLxM
10b9171afe
Distribute carbs strictly within timeframe 2018-04-13 00:48:57 +02:00
Milos Kozak
d9ac199559
Merge pull request #878 from triplem/fix_objectives 
Fix Objectives Issue #842
 2018-04-12 22:26:51 +02:00
Milos Kozak
54048b29c4 NewNSTreatment dialog cleanup 2018-04-12 21:45:59 +02:00
Johannes Mockenhaupt
bf02edd871
Make visibility of notes field a preference. 2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt
05e07cf943
Align style of labels, i18n. 2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt
4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Adding notes to carbs and to wizard on overview
 2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt
7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Overview: fix rendering zero-temp covering entire displayed range.
  cleanup
  remove duplicate upload
  upload temptargets to NS properly
  fix NPE
  log profile conditional
  adding device name to AndroidAPS started note
  show tests in travis
  gradle 3.1.1
  Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
  added phone Manufacturer and model note to NS
  dummy-edit to re-trigger travis
  Fix for black number and labels on black background (aaps wear)
  Fix re-enabling the loop plugin from overview. Fixes #861.
  int to double in the isOlderThan()
  Get thresholds from NS

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
 2018-04-12 21:18:04 +02:00
Milos Kozak
7fafd59a5e
Merge pull request #872 from triplem/notes_wizard 
Notes wizard
 2018-04-12 21:17:33 +02:00
Milos Kozak
c573bcc277
Merge pull request #876 from MilosKozak/temptargetfix 
upload temptargets to NS properly
 2018-04-12 21:17:11 +02:00
Markus M. May
42e36ab818 Fix #842 2018-04-12 21:08:06 +02:00
Johannes Mockenhaupt
b04eee0b52
Overview: fix rendering zero-temp covering entire displayed range. 
(cherry picked from commit 525eaef)
 2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt
a075d87da1
Remove help dialog. 
(cherry picked from commit b1ef8e1)
 2018-04-12 20:59:24 +02:00
Milos Kozak
0a377eb98e cleanup 2018-04-12 10:32:52 +02:00
Milos Kozak
5eee8054c4 remove duplicate upload 2018-04-12 10:21:38 +02:00
Milos Kozak
dfc869ba2b upload temptargets to NS properly 2018-04-12 10:17:59 +02:00
Milos Kozak
80e81b1c25 fix NPE 2018-04-12 09:53:14 +02:00
Milos Kozak
613b8a2f30 log profile conditional 2018-04-12 09:40:12 +02:00
Johannes Mockenhaupt
5ef2502b4f
Saner types. 2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt
b1f66d086a
Fix overshoot on last carb record. 2018-04-12 00:42:12 +02:00