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

3840 commits

Author SHA1 Message Date
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