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

2611 commits

Author SHA1 Message Date
Johannes Mockenhaupt
6fa1badcdb
Clean up parsing of SMB result and applying the requests. 2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt
0655e4e676
SMB: clean up APSResult.toSpanned a bit. 
(cherry picked from commit 10d7c79)
 2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt
b1fd66aae5
Make TreatmentsPlugin.getLastBolusTime robust. 
Ignore carb-only treatments, ignore future records.

(cherry picked from commit cba015e)
 2018-01-29 03:05:12 +01:00
Jamorham
742ee5b762
Insight plugin updates 2018-01-28 23:16:30 +00:00
Jamorham
afd7fc5769
Update sightparser library 2018-01-28 22:36:24 +00:00
Jamorham
07cdee0533
Insight CancelBolusTaskRunner refactor 2018-01-28 22:35:26 +00:00
Milos Kozak
f54452515b KO language cleanup 2018-01-28 23:29:33 +01:00
Jamorham
c019b4c533
Insight Cstatus add success helper 2018-01-28 22:04:21 +00:00
Jamorham
cbe827ac07
Add History Receivers 2018-01-28 22:03:40 +00:00
Jamorham
9a8521b809
Insight Live History 2018-01-28 21:52:58 +00:00
Jamorham
e704f130bc
Add Insight HistoryLogAdapter 2018-01-28 21:52:18 +00:00
warstar2187
c297ce88bb
Update strings.xml 2018-01-28 11:01:56 +09:00
warstar2187
76d606fddf
Update strings.xml 2018-01-28 10:51:09 +09:00
Johannes Mockenhaupt
3be65319d7
AlarmSoundService: don't set volume to 100% if music is playing. 
Have mercy with my ears.
 2018-01-27 20:12:17 +01:00
Johannes Mockenhaupt
db5ee7067a
PumpEnactResult.toSpanned: add SMBs, handle SMB-only enact. 2018-01-27 19:58:37 +01:00
Johannes Mockenhaupt
7e264b1bfd
Let IobCob handle EventNewBg and loop act its result. 2018-01-27 19:04:03 +01:00
Radoslav Radev
d4fe03ac30
Bg translation 2018-01-27 16:12:51 +02:00
Milos Kozak
b4d13c727e let nsclient bg source be with advanced filtering temporary 2018-01-27 15:07:15 +01:00
Milos Kozak
5b11c5630c hide deviation slope graphs 2018-01-27 14:47:35 +01:00
Milos Kozak
296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Milos Kozak
4af8e14417 Merge branch 'dev' into smb060 2018-01-27 13:47:41 +01:00
Milos Kozak
ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Jamorham
2c9cd89ff3
Add unit test 2018-01-26 22:44:12 +00:00
Jamorham
b831fd7dfb
Insight Temporary basal absolute 2018-01-26 22:34:43 +00:00
Jamorham
f036ca4547
Attempt to eliminate duplicate connectors 2018-01-26 22:27:04 +00:00
Jamorham
3150e7d00f
Add double rounding helper 2018-01-26 22:26:29 +00:00
Milos Kozak
b2d9ad8986 Merge branch 'dev' into smb060 2018-01-26 22:49:25 +01:00
Milos Kozak
d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Jamorham
0966bea1e8
InsightPumpFragment: add redundant casting for travis 2018-01-26 17:17:04 +00:00
Jamorham
ee0a53976f
StatusItemViewAdapter add redundant casting for travis 2018-01-26 17:10:43 +00:00
Jamorham
f30efd0224
Insight fragment use status list 2018-01-26 16:59:14 +00:00
Jamorham
076685992c
Insight status list and connector 2018-01-26 16:58:19 +00:00
Jamorham
f2cfc3cdbd
Update helpers 2018-01-26 16:56:09 +00:00
Jamorham
2f7dc11b9f
Update Insight fragment layouts 2018-01-26 16:46:09 +00:00
Milos Kozak
e5d20ca996 ButterKnife to Dana fragment 2018-01-26 17:18:40 +01:00
Jamorham
31b0ce21e5
StatusItem ui elements 2018-01-26 16:12:37 +00:00
Milos Kozak
a7a4693e9c
Merge pull request #621 from jotomo/disable-release-checks 
Disable release build checks until wear lib upgrade (#620).
 2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt
3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak
d8a6c0d111 Rv2,RS: use safe carb diff 30s 2018-01-26 15:47:45 +01:00
Milos Kozak
98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham
8fa0de19c2
Insight async add wake locking 2018-01-26 10:31:11 +00:00
Jamorham
11fcfb88d4
More helper methods 2018-01-26 10:29:56 +00:00
Milos Kozak
6be2988e31
Merge pull request #619 from MilosKozak/sdk27 
Sdk27
 2018-01-26 10:14:21 +01:00
Milos Kozak
3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only 
Push carbs only to pumps supporting storing carbs.
 2018-01-26 10:10:16 +01:00
Jamorham
69da0cf57a
Always connected option 2018-01-25 23:21:42 +00:00
Jamorham
4be1f52254
Cancels for TBR + extended 2018-01-25 23:21:11 +00:00
Jamorham
8ee75c5c72
Try to get missing status 2018-01-25 23:20:14 +00:00
Jamorham
07d17ede5f
Lower reconnect threshold 2018-01-25 21:26:11 +00:00
Jamorham
d421ceffa6
Insight automatic reconnector 2018-01-25 20:55:55 +00:00
Jamorham
c8ba4076c6
Update Helpers 2018-01-25 20:55:02 +00:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Jamorham
54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Jamorham
8cf159a6a7
Insight async callback handling 2018-01-25 17:23:57 +00:00
Johannes Mockenhaupt
ed1226ae67
Push carbs only to pumps supporting storing carbs. 2018-01-25 13:22:01 +01:00
Milos Kozak
91bd21131d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-25 11:27:17 +01:00
Milos Kozak
ca01168474
Merge pull request #611 from MilosKozak/min_unreachable 
minimum of 30 min for unreachable alert
 2018-01-25 11:24:09 +01:00
Milos Kozak
1ba793304f
Merge pull request #616 from jotomo/check-that-box 
Overview: make checkbox labels toggle state as well.
 2018-01-25 11:23:06 +01:00
Milos Kozak
8d792a24db bump 1.57a-dev 2018-01-25 11:21:27 +01:00
Milos Kozak
893c64e2e4 fix not attached to the activity 2018-01-25 11:17:23 +01:00
Milos Kozak
a3e6794138 check for no profile 2018-01-25 11:09:58 +01:00
Milos Kozak
7be0bfb27e check for no profile 2018-01-25 11:06:35 +01:00
Jamorham
8f1feefce9
Add sightparser library 2018-01-24 21:18:34 +00:00
Jamorham
c85854fe93
initial InsightPumpPlugin rough and untested 2018-01-24 21:12:12 +00:00
Milos Kozak
bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00
Jamorham
979dc2d5e2
More pieces for Insight Pump 2018-01-24 16:51:05 +00:00
Milos Kozak
801182eccd fix cob calculation for history records 2018-01-24 17:03:45 +01:00
Johannes Mockenhaupt
0f98c49876
Fix namespace errors. 2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt
2a4f1950b3
Add missing ids to other overview layouts. 2018-01-24 16:53:40 +01:00
Jamorham
7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt
3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Milos Kozak
8a45422135 Merge branch 'dev' into cobthread 2018-01-24 00:00:23 +01:00
Milos Kozak
b6f3fae487 fix storing food to the database 2018-01-23 23:14:39 +01:00
Milos Kozak
9663dd499e remove forgotten log 2018-01-23 23:01:04 +01:00
Milos Kozak
d4ddfbb942 Merge branch 'dev' into cobthread 2018-01-23 22:04:42 +01:00
Milos Kozak
c2a7747167 use getAutosensData(toTime) in oref0 sensitivity 2018-01-23 22:02:17 +01:00
Milos Kozak
de7789bec0 delete all dbrequests from query 2018-01-23 21:43:48 +01:00
Milos Kozak
48211aaa30 cob calculation thread 2018-01-23 20:58:48 +01:00
Milos Kozak
9c78595c80 log RS history 2018-01-23 18:19:18 +01:00
Milos Kozak
d6201eec17
Merge pull request #563 from MilosKozak/jellyRS 
WIP: RS BLE modifications
 2018-01-23 13:58:47 +01:00
Milos Kozak
4d474ddbdb RS: reset isConnected & isConnecting on error 2018-01-23 13:59:33 +01:00
Milos Kozak
52e4496add Careportal DB browser 2018-01-22 21:49:01 +01:00
Milos Kozak
d033407ba7 fix rendering treatments with duration 2018-01-22 19:12:22 +01:00
Milos Kozak
f835c272ad more autosens logging 2018-01-22 17:18:18 +01:00
Milos Kozak
f5a2c5bcd2 cancel extending bolus on pump disconnection 2018-01-21 23:38:24 +01:00
Milos Kozak
ef2a565c18 set maxiob=0 only for objective 4 2018-01-21 23:20:41 +01:00
Milos Kozak
1c65a88e49 fix stopping bolus connection error 2018-01-21 22:51:30 +01:00
AdrianLxM
3962808626 minimum of 30 min for unreachable alert 2018-01-21 19:05:04 +01:00
Milos Kozak
fa48720f0e Merge branch 'dev' into smb060 2018-01-21 15:58:54 +01:00
Milos Kozak
eedc38fbcf synchronized access to basal_v 2018-01-21 15:56:07 +01:00
Milos Kozak
e5ede788ba Merge branch 'dev' into smb060 2018-01-21 13:38:21 +01:00
Milos Kozak
060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt
8109900e9b
Overview: move checkboxes before label. 
(cherry picked from commit 4825e16)
 2018-01-19 20:13:53 +01:00
Milos Kozak
97e0aaa380 fix pump unreachable for virtual pump 2018-01-16 23:28:09 +01:00
Milos Kozak
7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
Milos Kozak
54ac28bdf9 typo fix 2018-01-15 16:56:30 +01:00
Johannes Mockenhaupt
0569addc55
Set enableSMB_always if using a non-noisy BG source. 2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt
0e4c72e790
Fix check for DexcomG5 Bg source. 2018-01-15 13:58:25 +01:00
Milos Kozak
c501d8e3c5 Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2018-01-15 12:47:28 +01:00
Milos Kozak
91a6c7a96c Merge branch 'dev' into smb060 2018-01-15 12:46:50 +01:00
Milos Kozak
5a00b68f68 remove readstatus prior every command 2018-01-14 21:42:36 +01:00
Milos Kozak
99d83a60f4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-14 17:12:35 +01:00
Milos Kozak
44381288f4 bump 1.57-dev 2018-01-14 17:12:18 +01:00
Milos Kozak
89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Milos Kozak
12fe8bcfdd Merge branch 'dev' into smb060 2018-01-13 22:50:41 +01:00
Milos Kozak
24909bf59c Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2018-01-13 22:50:10 +01:00
Milos Kozak
390cef5174 remainingCATime fix 2018-01-13 22:49:58 +01:00
Milos Kozak
fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition 
Avoid race condition checking for an active TBR.
 2018-01-13 22:43:41 +01:00
Milos Kozak
4f9df99ffb
Merge pull request #601 from jotomo/combo-strings 
Add strings for the Combo pump, including some renames.
 2018-01-13 22:29:46 +01:00
Markus M. May
f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +01:00
Johannes Mockenhaupt
be8534db51
Add strings for the Combo pump, including some renames. 
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
 2018-01-11 21:47:30 +01:00
AdrianLxM
51ca0e0d12
Update build.gradle 2018-01-11 14:14:53 +01:00
Milos Kozak
1d5d44e008
Merge pull request #598 from MilosKozak/coverage 
Coverage
 2018-01-11 00:09:07 +01:00
Milos Kozak
99eef3b19a more round tests 2018-01-10 23:57:02 +01:00
Milos Kozak
a430a7d70d coverage 2018-01-10 23:31:31 +01:00
Johannes Mockenhaupt
27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
Markus M. May
d4365a2352 Add a unit test for Insulin Plugin 2018-01-10 22:11:20 +01:00
Johannes Mockenhaupt
06d949cd82
Avoid race condition checking for an active TBR. 2018-01-10 10:48:44 +01:00
Simon Pauwels
2df19b85a5
typo and added dutch translations 2018-01-09 21:16:37 +01:00
Milos Kozak
70e22487b2 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:47:32 +01:00
Milos Kozak
1ce6f32c39 Merge branch 'dev' into smb060 2018-01-09 19:45:45 +01:00
Milos Kozak
bdd1a85d26 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:44:42 +01:00
Milos Kozak
7e625918ac Merge branch 'dev' into smb060 2018-01-08 14:27:39 +01:00
Milos Kozak
d7dfe8942e prevent basal updated messages on virtual pump 2018-01-08 14:27:27 +01:00
Milos Kozak
144315ba61 pass enableSMB_always to determinebasal 2018-01-08 14:19:21 +01:00
Milos Kozak
db3369865a Merge branch 'dev' into smb060 2018-01-08 14:09:23 +01:00
Milos Kozak
6ebd6bcdc0 Merge branch 'nsc' into dev 2018-01-08 14:09:02 +01:00
Milos Kozak
b31504ac83
Merge pull request #590 from kuchjir/BolusWizard_fix_for_bg_bellow_targetBGLow 
added BolusWizardTest
 2018-01-07 22:58:22 +01:00
kuchjir
e5b21ccc3e added BolusWizardTest 2018-01-07 22:16:08 +01:00
Milos Kozak
fbb120673f Merge branch 'dev' into smb060 2018-01-07 15:32:14 +01:00
Milos Kozak
1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Milos Kozak
ab89e16acd PARTIAL_WAKE_LOCK for NSClientService 2018-01-07 12:09:23 +01:00
Milos Kozak
8cf69006b2 check 30min interval only for basal rates 2018-01-07 11:13:02 +01:00
AdrianLxM
6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif 
basal updated notification
 2018-01-06 09:10:00 +01:00
AdrianLxM
4dd238097f basal updated notification 2018-01-06 07:37:39 +01:00
AdrianLxM
b9ad3a71fd Dialogs usability tweaks 2018-01-06 06:52:30 +01:00
Milos Kozak
144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
Milos Kozak
aff0e6f5a8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-04 23:12:40 +01:00
Milos Kozak
b7df21c7d0 prevent processing incomplete profiles 2018-01-04 23:12:35 +01:00
Milos Kozak
955ecc6d64 set defaults for display range 2018-01-04 21:33:18 +01:00
AdrianLxM
95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
AdrianLxM
468426bd31
Merge pull request #581 from MilosKozak/watchfaces-steampunk 
request new data on preference change
 2018-01-04 17:41:30 +01:00
AdrianLxM
c3d14b506d allow old data on the wf 2018-01-04 16:20:49 +01:00
Milos Kozak
d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak
4643cdc3b9 accept local NS data broadcast even when ns_upload_only is selected 2018-01-04 09:45:17 +01:00
Milos Kozak
a08a6cbb70 patch SMB determine_basal to not produce error 2018-01-03 22:59:26 +01:00
Milos Kozak
ed3f076bd7 Merge branch 'dev' into smb060 2018-01-03 22:40:34 +01:00
Milos Kozak
de1475dbba remove logging 2018-01-03 22:28:48 +01:00
Milos Kozak
230ec7177b Merge branch 'dev' into smb060 2018-01-03 21:22:38 +01:00
Johannes Mockenhaupt
f09d68ad59
Check activity != null before drawing graph. 2018-01-03 20:58:49 +01:00
Milos Kozak
ff5d42522c Merge branch 'dev' into smb060 2018-01-03 20:31:36 +01:00
Milos Kozak
094737adde improve GUI response 2018-01-03 19:59:18 +01:00
AdrianLxM
0b76290091
Merge pull request #578 from andrew-warrington/watchfaces 
Steampunk watch face
 2018-01-03 19:58:40 +01:00
AdrianLxM
e0abd1b816 Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk 2018-01-03 13:53:38 +01:00
AdrianLxM
28a52b3ab7
Merge pull request #574 from MilosKozak/illegalstate-fix 
illegalState crash fix
 2018-01-03 13:45:31 +01:00
Andrew Warrington
8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00
Milos Kozak
cc1cd675c7
Merge pull request #573 from MilosKozak/combo-bolus-fix 
combo-bolus-fix
 2018-01-02 10:05:20 +01:00
Andrew Warrington
7475b1ba3a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-01 22:36:07 +01:00
AdrianLxM
c8fa729d8d
update German 2018-01-01 15:45:01 +01:00
swissalpine
62da90011a
Revised German Translation 2018-01-01 15:10:38 +01:00
Milos Kozak
d2753e0dad another cob fix 2018-01-01 14:38:37 +01:00
AdrianLxM
4a01b14b35 missing file 2017-12-31 16:51:44 +01:00
AdrianLxM
e190f1b9ef illegalState crash fix 2017-12-31 16:44:13 +01:00
Milos Kozak
d27d1b1821 Objectives update 2017-12-31 12:24:51 +01:00
Milos Kozak
458d812e2e fix objective 1 2017-12-31 11:07:21 +01:00
Milos Kozak
fcbe8555a6 upload aps status and iob when loop is suspended 2017-12-31 10:22:18 +01:00
AdrianLxM
d3127bc97b
Merge pull request #571 from MilosKozak/offline-treatments 
fully offline CP
 2017-12-31 09:52:29 +01:00
AdrianLxM
3a7fe56f64 combo-bolus-fix 2017-12-31 09:50:51 +01:00
Milos Kozak
7b0a4d2ce7
Merge pull request #570 from jotomo/queue-starts 
Queue: synchronize creating queue thread to avoid multiple threads.
 2017-12-31 09:27:27 +01:00
AdrianLxM
937872e80c fully offline CP 2017-12-30 23:01:25 +01:00
AdrianLxM
fb2271e758
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3 
Wear: No guard for RS
 2017-12-30 22:20:37 +01:00
Milos Kozak
f3db104979 autofix error in profile 2017-12-30 19:56:37 +01:00
Milos Kozak
8c213cbc11 missing cob fix 2017-12-30 19:42:07 +01:00
Milos Kozak
b39fe2ee5e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-30 16:25:18 +01:00
Milos Kozak
cc50a6fb99 missing inheritance 2017-12-30 16:25:08 +01:00
Johannes Mockenhaupt
facdc51f6f
Queue: synchronize creating queue thread to avoid multiple threads. 2017-12-29 16:36:19 +01:00
Andrew Warrington
c43afd9d28 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-28 01:03:02 +01:00
AdrianLxM
bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev 
Always show basal rates on watch, whether temporary or normal.
 2017-12-27 23:17:52 +01:00
AdrianLxM
774203605f
Wear: No guard for RS 2017-12-27 21:19:57 +01:00
Milos Kozak
3df0e8f9ce Merge branch 'dev' into smb060 2017-12-27 18:02:06 +01:00
AdrianLxM
79d05488c3
RS create bond 2017-12-27 02:24:26 +01:00
Milos Kozak
0ab259f61f Merge branch 'dev' into smb060 2017-12-26 01:22:49 +01:00
Milos Kozak
72d6c4494b add scrollview 2017-12-26 01:22:35 +01:00
Milos Kozak
162e73e64d Merge branch 'dev' into smb060 2017-12-26 00:35:16 +01:00
Milos Kozak
8fdd16c305 QuickWizard detailed settings 2017-12-26 00:27:34 +01:00
Milos Kozak
e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2 
don't show single connection timeouts on the watch
 2017-12-25 20:44:39 +01:00
AdrianLxM
e50c6fc8ed RS BLE modifications 2017-12-25 20:39:14 +01:00
Milos Kozak
dd58952b42
Merge pull request #548 from MilosKozak/COB-Wizard-idea 
Use autosensdata for wizard instead of  APSResult
 2017-12-25 19:22:02 +01:00
Milos Kozak
b0bf9b5c79 Merge branch 'dev' into smb060 2017-12-25 17:01:53 +01:00
Milos Kozak
f968ec630c fix non smooth ratio graph 2017-12-25 17:01:31 +01:00
Milos Kozak
ae30046c95 Merge branch 'dev' into smb060 2017-12-23 11:18:37 +01:00
Milos Kozak
3ce260dfe9 fix of fix 2017-12-23 11:18:17 +01:00
Milos Kozak
51de0f16c1 Merge branch 'dev' into smb060 2017-12-23 11:07:48 +01:00
Milos Kozak
6e09bfbbe4 fix wrong button type 2017-12-23 11:07:29 +01:00
Milos Kozak
7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +01:00
Milos Kozak
2bb37a4bfc fix doubled percentage when comming from NS 2017-12-22 21:03:36 +01:00
Milos Kozak
248d3d1697 proper select last used profile 2017-12-22 20:34:53 +01:00
Milos Kozak
93b954fffe when using profile percentage limit basal rate to minimal value supported by pump 2017-12-22 20:17:31 +01:00
Milos Kozak
600e2ade1c SingleClickButton 2017-12-22 19:50:16 +01:00
Milos Kozak
0851581f7f Merge branch 'dev' into smb060 2017-12-22 12:03:11 +01:00
Milos Kozak
25667bc79e RS fix crash when pairing is not confirmed on pump 2017-12-22 11:57:59 +01:00
Milos Kozak
e77e7ffbbd Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2017-12-22 10:35:33 +01:00
Milos Kozak
99e5a39b33 Merge branch 'dev' into smb060 2017-12-22 10:34:45 +01:00
Milos Kozak
5bc6ea04c2 Double -> double 2017-12-22 03:27:13 +01:00
Milos Kozak
31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Milos Kozak
74abdc0271 fix disconnecting pump 2017-12-22 01:35:52 +01:00
Milos Kozak
6b23ba10bd format output date to be displayed on iDevices correctly 2017-12-22 00:37:22 +01:00
Milos Kozak
a5c4495a5d BolusWizard use 0 for insulin correction if in range 2017-12-22 00:17:46 +01:00
Milos Kozak
771f9eac1a LocalProfile TimeListEdit min, max 2017-12-22 00:12:40 +01:00
Andrew Warrington
176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. 2017-12-21 09:50:16 +01:00
Milos Kozak
fb12c0bc96 enable SMB for G5 2017-12-21 09:02:49 +01:00
Milos Kozak
cb2368f535 Merge branch 'dev' into smb060 2017-12-21 08:58:33 +01:00
AdrianLxM
2d2bd6d77a
remove string with no default translation 2017-12-21 08:26:55 +01:00
Milos Kozak
2bdda9af43 Rv2,RS fix loading events 2017-12-21 07:45:56 +01:00
Milos Kozak
5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +01:00
Milos Kozak
adff0329dd initialize lastCommandTime too after BT reset 2017-12-20 20:55:14 +01:00
Milos Kozak
0f43e95644 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 20:45:35 +01:00
Milos Kozak
63b0efede3 allow to read status after every command 2017-12-20 20:45:21 +01:00
Milos Kozak
beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline 
Nsoffline
 2017-12-20 20:17:30 +01:00
Milos Kozak
c33dd1e7d7 RS enable BT before scanning 2017-12-20 19:50:44 +01:00
Milos Kozak
70f4b72ff9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 18:26:52 +01:00
Milos Kozak
096b2e93a3 wait a few sec before disconnection for another command 2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt
7651107167 Merge branch 'bolus-progress-dialog' into 'smb060' 
Only show progress dialog for normal boluses, not SMBs.

See merge request MilosKozak/AndroidAPS!375
 2017-12-20 16:58:33 +00:00
Johannes Mockenhaupt
c5089d821e Merge branch 'disappearing-predections-checkbox' into 'smb060' 
Overview: fix predictions checkbox disappearing after unchecking it.

See merge request MilosKozak/AndroidAPS!370
 2017-12-20 16:58:12 +00:00
Johannes Mockenhaupt
2955dd7ec6
Only show progress dialog for normal boluses, not SMBs. 
(cherry picked from commit b3d4607)
 2017-12-20 17:42:39 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060 
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
 2017-12-20 17:28:08 +01:00
Milos Kozak
3975ce4cbe
Merge pull request #551 from jotomo/profile-switch-on-actions-tab 
Actions tab: show profile switch button for single profile too.
 2017-12-20 16:45:10 +01:00
Johannes Mockenhaupt
d1085c876e
Actions tab: show profile switch button for single profile too. 2017-12-20 16:31:28 +01:00
AdrianLxM
81ca35515f
Old NS-Version non-urgent 2017-12-20 14:34:30 +01:00
Milos Kozak
eb34345ee2
Merge pull request #539 from jotomo/queue-bolus-constraints 
Apply bolus constraint before issuing the bolus
 2017-12-20 13:25:02 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump 
Remove sync to pump pref, always sync
 2017-12-20 10:49:47 +01:00
AdrianLxM
e11a4f6d42
Use autosensdata for wizard instead of APSResult 2017-12-19 22:41:43 +01:00
AdrianLxM
3342d9daa3 don't show single connection timeouts on the watch 2017-12-19 14:47:55 +01:00
AdrianLxM
88adc31dbc
Add SP to imports 2017-12-19 07:16:41 +01:00
Andrew Warrington
b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +01:00
AdrianLxM
00f13d0479 refactor cancelAlarm back to KeepAliveReceiver 2017-12-17 15:46:43 +01:00
AdrianLxM
9bd0a1f144 push next alert on read status 2017-12-17 15:46:33 +01:00
Andrew Warrington
a0983a99b9 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-17 11:52:34 +01:00
Milos Kozak
8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak
a05c1f947e Merge branch 'nsoffline' into bgsource 2017-12-14 23:35:01 +01:00
Milos Kozak
5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
AdrianLxM
9602bde6a1 fake Esel new file 2017-12-13 22:39:44 +01:00
AdrianLxM
0151dbd496 fake Esel 2017-12-13 22:14:47 +01:00
Milos Kozak
fa4e80444d NSOffline remove from queue as well 2017-12-13 20:03:24 +01:00
Milos Kozak
2a284ce052
Merge pull request #532 from AdrianLxM/adrain156work01 
remove wear-overview notifications as replaced by system notifications
 2017-12-13 00:00:20 +01:00
Andrew Warrington
9e6f124097 Steampunk watchface (interim commit) 2017-12-12 23:17:25 +01:00
Johannes Mockenhaupt
f6721f628c
Apply bolus constraint before applying. 2017-12-12 22:30:42 +01:00
Milos Kozak
e14272c083 Rv2,RS: always load last 45 min 2017-12-12 18:18:41 +01:00
Milos Kozak
b98c321cbc NS offline 2017-12-12 00:12:35 +01:00
Milos Kozak
b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Milos Kozak
c714fead24 add deliverAt safety 2017-12-10 17:04:22 +01:00
Milos Kozak
890ef5978b safety check for multiple SMBs 2017-12-10 16:25:56 +01:00
Milos Kozak
20414c81c9 update minDeviationSlope default val 2017-12-10 16:14:10 +01:00
Milos Kozak
8822dcecd3 update smb execution in configbuilder 2017-12-10 15:48:28 +01:00
Milos Kozak
cd1327fc9e Merge branch 'dev' into smb 2017-12-10 00:36:47 +01:00
Milos Kozak
88defc9f7b
Merge pull request #533 from AdrianLxM/adrian156work01 
adapt wear actions to command queue
 2017-12-09 17:36:16 +01:00
AdrianLxM
21f91b9b29 remove unused imports 2017-12-08 14:58:13 +01:00
Milos Kozak
e8c3a0cf91
Merge pull request #525 from PoweRGbg/patch-5 
Added profile's target BG in NSClient mode
 2017-12-08 08:20:37 +01:00
AdrianLxM
874915e7b4 adapt wear actions to command queue 2017-12-08 06:00:49 +01:00
Milos Kozak
696dd4c592 Merge branch 'dev' into smb 2017-12-07 23:54:37 +01:00
Milos Kozak
dc3c853aca Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
AdrianLxM
0013050860 remove wear-overview notifications as replaced by system notifications 2017-12-07 17:07:32 +01:00
Roumen Georgiev
1d8dd5e35e
removing the whole if() statement 2017-12-07 17:11:54 +02:00
Milos Kozak
d3e11d9331
Merge pull request #530 from PoweRGbg/patch-7 
fix of extended bolus size
 2017-12-07 15:24:55 +01:00
AdrianLxM
aea47420e1 fix NPE when profile not loaded 2017-12-07 10:40:00 +01:00
Roumen Georgiev
242ed7217a
fix of extended bolus size 2017-12-07 10:08:26 +02:00
Milos Kozak
648b918e3a
Merge pull request #528 from jotomo/log-packages 
Log full class name (not just filename), so logs can be filtered by p…
 2017-12-06 14:16:20 +01:00
Johannes Mockenhaupt
ab456d5966
Remove missed reference to pref in NSProfilePlugin. 2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly. 2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt
7d07982181
Log full class name (not just filename), so logs can be filtered by package name. 2017-12-06 11:53:51 +01:00
Johannes Mockenhaupt
d21a2bd691
Overview: fix predictions checkbox disappearing after unchecking it. 2017-12-06 11:35:58 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev 
Dev
 2017-12-06 10:18:43 +01:00
Milos Kozak
7be5c041cc
Merge pull request #526 from MilosKozak/untranslatable 
untranslatable strings greek
 2017-12-05 22:37:34 +01:00
Milos Kozak
455383cfd5 check for duration in json 2017-12-05 22:08:37 +01:00
AdrianLxM
50cbff6fa4 untranslatable strings 2017-12-05 22:08:14 +01:00
Milos Kozak
a293f86978 Merge branch 'dev' into smb 2017-12-05 17:36:44 +01:00
Milos Kozak
a47fe757b9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-05 17:03:58 +01:00
Milos Kozak
188762519c greek language 2017-12-05 17:03:40 +01:00
Milos Kozak
1adbee5c9e check for null 2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref. 
(cherry picked from commit 01c52e7)
 2017-12-05 10:00:31 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode 2017-12-05 09:23:57 +02:00
Milos Kozak
202d260ad2 Merge branch 'dev' into smb 2017-12-05 07:34:48 +01:00
Milos Kozak
6c714261d0 queue logging 2017-12-05 07:34:34 +01:00
Milos Kozak
1986594877 hide deviation slope graph 2017-12-04 23:34:55 +01:00
Milos Kozak
ef16174e5b fix NPE 2017-12-04 23:31:35 +01:00
Milos Kozak
d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
AdrianLxM
17867478fb
Merge pull request #524 from MilosKozak/watchfaces 
Watchfaces Andrew
 2017-12-04 23:19:52 +01:00
Milos Kozak
bce6d976b0 max connection time to 120 sec 2017-12-04 20:26:57 +01:00
AdrianLxM
2f235385e0 fix NPE 2017-12-04 20:04:58 +01:00
Milos Kozak
620c56e4cb lowest priority for background calculations 2017-12-04 19:57:09 +01:00
AdrianLxM
c83f966d92 wear timestamps long 2017-12-04 18:40:13 +01:00
Milos Kozak
23e37a8be7 remove unneeded code 2017-12-04 18:13:20 +01:00
AdrianLxM
aefb0d62df
Merge pull request #522 from MilosKozak/dev 
Dev
 2017-12-04 17:53:36 +01:00
Milos Kozak
34fe8d8b60 Merge branch 'staledata' into dev 2017-12-04 13:02:23 +01:00
Milos Kozak
812583059a
Merge pull request #512 from PoweRGbg/patch-3 
ProfileSwitch on graph depending on ScreenSize
 2017-12-04 12:49:01 +01:00
AdrianLxM
53723411c4
fix landscape overview 2017-12-04 10:42:34 +01:00
AdrianLxM
42c61f4e6f synchronized wait 2017-12-03 21:58:35 +01:00
Milos Kozak
5a12d15c8c upgrade build tools 2017-12-03 21:15:12 +01:00
Milos Kozak
4c3e26d19c R: resolve thread deadlock during bolus stop 2017-12-03 20:10:54 +01:00
Milos Kozak
2b2d729f42 remove unsupported code from korean pump 2017-12-03 19:55:23 +01:00