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

4282 commits

Author SHA1 Message Date
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
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
Markus M. May
ca53b94498 Merge branch 'dev' into notes_wizard 2018-04-11 20:05:47 +02:00
Milos Kozak
263263daf1
Merge pull request #869 from PoweRGbg/phoneModel 
Phone model note added to Ns #841
 2018-04-11 17:57:30 +02:00
Roumen Georgiev
1acefaea3c
adding device name to AndroidAPS started note 2018-04-11 18:09:08 +03:00
Milos Kozak
83421c7266 show tests in travis 2018-04-11 16:23:35 +02:00
Johannes Mockenhaupt
d0edd89b5b
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin(). 2018-04-11 15:42:51 +02:00
Johannes Mockenhaupt
61cce65947
Revert "NewCarbsDialog: prefill with carbsReq." 
This reverts commit f8d022ba87.
 2018-04-11 15:22:38 +02:00
Roumen Georgiev
564e87d782 added phone Manufacturer and model note to NS 2018-04-11 15:44:53 +03:00
Johannes Mockenhaupt
f8d022ba87
NewCarbsDialog: prefill with carbsReq. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
9b3b228aad
Color active/scheduled bolus/carbs and TT entries in treatment tab. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
d2491ca429
NewCarbsDialog: add duration, help. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
80be7fb586
Fix re-enabling the loop plugin from overview. Fixes #861. 
Note that enabling a loop plugin is hardcoded against the only
impl currently available LoopPlugin. Support for multiple loop
plugins is incomplete (and not needed at this point), since
there's no LoopInterface, but immediately LoopPlugin (as compared
to APSInterface with OpenAPS* impls).
When adding support, the last activated loop plugin must be remembered
so the correct one is re-enabled.
 2018-04-10 12:10:19 +02:00
Markus M. May
99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
Milos Kozak
e9ac979a1b fix NPE in TempBasal treatments tab 2018-04-09 19:52:01 +02:00
AdrianLxM
d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit 
LocalProfile reset/save button
 2018-04-09 14:08:22 +02:00
Milos Kozak
b2129fa48e
Merge pull request #857 from TebbeUbben/disable-tdd-load-button 
Hide TDD buttons
 2018-04-09 00:36:48 +02:00
Milos Kozak
0f0d68e46a
Merge pull request #855 from TebbeUbben/automatic-careportal-events 
Automatic careportal events
 2018-04-09 00:35:23 +02:00
Milos Kozak
82bb65560b QuickWizardTest part1 2018-04-09 00:37:23 +02:00
Milos Kozak
9b91b4ab93
Merge branch 'dev' into automatic-careportal-events 2018-04-08 23:53:04 +02:00
Milos Kozak
05591cd762 missing conditional logging 2018-04-08 22:28:05 +02:00
Milos Kozak
44e923dd09 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-08 22:24:51 +02:00
Milos Kozak
4663bb3cf6 extended boluses NS sync fix 2018-04-08 22:24:04 +02:00
Milos Kozak
a609d806d1 fix tests 2018-04-08 20:37:05 +02:00
TebbeUbben
df7d93ab2a Check for TDD support in updateGUI 2018-04-08 20:33:07 +02:00
TebbeUbben
851cec7240 Renamed alerts.xml to insight_alerts.xml 2018-04-08 20:27:23 +02:00
Milos Kozak
d9279eed2a split MaxIOB for SMB 2018-04-08 20:17:15 +02:00
TebbeUbben
42541fc7e3 Switched back to custom careportal code 2018-04-08 18:57:29 +02:00
TebbeUbben
b488e30459 Use uploadError for pump alarms 2018-04-08 18:46:29 +02:00
TebbeUbben
56b2799785 Added insight_real_tbr_cancel option again 2018-04-08 18:32:11 +02:00
TebbeUbben
50458d1fbc log.error("Unhandled exception", e); 2018-04-08 18:15:27 +02:00
TebbeUbben
b3c1bf6e7d Hide TDD button if pump doesn't support them 
Hide reload button if pump doesn't need it
 2018-04-08 17:54:16 +02:00
TebbeUbben
d3342d13f5 Added ACTION_OCCURENCE_OF_ALERT to IntentFilter 2018-04-08 17:28:48 +02:00
TebbeUbben
f8d4dbf6a1 Add pump alerts as notes 2018-04-08 17:22:53 +02:00
AdrianLxM
5c6e598cd6
Merge branch 'dev' into lp-edit 2018-04-08 16:14:43 +02:00
TebbeUbben
5022a77711 Automatic careportal events 2018-04-08 14:31:24 +02:00
TebbeUbben
ba83f7f499 Correct lastDataTime handling 2018-04-08 13:43:37 +02:00
Milos Kozak
7a74364af6 remove unused catch 2018-04-07 16:43:20 +02:00
Milos Kozak
2fee7f3186 fix NPE in Simulator 2018-04-07 16:33:37 +02:00
Milos Kozak
ca01fcc270 1.60d-dev 2018-04-07 09:35:21 +02:00
Milos Kozak
485bbd5d68
Merge pull request #850 from TebbeUbben/dev 
Insight - Support for TDDs
 2018-04-06 21:50:01 +02:00
TebbeUbben
1d2cd4b9cf Support for TDDs 2018-04-06 21:39:42 +02:00
Milos Kozak
78ffae6e47
Merge pull request #849 from jotomo/combo-cleanup 
Combo cleanup
 2018-04-06 21:14:50 +02:00
Milos Kozak
35decd0e53 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-06 21:12:14 +02:00
Milos Kozak
74edadd1e5 fix detailedbolusinfo for DanaRS 2018-04-06 21:07:29 +02:00
Milos Kozak
7cf2505276 Better time synchronization for DanaRS 2018-04-06 19:07:47 +02:00
Milos Kozak
fc56af7add Fix detailedbolusinfo for DanaRv2 2018-04-06 18:58:13 +02:00
Milos Kozak
c94d01f22b better time synchronization for danarv2 2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt
623a5e3da1
Combo: remove unused strings, minor code cleanups. 2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt
344d9c1f49
Combo: remove 'read history' button. 
History and basal rate profile are permanently checked and updated. This
functionality would only be needed if driver was fundamentally broken.
 2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt
db4439f1cc
Combo: remove half-backed alerts dialog. 2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt
e937a777ba
Combo: remove superseeded TDD button and dialog. 2018-04-06 11:35:34 +02:00
Milos Kozak
828b20e358 optimize notifications & overview, fix reporting profile update 2018-04-05 23:42:27 +02:00
Milos Kozak
a3811b503f catch the thread 2018-04-05 23:28:17 +02:00
Milos Kozak
f2a7876466
Merge pull request #846 from swissalpine/patch-1 
Overview fragment: Show "Disconnected" when disconnected not "Suspended"
 2018-04-05 23:22:44 +02:00
Milos Kozak
e5bf36bfe3 code cleanup 2018-04-05 23:21:08 +02:00
Milos Kozak
36d94ecdef Merge branch 'dev' into PoweRGbg/patch-15 2018-04-05 22:14:26 +02:00
Milos Kozak
b520a077f8 Merge branch 'dev' into PoweRGbg/patch-15 2018-04-05 22:05:47 +02:00
swissalpine
afebf30bc0
Add string loopdisconnectedfor 2018-04-05 21:55:07 +02:00
swissalpine
4ec959b0c4
Show "Disconnected (2d m)" on overview fragment 2018-04-05 21:53:09 +02:00
Markus M. May
a5a0a27db6 Xchange activity and eating soon temp target mgdl 2018-04-05 20:38:49 +02:00
Milos Kozak
ee133f87ae fix test 2018-04-05 10:56:55 +02:00
Milos Kozak
ba7d0aebaa show message ragarding closed loop mode only if closed mode is enabled in preferences 2018-04-05 10:46:23 +02:00
Milos Kozak
a615553047 check for profile already set before notification 2018-04-05 10:02:57 +02:00
Milos Kozak
aebaa76864 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-05 09:39:34 +02:00
Milos Kozak
f6cd1201e3 Treatments refactor 2018-04-05 09:39:18 +02:00
Roumen Georgiev
934fedaa73
added determineTextColor() to shorten source 2018-04-05 10:01:16 +03:00
Roumen Georgiev
6ace7080b2
changed isOlderThan() parameter to hours not days 2018-04-05 09:58:55 +03:00
Roumen Georgiev
269382f5ff
Default values of CAGE, SAGE .. like in NS 2018-04-05 09:37:20 +03:00
Milos Kozak
d235fc0bfb show build flavor in about dialog 2018-04-05 00:08:59 +02:00
Markus M. May
79094a92f9 Provide newer support libraries, compile with 27 and target 25 2018-04-04 22:46:44 +02:00
Markus M. May
3e792ebfe3 Downgrade supportLibVersion 2018-04-04 21:53:37 +02:00
Markus M. May
b7840fb5b5 Revert compileSdkVersion as well 2018-04-04 21:44:23 +02:00
Markus M. May
c3bec7e7a6 Revert targetSdkVersion 2018-04-04 21:38:47 +02:00
Milos Kozak
16319aeb52 logging options 2018-04-04 17:51:39 +02:00
AdrianLxM
8c303fd447 notifications for oreo quickfix 2018-04-04 14:55:25 +02:00
Roumen Georgiev
5e418c5916
adding color for warn levels of cage,sage... 2018-04-04 14:55:29 +03:00
Roumen Georgiev
29bbc9dfec
added method to get iage,cage,sage 2018-04-04 14:52:52 +03:00
Roumen Georgiev
2c42bad48d
change name of threshold to days to clarify 2018-04-04 12:22:54 +03:00
Roumen Georgiev
5e56e2afa0
Get thresholds from NS 
thresholds in NS are in hours
 2018-04-04 12:16:01 +03:00
Roumen Georgiev
5e045264d5
changed isOlderThan(int) to double 2018-04-04 12:14:19 +03:00
Roumen Georgiev
f284483500
used isOlderThan 2018-04-04 09:37:08 +03:00
Roumen Georgiev
d50f31e7a6
change age(int) to boolean isOldetThan() 2018-04-04 09:35:45 +03:00
AdrianLxM
009f5dfa38 reset -> strings.xml 2018-04-03 18:37:34 +02:00
AdrianLxM
933b1acd7e lp save button 2018-04-03 18:33:13 +02:00
AdrianLxM
f17deaedfb lp isValid 2018-04-03 17:54:29 +02:00
AdrianLxM
b4c3c3f216 no lazy-loading of converted profile 2018-04-03 16:53:22 +02:00
AdrianLxM
75a91997b7 lp reset 2018-04-03 14:34:15 +02:00
Roumen Georgiev
ddf39e8d55
added color when values are old 
harcoded values fo SAGE, CAGE ...
 2018-04-03 09:18:01 +03:00
Roumen Georgiev
f800d695ff
SAGE, CAGE ... change color if old - second try 
requested in #811
 2018-04-03 09:15:28 +03:00
Markus M. May
9006721873 Version bump butterknife plugin 2018-04-02 22:43:20 +02:00
Milos Kozak
c06b89e8e4 targetSdkVersion 27 2018-04-02 12:03:41 +02:00
Milos Kozak
149818a902
Merge pull request #821 from triplem/g44 
Gradle Update to 4.4
 2018-04-02 10:28:13 +02:00
Milos Kozak
ad74a9ba9a fix errors in tests 2018-04-02 10:29:19 +02:00
Markus M. May
6d6dee6f0b Use org.junit instead of junit.framework, use static imports 2018-04-01 23:01:37 +02:00
Milos Kozak
3cfc9c16fe check 3min timeout SMB right before execution 2018-04-01 22:33:32 +02:00
Milos Kozak
0e9366c6fe log existing db record 2018-04-01 22:21:46 +02:00
Markus M. May
0bf84d4fa2 Break build on linting 2018-04-01 20:53:53 +02:00
Markus M. May
297c288e6a Disable abortOnError on linting 2018-04-01 20:49:02 +02:00
Markus M. May
6024f0f5ee Remove unnecessary gitignores 2018-04-01 20:49:02 +02:00
Markus M. May
5ef062c22f inital gradle update 2018-04-01 20:49:02 +02:00
Milos Kozak
5a192d82d0 read pump status after pump driver change 2018-04-01 20:04:54 +02:00
Milos Kozak
5e2fdebc07 fix travis 2018-04-01 20:02:22 +02:00
Milos Kozak
5ce184e67d fix time in dialogs during DST change 2018-04-01 18:44:58 +02:00
Milos Kozak
89ee73ef7d fix state when new thread was not started during waiting for pump disconnection 2018-04-01 12:34:41 +02:00
Milos Kozak
5fa56b22c9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-01 11:10:24 +02:00
Milos Kozak
0a03798de9 move treatments interface out of ConfigBuilder 2018-04-01 11:09:58 +02:00
Johannes Mockenhaupt
280ed14c6b
Unbreak WearPlugin. 2018-04-01 02:20:36 +02:00
Milos Kozak
8d35a89870
Merge pull request #818 from MilosKozak/insulin-plugins 
remove old insulin plugins
 2018-03-31 22:51:18 +02:00
Milos Kozak
e9c7bdc7f4 add necessity of profile switch to objectives 2018-03-31 22:30:42 +02:00
Milos Kozak
34ec1225c6 fix NSCLIENT after plugin refactor 2018-03-31 21:41:14 +02:00
Milos Kozak
a91aeec144 fix nsclient layout 2018-03-31 20:32:47 +02:00
AdrianLxM
45c7753175 remove old insulin plugins 2018-03-31 19:36:44 +02:00
Milos Kozak
c57d14aa05 MainAppTest 2018-03-31 15:00:32 +02:00
Milos Kozak
6e69b25d8a Merge branch 'wip' into dev 2018-03-31 12:41:43 +02:00
Milos Kozak
66f6ddf052 Subscribe fix 2018-03-31 12:12:49 +02:00
Milos Kozak
364364f205 ConfigBuilderTest 2018-03-31 11:31:09 +02:00
Milos Kozak
1c6c5f85f7 DanaR pumps lifecycle 2018-03-31 10:36:57 +02:00
Milos Kozak
a30334f5d5 PluginDescriptionTest 2018-03-31 10:09:29 +02:00
Milos Kozak
3b3662af80 Merge branch 'dev' into wip 2018-03-31 00:39:35 +02:00
Milos Kozak
bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Markus M. May
314275d4b4 Remove unnecessary imports, rename method 2018-03-30 20:02:04 +02:00
Milos Kozak
e4f2049405 PumpEnactTestResult 2018-03-29 18:44:16 +02:00
Johannes Mockenhaupt
a36a9b0746
Move check for running setProfile command to KeepAlive. 2018-03-28 22:49:43 +02:00
Johannes Mockenhaupt
014864f0db
Trigger fabric event on user request, not queuing time. 2018-03-28 22:12:14 +02:00
Johannes Mockenhaupt
52c6d209af
Clean up initial profile push to pump. 2018-03-28 21:20:56 +02:00
Milos Kozak
259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged 
Tdds again merged
 2018-03-28 17:35:23 +02:00
Milos Kozak
fc2da20743 fix conflict 2018-03-28 10:25:58 +02:00
Milos Kozak
e9b499314d PUMP SMS command, connect to pump before reporting SMS STATUS 2018-03-28 10:22:10 +02:00
Milos Kozak
7b43971618 fix NPE 2018-03-27 21:49:10 +02:00
Milos Kozak
27c4fe3309 fix NPE 2018-03-27 21:43:35 +02:00
Milos Kozak
e49d430a50 revert DetailedBulusInflo cloning 2018-03-27 20:16:33 +02:00
Milos Kozak
cb4b117152 fix extended bolus NS upload 2018-03-27 20:00:34 +02:00
Milos Kozak
3567320788 fix test 2018-03-27 19:45:44 +02:00
Milos Kozak
eaecf48577 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-27 16:41:44 +02:00
Milos Kozak
95f2e5d913 IobTotalTest 2018-03-27 16:41:37 +02:00
Milos Kozak
6aa568a03e
Merge pull request #812 from jotomo/cleanups 
Cleanups
 2018-03-27 16:38:49 +02:00
Johannes Mockenhaupt
dffdc49c3b
SMB fragement: trim superflous newlines. 2018-03-27 14:52:36 +02:00
Johannes Mockenhaupt
da6f6dfe72
Clean up missed spots w.r.t. to FabricPrivacy transition. 2018-03-27 14:52:31 +02:00
Milos Kozak
689fda5969 IobTest 2018-03-27 14:36:43 +02:00
Milos Kozak
1b9b20cd41 1st ProfileSwitch must be with zero duration, ProfileIntervalsTest 2018-03-27 14:19:52 +02:00
Milos Kozak
0a87b0ede7 MealDataTest 2018-03-26 22:59:04 +02:00
Milos Kozak
f8c9fac7b1 NonOverlapingIntervalsTest 2nd 2018-03-26 22:55:38 +02:00
Milos Kozak
cc436a09d9 TempBasal, TempTarget refactor; NonOverlapingIntervalsTest 2018-03-26 22:37:53 +02:00
Milos Kozak
a4cb4cbbd5 OverlapingIntervalsTest 2018-03-26 19:46:18 +02:00
Milos Kozak
21c6827cf4 more GlucoseStatusTests 2018-03-26 17:47:25 +02:00
Milos Kozak
d071ca5b88 GlucoseStatusTest & fix 2018-03-26 16:51:25 +02:00
Milos Kozak
5c5b8ee2f0 DetailedBolusInfo test & fix 2018-03-26 13:25:53 +02:00
Milos Kozak
482d4f4454 1.60b-dev 2018-03-26 11:07:50 +02:00
Milos Kozak
cf619aa1fa nicer scale on basal graph 2018-03-26 11:07:16 +02:00
Milos Kozak
d357b00ca6 display activate button properly 2018-03-26 10:56:56 +02:00
Milos Kozak
f0e779cb1f set axisWidth based on dpi 2018-03-26 10:53:14 +02:00
Milos Kozak
8e6953cc92 activate button on NSProfile fragment 2018-03-26 09:25:57 +02:00
AdrianLxM
6c20d9b6c6 TDD 13 mergeconflict AbstractDanaPlugin 2018-03-26 08:51:17 +02:00
AdrianLxM
4a4982f6b8 TDD 12 mergeconflict Insight renaming 2018-03-26 08:47:44 +02:00
Milos Kozak
545debde92 fix displaying nsprofile 2018-03-26 08:46:26 +02:00
AdrianLxM
a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Milos Kozak
d5e60fa16f fix negative correction in wizard 2018-03-26 07:49:09 +02:00
Milos Kozak
afe3d68a10 display SMB reasons 2018-03-25 23:56:52 +02:00
Milos Kozak
4d6d7941ac try to catch getProfile errors 2018-03-25 18:51:16 +02:00
Milos Kozak
afb0249072 try to catch iobcalculation error 2018-03-25 18:03:55 +02:00
Milos Kozak
ca12124c10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-25 17:33:17 +02:00
Milos Kozak
f939994afa more synchronized access in treatments 2018-03-25 17:33:03 +02:00
Milos Kozak
8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh 
Prime/fill button refresh and some drive-by improvements
 2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt
7c959ce335
Create careportal events with explicit time. 2018-03-25 15:43:48 +02:00
Johannes Mockenhaupt
593174d6d2
Revert all changes to NSUpload. 2018-03-25 15:39:34 +02:00
Milos Kozak
51e0774021 prevent creating careportal event of the same time 2018-03-25 15:02:51 +02:00
Johannes Mockenhaupt
8a2d49b833
Fix the correct method. 2018-03-24 20:13:50 +01:00
Johannes Mockenhaupt
5a6af7f6d5
Unbreak NSUpload.updateProfileSwitch methods. 2018-03-24 20:03:45 +01:00
Milos Kozak
2cfa2ae8cf overview graph rendering update 2018-03-24 18:10:57 +01:00
Milos Kozak
bcf71d70dc increase font size 2018-03-24 17:33:23 +01:00
Milos Kozak
b2db393436 fix rendering in nsclient mode 2018-03-24 17:21:55 +01:00
Milos Kozak
1dfa8eb1a4 hide deviation slope 2018-03-24 17:10:33 +01:00
Milos Kozak
62d775b78e DEV warning only for APS builds 2018-03-24 17:09:56 +01:00
Milos Kozak
9af8672cab Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-24 15:14:40 +01:00
Milos Kozak
90390c91ab fix NPE when profile doesn't exists 2018-03-24 15:13:31 +01:00
Johannes Mockenhaupt
7694c80da9
Fix format specifiers in Spanish translation. 2018-03-24 10:53:46 +01:00
Milos Kozak
3d710dcf46 fix rendering TT in mmol 2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt
a4e9cb4976
Fixes. 2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt
8a7776fd74
Code dedup. 2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt
3700ad9813
Ensure new Careportal entries don't use the same second. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt
9838e2fabb
Rework prime/fill button. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt
e5bfa1fb1d
Show boluses with the precision the pump actually supports. 2018-03-23 23:02:35 +01:00
Milos Kozak
22f50198fc rename nsclientinternal -> nsclient 2018-03-23 22:44:37 +01:00
Milos Kozak
cbd60cfdbe synchronized access to log in nsclient 2018-03-23 22:37:27 +01:00
Milos Kozak
22d617cbc0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-23 20:53:44 +01:00
Milos Kozak
4502ed6807 1.60a-dev 2018-03-23 20:53:25 +01:00
Milos Kozak
9f67ad6b62 synchronized access to treatment data 2018-03-23 20:52:41 +01:00
Milos Kozak
044a3fc10f LoopPluginTest 2018-03-23 20:10:45 +01:00
Milos Kozak
30f09dc416 show constraints on LoopFragment 2018-03-23 18:23:19 +01:00
Milos Kozak
661595792f rename InsightPump -> Insight 2018-03-23 17:51:05 +01:00
Milos Kozak
15d8719508 collect most limited reason along with all reasons 2018-03-23 17:36:49 +01:00
Milos Kozak
3f5808eca3 show max basal limit on smb fragment 2018-03-23 09:59:07 +01:00
Milos Kozak
ad8ff15cdc getMax... constraints functions 2018-03-22 23:20:10 +01:00
Milos Kozak
0f531a9954 objectives cleanup & basal hard limits to constraints 2018-03-22 23:05:00 +01:00
Milos Kozak
ba09538f46 AMA - Autosens cleanup 2018-03-22 22:18:40 +01:00
Milos Kozak
ae57241833 use default functions in constraint interface 2018-03-22 21:31:32 +01:00
Milos Kozak
76ee3c51e4 applyMaxIOBConstraints refactor & tests 2018-03-22 21:13:26 +01:00
Milos Kozak
1aba9a2564 applyCarbsConstraints refactor & tests 2018-03-22 10:31:07 +01:00
Milos Kozak
15158fb5ea applyBolusConstraints refactor & tests 2018-03-21 23:01:30 +01:00
Milos Kozak
c68ab9f1ca applyBasalPercentConstraints refactor & tests part2 2018-03-21 22:06:28 +01:00
Milos Kozak
e2ea44a8a8 applyBasalPercentConstraints reactor & tests part1 2018-03-21 20:24:02 +01:00
Milos Kozak
ca70cbdaec
Merge branch 'dev' into newconstraints 2018-03-21 10:48:23 +01:00
Milos Kozak
272fdb4747
Merge pull request #779 from jotomo/loop-results 
Loop results
 2018-03-21 10:44:13 +01:00
Milos Kozak
7a5d8e2ec9 use US locale in tests 2018-03-21 07:51:27 +01:00
Milos Kozak
51ca4cc8c6 show failed tests at the end of travis log 2018-03-21 07:41:03 +01:00
Milos Kozak
ad7ec4daca fix tests 2018-03-20 23:47:37 +01:00
Milos Kozak
15ebfc1193 applyBasalConstraints reactor & tests 2018-03-20 22:09:22 +01:00
Johannes Mockenhaupt
e117527257
Revert "Merge pull request #770 from jotomo/new-bg-processing" 
This reverts commit 7f0918d147, reversing
changes made to 3f04d10f79.
 2018-03-20 19:05:12 +01:00
Milos Kozak
d62a836f6c
resistant adult max bolus 25U 2018-03-20 10:07:52 +01:00
AdrianLxM
fd1e78acef TDD 11 - fix DanaR 2018-03-19 23:15:13 +01:00
Milos Kozak
c2cfe4e7ea isSMBModeEnabled reactor & tests 2018-03-19 23:14:04 +01:00
Milos Kozak
26ecc3dd60 isAMAModeEnabled reactor & tests 2018-03-19 22:59:25 +01:00
Milos Kozak
f8a3b7aee7 isAutosensModeEnabled reactor & tests 2018-03-19 22:36:08 +01:00
Milos Kozak
f6fdef7986 isClosedLoopAllowed & isLoopInvokationAllowed tests 2018-03-19 22:20:42 +01:00
AdrianLxM
fcf8569b1e TDD 10 - split list and cumulative 2018-03-19 21:54:50 +01:00
AdrianLxM
9177307c37 TDD 09 - fix no data 2018-03-19 21:14:28 +01:00
AdrianLxM
088841ae23 TDD 08 - fix crash on empty 2018-03-19 20:23:45 +01:00
AdrianLxM
b6b7955dde TDD 07 2018-03-19 20:03:15 +01:00
AdrianLxM
e0dac6f24e TDD 06 2018-03-19 19:49:48 +01:00
AdrianLxM
954f73eabd TDD 05 2018-03-19 19:10:54 +01:00
AdrianLxM
db7526a7b5 TDD 04 2018-03-19 19:10:40 +01:00
AdrianLxM
f33b4d4838 TDD 03 2018-03-19 19:10:24 +01:00
AdrianLxM
8700f20d5f TDD 02 - combo 2018-03-19 19:10:09 +01:00
AdrianLxM
1e1a58468f TDD 01 2018-03-19 19:08:51 +01:00
AdrianLxM
f4cebd8a7c Merge remote-tracking branch 'milosremote/newconstraints' into newconstraints2 2018-03-19 18:49:26 +01:00
AdrianLxM
01a9e76827 refactor a bit 2018-03-19 18:45:23 +01:00
Milos Kozak
7178e1573a fix CommandQueueTest 2018-03-19 18:44:11 +01:00
Milos Kozak
ce63655097 move constraints interface functions from ConfigBuilder to ConstraintsChecker class 2018-03-19 18:21:02 +01:00
Milos Kozak
52ffcba047 generic Constraint type 2018-03-19 17:38:48 +01:00
Milos Kozak
326229ebbb limitClosedLoop & remove openloop flavor 2018-03-19 17:06:22 +01:00
Johannes Mockenhaupt
86b25174e2
Combo: unbreak basal rate conversion. 
This aligns the combo with the changes from the nodefaultprofile
merge.
 2018-03-19 15:59:23 +01:00
Milos Kozak
5a96b88499 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints 2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt
85d8730eae
Add missing return. 2018-03-19 14:33:57 +01:00
Johannes Mockenhaupt
ede1e719d2
CB.applyTBRRequest: enact same-rate TBR ... 
if requested duration is at least 30m longer than the currently
running TBR.
 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
f918a5f303
More loop results cleanup and i18n. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
706bb913e9
LoopPlugin: fix 'waiting for pump' display for SMB. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
d1f1db859b
Translations cleanup. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
fad10af11b
Clean ups around PumpEnactResult, APSResult. 2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt
379df79bf8
CB.applySMBRequest: return reason when skipping due to frequency. 2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt
213fc7ccb4
Combo: when suspended, create 0% TBR record, suppress checks. 
Fixes #774
 2018-03-19 14:07:26 +01:00
AdrianLxM
69cfa63fe5 xml-format ro 2018-03-19 13:33:11 +01:00
AdrianLxM
3ade9be7a2 cleanup 2018-03-19 13:32:05 +01:00
Milos Kozak
b0a9f678f0 limitRunningLoop constraint 2018-03-19 13:11:25 +01:00
Milos Kozak
f413c005f6 CS translations 2018-03-19 10:07:28 +01:00
Milos Kozak
1c413cc49f
Merge pull request #771 from jotomo/remove-pre-bolus 
Next round of button updates
 2018-03-19 09:29:27 +01:00
Milos Kozak
0266a79201 show invalid profiles in treatments tab 2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt
da014daec8
Merge branch 'dev' into remove-pre-bolus 2018-03-18 20:48:19 +01:00
Milos Kozak
7f0918d147
Merge pull request #770 from jotomo/new-bg-processing 
Trigger loop only for new and current BGs from the active BG source
 2018-03-18 20:47:28 +01:00
Johannes Mockenhaupt
643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Milos Kozak
106de14f9a
Merge branch 'dev' into nodefaultprofile 2018-03-18 19:58:36 +01:00
Milos Kozak
22d89c3ffc more ProfileTest 2018-03-18 19:59:28 +01:00
Johannes Mockenhaupt
946ce97dc2
Fix app init. 2018-03-18 19:57:28 +01:00
Johannes Mockenhaupt
89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge 
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
 2018-03-18 19:47:23 +01:00
Milos Kozak
e916cf4d06 ProfileTest update 2018-03-18 19:15:01 +01:00
Markus M. May
8b7b68003b prepend line feed like suggested on jamoto code review 2018-03-18 17:39:55 +01:00
Markus M. May
f0bec534fa Rename method to reflect jomoto code review 2018-03-18 17:38:05 +01:00
Milos Kozak
3ee586b6c0 Profile tests . -> , conversion 2018-03-18 15:09:26 +01:00
Milos Kozak
f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Johannes Mockenhaupt
a2ac21ea67
Combo: only reject bolus requests if the requested bolus was delivered 
recently

Since history is being read now (also just before starting to bolus),
it's safe to only reject boluses if the previous request actually
lead to insulin delivery.

Fixes #700.
 2018-03-18 14:36:58 +01:00
Johannes Mockenhaupt
c5ebb696a4
Extract EventNewBg.isCurrent() and use when relevant for decision making. 2018-03-18 11:26:15 +01:00
Milos Kozak
7961a9f00a ver 1.60-dev 2018-03-18 10:36:38 +01:00
Milos Kozak
df3c226d5a notify by SMS on new ProfileSwitch instead of profile 2018-03-18 10:35:37 +01:00
Milos Kozak
e6a606296d profile comming from NS do not trigger EventNewBasalProfile 2018-03-18 10:14:27 +01:00
Milos Kozak
4f43feb12e allow profile to be null 2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt
b54a010614
CarbsButton: replace suspend option with 'hypo tt'. 2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt
17219c08d1
Combo: fragment spacing fix. 2018-03-17 22:12:19 +01:00
Markus M. May
18521d6634 Unit tests are always in engmode 2018-03-17 21:48:58 +01:00
Markus M. May
c6e8ab35b6 Fix boolean stuff in accordance to code review with adrian 2018-03-17 21:35:16 +01:00
Markus M. May
0d4e8772a9 Cleanup boolean algrabra, add method for environment retrieval from logcontexxt 2018-03-17 21:23:45 +01:00
Markus M. May
72e8e5fd05 Determine directory from logback 2018-03-17 21:14:01 +01:00
Markus M. May
9b020f68db Correct merge 2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt
eae6c73671
Buttons: explicitely state that no action will be taken if nothing selected. 2018-03-17 20:39:58 +01:00
Johannes Mockenhaupt
766fe105b2
InsulinButton: remove broken pre-bolus calculation. 2018-03-17 20:02:24 +01:00
Johannes Mockenhaupt
17d5945a91
Don't run loop for back-filled BG either. 2018-03-17 19:46:15 +01:00
Milos Kozak
9a1d7b2c9f remove duplicated code 2018-03-17 18:46:11 +01:00
Milos Kozak
3f29ca3b96 more checks for null profile 2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt
612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-03-17 16:45:08 +01:00
Milos Kozak
6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement 
Button refinement
 2018-03-17 15:28:41 +01:00
Milos Kozak
2cd1d2014d
Merge pull request #768 from AdrianLxM/chart-menu2 
Chart menu - also for history-browser
 2018-03-17 15:24:54 +01:00
AdrianLxM
42e1c61c90
Merge pull request #766 from AdrianLxM/chart-menu 
Chart menu
 2018-03-17 14:07:20 +01:00
Johannes Mockenhaupt
30a191c6eb
Combo: ruffyscripter: abort a command if an unparsable menu is encountered. 
This happens when the pump is misconfigured (e.g. quick info is
labeled wrong), or the bolus history has no entries yet.
 2018-03-17 14:06:39 +01:00
Johannes Mockenhaupt
926bea55c0
Combo: align with dev changes. 2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt
1b38c9cf5e
Join pumps under Config.HWPUMPS switch. 2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt
8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
 2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt
de72fba92e
Combo: update button spacing to match overview. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
a7ca483565
Rename isActiveBgSource -> isFromActiveBgSource. 2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt
8849df639f
Invoke loop only for new BGs from active BG source. 2018-03-17 13:31:33 +01:00
Johannes Mockenhaupt
ad3bf19e4c
Handle received EventNewBg depending on args. 
(cherry picked from commit 79b7a7b)
 2018-03-17 13:28:49 +01:00
Johannes Mockenhaupt
7f45316a24
Add isActiveBg to EventNewBg. 
(cherry picked from commit a8291ff)
 2018-03-17 13:28:47 +01:00
Johannes Mockenhaupt
063505fdb3
Only invoke the loop for new BGs. 2018-03-17 13:27:56 +01:00
Milos Kozak
1e359184a9 check for null profile 2018-03-17 08:12:07 +01:00
AdrianLxM
a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt
7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin. 2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt
194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt
8564cf172e
Carbs button: send carbs to pump if pump supports carbs. 2018-03-16 22:11:15 +01:00
Johannes Mockenhaupt
32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM
90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM
47c6c2d9a8 chart menu 4 2018-03-16 19:26:18 +01:00
AdrianLxM
067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM
21c3853461 chart menu 2 2018-03-16 18:10:13 +01:00
AdrianLxM
32894a092e chart menu 1 2018-03-16 17:23:02 +01:00
Milos Kozak
b6ce7c03c6 remove profile dependency from pump drivers, TRB optimalization 2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt
0205dc40b3
Combo: set SMB flag on bolus progress update for wear. 2018-03-16 15:56:31 +01:00
Johannes Mockenhaupt
6bebb30da0
Combo: use PrivacyFabric to align with dev. 2018-03-16 15:52:21 +01:00
Johannes Mockenhaupt
30d522e1a8
Combo: update PumpDescription to align with dev. 2018-03-16 15:49:12 +01:00
Johannes Mockenhaupt
db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Markus M. May
2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode 2018-03-15 23:00:08 +01:00
Markus M. May
39aae28101 Disable profile switch if not in Engineering mode and on dev branch 2018-03-15 21:51:43 +01:00
Markus M. May
e38f10dba0 Merge jamoto/engineering-mode 2018-03-15 21:10:18 +01:00
Milos Kozak
db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM
5fd05158ac cleanup 2018-03-15 17:00:57 +01:00
AdrianLxM
b481e77008 draw profile in dana profile viewer 2018-03-15 16:56:59 +01:00
AdrianLxM
d31c9a6ed6 optimize imports 2018-03-15 14:13:21 +01:00
AdrianLxM
212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak
e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
Milos Kozak
d25855295d travis 2nd try 2018-03-13 23:48:14 +01:00
Milos Kozak
52d558388d
Merge pull request #758 from triplem/travis_coverage 
Add environment variable to handle testCoverage on travis
 2018-03-13 20:55:32 +01:00
Milos Kozak
e92e05cfbd
Merge pull request #759 from TebbeUbben/dev 
Save new profile when updating it to fix "endless loop"
 2018-03-13 20:31:38 +01:00
TebbeUbben
11295b1e96 Save new profile when updating it 2018-03-13 20:15:58 +01:00
Markus M. May
b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt
a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt
637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled. 2018-03-12 23:01:58 +01:00
Milos Kozak
8219332a2c do not pass DIA to SMB determine_basal 2018-03-12 22:23:15 +01:00
Milos Kozak
4ff09a0125 show Dana model properly after communication error 2018-03-12 22:16:10 +01:00
Milos Kozak
5b064cd8f8
Merge pull request #756 from TebbeUbben/dev 
Read maximum basal and bolus amount from pump
 2018-03-12 21:46:29 +01:00
Milos Kozak
e134b94f13 fix deviation slope calculations 2018-03-12 21:13:48 +01:00
TebbeUbben
ffb7b068a8 Read maximum basal and bolus amount from pump 2018-03-12 20:53:39 +01:00
Milos Kozak
30d12622f7 update maxIOB hard limits 2018-03-12 17:59:42 +01:00
Milos Kozak
eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak
fc070c95a7 use safeGetString 2018-03-12 11:22:19 +01:00
Milos Kozak
601dbc1036 JsonHelper test 2018-03-12 11:12:41 +01:00
Milos Kozak
a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak
38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Tebbe Ubben
d4ede0a5b3
Merge branch 'dev' into dev 2018-03-11 22:59:11 +01:00
TebbeUbben
8fd68a082c Show bolus progress 2018-03-11 22:53:18 +01:00
TebbeUbben
21dbeb299e Missing import statement 2018-03-11 21:00:08 +01:00
AdrianLxM
3068089297
Insight: add treatment to progress event 2018-03-11 20:56:11 +01:00
AdrianLxM
f2d6b92394
Merge pull request #750 from TebbeUbben/dev 
Improved rounding
 2018-03-11 18:34:10 +01:00
TebbeUbben
ccabb099f0 Improved rounding 2018-03-11 17:52:53 +01:00
Milos Kozak
3ad783260b max_daily_basal min value 0.1 -> 0.05 2018-03-11 17:17:34 +01:00