5291 commits

Author	SHA1	Message	Date
Andy Rozman	9bae53e53a	- update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working) ... - it will take some time until code is actually integrated into AAPS, but at least now all files are available	2018-06-10 21:50:50 +01:00
TebbeUbben	97984f8ef3	Improved leftover time display	2018-06-09 23:15:46 +02:00
TebbeUbben	6bc13d9cc0	Don't return false in isStarted if objective has been accomplished	2018-06-09 23:10:54 +02:00
TebbeUbben	0d21a0ab62	Fixed tests	2018-06-09 23:03:31 +02:00
TebbeUbben	005039effc	Objectives styling	2018-06-09 22:07:41 +02:00
TebbeUbben	531a926d00	Close navigation drawer on click	2018-06-09 13:17:26 +02:00
Milos Kozak	30dbbb12a8	Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3 ... Wizard: fully undo "ok" on constraints violation	2018-06-09 11:46:41 +02:00
TebbeUbben	f7597c93d7	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java	2018-06-08 23:30:39 +02:00
TebbeUbben	2d94133175	Plugin descriptions	2018-06-08 21:19:46 +02:00
AdrianLxM	bbf09a62f1	synchronize onDestroyView	2018-06-08 06:20:35 +02:00
AdrianLxM	97bbc00dcf	Don't set text onunbound gui elements	2018-06-08 06:19:02 +02:00
TebbeUbben	38526d64c6	These should not be changed	2018-06-07 23:24:10 +02:00
TebbeUbben	e25ebbdafa	Protection against callback looping	2018-06-07 23:23:10 +02:00
TebbeUbben	aa86a49339	Use real plugin descriptions	2018-06-07 22:55:13 +02:00
TebbeUbben	13cb4c28ed	ConfigBuilder styling	2018-06-07 22:54:27 +02:00
AdrianLxM	d6184cc151	Wizard: fully undo "ok" on constraints violation ... Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056	2018-06-07 22:44:09 +02:00
Roumen Georgiev	4b7f8615bf	Merge pull request #26 from MilosKozak/rsoption ... update	2018-06-07 09:30:22 +03:00
Roumen Georgiev	9e2074433e	remove button if pump is DanaR Korean	2018-06-07 09:26:33 +03:00
Milos Kozak	1d13712aec	nsclient setup wizard tweaking	2018-06-06 22:58:50 +02:00
Milos Kozak	f94d1e85e1	cleanup	2018-06-06 18:32:19 +02:00
Milos Kozak	04fffae811	addd setUserOption to Queue (Dana pumps)	2018-06-06 18:29:40 +02:00
Milos Kozak	d2830d1938	DanaRUserOptionActivity update on pump load	2018-06-06 17:13:58 +02:00
Milos Kozak	bbeca6b83e	cleanup	2018-06-06 16:57:00 +02:00
AdrianLxM	5ec828e16f	restrict local profile DIA to min of 5 on the GUI	2018-06-06 15:18:03 +02:00
Milos Kozak	4adcb88d12	Merge pull request #1067 from jotomo/fill-one-shot-guard ... One-short guards for Fill/Prime dialog.	2018-06-06 08:47:08 +02:00
Milos Kozak	65c8cb22ef	check for null context	2018-06-05 14:38:00 +02:00
Milos Kozak	7e7e921853	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-05 14:37:47 +02:00
Milos Kozak	5df51e8a6e	check for NPE	2018-06-05 14:35:18 +02:00
Roumen Georgiev	4a481bf294	Merge branch 'dev' into dev	2018-06-05 12:45:00 +03:00
Roumen Georgiev	c1b69404d0	files renamed and added icon	2018-06-05 12:19:47 +03:00
AdrianLxM	171209503e	remove unneeded log statement	2018-06-05 00:04:03 +02:00
AdrianLxM	4998ebae89	Merge pull request #1071 from TebbeUbben/new-design ... TabLayout + NavigationDrawer	2018-06-04 23:53:42 +02:00
TebbeUbben	f7b19e37a1	Button for plugin preferences	2018-06-04 21:56:31 +02:00
TebbeUbben	80e9d769e4	Compact version of toolbar	2018-06-04 21:34:21 +02:00
Roumen Georgiev	19e7d507b2	shutdown value can be 0	2018-06-04 10:24:20 +03:00
Roumen Georgiev	1147c28f04	use numberPicker instead of editText	2018-06-04 10:23:01 +03:00
TebbeUbben	9cf9da0d22	MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED	2018-06-03 23:33:49 +02:00
TebbeUbben	263275659a	TabLayout + NavigationDrawer	2018-06-03 23:28:04 +02:00
TebbeUbben	a86c654f8d	Use real TBR cancels and dismiss their alerts	2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt	ef6ee43c32	One-short guards for Fill/Prime dialog.	2018-06-02 18:06:04 +02:00
TebbeUbben	f151cbb0bf	TBR emulation	2018-06-02 16:37:53 +02:00
Roumen Georgiev	054003460c	push new settings to pump	2018-06-01 16:42:56 +03:00
Roumen Georgiev	75dbf71a70	Merge remote-tracking branch 'origin/dev' into dev	2018-06-01 12:11:29 +03:00
Roumen Georgiev	861f9bdd8d	Timeformat reverse	2018-06-01 12:10:08 +03:00
Roumen Georgiev	9569fbf183	Merge branch 'dev' into dev	2018-06-01 12:02:41 +03:00
Roumen Georgiev	85bef0036b	back to original	2018-06-01 11:45:31 +03:00
Roumen Georgiev	4581733cd7	some debugging output and forced getting user options	2018-06-01 11:41:37 +03:00
Roumen Georgiev	319e786988	display 666 in backlightontime if no settings read	2018-06-01 10:08:13 +03:00
Roumen Georgiev	f3d19aa6f4	convert int values to strings	2018-06-01 09:38:18 +03:00
swissalpine	dd60cadd5a	Fix broken cage age	2018-05-31 22:22:22 +02:00
Roumen Georgiev	bbb9c681e6	filling in some data	2018-05-31 17:16:30 +03:00
Roumen Georgiev	41af503104	filling in some data	2018-05-31 17:10:09 +03:00
Roumen Georgiev	da89ea1643	some formatting	2018-05-31 16:47:58 +03:00
Roumen Georgiev	39e704645b	create userOptionsActivity class	2018-05-31 14:45:26 +03:00
Markus M. May	a587f72de2	Fix wrong usage of event in refactored source	2018-05-30 18:09:41 +02:00
Milos Kozak	418f68153e	Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering ... NSClient as source without advanced filtering	2018-05-30 08:08:04 +02:00
Markus M. May	0fe744c3e6	Remove unnecessary assignment	2018-05-29 21:44:33 +02:00
Markus M. May	41503800e8	Remove some duplicate code lines	2018-05-29 20:57:55 +02:00
AdrianLxM	de1196f34b	NSClient as source without advanced filtering	2018-05-29 12:57:07 +02:00
Milos Kozak	35c07d1e60	SW scroll to the top on activity create	2018-05-24 00:13:59 +02:00
Milos Kozak	d642418e02	resolve NPE	2018-05-23 23:43:41 +02:00
Milos Kozak	683caf78f8	SW configure insulin button	2018-05-23 13:47:16 +02:00
Milos Kozak	a7cfcd56e3	SW fix return to 1st page	2018-05-23 13:20:24 +02:00
Milos Kozak	fa2c0ab003	Merge pull request #994 from MilosKozak/startupwizard ... Startupwizard	2018-05-22 23:07:04 +02:00
Milos Kozak	53bdb0bf09	asking permissions to notifications	2018-05-22 23:06:17 +02:00
Milos Kozak	5d27a28dc9	SW eula	2018-05-22 20:02:38 +02:00
Milos Kozak	250f9f74a0	move askForStoragePermission	2018-05-22 18:59:34 +02:00
Milos Kozak	2626e5bb63	SW android permissions	2018-05-22 17:34:09 +02:00
Milos Kozak	4fa24fb009	SW add more texts	2018-05-20 23:44:09 +02:00
Milos Kozak	c723deaf02	SW patient age screen finalization	2018-05-20 22:01:32 +02:00
Milos Kozak	b57683eaf5	SW rename package	2018-05-20 21:55:53 +02:00
Andy Rozman	e8f860be8b	- copied RL code ... - copied Medtronic code - added BLE Scan - added RL Stats activity - added RL configuration display	2018-05-20 20:53:55 +01:00
Milos Kozak	f24d296836	SW nsclient screen finalizing	2018-05-20 21:36:17 +02:00
AdrianLxM	953128ffe5	UAM without advanced filtering	2018-05-20 19:17:46 +02:00
Milos Kozak	52a4f9af14	SW loop screen update	2018-05-20 16:29:15 +02:00
Milos Kozak	d079052944	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard	2018-05-20 16:18:10 +02:00
Milos Kozak	de8557a115	SW sensitivity plugin	2018-05-20 16:17:53 +02:00
Milos Kozak	5b9594bdbb	SW create elements package	2018-05-20 15:09:32 +02:00
Milos Kozak	d0ed4bd717	SWString fix	2018-05-20 15:01:03 +02:00
Milos Kozak	7714aa9138	Merge branch 'dev' into startupwizard	2018-05-20 14:18:58 +02:00
Milos Kozak	53cbe05436	Merge pull request #1019 from McHoffi/obj.7-add-info ... Obj.7 add info about using SMB/maxIOB	2018-05-20 14:14:11 +02:00
Andy Rozman	4aefea0b28	Add constants file and modified status.	2018-05-17 14:21:35 +01:00
Roumen Georgiev	764e035666	remove wizard from backstack and fix the Exit -> returning to SW	2018-05-16 15:35:17 +03:00
Milos Kozak	66e50f5b62	Merge pull request #1038 from jotomo/upstreaming ... [Polish] Dialog/color consistency, translations and other small stuff	2018-05-15 13:09:50 +02:00
Milos Kozak	e58149379a	Merge pull request #1043 from jotomo/issue-646 ... [Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.	2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt	25aa6f859f	On bolus cancel request, cancel all boluses. Partially addresses #646.	2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt	29efe11ece	Combo: always send out progress updates (SMB or not). ... Without this, showing SMB progress on wear is broken. (cherry picked from commit 5ebff72)	2018-05-13 23:20:29 +02:00
TebbeUbben	3103a0f276	Some styling for SW	2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt	d80fecc390	Add T.now, plus, minus methods.	2018-05-13 12:44:47 +02:00
Johannes Mockenhaupt	1883ac06dd	Use TT color for TT confirmations in dialogs.	2018-05-13 12:14:49 +02:00
Andy Rozman	7a388a5715	Little bit of refactoring.	2018-05-12 14:29:02 +01:00
Andy Rozman	2cc4fe4450	Added options Max Bolus and Max Basal ... Little bit of refactoring in Medtronic code	2018-05-12 00:41:44 +01:00
Milos Kozak	4fae6c703c	SW autostart SetupWizard	2018-05-11 13:14:59 +02:00
Milos Kozak	ff2cc04408	SW warn if exported configuration is missing	2018-05-11 13:04:17 +02:00
Milos Kozak	337a3d9776	SW show ObjectivesFragment	2018-05-11 08:30:21 +02:00
Milos Kozak	0a51c86afb	SW Configure APS button	2018-05-11 00:09:35 +02:00
Milos Kozak	376fffa6ec	SW Import settings, Skip wizard	2018-05-10 23:59:20 +02:00
Milos Kozak	8d7df64050	Merge pull request #1016 from MilosKozak/pump-notifications ... Pump notifications	2018-05-10 23:24:45 +02:00
Milos Kozak	e105e5149e	Merge pull request #1032 from jotomo/wear-wizard-tt ... Wear wizard: add TT config option.	2018-05-10 16:53:34 +02:00
Andy Rozman	347d210d06	Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into virtual_pump_Bug863	2018-05-10 12:42:06 +01:00
Andy Rozman	6f19ad1407	Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging.	2018-05-10 12:40:31 +01:00
Roumen Georgiev	91c0b1a2ec	make Objectives visible	2018-05-10 14:36:05 +03:00
Milos Kozak	d5137a061b	Merge branch 'dev' into virtual_pump_Bug863	2018-05-10 13:19:44 +02:00
Roumen Georgiev	016aa1c069	Added insulin descriptions to SW screen	2018-05-10 13:56:50 +03:00
Roumen Georgiev	2fa77d2a8c	Added insulin descriptions to SW screen	2018-05-10 13:49:13 +03:00
Roumen Georgiev	33a6135e75	Added insulin descriptions to SW screen	2018-05-10 13:48:18 +03:00
Roumen Georgiev	06180e3bbd	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-10 12:51:12 +03:00
Milos Kozak	71b44edea6	SW enable loop	2018-05-09 19:34:15 +02:00
Milos Kozak	fb7067b207	SW profile switch	2018-05-09 19:24:20 +02:00
Milos Kozak	1ba828d20a	SWFragment	2018-05-09 18:49:42 +02:00
Roumen Georgiev	e3153230e0	added NSClient followup	2018-05-09 17:11:07 +03:00
Milos Kozak	0060a2ba7f	SW show pump status	2018-05-09 15:10:47 +02:00
Roumen Georgiev	50f8bf2d18	fix for screens adding up	2018-05-09 15:55:02 +03:00
Roumen Georgiev	bfd61a65a0	fix for screens adding up	2018-05-09 15:44:40 +03:00
Roumen Georgiev	41d736e176	updated to latest from Milos	2018-05-09 15:06:34 +03:00
Roumen Georgiev	a7bbf93599	Merge pull request #19 from MilosKozak/startupwizard ... Startupwizard	2018-05-09 14:49:17 +03:00
Roumen Georgiev	0e8f0669c5	Update SWDefinition.java	2018-05-09 14:48:35 +03:00
Milos Kozak	bacb3fb337	SW pump screen	2018-05-09 13:38:17 +02:00
Roumen Georgiev	1f2f2f54fc	added SWCheckbox item	2018-05-09 14:15:53 +03:00
Milos Kozak	ed43eddc83	SWInfotext	2018-05-09 11:55:21 +02:00
Milos Kozak	61a7d69a65	Merge branch 'dev' into startupwizard	2018-05-09 11:41:05 +02:00
Milos Kozak	8c2d0d80ee	Merge pull request #1017 from MilosKozak/notification-height ... Tests required: Notification height	2018-05-09 10:16:29 +02:00
Roumen Georgiev	d5a3177c35	trying pump followup screen -NOT WORKING	2018-05-09 11:06:52 +03:00
Milos Kozak	e29a590cad	Merge pull request #1020 from MilosKozak/dia-refactor ... default DIA	2018-05-08 23:43:54 +02:00
Roumen Georgiev	85d4ef4419	trying pump followup screen	2018-05-08 17:09:37 +03:00
Roumen Georgiev	e357c7fd1b	adding pump selection	2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt	ce6e53e9c6	Wear wizard: add TT config option.	2018-05-08 13:28:01 +02:00
Markus M. May	b0d8d547d8	Add isConnected, enable NSClient only, if really connected to internet	2018-05-07 20:43:13 +02:00
Andy Rozman	c03b4f6780	Minor change in plugin util.	2018-05-07 13:52:21 +01:00
Andy Rozman	41205d4ba7	Merge branch 'dev' into riley_link_medtronic	2018-05-07 12:11:38 +01:00
Andy Rozman	fb45bad8d9	Removed .orig	2018-05-07 12:06:47 +01:00
Andy Rozman	af56304669	Initial commit after dev was merged into here	2018-05-07 12:05:53 +01:00
Johannes Mockenhaupt	785c402848	LP: Don't notify about invalid values during editing.	2018-05-07 02:11:59 +02:00
AdrianLxM	cdc8e45f32	Merge pull request #1015 from jotomo/lemming-treatment ... Fix finding BG in graph for treatments before the first displayed BG.	2018-05-06 19:51:01 +02:00
McHoffi	9d367c1fa1	Update ObjectivesFragment.java	2018-05-06 18:18:34 +02:00
AdrianLxM	f0351834ff	default DIA	2018-05-06 12:49:03 +02:00
Johannes Mockenhaupt	56cbac3b4d	Leftover MainApp.gs rewrite.	2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt	ef70c1f244	MainApp.sResources.getColor -> MainApp.gc.	2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt	b9c649bd68	Uso blue/orange for carbs/insulin in confirmation dialogs. ... Aligns with the graph's use of using blueish colors insulin and orange for carbs stuff.	2018-05-06 11:46:09 +02:00
AdrianLxM	1ac41323e6	fix notification last line cutoff	2018-05-05 21:55:49 +02:00
AdrianLxM	116222858e	update lastApproachingDailyLimit	2018-05-05 21:12:09 +02:00
AdrianLxM	d99fafe375	restrict aproaching daily limit to once every 30 minutes RS	2018-05-05 21:10:15 +02:00
AdrianLxM	5458df0907	restrict aproaching daily limit to once every 30 minutes Rv2	2018-05-05 21:08:17 +02:00
AdrianLxM	c2315b7bea	restrict aproaching daily limit to once every 30 minutes R-Korean	2018-05-05 21:03:35 +02:00
AdrianLxM	b43eff8e55	restrict aproaching daily limit to once every 30 minutes R	2018-05-05 21:02:31 +02:00
AdrianLxM	70b2b1502f	restrict wrong password notification to once every 30 seconds	2018-05-05 20:59:11 +02:00
AdrianLxM	c8c7e12056	Wrong password notification	2018-05-05 20:54:10 +02:00
AdrianLxM	246c8922df	Korean wrong password notification	2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt	1e0b7d331a	Fix finding BG in graph for treatments before the first displayed BG. ... (cherry picked from commit 8bdafe3)	2018-05-05 19:13:38 +02:00
Johannes Mockenhaupt	d15ada5cd9	Combo: Fix visual glitch in fragment.	2018-05-04 21:27:54 +02:00
Milos Kozak	f5a23b2921	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 19:18:52 +02:00
AdrianLxM	f511b9ed39	Merge pull request #1000 from MilosKozak/bolusprogress-dismiss ... IDEA: dismiss bolus progress dialog when Queue is empty	2018-05-04 19:03:11 +02:00
Andy Rozman	4fb8e899c2	Feature Request/Bug #863 ... - merged with dev - extended PumpType with new setting in PumpDescription - added Insight pump settings for VirtualPump	2018-05-04 15:48:46 +01:00
Milos Kozak	57973d4d3a	Merge pull request #1001 from jotomo/carbs-gen-refactor ... Extract and deduplicate eCarbs generation	2018-05-04 16:10:23 +02:00
Milos Kozak	61e6404bbe	Merge pull request #995 from MilosKozak/wear-wizard ... Wear eCarbs	2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt	35a6bbb6a7	Set CareportalEvent.MEALBOLUS for eCarbs.	2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt	43cc3c4908	Extract CarbsGenerator class.	2018-05-04 14:18:55 +02:00
Milos Kozak	963f1e1abf	Merge branch 'dev' into startupwizard	2018-05-04 13:26:40 +02:00
swissalpine	10b67a0c11	Update GraphData.java	2018-05-04 12:31:11 +02:00
AdrianLxM	5c8e99b191	dismiss bolus progress dialog when Queue is empty	2018-05-04 12:24:37 +02:00
Andy Rozman	f2df13dbfb	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 10:06:18 +01:00
Milos Kozak	91f3db782d	SWButton rename option to text	2018-05-04 10:20:22 +02:00
Milos Kozak	55661ca7a0	SWButton	2018-05-04 10:17:50 +02:00
swissalpine	010a2f3fd8	Make deviation bars transparent	2018-05-04 10:04:45 +02:00
Milos Kozak	88d964f135	SW reuse save, cleanup	2018-05-04 09:35:57 +02:00
AdrianLxM	c34cc73b1e	fix wear wizard	2018-05-03 23:08:16 +02:00
AdrianLxM	8d6997f519	ecarb ignore 0 carbs	2018-05-03 22:08:54 +02:00
AdrianLxM	61f07da1a2	ecarb doECarb	2018-05-03 22:08:43 +02:00
AdrianLxM	c69a541b75	ecarb ash first response	2018-05-03 22:08:27 +02:00
Milos Kozak	d1958a3e2d	Merge branch 'dev' into startupwizard	2018-05-03 21:31:55 +02:00
Milos Kozak	02590ddd72	SW remove unneeded code	2018-05-03 21:29:34 +02:00
Milos Kozak	cc532b9107	SWRadioButton cleanup	2018-05-03 20:13:27 +02:00
Milos Kozak	94db444acb	SW validator, language, cleanup	2018-05-03 20:06:13 +02:00
Milos Kozak	36265ab1c6	SWPlugin	2018-05-03 18:41:47 +02:00
Andy Rozman	421946269a	Merge branch 'dev' into riley_link_medtronic	2018-05-03 17:23:23 +01:00
Andy Rozman	f6110bd096	Merge branch 'virtual_pump_Bug863' into riley_link_medtronic	2018-05-03 16:54:03 +01:00
AdrianLxM	62a38ed537	wearwizard fix NPE when CobInfo not available - missing part	2018-05-03 17:49:22 +02:00
AdrianLxM	b37b892eea	wearwizard fix NPE when CobInfo not available	2018-05-03 17:49:17 +02:00
AdrianLxM	fe0f2e3ce6	wearwizard settings on phone	2018-05-03 17:49:13 +02:00
AdrianLxM	c394c045c9	wearwizard reduced watch settings	2018-05-03 17:49:09 +02:00
AdrianLxM	bdfce784c0	wearwizard ensure watch apk is up to date	2018-05-03 17:49:05 +02:00
AdrianLxM	ec106726a7	wearwizard trend	2018-05-03 17:49:01 +02:00
AdrianLxM	24dd4e1710	wearwizard cob	2018-05-03 17:48:54 +02:00
Andy Rozman	f4648e44b2	- minor changes	2018-05-03 16:31:23 +01:00
Andy Rozman	5b8779f8a7	Feature Request/Bug #863 ... - added PumpCapability (to set boolean values) - added Dana Pumps to PumpType and to VirtulaPumps array	2018-05-03 15:10:34 +01:00
Roumen Georgiev	515590cdf6	other screens	2018-05-03 17:04:56 +03:00
Roumen Georgiev	425ba77200	other screens	2018-05-03 16:59:23 +03:00
AdrianLxM	012593a480	Update NotificationStore.java	2018-05-03 12:18:48 +02:00
Roumen Georgiev	083730f476	WIP: BGSOURCE screen	2018-05-03 09:02:16 +03:00
Andy Rozman	416bd2ff41	Feature Request/Bug #863 ... - added package PumpCommon for common pump files - added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType - added PumpType which contains all definitions for pumps - extended fragement to display Pump Type and Pump Type definitions - extended plugin to read configuration and set pumpDescription object - extended pref_virtualpump to add pump type selection	2018-05-02 23:59:33 +01:00
Milos Kozak	e5ed63a46f	fix name on future profile switches	2018-05-03 00:13:49 +02:00
Milos Kozak	a35c925930	Merge pull request #983 from jotomo/issue-939 ... WIP: Fix bolus progress dialog not closing with onPause/onResume cycle	2018-05-02 23:20:29 +02:00
Johannes Mockenhaupt	396268d9c8	Send invalid boluses (prime boluses) to watch.	2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt	599c87f794	Combo: better error message when initialization fails.	2018-05-02 22:48:57 +02:00
Milos Kozak	a64bfe7a39	Merge pull request #977 from MilosKozak/persistent-text ... show bg missing not no profile	2018-05-02 22:38:07 +02:00
Milos Kozak	f9bbb72831	Merge pull request #979 from MilosKozak/lp-ps-always ... LP: Allow ProfileSwitch before pump is connected.	2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt	79458a1c73	Ignore harmless errors (un)subscribing to the message bus.	2018-05-02 22:36:52 +02:00
Milos Kozak	28430cc757	fix cob calculation	2018-05-02 22:35:51 +02:00
Milos Kozak	e2f28e0ae4	fix rounding on bolus delivery	2018-05-02 22:20:27 +02:00
AdrianLxM	a3421316ac	Allow ProfileSwitch before pump is connected. ... https://github.com/MilosKozak/AndroidAPS/issues/969	2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt	3b19db14fd	Clean up.	2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt	22e90743aa	Fix #939.	2018-05-02 21:24:06 +02:00
AdrianLxM	eb594c1867	show bg missing not no profile	2018-05-02 21:09:04 +02:00
Milos Kozak	4cc952900d	show progress reason from iobcobthread	2018-05-02 18:39:37 +02:00
Johannes Mockenhaupt	c51635dba4	Watch: colored preds.	2018-05-02 16:01:40 +02:00
Milos Kozak	e562d0f437	Merge pull request #957 from triplem/charging_merged ... Charging merged	2018-05-02 15:04:00 +02:00
AdrianLxM	926ee535d5	use MainApp.gs instead of context 2	2018-05-02 14:28:16 +02:00
AdrianLxM	d289c5c7d7	use MainApp.gs instead of context	2018-05-02 14:27:23 +02:00
AdrianLxM	3f3959f785	use MainApp.gs instead of getString from Activity/Dialog 2	2018-05-02 14:21:53 +02:00
AdrianLxM	611d761a41	use MainApp.gs instead of getString from Activity/Dialog	2018-05-02 14:16:40 +02:00
AdrianLxM	4a22fd355d	Merge remote-tracking branch 'milosremote/dev' into use-gs	2018-05-02 14:11:45 +02:00
AdrianLxM	5aa3a88c7f	remove direct access to sResources 9	2018-05-02 13:59:27 +02:00
AdrianLxM	166f2843df	remove direct access to sResources 8	2018-05-02 13:58:52 +02:00
AdrianLxM	de4643d16f	remove direct access to sResources 8	2018-05-02 13:57:28 +02:00
AdrianLxM	74d0c71712	remove direct access to sResources 7	2018-05-02 13:51:24 +02:00
AdrianLxM	545d1d1586	remove direct access to sResources 6	2018-05-02 13:50:31 +02:00
AdrianLxM	0e4e36f2b1	remove direct access to sResources 5	2018-05-02 13:49:24 +02:00
AdrianLxM	3979913a6d	remove direct access to sResources 4	2018-05-02 13:46:38 +02:00
AdrianLxM	2af62d8e4e	remove direct access to sResources 3	2018-05-02 13:42:50 +02:00
AdrianLxM	a8382daefd	remove direct access to sResources 2	2018-05-02 13:36:56 +02:00
AdrianLxM	81ad2779bc	remove direct access to sResources 1	2018-05-02 13:32:41 +02:00
AdrianLxM	cfaa26d337	remove one more gs helper	2018-05-02 13:28:58 +02:00
AdrianLxM	20263c9fe4	remove other gs helper methods	2018-05-02 13:17:57 +02:00
AdrianLxM	73b41a7162	some more gs	2018-05-02 13:12:08 +02:00
AdrianLxM	7b6402de09	use gs function in MainApp to get strings	2018-05-02 13:05:22 +02:00
AdrianLxM	2749c1c853	refactor cob string	2018-05-02 11:19:03 +02:00
AdrianLxM	24bd509ec6	COB in ongoing notification	2018-05-02 08:30:37 +02:00
AdrianLxM	c445c078e1	add g to default COB as well	2018-05-02 08:30:34 +02:00
AdrianLxM	915dac8ef3	COB in external status	2018-05-02 08:30:28 +02:00
AdrianLxM	f75329f5dc	move COB string representation to CobInfo	2018-05-02 08:30:23 +02:00
Roumen Georgiev	15f4f64c4f	using View.generateId() instead of fixed value	2018-05-02 09:22:26 +03:00
Andy Rozman	4b121ae892	- copied roundtrip2 project into here (for easier use), some of it might be reused ... - added PumpCommon - added PumpMedtronic	2018-05-01 22:44:53 +01:00
Markus M. May	2d3d39d1dc	Use common helper method for day calculation	2018-05-01 23:43:18 +02:00
Markus M. May	a46b038381	use correct number format	2018-05-01 23:34:40 +02:00
Markus M. May	de92125967	Fixes wrong algo	2018-05-01 22:49:44 +02:00
Markus M. May	306d45bb3e	Fix Boolean thingy	2018-05-01 22:15:22 +02:00
Markus M. May	02e9ce105c	Add boolean thingie from Adrian ;-)	2018-05-01 22:01:08 +02:00
Markus M. May	12d80e96ef	Merge latest dev version	2018-05-01 21:56:33 +02:00
Markus M. May	e91fd00836	Add Unit-Test, as well as fixtures for SSID handling	2018-05-01 21:46:37 +02:00
Milos Kozak	dbca668afd	Merge pull request #952 from jotomo/rainbow ... Fix missing predictions in graph, color them.	2018-05-01 20:10:59 +02:00
Milos Kozak	537be09493	Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance ... Make persistent notification not peak on every update on Oreo.	2018-05-01 20:08:17 +02:00
Milos Kozak	eb7b67781c	Merge pull request #947 from jotomo/issue-940 ... Don't create empty future carbs records. Fixes #940.	2018-05-01 20:07:46 +02:00
Milos Kozak	c991673de1	Merge pull request #948 from MilosKozak/zerotempiob ... fix zeroTempIOB	2018-05-01 20:06:32 +02:00
Johannes Mockenhaupt	af563474d5	Skip predictions below 40.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	1e80ca22c6	Don't draw invalidated SMBs.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	ee61a71181	Sort predictions so they're properly displayed in the graph. ... GraphView library requires a series to be ordered by the x-value.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	5ef7506e5f	Clean up prediction colors.	2018-05-01 19:16:28 +02:00
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	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
Roumen Georgiev	3f0c2958c7	WIP: change of language works	2018-04-30 16:41:40 +03: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
Roumen Georgiev	a0463742fa	WIP: language set and validation	2018-04-27 17:04:08 +03:00
Roumen Georgiev	bb38d7644b	move onClick in SWRadioButton	2018-04-27 13:30:45 +03: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
Roumen Georgiev	11dc20faca	code cleanup	2018-04-26 16:59:56 +03:00
Roumen Georgiev	ef171dbccd	get SP value and check if it is already set	2018-04-26 16:13:08 +03:00
Roumen Georgiev	67ed699ca5	save() before showing next	2018-04-26 15:59:08 +03:00
Roumen Georgiev	59f654f918	show "NEXT" only when isValid() == true	2018-04-26 15:28:23 +03:00
Roumen Georgiev	d75de2f645	show "NEXT" only when isValid() == true	2018-04-26 15:18:01 +03: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
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
Roumen Georgiev	dc91e3a544	currentScreen not updating - fixed & center fields	2018-04-25 17:02:10 +03:00
Roumen Georgiev	8333fe8975	get radiobutton values from arrays.xml & no header	2018-04-25 16:45:15 +03:00
Roumen Georgiev	ddf3c44928	rename show() to generateDialog()	2018-04-25 15:34:07 +03:00
Roumen Georgiev	7fb1b32188	moved show() method to SWItem classes	2018-04-25 15:29:20 +03: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
Roumen Georgiev	dda7ca3f95	radio group is generated dynamically	2018-04-25 11:03:33 +03: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
Andy Rozman	99544e1f2b	Pre start for Medtronic plugin	2018-04-23 19:47:51 +01: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
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
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
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
Milos Kozak	c4db1c5e2d	move quickwizard preferences under overview	2018-04-21 21:58:07 +02:00
Milos Kozak	cab592efb5	overview preferences cleanup	2018-04-21 21:31:42 +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	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	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	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
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	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	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
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	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
TebbeUbben	df7d93ab2a	Check for TDD support in updateGUI	2018-04-08 20:33:07 +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	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	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	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	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
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	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
Milos Kozak	ad74a9ba9a	fix errors in tests	2018-04-02 10:29:19 +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
Milos Kozak	5a192d82d0	read pump status after pump driver change	2018-04-01 20:04:54 +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
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	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	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	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	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	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	90390c91ab	fix NPE when profile doesn't exists	2018-03-24 15:13:31 +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	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	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	01a9e76827	refactor a bit	2018-03-19 18:45:23 +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	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
Milos Kozak	b0a9f678f0	limitRunningLoop constraint	2018-03-19 13:11:25 +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
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
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	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	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
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	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	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	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	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
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	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
Milos Kozak	bd03c678d1	Merge pull request #748 from TebbeUbben/dev ... Added some debug lines and missing digit in isThisProfileSet	2018-03-11 16:54:55 +01:00
TebbeUbben	46a1be97f7	Added some debug lines and missing digit in isThisProfileSet	2018-03-11 16:42:47 +01:00
Milos Kozak	2c21571cf4	fix NPE	2018-03-11 16:38:30 +01:00
Milos Kozak	6cf849ce76	allow 30min basal rates when pump supports it	2018-03-11 16:03:21 +01:00
Roumen Georgiev	60c4986ffa	Removed unneeded conversion to Md/dl which leads to a mgDl targets always	2018-03-11 09:06:50 +02:00
TebbeUbben	51da08bf97	Undo history sync delay change	2018-03-10 21:27:50 +01:00
TebbeUbben	7329d3abff	Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev	2018-03-10 21:24:04 +01:00
TebbeUbben	cd309780d1	Update to Asclepenius ... Ability to change basal profile	2018-03-10 21:21:53 +01:00
Milos Kozak	2cd7a8e8df	Merge pull request #738 from MilosKozak/unify-target ... Unify target	2018-03-10 21:19:49 +01:00
Milos Kozak	8a197f41dc	Merge branch 'dialogmmol' into dev	2018-03-10 19:25:41 +01:00
Milos Kozak	ec1c43b905	carbs dialog: defaults for mmol, i18n	2018-03-10 19:22:31 +01:00
Milos Kozak	951ad26590	cleanup	2018-03-10 17:58:45 +01:00
AdrianLxM	6904cb8807	Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true ... enable SMB notify by default	2018-03-08 15:17:28 +01:00
AdrianLxM	5a5e0ca8b6	Merge pull request #734 from MilosKozak/watchsmb2 ... Watchface overhaul	2018-03-08 15:10:53 +01:00
AdrianLxM	b880a9bb10	unify target calculation 2	2018-03-08 15:04:48 +01:00
AdrianLxM	768f61bc07	unify target calculation	2018-03-08 15:04:38 +01:00
AdrianLxM	5f614b4072	TT unify target calculation	2018-03-08 15:04:30 +01:00
swissalpine	2d797e8ce3	Update StatuslinePlugin.java	2018-03-06 16:23:56 +01:00
swissalpine	237d55ee85	Add whitespace to xDrip status line ... ... which was removed by the last fix.	2018-03-06 11:21:44 +01:00
Johannes Mockenhaupt	090e1b13f8	Add basic Engineering mode. ... - Insight plugin disabled unless EM enabled - Closed loop constrainted unless EM enabled.	2018-03-05 22:45:00 +01:00
AdrianLxM	414f92bdf8	no double whitespace	2018-03-05 20:50:21 +01:00
AdrianLxM	d2919f9577	Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2	2018-03-04 19:25:26 +01:00
PoweRGbg	ca9150ba5b	more readable low TT message	2018-03-04 16:06:54 +02:00
PoweRGbg	37b96d7e31	remove unused import (RadioButton)	2018-03-04 15:59:17 +02:00
AdrianLxM	7d8674aa61	fix 5m-impact parameter - always was 0	2018-03-02 21:09:09 +01:00
Roumen Georgiev	6443502808	reduced if...else to single line as Adrian suggested	2018-03-02 16:41:25 +02:00
Roumen Georgiev	ea29b6ad82	propper conversion from MMOL to MgDl	2018-03-02 16:33:53 +02:00
Roumen Georgiev	6c75b1b317	more readable var names and	2018-03-02 15:28:32 +02:00
Roumen Georgiev	e923bf2156	As Adrian asked .... Profile.toMgDl()	2018-03-02 15:09:03 +02:00
Roumen Georgiev	f3a12be0be	renaming ESMCheckbox to startEsTTCheckbox	2018-03-02 14:53:19 +02:00
Roumen Georgiev	9dd129bbe6	Revert "Update MainApp.java" ... This reverts commit d3a7176209. reverting changess to app/src/main/java/info/nightscout/androidaps/MainApp.java	2018-03-02 10:37:12 +02:00
Roumen Georgiev	ab39536876	Only one TT can be selected	2018-03-02 10:12:05 +02:00
Milos Kozak	ed11bb1d70	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-02 00:00:09 +01:00
Milos Kozak	c61fcdbe3f	allow 15 & 30 pump disconnection	2018-03-01 23:59:44 +01:00
PoweRGbg	b3a10b47ce	undo the RadioButton tests	2018-03-01 21:57:30 +02:00
PoweRGbg	3edec79b8d	fixing identation and equals() to ==	2018-03-01 21:41:52 +02:00
PoweRGbg	2fb0e6edc1	format using the Profile class method and Constants	2018-03-01 18:40:06 +02:00
PoweRGbg	c6a46129df	format using the Profile class method and Constants	2018-03-01 18:38:56 +02:00
PoweRGbg	65ddf5ced5	format using the Profile class method and Constants	2018-03-01 18:31:29 +02:00
Johannes Mockenhaupt	d679481698	Remove unused method.	2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt	8f813d52fa	WatchUpdaterService: process requests in a separate thread. ... Previously, requests were executed on the main thread (base class is Service, not IntentService), which prompted Android to kill AAPS multiple times a day due to timeouts (of currently unknown origins). (cherry picked from commit 5ae45d5)	2018-03-01 16:12:41 +01:00
Roumen Georgiev	bea486d816	Don't show confirmation on empty message/input	2018-03-01 16:57:36 +02:00
Roumen Georgiev	38933ac323	Adding Eating soon TT check to carbs ... I use that a lot for meal anouncement only	2018-03-01 16:27:52 +02:00
Roumen Georgiev	d3a7176209	Update MainApp.java	2018-03-01 15:20:00 +02:00
Roumen Georgiev	5b003c62e2	added fix for mmol profiles & targets	2018-03-01 14:07:35 +02:00
AdrianLxM	e5e76113cc	Disable Insight by default	2018-03-01 11:09:57 +01:00
Roumen Georgiev	7ca1fdc36e	removed unused var	2018-03-01 11:54:24 +02:00
Roumen Georgiev	9baea01225	Not everybody's profile & targets are in mg/dl :)	2018-03-01 11:32:00 +02:00
Milos Kozak	bd6fab3ca3	Merge pull request #721 from jamorham/floatmaxbasal ... Make openapsama_current_basal_safety_multiplier Double instead of Int	2018-02-26 10:46:29 +01:00
Jamorham	805548dd1e	Make openapsama_current_basal_safety_multiplier Double instead of Integer	2018-02-25 21:30:11 +00:00
Milos Kozak	e93cfacb4f	fix insulin pattern	2018-02-25 21:55:22 +01:00
Milos Kozak	a1a3b14b18	fix displaying profile name if Ignore profile switch is checked	2018-02-25 21:13:27 +01:00
Milos Kozak	f62cac1b66	make new i & c buttons visible by default	2018-02-25 17:52:30 +01:00
Milos Kozak	7b91f0d490	allow to open G5 app from CGM button	2018-02-25 17:33:46 +01:00
Milos Kozak	32f2f4d6fa	Merge branch 'g5cal' into buttons	2018-02-25 15:31:43 +01:00
Milos Kozak	cb8fc905bb	catch if G5 app is missing	2018-02-25 15:23:25 +01:00
Milos Kozak	7e49f9039c	access overview preferences from configbuilder	2018-02-25 11:15:26 +01:00
Milos Kozak	a7da0bb67a	Merge pull request #719 from jotomo/buttons ... Moar buttons.	2018-02-25 11:05:21 +01:00
Milos Kozak	b18c16ce3b	Merge pull request #708 from jotomo/watch-carb-only-request ... Watch: don't bother pump with carbs if pump doesn't support it.	2018-02-25 10:10:09 +01:00
AdrianLxM	436e03aa03	wear only print valid boluses	2018-02-24 18:10:59 +01:00
AdrianLxM	6d3048a9b1	wear predictions update on loop run	2018-02-24 17:58:05 +01:00
Milos Kozak	31f7670f43	Merge pull request #716 from jamorham/dev ... Improve Insight Connector life-cycle handling	2018-02-23 22:26:52 +01:00
Jamorham	4b630a1ac6	Remove inactive experimental code	2018-02-23 09:16:48 +00:00
Jamorham	7854a51cc0	Remove commented out old code	2018-02-23 09:15:47 +00:00
Jamorham	cd95a0f5dd	Insight: better connector lifecycle handling	2018-02-23 09:00:08 +00:00
Milos Kozak	9d3c69e1b4	Merge pull request #709 from jamorham/dev ... Add Fabric Privacy option	2018-02-23 07:30:46 +01:00
Jamorham	b989cf5a3c	Revert NSClient service to previous for PR	2018-02-22 13:27:43 +00:00
Jamorham	9d985ec3b7	Add FabricPrivacy	2018-02-22 12:30:36 +00:00
Milos Kozak	dbab6b6809	Merge pull request #705 from jamorham/dev ... Updated Insight plugin	2018-02-21 22:56:02 +01:00
Johannes Mockenhaupt	87a7249997	Watch: don't bother pump with carbs if pump doesn't support it.	2018-02-21 21:09:23 +01:00
Johannes Mockenhaupt	b6b86e8f4a	Show SMBs in graph on lower end of target area.	2018-02-21 16:54:57 +01:00
AdrianLxM	c22c22f1d7	wear settings for predictions	2018-02-21 15:56:13 +01:00
JamOrHam	bc2f749ef3	Merge branch 'dev' into dev	2018-02-21 13:43:18 +00:00
AdrianLxM	c6a3efb60e	wear adaptive prediction timeframe	2018-02-21 14:23:52 +01:00
Jamorham	67b397b417	Insight: preemptive connection preference option	2018-02-21 12:23:19 +00:00
AdrianLxM	88ea215f66	add boluses to wear payload	2018-02-20 12:27:47 +01:00
Milos Kozak	59744fbd1d	fix NPE	2018-02-19 23:28:07 +01:00
McHoffi	6ed8aceff3	Update WearPlugin.java	2018-02-19 20:52:10 +01:00
Milos Kozak	220c099591	last connection fix RS,Rv2	2018-02-19 20:37:51 +01:00
Milos Kozak	d3c23f6c33	allow to override zero base basal on combo	2018-02-19 10:44:15 +01:00
Milos Kozak	eeeda92857	do not add 30s to carbs time in Rv2 and RS	2018-02-19 07:44:31 +01:00
Milos Kozak	a063fb05b4	G5 calibration button	2018-02-19 00:22:27 +01:00
Milos Kozak	92c7f2ee75	log pump unreachable	2018-02-18 22:55:04 +01:00
Jamorham	2f1efc7d06	Duplicate Visibility fix from dev	2018-02-18 15:07:36 +00:00
Jamorham	208c3ed9b1	Don't wake screen in QueueThread use PARTIAL_WAKE_LOCK instead	2018-02-18 15:00:24 +00:00
Jamorham	9a76cdb3a1	Insight: add preemptive connection, keep-alive, statistics	2018-02-18 14:57:28 +00:00
Jamorham	448ebbc7bf	Add FeatureRunning event triggered by activities	2018-02-18 14:27:30 +00:00
Johannes Mockenhaupt	a42d95df14	Unbreak unit test.	2018-02-18 13:33:24 +01:00
Milos Kozak	8812428078	Merge pull request #690 from triplem/rework_configbuilder ... Minor cleanup based on feedback of jomoto	2018-02-18 12:51:02 +01:00
Milos Kozak	0fe287bb79	Merge pull request #689 from AdrianLxM/smb-wear2 ... no wear vibrations on SMB (optional)	2018-02-18 12:39:36 +01:00
Milos Kozak	bc440817b8	Merge pull request #691 from swissalpine/patch-2 ... Set a higher hard limit for IC ratio	2018-02-18 12:36:10 +01:00
Johannes Mockenhaupt	832138398f	Crappy hack to deal with applying the first profile switch.	2018-02-18 11:53:41 +01:00
Johannes Mockenhaupt	bf2e567f9c	Moar buttons.	2018-02-18 11:06:36 +01:00
Johannes Mockenhaupt	1e3f6dd192	Disable wear plugin by default.	2018-02-18 02:20:49 +01:00
AdrianLxM	36b838fc49	remove switch-missing notification on profile switch	2018-02-18 02:13:21 +01:00
AdrianLxM	7b3d370564	Notification on missing profile switch	2018-02-18 01:10:27 +01:00
AdrianLxM	59a1e007ad	block if no profile switch is set	2018-02-18 00:55:37 +01:00
Johannes Mockenhaupt	d155616c0b	Minor fixes.	2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt	2bccf13213	Add shortname for G5.	2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt	52aa27de05	Sanity check bolus timestamp on start, after bolusing.	2018-02-16 17:33:59 +01:00
swissalpine	2613f6735f	Set a higher hard limit for IC ratio ... As written in a comment and in the AAPS thread, I think the new upper hard limit of the IC ratio is to low, for childs but also for me (that's why I found the problem). I run a profile with IC = 60 g when I do long lasting sports activities, the limit of 40 is much to low - and I'm shure that there are childs which have a higher IC ratio in real life. I propose the value of 100 which is relativly compared not as high as the hard limit MAXISF = 720 mg/dl.	2018-02-16 06:43:47 +01:00
Markus M. May	b5969d4279	Minor cleanup based on feedback of jomoto	2018-02-15 20:33:03 +01:00
AdrianLxM	a23c76f473	Merge branch 'dev' into smb-wear2	2018-02-14 15:03:45 +01:00
AdrianLxM	c821ef97d8	option to enable wear/SMB notifications	2018-02-14 15:02:04 +01:00
AdrianLxM	7270b0b2f5	no wear vibrations on SMB	2018-02-14 14:59:26 +01:00
Milos Kozak	bf6e3a9061	run calculation after interval change	2018-02-14 07:47:22 +01:00
Johannes Mockenhaupt	df4ad822fc	Make new behaviour configurable, default on. ... (cherry picked from commit f807592)	2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt	1cd4e72541	Create NS-anouncements for error dialogs and local alerts. ... (cherry picked from commit 0df796d)	2018-02-13 20:44:50 +01:00
Johannes Mockenhaupt	c5e0eb9968	Don't disconnect after history read when queue is busy. ... Temporary hack, ComboPlugin.runCommand will still run commands synchronously.	2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt	aae9f7d153	Show notification to check pump date if last bolus is older than 24h.	2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt	3ff56c7fa2	Disable unfinished dialogs.	2018-02-13 19:30:48 +01:00
Milos Kozak	4cdadaf0c4	IobCobPlugin specify loading time	2018-02-13 19:12:02 +01:00
Milos Kozak	31d493d8ae	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-13 18:38:55 +01:00
Milos Kozak	3e06b6a4ed	Merge pull request #687 from jotomo/error-announcements ... Create NS-anouncements for error dialogs and local alerts.	2018-02-13 18:08:14 +01:00
Johannes Mockenhaupt	f8075927f2	Make new behaviour configurable, default on.	2018-02-13 00:34:24 +01:00
Jamorham	d3bf4fd026	History intent updates for Asclepius compatibility	2018-02-12 21:27:35 +00:00
Milos Kozak	a6a937ba20	IobCobCalculatorPlugin as a param for GraphData	2018-02-12 20:07:39 +01:00
Milos Kozak	0ab2d5ba38	unstatic IobCobCalculatorPlugin	2018-02-12 19:49:08 +01:00
Johannes Mockenhaupt	0df796d3f4	Create NS-anouncements for error dialogs and local alerts.	2018-02-12 15:42:58 +01:00
Milos Kozak	97834e3fef	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-12 13:44:57 +01:00
Milos Kozak	5d408daefd	remove displaying deviation slope	2018-02-12 13:42:50 +01:00
Johannes Mockenhaupt	b6c5326524	NotificationStore: clean up access to store, avoid potential deadlock.	2018-02-12 12:43:23 +01:00
Johannes Mockenhaupt	ee1efa4f7f	NotificationStore: add synchronisation when accessing internal store.	2018-02-12 11:15:59 +01:00
Milos Kozak	d92a7e8ef1	Merge branch 'history' into dev	2018-02-11 23:46:20 +01:00
Milos Kozak	fa2e46fbe5	remove CPP profile	2018-02-11 23:02:21 +01:00
Milos Kozak	943205c782	HardLimits refactor	2018-02-11 22:41:10 +01:00
Milos Kozak	5dd0f70686	Merge pull request #682 from jotomo/insight-hide-your-constraint ... Only show Insight as pump plugin in config tab.	2018-02-11 21:09:54 +01:00
Johannes Mockenhaupt	e80559c948	Only show insight as pump plugin in config tab.	2018-02-11 19:51:03 +01:00
Milos Kozak	e4891683b5	fix NPE in profile	2018-02-11 14:40:07 +01:00
Milos Kozak	23396ed80b	Merge pull request #675 from triplem/configbuilder ... Refactoring ConfigBuilder - cleanup fragment visibility	2018-02-10 23:48:07 +01:00
Johannes Mockenhaupt	d40a4bf57e	Merge pull request #55 from AdrianLxM/comborc01 ... links unten in über	2018-02-10 15:19:17 +01:00
Milos Kozak	359b8401b2	Merge pull request #678 from jamorham/dev ... Updates to Insight plugin	2018-02-10 15:13:35 +01:00
AdrianLxM	c5057f3d5a	remove unused import	2018-02-10 14:55:29 +01:00
AdrianLxM	4587a47840	add links to about	2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt	573c818eb7	Combo: Answer detected TBR mismatches.	2018-02-10 14:33:44 +01:00
Jamorham	046de51496	Insight few small changes	2018-02-10 09:29:23 +00:00
Markus M. May	a1bb67d425	Refactoring ConfigBuilder - cleanup fragment visibility	2018-02-08 22:23:48 +01:00
Johannes Mockenhaupt	1985ed379d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message. (cherry picked from commit 43755f0)	2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt	7fa51a9248	Revert: Combo: retry twice to establish connection before giving up. ... Only increases number of failed connection attempts.	2018-02-08 22:15:36 +01:00
Milos Kozak	538f70a725	Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered ... Don't treat an extended bolus as bolus if it emulates basal	2018-02-08 21:08:10 +01:00
Milos Kozak	5c7c430ee4	Merge pull request #673 from jotomo/bolus-error-dialog-sound ... Bolus error dialog / sound	2018-02-08 21:07:21 +01:00
Milos Kozak	6f487aded5	Merge pull request #674 from jotomo/ext-bolus-query-race-condition ... Avoid race condition using active extended bolus.	2018-02-08 21:06:26 +01:00
Johannes Mockenhaupt	f888e0d7ab	Avoid race condition using active extended bolus. ... (cherry picked from commit 5b7c0cc)	2018-02-08 20:44:42 +01:00
Johannes Mockenhaupt	483ecadede	Fix dutch translation for Combo's last bolus, minor cleanup. ... (cherry picked from commit c0cf06a)	2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt	46ea4be4eb	ComboFragment: display last bolus regardless of age. ... (cherry picked from commit 197874e)	2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt	6b36dd27d8	Don't create a cancel record for requests to cancel a TBR when none is running. ... (cherry picked from commit a46b475)	2018-02-07 22:08:16 +01:00
Johannes Mockenhaupt	43755f071d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message.	2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt	6fb5f5bad4	Check result.success when hard cancelling TBR. ... (cherry picked from commit 654f984)	2018-02-07 15:30:02 +01:00
Jamorham	bda1866c6d	Do our own history merging for TBRs	2018-02-07 13:36:06 +00:00
AdrianLxM	599b04c4ff	Don't treat an extended bolus as bolus if it emulates basal	2018-02-06 19:31:04 +01:00
Johannes Mockenhaupt	c781601cbb	Commit missing string.	2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt	e9f0fa3c04	Warn when finding multiple boluses in the same minute with same amount. ... Not much can be done if the user manages to bolus multiple boluses within the same minute, with the same amount. This should almost never happen, but if it does, at least warn the user one of those boluses isn't accounted for wrt to IOB.	2018-02-05 23:58:19 +01:00
Johannes Mockenhaupt	a861afa208	Log bolus amount when saving to DB failed.	2018-02-05 23:19:43 +01:00
AdrianLxM	0c0f68d510	Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault ... Don't enable Insight by default	2018-02-05 23:16:48 +01:00
Johannes Mockenhaupt	5b21844423	Did it again.	2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt	e812c7119f	Fix setting 'pumpHistoryChanged'.	2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt	f07017a4f6	Document global state variables.	2018-02-05 23:14:25 +01:00
Jamorham	693c3ef8ad	Store in history exactly what we enact	2018-02-05 22:11:26 +00:00
AdrianLxM	8e69573710	Merge pull request #668 from savek-cc/careportal-bg-update ... fix display unit when updating careportal entry for historic bg value	2018-02-05 22:47:46 +01:00
Timm Korte	9713836e69	fix display unit when updating careportal entry for historic bg value	2018-02-05 22:35:08 +01:00
Jamorham	6a9b293e49	Improved TBR cancelling	2018-02-05 14:39:55 +00:00
AdrianLxM	36608559af	Don't enable Insight by default	2018-02-05 14:11:54 +01:00
Jamorham	44ba10e00c	Insight treat 100% TBR from absolute as cancel	2018-02-05 11:33:00 +00:00
Milos Kozak	9fd8ad8705	Merge pull request #665 from jotomo/graph-target-line-fix ... Graph: fix rendering target line for ranges from profiles.	2018-02-04 22:32:33 +01:00
Johannes Mockenhaupt	b5c35dea71	Graph: fix rendering target line for ranges from profiles.	2018-02-04 22:01:30 +01:00
Milos Kozak	4b061d1a51	Merge pull request #652 from savek-cc/careportal-bg-update ... update bg for treatment in the past via careportal	2018-02-04 21:54:33 +01:00
Jamorham	1d169bc27f	Better calculation for Absolute basal from Tebbe	2018-02-04 19:14:02 +00:00
Jamorham	501ca5c597	Fix for some TBR cancels getting through	2018-02-04 12:57:10 +00:00
Johannes Mockenhaupt	8c25bc4002	Answers cleanup.	2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt	f573265bc2	Add target line to graph. ... Uses the middle if a range is specified to show what the loop aims for.	2018-02-04 00:34:14 +01:00
Johannes Mockenhaupt	87771e8753	A few fixes.	2018-02-03 23:44:17 +01:00
Johannes Mockenhaupt	956a611af4	Fix checking/updating history. ... (cherry picked from commit 5413a0f)	2018-02-03 22:07:42 +01:00
Johannes Mockenhaupt	2a5c28cf6b	ReadQuickInfoCommand: only read as many boluses as are available. ... (cherry picked from commit 7857abb)	2018-02-03 22:07:41 +01:00
Johannes Mockenhaupt	183edfcc09	When checking for changed pump history, compare the last two records. ... This ensures changes are also detected if a bolus was added on the pump within the same minute of the previous record.	2018-02-03 20:03:30 +01:00
Johannes Mockenhaupt	1e8e2a59fd	ReadHistoryCommand: fetch records including the requested timestamp. ... To ensure we retrieve records with the same timestamp.	2018-02-03 19:56:27 +01:00
Johannes Mockenhaupt	6fded4c1bd	ComboPlugin.deliverBolus: avoid creating boluses within the same minute.	2018-02-03 19:32:00 +01:00
Johannes Mockenhaupt	72e4cd29c4	Extend ReadQuickInfoCommand to read more history records. ... Also remove switch to forego quick info, which really isn't the cause of the infamous bug, but is now required with the updated history check logic against timestamp dups. (cherry picked from commit 18aa827)	2018-02-03 19:31:01 +01:00
Johannes Mockenhaupt	ec4280bc2e	Fix creating a seconds-based bolus record based on minute and bolus. ... (cherry picked from commit f8848be)	2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt	f6c5b95904	Merge remote-tracking branch 'origin/master' into combo-scripter-v2 ... * origin/master: Revert "Update strings.xml" bump 1.58 Update strings.xml Add issue template. Enhance insulin plugin test filter null BT devices BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. ES translations Dana plugin refactoring KO language cleanup Update strings.xml Update strings.xml Bg translation add RO language CS translations ButterKnife to Dana fragment bump 1.57a-dev Add a unit test for Insulin Plugin # Conflicts: # app/build.gradle # app/src/main/res/values-de/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml	2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt	435c4dee85	Create Answer events when adding bolus to DB fails. ... (cherry picked from commit 947ea4f)	2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt	6c9effd027	Minor cleanup to reduce merge noise. ... (cherry picked from commit 4015f73)	2018-02-03 16:33:50 +01:00
Timm Korte	c33232108d	remote unused import	2018-02-03 14:57:36 +01:00
Timm Korte	c4a5285c24	update bg for treatment in the past via careportal	2018-02-03 12:00:59 +01:00
AdrianLxM	b21fac92e9	revert min_5m_carbimpact to int	2018-02-02 22:46:52 +01:00
AdrianLxM	4f05917467	autosens deactivated -> 1	2018-02-02 22:45:18 +01:00
Milos Kozak	0832ae9491	Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change ... Do not loop for SMB treatment change	2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt	5adaff6bc6	Don't run loop on treatment change if it's an SMB.	2018-02-02 21:27:05 +01:00
Johannes Mockenhaupt	eedd2ee28b	Add bg/treatment to EventNewBG/EventTreatmentChange.	2018-02-02 19:04:28 +01:00
Jamorham	8e2fe7eaec	Insight ConstraintsInterface and Mstatus response type	2018-02-02 15:09:20 +00:00
Milos Kozak	9797f6e5f4	fix NPE	2018-02-02 15:33:19 +01:00
Milos Kozak	bb21f2ae7b	fix NPE	2018-02-02 15:31:25 +01:00
Milos Kozak	d9cfe15b87	fix rendering absolute basal line	2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt	a07a4beaf8	Combo: update timestampOfLastKnownPumpBolusRecord after bolusing.	2018-02-02 11:59:11 +01:00
Milos Kozak	6312b81e10	Merge branch 'smb060' into dev	2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt	1f06d801a2	Combo: retry twice to establish connection before giving up. ... (cherry picked from commit a16560a)	2018-02-02 10:06:04 +01:00
Milos Kozak	411add616b	Merge pull request #632 from jamorham/dev ... Add Insight Pump Plugin	2018-02-02 09:21:57 +01:00
Milos Kozak	72eed13932	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-02 09:17:51 +01:00
Milos Kozak	727ace4cc1	check for NPE	2018-02-02 09:17:26 +01:00
Johannes Mockenhaupt	26e7834093	Clean up, no behavioral changes and a bigger bed.	2018-02-02 00:40:24 +01:00
Milos Kozak	c953086e3d	Merge branch 'smb-events' into 'smb060' ... Let IobCob handle EventNewBg and loop act on IobCob result. See merge request MilosKozak/AndroidAPS!379	2018-02-01 22:13:59 +00:00
Milos Kozak	36cb4fc474	recover deviation slope calculation	2018-02-01 22:57:58 +01:00
Jamorham	cdb3bc24c2	Use Config.DANAR to enable Insight	2018-02-01 21:37:21 +00:00
AdrianLxM	96668cbf9b	check for null profile	2018-02-01 18:45:48 +01:00
Jamorham	b3c0daaeae	Enable isRefillingCapable	2018-02-01 17:39:28 +00:00
Milos Kozak	416c9f817b	fix smb iob calculation	2018-02-01 17:12:19 +01:00
Milos Kozak	d088bfccc8	remove unused microBolusInsulin	2018-02-01 16:35:04 +01:00
Jamorham	6a12b0a931	Use bolus id for history entry	2018-02-01 14:37:16 +00:00
Jamorham	73ea3628b2	Extracted insight strings	2018-02-01 10:33:54 +00:00
Milos Kozak	fa46798fdf	remove unused microBolusIOB	2018-02-01 10:57:05 +01:00
Milos Kozak	e779dbf221	fix merge conflict	2018-02-01 10:29:00 +01:00
Jamorham	7f73c59530	Nightscout + UI performance improvements	2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt	c62ca89931	Fix adding a partial bolus to treatments.	2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt	b32351145a	Fix 'last bolus' not being displayed on start.	2018-01-31 13:55:25 +01:00
Johannes Mockenhaupt	98d666098b	Remove now unused PumpState.delivered field.	2018-01-31 13:54:42 +01:00
Johannes Mockenhaupt	1ba3a85655	Add DetailedBolusInfo.copy() method.	2018-01-31 13:54:15 +01:00
Johannes Mockenhaupt	1aee181f62	RuffyScripter: fix reading basal rate when no TBR is active	2018-01-31 12:54:25 +01:00
Johannes Mockenhaupt	344984e201	Fix recording partially delivered boluses.	2018-01-31 12:36:41 +01:00
Johannes Mockenhaupt	5bb8bdde3e	BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now.	2018-01-31 11:59:30 +01:00
Jamorham	d07d9d309e	Implement additional methods	2018-01-31 09:53:31 +00:00
Johannes Mockenhaupt	8be8f961ae	Answer ruffy warnings. ... (cherry picked from commit b73a822)	2018-01-31 02:02:02 +01:00
Johannes Mockenhaupt	4defd40023	RuffyScripter: clean up answers. ... (cherry picked from commit 0c30e1b)	2018-01-31 01:35:31 +01:00
Jamorham	ce0650a495	Check remote protocol version	2018-01-31 00:33:10 +00:00
Jamorham	c3b07d2a0f	Match library refactoring	2018-01-31 00:31:55 +00:00
Johannes Mockenhaupt	6108e9f17a	Fix basal rate check.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	1107d00571	Fix pump state display during init. ... (cherry picked from commit 3967c4b)	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	6981c0fec6	Pump needs rest. ... (cherry picked from commit 2e88fb9)	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	154902acdc	Fix ReadHistoryCommand not reading errors, TDDs.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	e790c87940	Cleanups and strings.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	34db941c29	Remove unused code to import TBRs from the pump.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	3db7aedb06	Fix activity indicator during on-connect-checks.	2018-01-31 00:09:38 +01:00
Johannes Mockenhaupt	c7cccf3220	Read quick info first when checking history.	2018-01-31 00:08:39 +01:00
Johannes Mockenhaupt	ecd16c26b8	ComboFragment: disable buttons when running.	2018-01-31 00:04:17 +01:00
Johannes Mockenhaupt	d08958e43f	Remove dead ruffyscripter code.	2018-01-30 23:16:45 +01:00
Johannes Mockenhaupt	a8cca7fcea	Remove duplication in ruffyscripter commands.	2018-01-30 23:16:27 +01:00
Milos Kozak	fada51c380	Merge pull request #597 from triplem/test ... Add a unit test for Insulin Plugin	2018-01-30 22:47:33 +01:00
Markus M. May	f68d8f1626	Cleanup Refactoring	2018-01-30 19:33:10 +01:00
AdrianLxM	3a0d5d73f8	filter null BT devices	2018-01-30 01:02:21 +01:00
Jamorham	ff0256345f	Display more live pump data	2018-01-29 22:55:53 +00:00
Milos Kozak	af3b77e646	history browser initial work	2018-01-29 22:48:47 +01:00
Jamorham	ef2189fec6	Insight faux cancel tbr option	2018-01-29 21:31:06 +00:00
Markus M. May	2a1bfe1f6c	merge changes on foodhelper	2018-01-29 22:23:20 +01:00
Markus M. May	9a7e57f0a0	rename event to stay in compliance to naming conventions	2018-01-29 22:20:18 +01:00
Markus M. May	147448afca	#557 - Encapsulate food plugin	2018-01-29 22:20:18 +01:00
Markus M. May	7d669fbeb8	Make food working, adopt category selection slightly	2018-01-29 22:20:18 +01:00
Markus M. May	a78652f737	This needs to get reverted, but for testing purposes...	2018-01-29 22:20:18 +01:00
Markus M. May	f31eabcefe	Minor update to show off the possiblities for the refactoring. This is just a short step, major improvements are still to come.	2018-01-29 22:20:18 +01:00
Markus M. May	9cb019f5ca	#557 - showoff of possible refactorings - see REFACTOR.md for additonal details	2018-01-29 22:20:18 +01:00
Johannes Mockenhaupt	216359312a	Minor non-code tweaks.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	2468f23e97	ComboFragment: i18n last bolus.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	5fbd9097d8	Rename ReadReservoirLevelAndLastBolus to ReadQuickInfoCommand.	2018-01-29 20:02:17 +01:00
Johannes Mockenhaupt	739e52dc47	Remove CommandResult.lastBolus in favour of CR.history.bolusHistory.	2018-01-29 20:01:53 +01:00
Roumen Georgiev	5e24289387	show output in mmol like in AMA	2018-01-29 16:43:45 +00:00
Johannes Mockenhaupt	3adda9bf6e	Clean up bolus delivery code.	2018-01-29 13:18:49 +01:00
Milos Kozak	c2dc3f9848	Merge branch 'danas' into smb060	2018-01-29 12:01:53 +01:00
Milos Kozak	d6f9dd819c	Merge branch 'smb-misc' into 'smb060' ... Smb misc See merge request MilosKozak/AndroidAPS!381	2018-01-29 10:50:27 +00:00
Milos Kozak	e55f88a255	Merge branch 'smb-apsresult' into 'smb060' ... Clean up parsing OpenAPS result and applying it See merge request MilosKozak/AndroidAPS!383	2018-01-29 10:46:40 +00:00
Milos Kozak	4cef8db54b	Dana plugin refactoring	2018-01-29 11:24:03 +01:00
Johannes Mockenhaupt	038ea06abc	Log history reads. ... (cherry picked from commit 7326f29)	2018-01-29 10:08:28 +01:00
Johannes Mockenhaupt	449dbd79f7	Rename TBR to 'temp basal'	2018-01-29 03:14:10 +01:00
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
Johannes Mockenhaupt	2b995a8a73	RufyfScripter: log active/previous command in error routines.	2018-01-28 23:56:27 +01:00
Johannes Mockenhaupt	864100299d	Set activity indicator for refresh button.	2018-01-28 23:39:57 +01:00
Johannes Mockenhaupt	262fdf92c8	Check pump basal rate matches cached profile, force re-read otherwise.	2018-01-28 23:39:53 +01:00
Jamorham	07cdee0533	Insight CancelBolusTaskRunner refactor	2018-01-28 22:35:26 +00:00
Johannes Mockenhaupt	9f5ffc6646	Actually do something with the basal rate profile after force-reading.	2018-01-28 23:23:44 +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
Johannes Mockenhaupt	eb7ec24335	Don't read pump TBR history.	2018-01-28 22:33:05 +01:00
Johannes Mockenhaupt	3fde47d283	Move ruffyscripter to combo plugin package.	2018-01-28 22:16:58 +01:00
Johannes Mockenhaupt	6c4c662c31	Remove RuffyCommandsV1Impl.	2018-01-28 22:14:31 +01:00
Johannes Mockenhaupt	10d2b8739f	Log commands to Fabric.	2018-01-28 22:10:11 +01:00
Johannes Mockenhaupt	6609eb6be5	Cleanup.	2018-01-28 21:56:56 +01:00
Johannes Mockenhaupt	302d3494d2	Covering 105% of all failure cases.	2018-01-28 19:53:44 +01:00
Johannes Mockenhaupt	3b7045227e	Only check reservoir level before bolus if data is available.	2018-01-28 19:04:46 +01:00
Johannes Mockenhaupt	bd87a893c2	Best effort to handle multiple boluses within the same minute. ... (cherry picked from commit cc9094f)	2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt	3a95c3c4d9	More work for bolusing with pump history records. ... (cherry picked from commit 4bc3e42)	2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt	8c27b32d07	Let "Initializing" be a pump state, not an action.	2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt	cd385a3217	ComboFragment: deal with resevoir levels being available or not.	2018-01-28 15:43:50 +01:00
Johannes Mockenhaupt	e3abe04545	Bring back last bolus to combo fragment. ... (cherry picked from commit 108349e)	2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt	5de588b540	Enable reading reservoir level units. ... This partially reverts commit b4998feee1.	2018-01-28 15:27:59 +01:00
Johannes Mockenhaupt	b3a60eb5ab	Initial work on basing boluses on pump history.	2018-01-28 15:22:41 +01: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
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
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
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
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
Johannes Mockenhaupt	3d1f8c0893	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Disable release build checks until wear lib upgrade (#620). Rv2,RS: use safe carb diff 30s	2018-01-26 16:19:45 +01:00
Milos Kozak	d8a6c0d111	Rv2,RS: use safe carb diff 30s	2018-01-26 15:47:45 +01:00
Johannes Mockenhaupt	61bb6aa1ba	Combo: declare as not supporting carb infos.	2018-01-26 13:53:50 +01:00
Johannes Mockenhaupt	372e435761	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Fix format specifiers in Spanish translation, add MainApp.gs(id, args). travis accept license manually Push carbs only to pumps supporting storing carbs. travis to 27.0.2 sdk27 & butterknife	2018-01-26 13:53:42 +01:00
Johannes Mockenhaupt	4a1970926c	Cleanup.	2018-01-26 13:53:17 +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	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
Johannes Mockenhaupt	5dcf214d08	Fix German translation.	2018-01-25 20:10: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	947203b107	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix not attached to the activity check for no profile check for no profile Fix namespace errors. Add missing ids to other overview layouts. Overview: make checkbox labels toggle state as well. minimum of 30 min for unreachable alert	2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt	ed1226ae67	Push carbs only to pumps supporting storing carbs.	2018-01-25 13:22:01 +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	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
Johannes Mockenhaupt	c469edb5a3	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-25 03:28:06 +01:00
Johannes Mockenhaupt	f7ed34532a	Fabric-Log combo init to get an idea of user count.	2018-01-25 03:28:06 +01: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
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
Johannes Mockenhaupt	01d49f9e52	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix storing food to the database remove forgotten log delete all dbrequests from query	2018-01-24 02:15:45 +01:00
Johannes Mockenhaupt	ae1707ead3	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: log RS history RS: reset isConnected & isConnecting on error RS BLE modifications	2018-01-24 02:06:02 +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
Johannes Mockenhaupt	0eba153d8a	Combo: add 'base basal rate' to fragment. ... (cherry picked from commit 2873da5)	2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt	b7f8913cae	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Careportal DB browser fix rendering treatments with duration more autosens logging cancel extending bolus on pump disconnection set maxiob=0 only for objective 4 fix stopping bolus connection error	2018-01-23 02:04:02 +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
Johannes Mockenhaupt	0553754d8f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: synchronized access to basal_v	2018-01-21 17:01:27 +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
Johannes Mockenhaupt	8fda1a678f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: better handling of wrong profiles	2018-01-21 14:13:46 +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	20c218ae9a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Overview: move checkboxes before label. fix pump unreachable for virtual pump getLastAutosensData improvement and logging remove readstatus prior every command bump 1.57-dev better log build verison to Fabric # Conflicts: # app/build.gradle	2018-01-19 21:05:37 +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	91a6c7a96c	Merge branch 'dev' into smb060	2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt	723bcc4ee3	Remove 'queued activities' from ComboFragment. ... (cherry picked from commit 57a4449)	2018-01-15 11:11:58 +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	89b7b9c24a	better log build verison to Fabric	2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt	d54b99c559	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cleanup gradle build files Add null check in ConfigBuildPlugin.getTempBasalFromHistory. Avoid race condition checking for an active TBR. Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). # Conflicts: # app/build.gradle	2018-01-13 23:18:44 +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
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
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	b4998feee1	Disable reading reservoir level units.	2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt	06d949cd82	Avoid race condition checking for an active TBR.	2018-01-10 10:48:44 +01:00
Johannes Mockenhaupt	9a74b0fb95	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix canceling temp in open loop mode. credits to @warstar2187 prevent basal updated messages on virtual pump added BolusWizardTest prefill profile switch JSON from local store if not exists PARTIAL_WAKE_LOCK for NSClientService	2018-01-09 20:59: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	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
Johannes Mockenhaupt	968431d931	i18n reservoir unit.	2018-01-07 13:02:50 +01:00
Milos Kozak	ab89e16acd	PARTIAL_WAKE_LOCK for NSClientService	2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt	d72c243140	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check 30min interval only for basal rates	2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt	117b79619b	Check reservoir level before bolus and abort if not enough left.	2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt	836abd74ab	Read reservoir level.	2018-01-07 11:21:56 +01:00
Milos Kozak	8cf69006b2	check 30min interval only for basal rates	2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt	3369d84de8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: basal updated notification Dialogs usability tweaks	2018-01-06 16:27: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
Johannes Mockenhaupt	3aafcc9854	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cockpit watch face: Double-tap opens MainMenuActivity prevent processing incomplete profiles set defaults for display range actual bg in objective 1 warn if wrong profile is detected	2018-01-06 00:30:04 +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
Johannes Mockenhaupt	ead299442a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: allow old data on the wf request new data on preference change accept local NS data broadcast even when ns_upload_only is selected remove logging	2018-01-04 21:38:19 +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	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	bf25af8c42	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Check activity != null before drawing graph.	2018-01-03 21:18:12 +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
Johannes Mockenhaupt	abdad220f6	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: improve GUI response narrower temp basal line for steampunk watchface darker and gracile steampunk-chart Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. move steampunk md to main dir Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit. Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). Steampunk watch face - unit testing complete. Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low"). Steampunk watchface (moto360 support - ignores the chin) Steampunk watchface (mmol support) Includes delta granularity in the watch preferences. Steampunk watchface (interim commit) Steampunk watch face addition of mmol/L drawable Steampunk watch face layout changes Steampunk watch face (for testing) Steampunk watch face (not yet functional) Steampunk watch face (not yet functional)	2018-01-03 20:16:50 +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
Johannes Mockenhaupt	fd8f2c0801	Clean up unintended diversions from upstream.	2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt	53a8cd4eac	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing file illegalState crash fix combo-bolus-fix	2018-01-03 18:28:17 +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
AdrianLxM	1bbd9012cb	Merge pull request #37 from jotomo/the-clock-strikes-midnight ... Correctly infer pump date when crossing midnight. Fixes #35.	2018-01-02 13:28:30 +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
Johannes Mockenhaupt	cbf005a11e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: another cob fix	2018-01-01 15:07:34 +01:00
Milos Kozak	d2753e0dad	another cob fix	2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt	1617d6698d	Update ComboPlugin for updated ContstraintsInterface.	2018-01-01 13:26:16 +01:00
Johannes Mockenhaupt	8fb8182f4f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Objectives update	2018-01-01 13:25:36 +01:00
AdrianLxM	3bfffdb1b0	brackets on string format	2018-01-01 01:23:30 +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
Johannes Mockenhaupt	8ee95077a8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix objective 1 upload aps status and iob when loop is suspended fully offline CP Queue: synchronize creating queue thread to avoid multiple threads. Wear: No guard for RS	2017-12-31 11:41:41 +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
Johannes Mockenhaupt	a6b938d98a	Correctly infer pump date when crossing midnight. Fixes #35. ... (cherry picked from commit bda2551)	2017-12-31 00:27:41 +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
Johannes Mockenhaupt	99f3fb6216	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: autofix error in profile	2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt	58d5c25703	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing cob fix missing inheritance	2017-12-30 19:57:53 +01:00
Milos Kozak	f3db104979	autofix error in profile	2017-12-30 19:56:37 +01:00
Johannes Mockenhaupt	5ecc0ea430	Fix crash in Combo fragment when accessing resoures.	2017-12-30 19:53:22 +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	f658da42a7	Abort bolusing when reading initial state fails. ... Otherwise request time is zero and and any old bolus will be regarded as the last bolus delivered when recovery kicks in. Also add a safety check to not count a bolus bigger than the requested bolus as a partially delivered bolus.	2017-12-30 15:51:26 +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
Johannes Mockenhaupt	d0f876659e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Ensure basal rate shown as a percentage if required according to user preferences. Show watch basal rates, whether temporary or normal.	2017-12-28 00:15:05 +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
Johannes Mockenhaupt	f970e5e20e	Minor cleanups.	2017-12-27 21:16:03 +01:00
Johannes Mockenhaupt	0e61032dec	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml	2017-12-27 18:19:51 +01:00
Milos Kozak	3df0e8f9ce	Merge branch 'dev' into smb060	2017-12-27 18:02:06 +01:00
Johannes Mockenhaupt	ee1236c4e4	ComboPlugin: assume valid BR unless proven otherwise. ... (cherry picked from commit bc93a4b)	2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt	3333d7a6b7	Clean up all the basal rate sanity checks. ... * Disable loop entirely if no valid basal rate is set on the pump. Neither closed nor open loop mode makes sense without it. * Check active BR before updating the pump profile * Show 'loop disabled' state in Combo fragement. * Cancel active TBR when basal profile switch to profile != 1 is detected or when an unsupported bolus is active.	2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt	88b3857fb9	Clean up pump init.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	6af28479d6	Disable loop if unsupported basal rate profile is selected. Fixes #31.	2017-12-27 12:28:01 +01:00
AdrianLxM	79d05488c3	RS create bond	2017-12-27 02:24:26 +01:00
Johannes Mockenhaupt	c84ba24c77	Provide message when setting basal profile fails. Fixes #29.	2017-12-27 01:33:54 +01:00
Johannes Mockenhaupt	715ffa28d2	Remove empty Combo prefs.	2017-12-27 01:33:42 +01:00
Johannes Mockenhaupt	3266cb4944	Don't show ComboPlugin as constraints plugin.	2017-12-27 01:33:38 +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
Johannes Mockenhaupt	a8e0a4dfe8	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: don't show single connection timeouts on the watch	2017-12-25 20:52:16 +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
Johannes Mockenhaupt	ea5629fc86	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: fix non smooth ratio graph fix of fix fix wrong button type fix doubled percentage when comming from NS proper select last used profile when using profile percentage limit basal rate to minimal value supported by pump SingleClickButton RS fix crash when pairing is not confirmed on pump Double -> double use joda-time Use autosensdata for wizard instead of APSResult	2017-12-25 20:29:32 +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
Johannes Mockenhaupt	d081345da2	Define lowest non-zero basal rate as minimum basal rate for the Combo.	2017-12-25 11:05:51 +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
Johannes Mockenhaupt	7073688920	Update ComboPlugin to match updated PumpInterface.	2017-12-22 10:46:54 +01:00
Johannes Mockenhaupt	bd0ae23e30	Merge branch 'dev' into csv2-staging ... * dev: fix disconnecting pump format output date to be displayed on iDevices correctly BolusWizard use 0 for insulin correction if in range LocalProfile TimeListEdit min, max remove string with no default translation Rv2,RS fix loading events initialize lastCommandTime too after BT reset allow to read status after every command	2017-12-22 10:39:30 +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
Johannes Mockenhaupt	42418d4146	ComboFragment: make warning/error bold for a better readability. ... On lower DPI devices they're already bold, but on higher DPI devices the yellow "Low" is hardly discernible from white. (cherry picked from commit 693ba73)	2017-12-21 22:45:27 +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
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
Johannes Mockenhaupt	3b43e4d06a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: RS enable BT before scanning BG viewer NSOffline remove from queue as well NS offline # Conflicts: # app/src/main/res/values/strings.xml	2017-12-20 20:21:12 +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
Johannes Mockenhaupt	4094b0dd61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wait a few sec before disconnection for another command	2017-12-20 19:42:13 +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	7c04f528cc	Revert "Handle edge case of setting basal rate in range 0.00 - 0.05." ... This reverts commit 2054e76cde.	2017-12-20 18:06:50 +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
Johannes Mockenhaupt	3880c5ff61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent	2017-12-20 16:46:35 +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	2054e76cde	Handle edge case of setting basal rate in range 0.00 - 0.05.	2017-12-20 16:40:45 +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
Johannes Mockenhaupt	a3db2136e1	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java	2017-12-20 13:28:41 +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
Johannes Mockenhaupt	40edb9ff5c	Don't update pump basal profile during startup. ... * Avoids issues of no profile being set yet * Making startup take minutes * KeepAlive will update profile as needed every 5m.	2017-12-20 13:01:24 +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
Johannes Mockenhaupt	181338e9e2	Another NPE check for failure scenarios.	2017-12-20 00:04:14 +01:00
AdrianLxM	e11a4f6d42	Use autosensdata for wizard instead of APSResult	2017-12-19 22:41:43 +01:00
Johannes Mockenhaupt	715366b2b4	Don't consider pump initialized if updating basal profile on start failed.	2017-12-19 22:24:46 +01:00
Johannes Mockenhaupt	0e20a148e2	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status # Conflicts: # app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java	2017-12-19 21:18:18 +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
Johannes Mockenhaupt	28961da253	Declare profile switches being supported by the Combo.	2017-12-19 00:00:00 +01:00
Andrew Warrington	b180569695	Show watch basal rates, whether temporary or normal.	2017-12-18 21:58:02 +01:00
Johannes Mockenhaupt	9eefae4f67	Merge branch 'queue-bolus-constraints' into combo-scripter-v2 ... * queue-bolus-constraints: Apply bolus constraint before applying. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java	2017-12-18 21:06:31 +01:00
Johannes Mockenhaupt	8e68a23225	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: G5 upload to xdrip fake Esel new file fake Esel Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications # Conflicts: # app/src/main/res/values/strings.xml	2017-12-18 20:22:26 +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
Johannes Mockenhaupt	34f3428d99	ComboPlugin.setTempBasal: clean up, fix potential bug. ... (cherry picked from commit 41c45a1)	2017-12-17 15:39:38 +01:00
Andrew Warrington	a0983a99b9	Merge remote-tracking branch 'origin/dev' into watchfaces	2017-12-17 11:52:34 +01:00
AdrianLxM	ca9b68da0d	refactor cancelAlarm back to KeepAliveReceiver	2017-12-17 01:40:27 +01:00
AdrianLxM	14810a142d	push next alert on read status	2017-12-17 01:37:27 +01:00
Johannes Mockenhaupt	fd71ab6b68	Update fake reservoir numbers to trigger default NS warnings. ... (cherry picked from commit 6e5f9fc)	2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt	92d0630c55	Fix partial bolus displayed in error popup.	2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt	a6a87d0790	Minor fixes and polish around bolus cancellation.	2017-12-15 10:41:07 +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
Johannes Mockenhaupt	b6bc957813	Minor tewaks and cleanups.	2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt	618e00d71d	Update bolus progress dialog when recovery kicks in.	2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt	67eb6b20ed	Handle errors when reading the history for verification fails.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	25f46fe601	Cleanup.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	7eb40653b2	The pump doesn't accept connections while a bolus delivery is in progress. ... Remove the code which checked for a bolus delivery in progress and waited.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	a169245dc3	On bolusing failure, attempt verify by reading last bolus from history.	2017-12-13 20:39:08 +01:00
Milos Kozak	fa4e80444d	NSOffline remove from queue as well	2017-12-13 20:03:24 +01:00
Johannes Mockenhaupt	71355f0421	Typo that typo and other minor cleanups.	2017-12-13 16:29:53 +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
Johannes Mockenhaupt	f83dd1cb67	Unbreak RuffyCommandsV1Impl.readHistory, cleanups.	2017-12-12 00:57:04 +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
Johannes Mockenhaupt	a5ea94de7d	Fix #12: properly update TBR from pump on mismatch.	2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt	ca9fe3e755	Fixes around bolus cancellation.	2017-12-10 01:39:58 +01:00
Milos Kozak	cd1327fc9e	Merge branch 'dev' into smb	2017-12-10 00:36:47 +01:00
Johannes Mockenhaupt	fe281b9224	Minor cleanups.	2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt	26fa63d571	ComboFragment: always show refresh button. ... To allow force starting a conecting attempt if the pump is still in disconnected state.	2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt	471beae14c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: remove unused imports adapt wear actions to command queue RS report unsupported firmware removing the whole if() statement fix NPE when profile not loaded fix of extended bolus size Added profile's target BG in NSClient mode	2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt	3316ab2081	ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	8699d9a384	Add missing listener registration.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	27e9cfda6f	Overhaul Combo tab buttons and dialogs.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	063a5ba6b9	Only read Tdd and Alerts through buttons on Combo tab, not treatment history.	2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt	a7f07b26f9	Pump time warning: urgency level based on how much the time is off.	2017-12-09 19:43:53 +01:00
AdrianLxM	4d356096cf	Check pump time not last connection time	2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt	d2f2266a2b	Re-add warning if pump time is off (needed for basal rates).	2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt	cf142a4538	Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel ... Verify and return delivered bolus amount in BolusCommand	2017-12-09 19:41:16 +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
Johannes Mockenhaupt	b409b737e5	On connect, take over TBR CANCELLED warning and raise message. Fixes #9.	2017-12-09 17:33:11 +01:00
AdrianLxM	21f91b9b29	remove unused imports	2017-12-08 14:58:13 +01:00
Johannes Mockenhaupt	f09464e5d6	Move detection of partial bolus delivery to BolusCommand. ... Have BolusCommand verify delivered bolus if needed and return the actually delivered bolus amount. This makes more sense now, given history is only read if unavoidable.	2017-12-08 12:56:15 +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
Johannes Mockenhaupt	87ab6432c6	Revert "Custom: Disable Crashlytics." ... This reverts commit 015a852ab5.	2017-12-07 18:19:27 +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
Johannes Mockenhaupt	60d6f305b5	Debug code.	2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt	de06c54f1d	Minor cleanups in ComboPlugin.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	b0d55b09d4	Minor cleanups around the Command queue.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	86b63cb27d	Combo tab: show command queue if non-empty.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	51b51c159c	Clean up earlier merge blunder.	2017-12-06 12:12:25 +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	d21a2bd691	Overview: fix predictions checkbox disappearing after unchecking it.	2017-12-06 11:35:58 +01:00
Johannes Mockenhaupt	5caec45760	Fix add bolus record from pump history when bolus was cancelled.	2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt	0f034dd662	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check for duration in json untranslatable strings greek language check for null queue logging	2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt	960cb92789	Remove idle-disconnect-monitor and let the command queue take care of that.	2017-12-05 23:17:05 +01:00
Milos Kozak	455383cfd5	check for duration in json	2017-12-05 22:08:37 +01:00
Johannes Mockenhaupt	21fc05a707	Remove ComboPlugin.checkHistory().	2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt	f9867c69fb	Remove warning if pump time is off.	2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt	7b88ec9e93	Device-Status: provide pseudo-levels or reservoir.	2017-12-05 21:07:49 +01:00
Milos Kozak	a293f86978	Merge branch 'dev' into smb	2017-12-05 17:36:44 +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
Johannes Mockenhaupt	01c52e753c	Remove 'sync to profile' pref.	2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt	ada5301361	Cleanups.	2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt	68af342eeb	Update combo stuff to work with new queue.	2017-12-05 00:54:08 +01:00
Johannes Mockenhaupt	e7d49f2300	Merge branch 'no-history-for-you' into combo-scripter-v2 ... * no-history-for-you: When bolusing, only read history in case of error or cancellation. Cleanups. Remove lastBolus, reservoirLevel. Use timestamp for TBR, not pump minutes. Rework checkAndResolveTbrMismatch to update from pump to AAPS only. ComboFragment: move forced history read to long-pressing the TDD button. More steps towards reducing comms amount. Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. Remove last bolus, units display of reservoir level from Combo fragment. # Conflicts: # app/src/main/res/values/strings.xml	2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt	bf9f877b3d	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: (68 commits) max connection time to 120 sec make chart zoomable again fix NPE lowest priority for background calculations wear timestamps long remove unneeded code fix landscape overview synchronized wait fix build tools for travis try to fix travis upgrade build tools R: resolve thread deadlock during bolus stop remove unsupported code from korean pump handle bolus stop prior to delivery correctly fix translations better logging Revert unnecessary change. Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face. gradle update parse more iso formats ... # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/info/nightscout/androidaps/Config.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java # app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java # app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_others.xml # app/src/main/res/xml/pref_wear.xml # gradle/wrapper/gradle-wrapper.properties # wear/build.gradle	2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt	98ba0fbf87	When bolusing, only read history in case of error or cancellation.	2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt	8c04d12904	Cleanups.	2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt	85e20a8977	Remove lastBolus, reservoirLevel.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	4c1c1c43a3	Use timestamp for TBR, not pump minutes.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	1735842e57	Rework checkAndResolveTbrMismatch to update from pump to AAPS only.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	141c116db6	ComboFragment: move forced history read to long-pressing the TDD button. ... To avoid accidentally doing this when a short press on Refresh was intended.	2017-12-05 00:08:42 +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
Johannes Mockenhaupt	fe40ebd4a5	More steps towards reducing comms amount. ... (cherry picked from commit 3ba6079)	2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt	471c813bb4	Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. ... (cherry picked from commit bcd1ac3)	2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt	0c7b2e1953	Remove last bolus, units display of reservoir level from Combo fragment. ... (cherry picked from commit 42847cb)	2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt	afdcf0b1c5	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt	1b91684c65	Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.	2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt	1e19f19cd2	Hide buttons on Combo tab until plugin is initialized.	2017-12-03 22:25:43 +01:00
AdrianLxM	42c61f4e6f	synchronized wait	2017-12-03 21:58:35 +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
Milos Kozak	4185bb347d	handle bolus stop prior to delivery correctly	2017-12-03 19:34:01 +01:00
Milos Kozak	5d217cf1b3	better logging	2017-12-03 19:02:11 +01:00
Andrew Warrington	eea5082278	Revert unnecessary change.	2017-12-03 19:01:56 +01:00
Andrew Warrington	9dca53f968	Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.	2017-12-03 18:53:52 +01:00
Andrew Warrington	cefe93d0a0	Merge remote-tracking branch 'origin/dev' into watchfaces	2017-12-03 17:48:36 +01:00
Milos Kozak	f25334273a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-03 17:34:58 +01:00
Milos Kozak	0101bc0a81	parse more iso formats	2017-12-03 17:34:29 +01:00
AdrianLxM	7777143b07	scrollable overview on Jelly	2017-12-03 17:30:20 +01:00
AdrianLxM	7958dc9dce	jelly overview	2017-12-03 13:55:54 +01:00
AdrianLxM	0a8d89db8a	Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview	2017-12-03 11:48:14 +01:00
AdrianLxM	07c1084287	Merge branch 'watchfaces' into dev	2017-12-02 21:45:39 +01:00
Milos Kozak	38ecd88f6c	Merge pull request #513 from AdrianLxM/btwatchdog-pr	2017-12-02 16:19:46 +01:00
AdrianLxM	14bb0e6ac4	Only do pump alarms in APS mode	2017-12-02 10:21:42 +01:00
Milos Kozak	8a7f0f22d9	min NS version 0.10.2	2017-12-01 22:51:25 +01:00
AdrianLxM	98777579c8	delta granularity and NPE fix	2017-12-01 20:32:26 +01:00
Milos Kozak	67c89f5d98	distinguish between common and SMB bolus in queue	2017-12-01 18:41:24 +01:00
Milos Kozak	622ac15c50	Merge branch 'dev' into smb, fix compile, add queue features	2017-12-01 18:13:05 +01:00
Milos Kozak	faea3a5147	RS proper evaluate extended bolus result	2017-12-01 17:37:49 +01:00
Milos Kozak	2a04505862	fix compile	2017-12-01 16:18:46 +01:00
AdrianLxM	090127012c	Merge branch 'dev' into btwatchdog-pr	2017-12-01 14:03:44 +01:00
AdrianLxM	09dac632f9	bluetooth watchdog	2017-12-01 13:57:53 +01:00
AdrianLxM	4b063a7766	fix SP for long with string-ressource-id	2017-12-01 13:49:50 +01:00
Milos Kozak	aa210970ec	Merge branch 'g5' into dev	2017-12-01 10:18:53 +01:00
Milos Kozak	77e855ec61	fix NPE	2017-12-01 10:18:27 +01:00
Roumen Georgiev	ecbac7ea96	Make ProfileSwitch text 20% larger	2017-12-01 10:30:18 +02:00
Roumen Georgiev	d683ea2f0c	All labes scaled ... COB is not here	2017-11-30 11:28:26 +02:00
Roumen Georgiev	24b9326602	Update PointsWithLabelGraphSeries.java	2017-11-30 09:57:16 +02:00
Roumen Georgiev	418a7f7094	ProfileSwitch depending on ScreenSize ... Text size in ProfileSwitch events depends on screen resolution	2017-11-30 09:45:18 +02:00
Milos Kozak	04742c60cd	G5 fix time value	2017-11-29 23:00:41 +01:00
Milos Kozak	b73e12b731	G5: accept arrays	2017-11-29 17:22:45 +01:00
Milos Kozak	7fc9efde40	G5 offline/uploader	2017-11-29 16:07:26 +01:00
Roumen Georgiev	c56330cae7	Less than, not moreThan15	2017-11-29 09:21:55 +02:00
Milos Kozak	b1a214b9e7	Merge branch 'dev' into dev	2017-11-28 21:50:32 +01:00
Milos Kozak	d1aec1ff18	Localalerts settings by adrian	2017-11-28 21:48:46 +01:00
Milos Kozak	7d5d327c5d	fix compile	2017-11-28 21:06:50 +01:00
Milos Kozak	b8df1fcec4	Merge branch 'dev' into queue	2017-11-28 20:27:58 +01:00
Roumen Georgiev	542cedff9d	check for sgv older than 15 mins	2017-11-28 16:29:18 +02:00
Roumen Georgiev	723cb33497	Disabling staledata alarm on new sgv values fromNSClient	2017-11-28 16:15:25 +02:00
Roumen Georgiev	eb593a4557	Update Notification.java	2017-11-28 16:09:23 +02:00
Andrew Warrington	dcf79c710c	Update following testing! Bug fixes: ... - Detailed IOB always shown in older watch faces (fixed) - Cockpit: Loop graphic stays red once set (fixed) Design changes: - AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic) - Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces. - Changed to 1 decimal point in BGI to gain space. This will affect older watches as well. - Changed order of preferences to match screen layout more closely New features: - Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2	2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt	b03202f3d3	Bug notes. ... (cherry picked from commit c553626)	2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt	dc6c91fd87	Set Source.PUMP when setting/cancelling TBR. ... While technically, the history isn't read, we can be reasonably sure a TBR was set/cancelled by reading the main menu (and for TBR starts that's the only way to do so). Reading the history might cause (more) problems with the pump's minute-precision and not yield much safety. Besides, command mode is expected to take over yesterday. (cherry picked from commit 04fb1c8)	2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt	383750d5e8	Set Source.PUMP when bolusing (already reading from history). ... (cherry picked from commit d747415)	2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt	720e64e541	Fix checkTbrMismatch tolerance for TBRs up to 2m off. ... (cherry picked from commit 46c1e00)	2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt	ffb5ee3b22	Show min/avg/max in Combo TDD dialog. ... (cherry picked from commit 348b53a)	2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt	b46165e52a	Abort reading all pump data if history read fails. ... (cherry picked from commit 9f679bc)	2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt	9ce57e7076	Fix bolus verification.	2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt	a0ba857279	Move WarningOrErrorCode class to parent package. ... (cherry picked from commit 38922ba)	2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt	c36eac1ff3	More logging around bolusing. ... (cherry picked from commit df89b7f)	2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt	0f8442d65c	Issue a history read when bolusing fails. ... (cherry picked from commit cafed14)	2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt	1d83abc0d2	Fix rejecting multiple TBRs. ... (cherry picked from commit c1e9800)	2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt	1e9d0d08c3	Reject requents to enact TBRs if one was already started within this minute. ... (cherry picked from commit 3805413)	2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt	b148b334b2	Adhere to 'Sync to profile' setting in ConfigBuilder.	2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt	ac935b19de	SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead.	2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt	5e79900411	Small robustness improvements.	2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt	1a00f8c661	Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.	2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt	44ccbc06a0	Retry reading/writing basal profile, cleanups, notes.	2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt	28f31414ba	Update pump profile during Combo init.	2017-11-23 20:54:28 +01:00
AdrianLxM	5b9fd6fd78	set basal rate overview notifications	2017-11-23 03:06:10 +01:00
AdrianLxM	b3f0951d1f	isThisProfileSet - same behaviour on uninitialized pump as DanaR	2017-11-23 02:19:29 +01:00
AdrianLxM	3f10c316a4	combo set basal: account for different granularity > 1 U/h	2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt	61d1028011	Update local basal profile after setting it on pump.	2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt	1a8c0fcf52	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cancel ongoing notification when plugin is disabled. Fix typo in fragment name. Nitpicky symmetry. PersistentNotification unregister workaround. Make PumpEnactResult fluent. Minor code cleanup. # Conflicts: # app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java # app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java	2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt	83be0a8315	Setting basal rate on pump (combo side).	2017-11-22 22:16:28 +01:00
Milos Kozak	a13661400f	DanaRv2 queue & pump autodection	2017-11-22 22:09:58 +01:00
Milos Kozak	8818afe033	KoreanDanaR queue	2017-11-22 20:11:25 +01:00
Milos Kozak	dfd0218a6a	Merge branch 'dev' into queue	2017-11-22 19:44:16 +01:00
Milos Kozak	a9f1acf7a7	Merge pull request #502 from jotomo/combo-extractions ... Combo extractions	2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt	e28e5685f6	Cancel ongoing notification when plugin is disabled.	2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt	9f946229bc	Slightly improve the dialogs.	2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt	cf430b84cf	Extract some string resources.	2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt	1e4070e862	Fix typo in fragment name.	2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt	5690772946	Nitpicky symmetry.	2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt	d202976251	PersistentNotification unregister workaround.	2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt	9442c56eb8	Make PumpEnactResult fluent.	2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt	60324ac6c6	Minor code cleanup.	2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt	c6ad1b59f3	Clean up string resources.	2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt	813f857306	Rename fragment 'error history' -> 'alert history'.	2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt	2861509d07	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. BolusProgressDialog: hide stop button once pressed. fix RU translation use MIN_DIA instead of DEFAULT_DIA	2017-11-22 10:56:57 +01:00
Milos Kozak	62527ab33b	Merge pull request #500 from jotomo/prevent-gaps-in-tbr ... ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…	2017-11-22 10:52:15 +01:00
Milos Kozak	63dbe2bd52	Merge pull request #501 from jotomo/hide-stop-button-once-pressed ... BolusProgressDialog: hide stop button once pressed.	2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt	4c66199142	Cleanups based on Android Studio analysis.	2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt	8b81925ccb	Only raise notification to check pump time when the latter could be read.	2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt	b4d2d9f71d	Rename 'error' to 'alert' when referring to Combo pump alerts.	2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt	a8a7d47da2	ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.	2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt	b49a4c57ba	BolusProgressDialog: hide stop button once pressed.	2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt	b27ee06ebe	Fix issues during history read.	2017-11-22 00:05:59 +01:00
Milos Kozak	252c0b3db9	DanaR queue driver	2017-11-21 23:00:53 +01:00
Milos Kozak	f134163a76	Merge branch 'dev' into queue	2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt	066d138e59	Double comparisons.	2017-11-21 22:31:28 +01:00
Milos Kozak	a6bf18244a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-11-21 22:31:22 +01:00
Milos Kozak	4007049118	use MIN_DIA instead of DEFAULT_DIA	2017-11-21 22:29:50 +01:00
Milos Kozak	d2cba61354	allign dana plugin code	2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt	bf52352224	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing return log profiles if different fix setting of TRB when low basal rate is running fix format and add test for fromISODateString use mills from status if available	2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt	d6938c20e6	Updating README.	2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt	426379c6d3	Remoe SetBasalProfileCommand. ... Too slow, unclear usage (ProfileInterface), likely superseeded soon.	2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt	4b1a774544	Optimize fetching full history.	2017-11-21 00:43:17 +01:00
Johannes Mockenhaupt	1b50b43fbb	Add headers to dialogs.	2017-11-21 00:22:16 +01:00
Johannes Mockenhaupt	75855f3f05	Implement reading basal profile.	2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt	971a97a9e3	Some minor tweaks.	2017-11-20 23:53:39 +01:00
Milos Kozak	3ab235f829	refactor pump interface out of ConfigBuilder, remove handlers	2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt	3cccf287da	Only update pumpState cache if menu could be read.	2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt	dbd442e8ea	ComboPlugin.checkTbrMismatch: allow for deviations ... to compensenate inprecise times used by pump for tbr duration.	2017-11-20 18:59:59 +01:00
Milos Kozak	21ae42d37b	Merge branch 'dev' into queue	2017-11-20 17:50:49 +01:00
Milos Kozak	1335887957	Merge branch 'dev' into dev2	2017-11-20 17:40:45 +01:00
Milos Kozak	2f0599fbc7	missing return	2017-11-20 17:38:06 +01:00
Milos Kozak	d8d8b150b6	Merge branch 'dev2' into queue	2017-11-20 17:34:03 +01:00
Milos Kozak	973b9d50c1	Merge branch 'dev' into dev2	2017-11-20 17:28:15 +01:00
Milos Kozak	0f0f39dfb4	log profiles if different	2017-11-20 17:26:03 +01:00
Milos Kozak	777aedd5db	fix setting of TRB when low basal rate is running	2017-11-20 15:25:44 +01:00
Milos Kozak	297617467e	fix format and add test for fromISODateString	2017-11-20 13:34:13 +01:00
Milos Kozak	d8798e0bcf	use mills from status if available	2017-11-20 13:23:25 +01:00
Johannes Mockenhaupt	aadb7c5728	Update TODO, javadoc.	2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt	dafb6d225b	Display active alert in Combo tab.	2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt	9d3625e78c	Show bolus/TBR percent and duration with activity.	2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt	46fdd47ac0	Fixes and cleanups.	2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt	2c0975994d	Fixes.	2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt	9459dfe321	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Remove dead code. Ctors Android-style. Fix NPE initialising MyPreferencesFragment. RS fix last bolus time RS remove duplicated message RS fix extended bolus result show timeshift if not zero CS translation removed unneeded code long click on name to open settings add link to advanced settings # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt	99db38a8e0	Fix displaying connection problems in Combo tab.	2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt	deb566c1bd	Align ComboPlugin with merged changes.	2017-11-18 16:42:56 +01:00
Johannes Mockenhaupt	d92540a17c	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 ... * adrian/localalerts-settings: remove already commented out code upper case literals use correct setting Don't alarm while disconnected disconnect state remove deprecated wear notification settings no-urgent notification title presnooze missed readings/pump on startup system notifications for non-urgent Notification bugfixes use ID as request code guard double clicks refactor notifications: subpackage initialized only when maxBasal >0 Dismiss notification service local alert thresholds as settings Extract local alerts for unreachable pump, missed BG readings. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/res/values/strings.xml	2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt	f03b9669d5	Minor improvements.	2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt	b85b6f85f4	Major cleanup and some new features. ... * PumpState.timestamp: round to second (format used in DB) * Raise notification about wrong pump clock time since setting clock isn't possible with current ruffy * Set TempBasal.pumpId when setting/cancelling TBR * Checking state of pump on connect * Better checks whether pump is ready to execute command * Rework dynamic command timeout * Confirm benign warnings on connect and turn into notifications * Some groundwork for reading/setting basal profile * Check pump history every 15m	2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt	76cc08c1a9	BolusProgressDialog: hide stop button once pressed.	2017-11-16 00:23:37 +01:00
Andrew Warrington	bc485a4783	Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces. ... Inclusion of Home2 ("AAPSv2") watch face for round.	2017-11-15 23:07:44 +01:00
Johannes Mockenhaupt	5ed97d297f	Minor code cleanup.	2017-11-15 11:23:20 +01:00
Johannes Mockenhaupt	21a2c688c6	Cleanups.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	104cead555	Lots of work around properly reading pump history.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	a52e159bf6	Fire EventInitializationChanged after pump init.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	ef0c5b9138	Dialog cleanups.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	c21799fe0f	Treatments tab: display extended bolus tab if active pump supports it or there are any ext bolus records.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	e0df4646f9	Remove dead code.	2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt	5839ad6a93	Ctors Android-style.	2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt	9a4acbe052	Fix NPE initialising MyPreferencesFragment.	2017-11-13 01:12:05 +01:00
Andrew Warrington	45a26da8b3	Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu. ... Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.	2017-11-12 21:46:32 +01:00
Johannes Mockenhaupt	9606df13b7	Fix false error popup when cancelling bolus after confirmation on the pump, during the wait before delivery starts.	2017-11-12 02:06:32 +01:00
Johannes Mockenhaupt	11777f8b7f	Cleanups.	2017-11-12 00:58:16 +01:00
Johannes Mockenhaupt	02af439dd7	Minor tweaks.	2017-11-12 00:37:03 +01:00
Milos Kozak	7374545046	refactor all deliverTreatment	2017-11-12 00:08:25 +01:00
Johannes Mockenhaupt	c11086d9ea	Stuff: ... * Read all history * Simple viewer for TDDs, errors * Clean up cancelling TBR (incomplete) * Initializing pump robustness	2017-11-12 00:01:01 +01:00
Milos Kozak	620a54a31b	bolus from wizard to queue	2017-11-11 23:44:30 +01:00
Milos Kozak	c7faf2a5e7	bolus progress dialog during connection	2017-11-11 23:03:31 +01:00
Milos Kozak	25aa5094a4	alarm for failed bolus	2017-11-11 22:32:00 +01:00
Johannes Mockenhaupt	3072a42cd7	Initial dialog to display pump alerts.	2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt	9804f004f5	Remove unreachable code.	2017-11-11 17:29:39 +01:00
Johannes Mockenhaupt	ee6f29dd75	Revert more local alerts	2017-11-11 16:29:46 +01:00
Milos Kozak	a5227fc773	add bolus sound	2017-11-11 16:20:34 +01:00
Johannes Mockenhaupt	2f8febabb8	Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.	2017-11-11 16:15:03 +01:00
Johannes Mockenhaupt	fb65aca081	ComboFragment: hack to make battery display look pretty before init.	2017-11-11 16:13:06 +01:00
Johannes Mockenhaupt	355a973727	Empty activity instead of 'Idle' in combo tab.	2017-11-11 16:12:19 +01:00
Milos Kozak	86b11edd58	RS connection and status reading	2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt	7163fbae54	ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.	2017-11-10 01:26:17 +01:00
Johannes Mockenhaupt	bfc6f0b618	another fi	2017-11-10 00:59:40 +01:00
Johannes Mockenhaupt	5ce956b5fc	quick fix for cancelling tbr to fake neutral temp.	2017-11-10 00:57:40 +01:00
Johannes Mockenhaupt	8983143bff	Cleanup.	2017-11-10 00:57:40 +01:00
Milos Kozak	a186ce6468	more command queue code	2017-11-10 00:27:18 +01:00
AdrianLxM	d0806802eb	compile fixes	2017-11-10 00:19:13 +01:00
Johannes Mockenhaupt	a17cff7adf	Some work around refreshing pump data.	2017-11-08 23:41:53 +01:00
Milos Kozak	d40e0c97c4	simplify active pump access where possible	2017-11-08 23:40:54 +01:00
Johannes Mockenhaupt	cc6db3a059	Some ComboFragment cleanups.	2017-11-08 23:31:40 +01:00
Milos Kozak	8bae1a18e4	CommandQueue	2017-11-08 22:22:51 +01:00
Milos Kozak	3a773feeeb	RS fix last bolus time	2017-11-08 19:23:48 +01:00
Milos Kozak	676dfcc5d1	RS remove duplicated message	2017-11-08 19:18:17 +01:00
Milos Kozak	30f16c7d3e	RS fix extended bolus result	2017-11-08 19:13:44 +01:00
AdrianLxM	ec81f124e9	remove already commented out code	2017-11-08 18:53:33 +01:00
Johannes Mockenhaupt	ff3707d201	Fix NPE initialising MyPreferencesFragment, part 2	2017-11-08 15:07:10 +01:00
Johannes Mockenhaupt	dd98d9f7ae	wip	2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt	324b68717f	Fix NPE initialising MyPreferencesFragment.	2017-11-08 10:20:49 +01:00
Milos Kozak	0af51bb6ea	show timeshift if not zero	2017-11-07 13:24:08 +01:00
Johannes Mockenhaupt	5bd2911754	wip ..	2017-11-07 09:36:21 +01:00
AdrianLxM	4e53b4b1a4	upper case literals	2017-11-07 00:00:38 +01:00
AdrianLxM	d6b534b3b6	use correct setting	2017-11-06 23:47:39 +01:00
Johannes Mockenhaupt	be5f7e68a7	unsafe usage checks update.	2017-11-06 23:15:16 +01:00
AdrianLxM	a864703c76	Don't alarm while disconnected	2017-11-06 22:24:25 +01:00
AdrianLxM	b9ad90a51b	disconnect state	2017-11-06 22:04:48 +01:00
AdrianLxM	f2e44e8ab9	no-urgent notification title	2017-11-06 21:38:42 +01:00
AdrianLxM	2e6a136de6	presnooze missed readings/pump on startup	2017-11-06 20:32:33 +01:00
AdrianLxM	2f56687e82	system notifications for non-urgent	2017-11-06 20:16:17 +01:00
AdrianLxM	2b06e9e63e	Notification bugfixes	2017-11-06 17:12:33 +01:00
AdrianLxM	ef425563bf	use ID as request code	2017-11-06 15:24:52 +01:00
AdrianLxM	e4f15c0e0d	guard double clicks	2017-11-06 15:07:39 +01:00
AdrianLxM	8c8674ed63	refactor notifications: subpackage	2017-11-06 14:26:06 +01:00
AdrianLxM	3ea4bfaf37	initialized only when maxBasal >0	2017-11-06 14:16:50 +01:00
AdrianLxM	d990d59ddf	Dismiss notification service	2017-11-06 14:09:03 +01:00
AdrianLxM	87ea412516	local alert thresholds as settings	2017-11-06 12:58:44 +01:00
AdrianLxM	ffd912e32b	Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings	2017-11-06 11:56:41 +01:00
Andrew Warrington	d70860bd97	Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu. ... Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.	2017-11-05 21:41:50 +01:00
Johannes Mockenhaupt	7c44761f25	WIP	2017-11-04 17:42:47 +01:00
Johannes Mockenhaupt	011409a6e5	Minor cleanups.	2017-11-03 23:40:57 +01:00
Johannes Mockenhaupt	6ba57ff1f7	WIP Cleaning up ComboPlugin/Ruffyscripter.cancelTbr	2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt	142878a22b	Fix getting resources string in fragment.	2017-11-03 21:41:20 +01:00
Johannes Mockenhaupt	f9a7d6fe20	Use PumpEnactResult's fluent interface in Combo plugin.	2017-11-03 14:40:01 +01:00
Johannes Mockenhaupt	49885afb39	Refresh entire pump state when long-pressing Combo tab's refresh button.	2017-11-03 14:23:47 +01:00
Milos Kozak	e063f3a2cb	removed unneeded code	2017-11-02 18:03:40 +01:00
Milos Kozak	a7077a8a6a	long click on name to open settings	2017-11-02 17:47:41 +01:00
Milos Kozak	20c66e3b6f	add link to advanced settings	2017-11-02 17:39:25 +01:00
Johannes Mockenhaupt	604a9e664a	Reject requests to bolus the same amount within 60s.	2017-11-02 15:37:19 +01:00
Johannes Mockenhaupt	fe45b917be	Align Combo with recent preferences updates.	2017-11-01 23:25:37 +01:00
Johannes Mockenhaupt	f569163d19	Merge remote-tracking branch 'origin/dev2' into combo-v2 ... * origin/dev2: (26 commits) add getPreferenceId to food plugin preferences update use DateUtil#agoString use DateUtil#untilString timeframe strings Show remaining time of TT NSTreatments NPE fix Cleanup. Revert "Debug: wider thread column in log to improve readability." Disable event logging by default. Log summary after 10s, then every 60s. Log receivers of event. Log source of event. Debug: wider thread column in log to improve readability. Better log messages for events. Group events in type hierarchy related to the LoopPlugin. Remove dead NSPingAck class. Let event classes extend Event(UpdageGui) classes. Add base event class. Log posted events. ...	2017-11-01 21:39:45 +01:00
Milos Kozak	a1c6704ae9	Merge branch 'dev2' into smb	2017-11-01 20:50:14 +01:00
Milos Kozak	a162343cd4	add getPreferenceId to food plugin	2017-11-01 20:47:16 +01:00
Milos Kozak	f67bd291cd	Merge branch 'dev' into dev2	2017-11-01 20:44:24 +01:00
Milos Kozak	60699eddbb	preferences update	2017-11-01 20:43:59 +01:00
Milos Kozak	00152eaffa	Merge pull request #490 from MilosKozak/tt-remaining ... Show remaining time of TT	2017-11-01 18:29:54 +01:00
Milos Kozak	f7871e64e0	Merge pull request #489 from MilosKozak/NPE-fix ... NSTreatments NPE fix	2017-11-01 18:29:34 +01:00
Milos Kozak	440be77de0	Merge pull request #488 from jotomo/events ... Event logging	2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt	4da160a951	Disable closed loop under unsafe conditions.	2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt	8d3947dc7f	Initial bolus syncing.	2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt	744d24cbcf	DatabaseHelper: add getTreatmentByDate.	2017-10-31 19:28:32 +01:00
Johannes Mockenhaupt	74bbab9cf1	More bolus work.	2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt	ab900fda6c	Refresh tab after pump init.	2017-10-31 14:46:06 +01:00
Johannes Mockenhaupt	69648ecf30	Make bolusing safe.	2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt	efc298bf90	Make PumpEnactResult fluent.	2017-10-31 12:47:41 +01:00
Johannes Mockenhaupt	f64e00fc79	Auto-retrying repeatable commands when there's a connection loss.	2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt	88f500417d	Cleanup: ComboFragement.	2017-10-31 11:02:14 +01:00
Johannes Mockenhaupt	9121aa5217	Bolus cancellation for all stages.	2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt	522b5e9e1b	Clean up string resource names.	2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt	2198747feb	NPE fix.	2017-10-30 19:52:26 +01:00
Johannes Mockenhaupt	75bc2cd940	NotificationStore: extract key string.	2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt	9bae22f551	Tweaking ComboFragment's Last Connection.	2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt	a920946cd1	Extract local alerts for unreachable pump, missed BG readings.	2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt	79d7ec5467	Add prefs for local alerts.	2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt	bffd1239c0	Disable reading history while incomplete.	2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt	550ed57ca5	KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode.	2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt	d423c8ae2a	Add pref to raise urgent alarms as system notifications.	2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt	bdc61765ce	KeepAliveReceiver: sanitize pump disconnected/missed readings alarms. ... * Don't raise alarm on application start * Re-raise alert only every ~30 min, not every 5 min.	2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt	a2460180f9	Remove unclear error message field from CommandResult, use codes from pump warnings/errors.	2017-10-29 21:19:03 +01:00
Johannes Mockenhaupt	6b6d252173	Day 1 ... * Some UI rework * Start removing (retry) logic from ruffyscripter to ComboPlugin * Cleanups all over * Remove TDD stuff, this can be done independently of a pump * New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus * Add warning and error codes from Combo manual * Rework commands to just execute an action (verification will be in ComboPlugin eventually, together with retry logic) * Rework commands to update state in field as command progresses rather than returnin/throwing. * Initial version reading bolus and error history (no DB sync yet).	2017-10-29 11:36:35 +01:00
AdrianLxM	f9ed104fe3	use DateUtil#agoString	2017-10-29 02:08:43 +02:00
AdrianLxM	3121fa3e84	use DateUtil#untilString	2017-10-29 02:07:17 +02:00
AdrianLxM	9e8752b096	timeframe strings	2017-10-29 02:06:06 +02:00
Johannes Mockenhaupt	255e9d0dff	Move initialized flag to ComoPump class.	2017-10-28 13:12:55 +02:00
Johannes Mockenhaupt	4befa38d46	Close bolus progress dialog better in case of error.	2017-10-28 11:46:54 +02:00
AdrianLxM	7d82870203	Show remaining time of TT	2017-10-28 02:16:30 +02:00
Johannes Mockenhaupt	36d5c4d806	Clean up ComboFragment, related string resources.	2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt	c53936a7ac	Revert inadvertent change to keepAlive interval.	2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt	d237c46ca8	Merge remote-tracking branch 'origin/dev' into combo-v2 ... * origin/dev: (26 commits) fix RS response code use max absorption time for AAPS and weighted average sensitivity detection log.debug -> log.error on RS comm read status after bolus RS connectivity & bolus improvement Better bolusing with different speeds (R & Rv2) Detailed onscreen history logging Split to smaller pieces Update strings.xml Sensitivity logging optional RS synchronized change fix displaying XX:30 time intervals CS translations allow to use actual profile in wizard getUnits from active profile not interface Update strings.xml Update strings.xml Update dutch Update strings.xml Update strings.xml ...	2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt	4bc970091e	More i18n.	2017-10-27 21:51:15 +02:00
Johannes Mockenhaupt	a8061b410c	Clean up pump init.	2017-10-27 19:40:44 +02:00
Johannes Mockenhaupt	a1d6834bce	KeepAliveReceiver: check pump only if initialized already.	2017-10-27 19:39:51 +02:00
Johannes Mockenhaupt	eed3773b49	Combo i18n.	2017-10-27 17:19:10 +02:00
AdrianLxM	88e22c5f17	NSTreatments NPE fix ... When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.	2017-10-27 16:56:17 +02:00
Johannes Mockenhaupt	b47559647f	wip	2017-10-27 00:03:01 +02:00
Milos Kozak	b5f843d901	getLastSBMTime -> getLastBolusTime	2017-10-26 22:12:15 +02:00
Milos Kozak	dfd657ce2d	remove wrong imports	2017-10-26 21:29:38 +02:00
Milos Kozak	e71ce02131	fix merge conflict	2017-10-26 21:23:23 +02:00
Milos Kozak	8a6e811c95	Merge branch 'dev' into dev2	2017-10-26 21:13:10 +02:00
Milos Kozak	ae47183459	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-26 21:12:37 +02:00
Milos Kozak	26b216a8ee	fix RS response code	2017-10-26 20:40:24 +02:00
Johannes Mockenhaupt	e5cb5386e3	Disable event logging by default.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	785a8f21de	Log receivers of event.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	9a1d7fd512	Log source of event.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	d830096482	Better log messages for events.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	9d10563bd9	Group events in type hierarchy related to the LoopPlugin.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	3e24a6069d	Remove dead NSPingAck class.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	302ed69564	Let event classes extend Event(UpdageGui) classes.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	8ad223e5e1	Add base event class.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	5a446c9ab5	Log posted events.	2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt	e895ba65eb	KeepAliveReceiver: proper Notification ids.	2017-10-26 01:09:46 +02:00
Johannes Mockenhaupt	4539b5a9e5	KeepAliveReceiver: add alarm for missed readings.	2017-10-26 01:09:37 +02:00
Johannes Mockenhaupt	001a56728d	KeepAliveReceiver: add alarm sound to 'pump unreachable' notification.	2017-10-26 01:09:31 +02:00
AdrianLxM	707d2df345	No explicit service start	2017-10-25 20:10:59 +02:00
Johannes Mockenhaupt	4767809931	Start KeepAliveService after pump init.	2017-10-25 20:10:24 +02:00
AdrianLxM	41dcf8d6f4	Merge remote-tracking branch 'milosremote/dev' into servicestart	2017-10-25 19:57:00 +02:00
AdrianLxM	f3872cd934	Merge pull request #465 from jotomo/j2v8-removal ... J2v8 removal	2017-10-25 19:56:29 +02:00
Johannes Mockenhaupt	e620878d17	KeepAliveReceiver: raise notification when pump couldn't be reached for 25m.	2017-10-25 18:30:06 +02:00
Johannes Mockenhaupt	d907a1b6b3	Force refresh every 15 min (previously 30).	2017-10-25 18:20:38 +02:00
Johannes Mockenhaupt	22bac709fb	Cleanups around ComboPlugin.refreshDataFromPump.	2017-10-25 18:17:19 +02:00
Johannes Mockenhaupt	68a3dbbf33	Start KeepAliveService after pump init.	2017-10-25 18:16:38 +02:00
Johannes Mockenhaupt	ec383bb082	Remove the alerter and related prefs.	2017-10-25 16:27:55 +02:00
Johannes Mockenhaupt	e09d337c02	ComboFragment: colours and text for last connection.	2017-10-25 15:42:38 +02:00
Johannes Mockenhaupt	fa81f57d9f	ComboPlugin.deliverTreatment: don't update progress dialog for non-interactive SMBs.	2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt	34861960ea	Bolus command: ensure the progress dialog is always closed.	2017-10-25 15:11:27 +02:00
Milos Kozak	3e6fcabfab	Merge branch 'dev2' into smb	2017-10-25 11:38:45 +02:00
Milos Kozak	4f0bbda847	Merge branch 'dev' into dev2	2017-10-25 11:38:12 +02:00
Milos Kozak	7c99157d89	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-25 11:37:19 +02:00
Milos Kozak	606973d4ad	use max absorption time for AAPS and weighted average sensitivity detection	2017-10-25 11:37:05 +02:00
Johannes Mockenhaupt	551ca92201	Remove cast to DetermineBasalResultAMA for predictions.	2017-10-24 23:14:45 +02:00
Milos Kozak	9de332e997	Merge branch 'dev2' into smb	2017-10-24 21:09:17 +02:00
Milos Kozak	f673d3a721	Merge branch 'dev' into dev2	2017-10-24 21:08:54 +02:00
Milos Kozak	8b020d72cd	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-24 21:08:13 +02:00
Milos Kozak	2fb707b9ed	log.debug -> log.error on RS comm	2017-10-24 21:08:03 +02:00
Milos Kozak	2925c16fb9	comment minDeviationSlope	2017-10-24 17:50:44 +02:00
Milos Kozak	29b075e700	display minDeviationSlope	2017-10-24 17:15:49 +02:00
Milos Kozak	fe0376206e	fix merge conflict	2017-10-24 11:46:27 +02:00
Milos Kozak	441c2beffc	read status after bolus	2017-10-24 09:19:03 +02:00
Milos Kozak	1ad409754f	move preparing graph series to extra class #2	2017-10-23 22:41:12 +02:00
Milos Kozak	d180d088f0	fix merge conflict	2017-10-22 21:11:31 +02:00
Johannes Mockenhaupt	2d8b3a7cb8	wip	2017-10-22 10:40:24 +02:00
AdrianLxM	4e5a374b9c	include smb into basal iob	2017-10-22 02:20:11 +02:00
AdrianLxM	755c82898c	SMB Rhino	2017-10-21 22:38:07 +02:00
Milos Kozak	3cdca93b30	RS connectivity & bolus improvement	2017-10-21 20:09:21 +02:00
Johannes Mockenhaupt	73d5db43ed	Nitpicky symmetry.	2017-10-21 19:17:04 +02:00
Milos Kozak	7dd678c917	Better bolusing with different speeds (R & Rv2)	2017-10-21 18:55:56 +02:00
Milos Kozak	8e82e341fd	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-21 18:07:30 +02:00
Milos Kozak	a8751bf35a	Detailed onscreen history logging	2017-10-21 18:05:19 +02:00
Johannes Mockenhaupt	fc60edc15a	wip	2017-10-21 17:44:16 +02:00
McHoffi	986eab041d	Merge pull request #1 from MilosKozak/dev ... Dev	2017-10-21 17:43:33 +02:00
McHoffi	9c7c583aed	Split to smaller pieces	2017-10-21 17:41:01 +02:00
AdrianLxM	7ed7a2e8c4	Merge remote-tracking branch 'milosremote/dev' into smb-rhino	2017-10-21 17:06:57 +02:00
Johannes Mockenhaupt	cb438934b6	WIP: Pairing	2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt	015a852ab5	Custom: Disable Crashlytics. ... (cherry picked from commit 7890f6b) (cherry picked from commit 1374739)	2017-10-21 13:37:42 +02:00
Milos Kozak	dbf5a5e577	Sensitivity logging optional	2017-10-21 13:14:06 +02:00
Milos Kozak	881a745e32	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-20 21:36:56 +02:00
Johannes Mockenhaupt	e2d684ac33	PersistentNotification unregister workaround.	2017-10-20 20:15:37 +02:00
Johannes Mockenhaupt	950d1b62db	Undo "explicit pump initalization."	2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt	87c1c4b112	More sync prototyping.	2017-10-20 18:51:15 +02:00
Milos Kozak	01d6f1594a	RS synchronized change	2017-10-20 17:37:06 +02:00
Johannes Mockenhaupt	1aa2ce48a1	First steps to syncing full pump state with AAPS.	2017-10-20 15:24:11 +02:00
Johannes Mockenhaupt	491caadd71	Check for active alerts on the pump, confirm and re-raise in AAPS.	2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt	57be9bb9b1	Explicit pump initialization. ... (cherry picked from commit d8b244a)	2017-10-20 15:10:24 +02:00
Milos Kozak	e545f75d69	fix displaying XX:30 time intervals	2017-10-20 11:34:33 +02:00
Johannes Mockenhaupt	8b8a135804	Add (back) last bolus to ComboFragment.	2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt	4517736122	Add back TBR to ComboFragment.	2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt	c04d746cfc	Remove duplicated code.	2017-10-19 23:30:44 +02:00
Johannes Mockenhaupt	4e978656f5	Trim down ComboFragment. ... Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.	2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt	3d6c8ee2a5	Combo Fragment misc.	2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt	c29b4d13a3	Support pump suspend status (and misc other ...).	2017-10-19 21:31:10 +02:00
Milos Kozak	c258b41f11	allow to use actual profile in wizard	2017-10-19 19:35:35 +02:00
Milos Kozak	0b7832ec60	getUnits from active profile not interface	2017-10-19 19:23:19 +02:00
Johannes Mockenhaupt	4de010b1a2	Strings reuse for pumps.	2017-10-19 16:11:36 +02:00
Johannes Mockenhaupt	8fe72e1474	WIP notes, combo fragement expansion	2017-10-19 13:24:18 +02:00
Johannes Mockenhaupt	07253b59a0	Refactoring.	2017-10-19 02:56:29 +02:00
Johannes Mockenhaupt	413464f1f1	Overview: add space between insulin and unit letter.	2017-10-19 02:46:06 +02:00
Johannes Mockenhaupt	7797cbd69e	Remove accidential debug wait.	2017-10-19 02:45:39 +02:00
Johannes Mockenhaupt	64c3d452a8	Some ui polish.	2017-10-19 02:45:29 +02:00
Johannes Mockenhaupt	0a67bb73a4	Fix displaying reservoir level on startup.	2017-10-19 00:04:01 +02:00
Milos Kozak	19f107fe53	move preparing graph series to extra class #2	2017-10-18 23:56:13 +02:00
Johannes Mockenhaupt	dca219d900	Fix initializing ruffy service, read reservoir level on init.	2017-10-18 20:53:44 +02:00
Milos Kozak	d65a2d8f8c	move preparing graph series to extra class	2017-10-18 19:01:39 +02:00
Johannes Mockenhaupt	ab4f46471b	Add RuffyCommands.readPumpState, cleanup, fix.	2017-10-18 18:29:29 +02:00
Johannes Mockenhaupt	e4901f292f	Extract modules ruffy-spi, ruffyscripter.	2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt	e5eba342ba	SPI first draft.	2017-10-18 14:00:47 +02:00
Milos Kozak	6ff3d00f3c	Merge remote-tracking branch 'origin/dev' into food	2017-10-17 20:55:55 +02:00
Milos Kozak	13184dcb51	food plugin	2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt	4a91b68ed7	Package refactoring.	2017-10-17 19:45:37 +02:00
Johannes Mockenhaupt	f33d55b092	Trim combo prefs.	2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt	64ecf84174	Cleaning up.	2017-10-17 19:08:56 +02:00
Johannes Mockenhaupt	5ab7e4dbd6	Connect to IRuffyService in RuffyScripter, rather than ComboPlugin.	2017-10-17 19:05:55 +02:00
Johannes Mockenhaupt	142f9cf6a3	Extract SPI.	2017-10-17 18:59:41 +02:00
Johannes Mockenhaupt	5131b8b62f	Remove combo hacks outside of combo plugin.	2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt	357c84e2e2	ComboPlugin singletion.	2017-10-17 12:20:12 +02:00
Johannes Mockenhaupt	41ebabe5e7	Merge remote-tracking branch 'origin/dev' into combo-v2 ... * origin/dev: (126 commits) ConfigBuilder: hide disabled plugins by default. sum on name for LP log to debug not error logger reformat logging rhinoAMA first full run rhinoAMA first crashfree call rhino some more cleanups rhino logging and cleanups rhino MA looping rhino first real detemine-basal call rhino small refactor NDK filters to work around j2v8 vs. libBleCommandUtil issue. NewTreatmentDialog: sanitize inputs, fixes #417. rhino complex parameter passing rhino first parameter passing rhino function passing first rhino location permission for BLE scanning use customized name only for LocalProfile ...	2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt	60c9a984b5	Refactor, clean out stuff, add RuffyCommands interface.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	960586b79d	ExperimentalBolusCommand: update progress when starting to programm the pump.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	cb24d13cae	Remove GetReservoirLevelCommand, will be a method in the future.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	f4f91c0b85	Add TODO.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	09f834d990	Make access to RuffyScripter.currentMenu safer.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	882f400d1e	Disable incomplete parts in ExperimentalBolusCommand.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	5d10956900	Declare RuffyScripter.currentMenu nullable. ... (cherry picked from commit fb0c829)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	15bac4d386	Wait for currentMenu to be != null ... (cherry picked from commit 13b96ec)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	fd7f4ae145	Option to ignore TBR failures: also ignore errors when reading pump state. ... (cherry picked from commit 82052e8)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	a33d7db471	Refactorings and notes. ... (cherry picked from commit 8c77f0e)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	0fda86dffa	A little less broken CancellableBolusCommand. ... (cherry picked from commit 9d56f23)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	a76fbefee8	Add pref to disable all pump comm alerts. ... (cherry picked from commit f074a5b)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	516a8c044b	Move RuffyScripter to PumpCombo package. ... (cherry picked from commit 7875ac0)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	c8c445c608	Add option to skip small TBR changes, add summaries to prefs. ... (cherry picked from commit a76b03a)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	9b6cd23cdd	Experimental options: for specifc prefs, always check experimental options are turned on. ... While the specific prefs are disabled when disabling experimental options, they can still be turned on. (cherry picked from commit 6270239)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	81b97b5278	Add option to ignore setting a TBR as long as it does't occur twice in a row. ... (cherry picked from commit 238e85c)	2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt	17dd6df527	Move config options to preferences. ... (cherry picked from commit 24657ed)	2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt	21a37c9247	Add experimental option to avoid one vibration after bolusing. ... (cherry picked from commit 104777c)	2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt	9649682ae3	Don't raise alerts if loop is disabled. ... (cherry picked from commit dc7fd2b)	2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt	fee19db501	ConfigBuilder: hide disabled plugins by default.	2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt	f7a46d386e	Remove j2v8.	2017-10-16 21:52:06 +02:00
Milos Kozak	d1a9398451	Merge pull request #463 from AdrianLxM/mr-profileRhino ... sum on name for LP	2017-10-16 14:58:41 +02:00
AdrianLxM	414cb5fd8d	sum on name for LP	2017-10-16 12:54:17 +02:00
Milos Kozak	5172a91ca1	Merge pull request #458 from jotomo/gh-417-new-treatment-validation ... NewTreatmentDialog: sanitize inputs, fixes #417.	2017-10-16 08:38:30 +02:00
AdrianLxM	3e7b7ced06	logger reformat	2017-10-15 22:34:03 +02:00
AdrianLxM	c499e5977c	logging	2017-10-15 22:27:08 +02:00
AdrianLxM	1c49362415	rhinoAMA first full run	2017-10-15 20:42:36 +02:00
AdrianLxM	1494b7f5b3	rhinoAMA first crashfree call	2017-10-15 19:36:31 +02:00
AdrianLxM	564c882754	rhino some more cleanups	2017-10-15 16:19:29 +02:00
AdrianLxM	d32a874baa	rhino logging and cleanups	2017-10-15 16:10:58 +02:00
AdrianLxM	e65b4bf858	rhino MA looping	2017-10-15 14:06:13 +02:00
AdrianLxM	190305c6df	rhino first real detemine-basal call	2017-10-15 13:00:10 +02:00
AdrianLxM	124ec6e992	rhino small refactor	2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt	a9adcee974	NewTreatmentDialog: sanitize inputs, fixes #417. ... Inputs are now check as they're being made and cleared if they exceed constraints. This is the same behaviour the Calculator dialog shows.	2017-10-15 10:45:12 +02:00
AdrianLxM	9008ef6f6f	rhino complex parameter passing	2017-10-15 03:55:03 +02:00
AdrianLxM	303d35118e	rhino first parameter passing	2017-10-15 03:50:18 +02:00
AdrianLxM	81b611ad92	rhino function passing	2017-10-15 03:21:32 +02:00
AdrianLxM	7f2451934c	first rhino	2017-10-15 02:52:57 +02:00
Milos Kozak	1db158670a	location permission for BLE scanning	2017-10-14 13:36:38 +02:00
Milos Kozak	1994cd707c	use customized name only for LocalProfile	2017-10-14 10:39:32 +02:00
Milos Kozak	3b90d02e05	show status on Dana fragment too	2017-10-13 13:31:32 +02:00
Milos Kozak	02c57fb9a3	RS connection improvement	2017-10-13 13:17:17 +02:00
Milos Kozak	c99830968a	adjust enforcing new temp basal on user request	2017-10-13 12:39:34 +02:00
Milos Kozak	f235b5fb02	use basalStep instead of fixed value	2017-10-13 12:07:33 +02:00
Milos Kozak	9a4e457d2b	fix RS events parsing	2017-10-13 11:54:50 +02:00
Milos Kozak	1f3c54eb73	split sgvs before broadcast	2017-10-13 08:35:29 +02:00
Milos Kozak	6124ef25a4	report wrong alarm data #2	2017-10-13 08:21:37 +02:00
Milos Kozak	91e286b2ae	report wrong alarm data	2017-10-13 08:11:30 +02:00
Milos Kozak	45a2eba0c2	fix NPE	2017-10-13 08:06:27 +02:00
AdrianLxM	71d95bea92	fix ic isf	2017-10-13 02:56:49 +02:00
AdrianLxM	869b3eff5f	Spinner set selection delayed	2017-10-12 23:56:58 +02:00
AdrianLxM	746d71bcff	remove wear flavours	2017-10-12 18:24:48 +02:00
AdrianLxM	f751638a7f	enabling wearcontrols from preferences	2017-10-12 18:01:10 +02:00
AdrianLxM	944e334231	migrate CPP->LP working	2017-10-12 12:44:17 +02:00
AdrianLxM	6f97e52a07	migrate CPP->LP partial	2017-10-12 12:36:06 +02:00
AdrianLxM	45c07d4106	U/h -> U	2017-10-11 23:38:08 +02:00
AdrianLxM	4667a047ea	add sum to basal in lp	2017-10-11 20:57:43 +02:00
AdrianLxM	39b18915d0	Align LP GUI	2017-10-11 20:19:42 +02:00
AdrianLxM	339c33bd75	Spinner - selection events only after first touch	2017-10-11 19:25:09 +02:00
AdrianLxM	374983e1ae	only inflate elements when needed	2017-10-11 07:59:41 +02:00
AdrianLxM	c181aaaf34	Basal sum in label	2017-10-11 02:32:17 +02:00
AdrianLxM	e6565c1911	reuse button on profile switch	2017-10-11 00:25:44 +02:00
AdrianLxM	02369b952b	a little safer<	2017-10-10 22:54:24 +02:00
AdrianLxM	398e950f8e	fix percentage concatenation on profile names	2017-10-10 22:11:06 +02:00
AdrianLxM	549b72b032	fix percentage/shift from watch	2017-10-10 21:51:58 +02:00
AdrianLxM	b60ff8ceef	max timeshift to 23	2017-10-10 20:47:38 +02:00
AdrianLxM	36784b983e	remove cpp import	2017-10-10 20:42:29 +02:00
AdrianLxM	1410b2e706	wear cpp -> general profile	2017-10-10 20:32:43 +02:00
Milos Kozak	982e46d958	prepare profileswitch function for watch	2017-10-10 19:25:21 +02:00
Milos Kozak	77ec52ff23	fix sending profile switch to pump	2017-10-10 19:19:39 +02:00
Milos Kozak	da71cdfca0	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-10 19:15:07 +02:00
Milos Kozak	24099222f3	Dana R & v2 speed selection	2017-10-10 19:14:43 +02:00
Milos Kozak	50de4a5979	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-10 18:03:50 +02:00
Milos Kozak	d142d2e4f9	resolve RS merge conflict	2017-10-10 16:47:03 +02:00
Milos Kozak	9ec3efbaab	fix conflict	2017-10-09 23:14:46 +02:00
Milos Kozak	4687b001e0	more cpp functionality to Profile	2017-10-08 14:41:51 +02:00
Johannes Mockenhaupt	c6c5624b85	Singleton OpenAPSSMBPlugin.	2017-10-07 23:05:37 +02:00
Milos Kozak	a617d591b0	fix NPE	2017-10-07 22:29:55 +02:00
Milos Kozak	8f259042d6	fix NPE	2017-10-07 22:24:42 +02:00
Johannes Mockenhaupt	fa1c282699	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (28 commits) Singleton & Crashlytics logging part 2 treatments in config builder Singleton & Crashlytics logging part 1 checkboxes for NS-Client layouts overview checkboxes cutoff fix update NP value after manual entry restore preferences temp target presets Rv2 percent fix korean percent fix serialize reload of treatments getTempBasalFromHistory -> getRealTempBasalFromHistory Do not misinterpret a fake-extended as 0% temp. In one line Update danar_fragment.xml text identation Add files via upload Add files via upload Add files via upload Add files via upload ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java	2017-10-07 21:33:22 +02:00
Milos Kozak	6618d2fef2	fix negative timeshift	2017-10-07 20:42:56 +02:00
Milos Kozak	60086dac8d	Merge remote-tracking branch 'origin/dev' into profile	2017-10-07 18:30:55 +02:00
Milos Kozak	c56ecfced6	Merge pull request #447 from AdrianLxM/treatments-configbuilder2 ... treatments in config builder	2017-10-07 18:29:44 +02:00
Milos Kozak	9e7c81613c	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-07 18:28:59 +02:00
Milos Kozak	ef645ca600	fix merge conflict	2017-10-07 18:27:20 +02:00
Milos Kozak	d6fb912ff9	Singleton & Crashlytics logging part 2	2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt	da3f02648c	Use SpinnerHelper in TimeListEdit. ... Resolves the spinner's onItemSelected handler to back invoked repeatedly on faster devices.	2017-10-07 16:37:24 +02:00
AdrianLxM	046c28856c	treatments in config builder	2017-10-07 01:18:28 +02:00
Milos Kozak	0e763724f6	Singleton & Crashlytics logging part 1	2017-10-06 16:39:59 +02:00
Milos Kozak	a1ca4677c0	log exception	2017-10-06 16:07:41 +02:00
Milos Kozak	4db82fd275	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-06 13:15:57 +02:00
Milos Kozak	32d6e06b07	Merge pull request #444 from AdrianLxM/temptarget-presets ... Temptarget presets	2017-10-06 13:15:06 +02:00
Milos Kozak	a670a43346	Merge pull request #445 from AdrianLxM/numberpicker-update ... update NP value after manual entry	2017-10-06 12:41:34 +02:00
AdrianLxM	1b5ef50eb2	update NP value after manual entry	2017-10-06 03:24:35 +02:00
AdrianLxM	bd93fc1adb	temp target presets	2017-10-06 02:53:23 +02:00
Milos Kozak	e0794a6e7f	fix time shifting	2017-10-05 00:54:35 +02:00
Milos Kozak	f08809ff9e	rename button to activate profile	2017-10-04 23:33:02 +02:00
Milos Kozak	3d58fe6bb5	cleanup	2017-10-04 23:24:56 +02:00
Milos Kozak	96edac5ddf	LocalProfile fix	2017-10-04 23:17:19 +02:00
AdrianLxM	d6089bef73	Rv2 percent fix	2017-10-04 19:39:41 +02:00
AdrianLxM	7ce282dc4e	korean percent fix	2017-10-04 19:38:42 +02:00
Milos Kozak	9f6962cee5	serialize reload of treatments	2017-10-04 18:04:34 +02:00
AdrianLxM	3d2647321b	getTempBasalFromHistory -> getRealTempBasalFromHistory	2017-10-04 16:51:54 +02:00
AdrianLxM	9e2968f21a	Do not misinterpret a fake-extended as 0% temp.	2017-10-04 16:00:48 +02:00
Milos Kozak	8bf5933c88	refactor TimeListEdit	2017-10-04 15:46:23 +02:00
Milos Kozak	067494fae1	RS hightempbasal	2017-10-03 22:27:06 +02:00
Milos Kozak	2a98a7e9ba	RS bolus code	2017-10-03 21:47:36 +02:00
Milos Kozak	f5dfff7491	RS APS messages	2017-10-03 20:58:09 +02:00
Milos Kozak	3a014949e9	remove firmware check	2017-10-03 18:45:54 +02:00
Milos Kozak	a5730cb982	initialize only with proper protocol	2017-10-02 22:44:10 +02:00
Milos Kozak	97f69c50fd	store pairing key per pump	2017-10-02 22:21:11 +02:00
Milos Kozak	8cecac0a7f	more LocalProfile work	2017-10-02 19:57:41 +02:00
Milos Kozak	1a5b72f745	Fix time parsing	2017-10-02 17:38:45 +02:00
Milos Kozak	8bbee37b70	fix TB & EB is not set	2017-09-25 19:38:27 +02:00
Milos Kozak	73687442c8	Merge branch 'dev' into rs	2017-09-25 19:36:01 +02:00
Milos Kozak	dc6cbadbdf	fix TB & EB is not set	2017-09-25 19:34:49 +02:00
Milos Kozak	d9f59840b6	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food	2017-09-24 22:47:50 +02:00
Milos Kozak	4fbe7d1000	food database support	2017-09-24 22:47:18 +02:00
Milos Kozak	91b02d4d39	fill dialog refactor & code clean	2017-09-24 14:51:16 +02:00
Milos Kozak	3c7abff88d	remove unused imports	2017-09-24 14:28:26 +02:00
Milos Kozak	1823cd3f24	extended bolus dialog refactor	2017-09-24 13:00:59 +02:00
Milos Kozak	547f09ffbd	allow to view profile from overview	2017-09-24 11:45:32 +02:00
Milos Kozak	c79b750a9c	reactor OptionsToShow	2017-09-24 11:08:04 +02:00
Milos Kozak	082414f0d3	CPP support to profile switch	2017-09-24 10:39:54 +02:00
Milos Kozak	349b27e31a	NS profile fragment shows all profiles	2017-09-23 23:54:43 +02:00
Milos Kozak	6393ee5e10	CPP functionality to Profile.class	2017-09-23 23:12:08 +02:00
Milos Kozak	b3bcb778e0	check for NPE in posted dialogs	2017-09-23 20:12:53 +02:00
Milos Kozak	c3a0f5ddad	split BLE to separate class	2017-09-23 15:03:07 +02:00
Milos Kozak	144a227d14	more progress logging on R	2017-09-23 12:53:41 +02:00
Milos Kozak	8cd8c6b5d9	more progress logging on RS	2017-09-23 12:28:11 +02:00
Milos Kozak	4ed2896f76	remove duplicated code	2017-09-23 10:56:00 +02:00
Johannes Mockenhaupt	7e8e7f0dae	Fix APSResult.toString as well. ... (cherry picked from commit d485e5b)	2017-09-22 16:00:19 +02:00
Milos Kozak	1eeb1c6f7a	RS history OK	2017-09-22 14:57:23 +02:00
Johannes Mockenhaupt	2750ccbf26	Fix APSResult.toSpanned for SMBs. ... Adds a missing newline after "SMB: xxx" (cherry picked from commit d4de9ce)	2017-09-22 09:54:51 +02:00
SMUSTAF1	81fe9ebdcc	Clear the SMS text field if the user removes the old number.	2017-09-20 13:54:05 +02:00
Johannes Mockenhaupt	ce2b1e4d10	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (40 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java # app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java	2017-09-20 13:02:31 +02:00
Milos Kozak	e1903840dd	handle received foods in nsclient	2017-09-20 10:20:50 +02:00
Milos Kozak	60990e500e	Revert "Only do SMB if invoke is from EventNewBG" ... This reverts commit 6ef4b0c2a9	2017-09-18 21:28:43 +00:00
Johannes Mockenhaupt	99c2f797ea	Fix imports.	2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt	1bd5dc3719	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (53 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/res/values/strings.xml	2017-09-18 22:54:35 +02:00
Milos Kozak	fdc3c49a2a	fix merge conflits	2017-09-18 22:03:26 +02:00
Milos Kozak	b797530c9d	BG & IOB contribution on by default in wizard	2017-09-18 21:57:35 +02:00
Milos Kozak	d2815e4045	check for NaN	2017-09-18 21:52:06 +02:00
Milos Kozak	d7f8d75d06	Revert "Rounding issues visible in nightscout insulin field"	2017-09-18 21:24:22 +02:00
Milos Kozak	a98d2e846f	Merge pull request #419 from dylanleonard/feature_time_spinner_fix ... Time Spinner Local Profile Fix	2017-09-18 21:06:34 +02:00
Dylan Leonard	d8590fe8f1	Clarified boolean logic with parentheses :)	2017-09-18 15:04:46 -04:00
Milos Kozak	bf748f3d4b	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:56:42 +02:00
Milos Kozak	8785bc63d5	loadEvents after bolus in separate thread	2017-09-18 20:54:53 +02:00
Milos Kozak	c2afa328e3	Merge branch 'dev' into tt-in-wizard	2017-09-18 20:44:54 +02:00
Milos Kozak	42ee7c668e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:43:24 +02:00
Milos Kozak	8daf9e5c2c	use notification for bolus delivery failed message when window has been destroyed	2017-09-18 20:40:03 +02:00
Milos Kozak	17fa2617f7	fix null pointer exception	2017-09-18 20:23:05 +02:00
Dylan Leonard	4f5987b72a	Added cases to accept both a.m./p.m. and AM/PM	2017-09-18 14:20:28 -04:00
Milos Kozak	3f7819937b	split JSON arrays to 50 elements	2017-09-18 20:10:53 +02:00
Milos Kozak	04994924c5	GUI tweaking, small fixes	2017-09-18 18:41:45 +02:00
Milos Kozak	7f4888978e	warn if basal step is not 0.01	2017-09-18 13:28:00 +02:00
Milos Kozak	6cee6c0f51	RS extended disabled warning	2017-09-18 12:59:56 +02:00
Milos Kozak	e3ad396f65	more work on service	2017-09-18 12:57:07 +02:00
Milos Kozak	ee4d8b7748	some work on history	2017-09-18 09:10:27 +02:00
Wouter Lagerweij	02c2213545	Changed rounding to use BigDecimals to avoid noisy long doubles in output	2017-09-17 14:27:49 +02:00
Dylan Leonard	91f0c21306	Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called	2017-09-16 19:30:07 -04:00
Wouter Lagerweij	aaa3f648d0	Removed unused imports	2017-09-17 00:56:00 +02:00
Wouter Lagerweij	e350c8c3c3	Rounding fix	2017-09-17 00:53:16 +02:00
Milos Kozak	6662c9dd6c	bolus ok	2017-09-15 13:52:28 +02:00
Roumen Georgiev	6ef4b0c2a9	Only do SMB if invoke is from EventNewBG	2017-09-15 09:33:07 +00:00
Milos Kozak	08fca41b5f	partial bolus code, messages blocked by sleep :(	2017-09-14 22:53:11 +02:00
Milos Kozak	01002f11e7	Merge pull request #416 from jotomo/vpump-enact ... VirtualPump: set PumpEnactResult.enacted.	2017-09-14 10:06:01 +02:00
Milos Kozak	13fd6136c3	refactor connectivity notifications	2017-09-14 00:29:34 +02:00
Milos Kozak	1bd938c8d5	Merge branch 'smb-source' into 'smb' ... Set Source.USER for SMB to deliver. See merge request !363	2017-09-13 11:21:27 +00:00
Johannes Mockenhaupt	a4ebd15dbf	Set Source.USER for SMB to deliver.	2017-09-13 13:19:20 +02:00
Johannes Mockenhaupt	cb3b472488	VirtualPump: set PumpEnactResult.enacted. ... (cherry picked from commit ec49bc3)	2017-09-13 13:16:48 +02:00
Milos Kozak	e795a8cd99	Revert "Temp fix for not adding SMB boluses to treatments and IOB calculations" ... This reverts commit 87c993cde1	2017-09-13 07:05:47 +00:00
Roumen Georgiev	87c993cde1	Temp fix for not adding SMB boluses to treatments and IOB calculations	2017-09-13 06:49:48 +00:00
Milos Kozak	ed6cabe7fa	initial RS work	2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt	07b04b8abf	Use correct units for low/high from TT.	2017-09-12 01:23:38 +02:00
Milos Kozak	69b04fdf26	Merge pull request #413 from samihusseingit/dev ... Dev	2017-09-11 20:12:51 +02:00
Roumen Georgiev	1a8edc8372	Update ConfigBuilderPlugin.java - Typo fix on line 598	2017-09-11 13:09:57 +00:00
Johannes Mockenhaupt	936ce42cc0	Remove duplicate logging.	2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt	612efa6a13	Revert "Make the BolusProgress dialog a bit more self-contained." ... Breaks dismissal of dialog (only one invocation of EventDismissBolusprogressIfRunning also sets bolusEnded=true). This reverts commit c11455dff1.	2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt	c11455dff1	Make the BolusProgress dialog a bit more self-contained. ... (cherry picked from commit 75db72a)	2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt	c227e0e5fa	Dead code be gone. ... (cherry picked from commit bb626ce)	2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt	5c3ec9a086	Use SystemClock.sleep instead of Thread.sleep. ... Gets rid of all those pointless InterruptedException catching. (cherry picked from commit 6acaa2b)	2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt	c50fad81bb	Log exceptions in catch blocks rather than printing to console. ... The default code used by Android Studio when generating a try/catch can be altered in Settings under Editor->File and Code Templates->Catch Statement body to log.error("Unhandled exception", e); to also do this for newly generated code. (cherry picked from commit c2ae29f) (cherry picked from commit 6031a25)	2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt	627cb8e9b2	WizardDialog: don't persist state of tt checkbox, default to false. ... This assumes that a default is not useful, as it needs to be decided whether this is needed on each case (using tt when bolusing to start eating soon, but not using it when bolusing for the meal at the end of a tt).	2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt	b1e3b45ce9	Add temp target to Wizard dialog ... Also, store checkboxes' state as prefereces. (cherry picked from commit 6e1c66e)	2017-09-09 16:30:17 +02:00
Milos Kozak	e3ae7bbeaf	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-05 22:47:37 +02:00
Milos Kozak	98848b61ec	send max 30 at once to NS	2017-09-05 22:47:10 +02:00
SMUSTAF1	1fd99a9582	changing the color of the bolus value, for visual clarify and confirmation. Reducing errors.	2017-09-05 13:29:43 +02:00
Milos Kozak	90496d0a02	Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh ... Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…	2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt	3bebea37ae	Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab.	2017-09-03 01:53:30 +02:00
Milos Kozak	fa24368701	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-02 10:26:07 +02:00
Milos Kozak	7801db5a29	fix danar bolus step	2017-09-02 10:25:46 +02:00
AdrianLxM	15a40cba80	Split treatments into smaller packages before broadcasting	2017-09-01 14:02:47 +02:00
Milos Kozak	db952759e1	Insulin fragments consolidation	2017-08-31 22:00:45 +02:00
Milos Kozak	c312b51fcf	consolidate DanaR fragments	2017-08-31 19:32:28 +02:00
Milos Kozak	13b8a9ecf2	Merge pull request #404 from kakoni/master ... Adding out_units support for determine-basal.js	2017-08-29 18:23:36 +02:00
Milos Kozak	981a96aa16	ConfigBuilder layout	2017-08-29 17:59:46 +02:00
Karri Niemelä	034faa4f6e	Adding support out_units	2017-08-29 15:06:53 +03:00
Johannes Mockenhaupt	448f527525	Splitted boluses: add a wait, so that boluses are delivered with 40s between them.	2017-08-28 21:02:37 +02:00
Milos Kozak	addd6c8232	fix conflict	2017-08-28 19:15:33 +02:00
Johannes Mockenhaupt	381a26119b	Crap, don't enable experimental bolus by default.	2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt	b85f5324de	Restore bolus splitting hack.	2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt	ecd05bef2d	Make new BolusCommand configurable.	2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt	95fda165a3	Merge fixes without changes to behaviour.	2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt	c8f7b535c2	Remove code to determine pump capabilities for the time being.	2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt	40941996c2	Don't provide status JSON until we can provide it properly.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	ff088ddd3f	ComboPlugin: don't implement ConstraintsInterface, ProfileInterface.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	1d53305ff9	Use string resource.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	fdab7daf2c	Only display Extended Bolus tab in Treatments if pump supports them. ... (cherry picked from commit e862c35)	2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt	fce696b51d	Cleanup, fix merge issues.	2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt	4d2fa19ad4	Merge branch 'bolus-progress' into rework ... * bolus-progress: wip wip wip more more Remove TODOs for extended bolus. wip cancelling Initial take on bolus cancellation. Initial take on bolus progress reporting. Add alternative SetTbrCommand for pumps with different behaviour. Formatting.	2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt	e6ba99b02f	Fix reading blinking values, use alternate SetTbrCommand by default, ... cleanups	2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt	37523fbdd1	ComboPlugin: Extract fields into ComboPump.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	3fdac4b23e	Small refactoring.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	9f57f82b6a	Remove wait for carb-only treatment.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	c301d6585c	ComboPlugin: implement Constraint, ProfileInterface.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	eb74a24e54	Misc cleanups.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	9349662f8e	Rename ReadPumpStateCommand -> GetPumpStateCommand.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	1d3411ba56	Show connection, execution time in combo fragment. ... (cherry picked from commit 4078c23)	2017-08-27 12:36:28 +02:00
Milos Kozak	03bf1abdd4	add WakeLock#isHeld()	2017-08-27 11:57:06 +02:00
Milos Kozak	1417410dbb	add WakeLock#isHeld()	2017-08-27 11:53:36 +02:00
Milos Kozak	ba967df2e3	disable careportal buttons until profile is set	2017-08-27 11:44:39 +02:00
Milos Kozak	b02b1829ad	put back sensitivity plugins	2017-08-26 21:26:40 +02:00
Milos Kozak	3369ce1759	temporary remove untested plugin for release	2017-08-26 20:42:25 +02:00
Milos Kozak	adceef3641	fix merge conflict	2017-08-23 23:42:51 +02:00
Milos Kozak	4e8d92a74b	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-23 23:04:10 +02:00
Milos Kozak	ad3d175b02	better handling DetailedBolusInfo in v2 driver	2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt	52d2b425b8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (21 commits) 1.5h Don't change schema. Fix comparing non-primitives. Generify MainApp.getSpecificPlugin. Fix some warnings / simplify a bit. Remove now unused dia, insulinInterfaceId from Treatment. correct supercall Use bolusstep granularity in fill dialog bugfix: fill as invalid treatments if triggered from phone add invalid treatments to charts in "invalid" colour Use bolusstep as step for insulin correction in wizard Update strings.xml fix of fix :( small refactoring Multiply time passed instead of divide dia. Update strings.xml Fix initalizing profile with default values. moved the code of the bg update to the top before all the loop logic happens, so there would be no delay Update strings.xml Update strings.xml ...	2017-08-23 16:36:06 +02:00
Milos Kozak	d6a27c1af0	1.5h	2017-08-23 13:28:07 +02:00
Milos Kozak	01a93a35b9	Merge branch 'dev' into smb	2017-08-22 20:34:38 +02:00
Milos Kozak	c98cd3c834	Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume ... Delay in bg update on resume	2017-08-22 20:33:56 +02:00
Milos Kozak	e74c2b564a	fix conflicts	2017-08-22 20:25:10 +02:00
Milos Kozak	0551f7f16d	Merge pull request #387 from MilosKozak/invalid-overview ... Fill treatments in Overview	2017-08-22 20:20:28 +02:00
Milos Kozak	5b17eee586	Merge pull request #389 from jotomo/cleanups ... Cleanups	2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt	bde57fde5f	Don't change schema.	2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt	56423028f6	Fix comparing non-primitives.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	30372897c0	Generify MainApp.getSpecificPlugin.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	59c7dbef27	Fix some warnings / simplify a bit.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	97d0140614	Remove now unused dia, insulinInterfaceId from Treatment.	2017-08-22 13:47:02 +02:00
AdrianLxM	d5ea2a2f08	correct supercall	2017-08-22 13:26:48 +02:00
AdrianLxM	4d33e1df97	Use bolusstep granularity in fill dialog	2017-08-22 13:02:56 +02:00
AdrianLxM	7ea33c7de4	bugfix: fill as invalid treatments if triggered from phone	2017-08-22 12:57:03 +02:00
AdrianLxM	3f8dea1197	add invalid treatments to charts in "invalid" colour	2017-08-22 12:56:17 +02:00
AdrianLxM	6b0bf5860c	Use bolusstep as step for insulin correction in wizard	2017-08-22 00:41:23 +02:00
Milos Kozak	aad168c50f	visualize SMB	2017-08-21 17:42:26 +02:00
Milos Kozak	204c39880f	mark SMB boluses in treatments tab	2017-08-21 17:22:25 +02:00
Milos Kozak	4f16700dc0	provide lastBolusTime	2017-08-21 15:47:37 +02:00
Milos Kozak	ebfc4e3075	colored predictions	2017-08-21 15:36:52 +02:00
Milos Kozak	f5143b2ec4	display UAM prediction	2017-08-21 09:24:17 +02:00
Milos Kozak	ec114c3b38	execute SMB	2017-08-21 08:41:34 +02:00
Milos Kozak	466ba2907b	Merge branch 'dev' into smb	2017-08-20 21:53:19 +02:00
Milos Kozak	33cf707d45	Merge pull request #380 from MilosKozak/dia-divisor-fix ... Dia divisor / bolussnooze fix	2017-08-20 21:52:42 +02:00
Milos Kozak	a18e2b4641	fix of fix :(	2017-08-20 19:42:41 +02:00
Johannes Mockenhaupt	bffcd3ceee	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (35 commits) fix displaying target in mmol Profile.getValuesList: don't add trailing newline. Fix some warnings. Use OK/Cancel buttons for profile removal dialog. static variables -> object variables Avoid npe if no string is assigned to the profile switch isValid implementation Show profile on tap in Treatments->ProfileSwitch Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt	387ceff525	Add config options: ... * alternate SetTbrCommand impl (original impl) * split bolus (quick hack) to split up boluses to slow delivery	2017-08-19 22:29:48 +02:00
AdrianLxM	9c2808bf6f	small refactoring	2017-08-19 20:37:25 +02:00
AdrianLxM	d49eea854c	Multiply time passed instead of divide dia.	2017-08-19 20:12:37 +02:00
Johannes Mockenhaupt	ce4aee67d0	Fix initalizing profile with default values.	2017-08-19 12:28:10 +02:00
Susan	4f3b5f551a	moved the code of the bg update to the top before all the loop logic happens, so there would be no delay	2017-08-18 20:58:54 +02:00
Milos Kozak	838deed1e8	Merge branch 'dev' into smb	2017-08-18 12:30:09 +02:00
Johannes Mockenhaupt	d851637d4f	more	2017-08-18 11:55:19 +02:00
Milos Kozak	6b8dd5868d	fix displaying target in mmol	2017-08-18 11:46:04 +02:00
Milos Kozak	a097bf51aa	minDeviationSlope 1st try	2017-08-17 23:37:59 +02:00
Johannes Mockenhaupt	5991f307af	Profile.getValuesList: don't add trailing newline.	2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt	a6351f4455	Fix some warnings.	2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt	4f2357e9fb	Use OK/Cancel buttons for profile removal dialog.	2017-08-17 22:01:59 +02:00
AdrianLxM	5d6327bfaa	static variables -> object variables	2017-08-17 21:34:30 +02:00
AdrianLxM	5769915f8c	Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer	2017-08-17 21:29:15 +02:00
Milos Kozak	c36587430c	fix merge conflict	2017-08-17 21:24:50 +02:00
AdrianLxM	0cc9ee4193	Avoid npe if no string is assigned to the profile switch	2017-08-17 21:24:31 +02:00
Milos Kozak	ca3d94a8ca	fix merge conflict	2017-08-17 21:21:38 +02:00
Milos Kozak	73c2be5248	isValid implementation	2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt	fabaf7c2ef	more	2017-08-17 19:04:43 +02:00
AdrianLxM	92077dcb6a	Show profile on tap in Treatments->ProfileSwitch	2017-08-17 17:03:08 +02:00
Johannes Mockenhaupt	738dd72f5b	Remove TODOs for extended bolus.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	22e3517cd6	wip cancelling	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	a664bdeaaa	Initial take on bolus cancellation.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	c1ecad1ed6	Initial take on bolus progress reporting.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	a230501f74	Add alternative SetTbrCommand for pumps with different behaviour.	2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt	f41d597c07	Formatting.	2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt	b000824b8a	Merge branch 'remove-cmd-retry-with-reconnect' into develop ... * remove-cmd-retry-with-reconnect: Don't rebind ruffy and retry command in case of failure.	2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt	a19e49e5f8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (27 commits) Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. Overview: format target using unit specific format. Dutch language insulincurves - notification on short DIA insulincurves - forgotten string updated insulincurves - rename peak to peak time insulincurves - remove unused base fragment insulincurves - i18n insulincurves - ActivityGraph fix double plotting ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-17 10:08:15 +02:00
AdrianLxM	47e295b3c1	Check for tempbasal not RealTempbasla	2017-08-17 00:42:26 +02:00
AdrianLxM	776ae3f424	Overlapping interval - regard first element on cut	2017-08-16 23:56:14 +02:00
Milos Kozak	6ca44fce84	Merge pull request #367 from MilosKozak/profile-switch-buttons ... show notification on toast alarm	2017-08-16 22:58:34 +02:00
AdrianLxM	e61d7a4442	show notification on toast alarm	2017-08-16 21:37:33 +02:00
Milos Kozak	b93a153b23	parse 12h format properly	2017-08-16 19:33:41 +02:00
Milos Kozak	e5cc34b975	fix merge conflict	2017-08-16 18:38:14 +02:00
Milos Kozak	7884c98f2f	fix index	2017-08-16 18:26:47 +02:00
Milos Kozak	35db28f013	Merge pull request #365 from MilosKozak/dia-expecteddelta-fix ... Restrict DIA for expectedDelta	2017-08-16 18:11:37 +02:00
Milos Kozak	69a378bb75	Merge pull request #366 from MilosKozak/profile-switch-buttons ... Show profile switch button in profiles	2017-08-16 18:11:26 +02:00
AdrianLxM	63793ed358	Show profile switch button in profiles ... Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written. Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE". This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.	2017-08-16 17:56:57 +02:00
Milos Kozak	e005a6172b	set pump time only if needed	2017-08-16 17:26:58 +02:00
AdrianLxM	5fc63d8f16	restrict DIA for expectedDelta	2017-08-16 14:23:22 +02:00
Milos Kozak	e1d2c557af	Merge pull request #364 from MilosKozak/overlappin-intervals-fix ... Overlappinginterfals - find first element	2017-08-16 08:11:04 +02:00
Milos Kozak	898e162300	initial work on SMB	2017-08-15 23:13:37 +02:00
AdrianLxM	2e382267d4	Overlappinginterfals - find first element	2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt	759afcec7a	Extract method Profile.toTargetRangeString.	2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt	754a0097b9	Simplify.	2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt	6dcdeb2bbc	Overview: format target using unit specific format.	2017-08-15 14:51:09 +02:00
Johannes Mockenhaupt	f0d9f0e86a	Don't rebind ruffy and retry command in case of failure. ... RuffyService is now immeditately rebound when connection was lost, therefore retrying a command after blindly rebinding the service doesn't make sense anymore,more so given that ruffy is less prone to crashing now.	2017-08-15 14:03:01 +02:00
AdrianLxM	ee7b3cca22	insulincurves - notification on short DIA	2017-08-14 20:41:24 +02:00
AdrianLxM	f23c3e7ae1	insulincurves - forgotten string updated	2017-08-14 16:44:39 +02:00
AdrianLxM	94fbd620f4	insulincurves - remove unused base fragment	2017-08-14 15:53:47 +02:00
AdrianLxM	ced1da09cf	insulincurves - i18n	2017-08-14 15:25:37 +02:00
AdrianLxM	13cd7dbda1	insulincurves - ActivityGraph fix double plotting	2017-08-14 15:25:21 +02:00
AdrianLxM	085caddeee	insulincurves - freepeak	2017-08-14 15:24:55 +02:00
AdrianLxM	63d46aed56	insulincurves - minimum 5	2017-08-14 15:24:41 +02:00
AdrianLxM	a538160e76	insulincurves - rapid and ultra both with adjustable dia	2017-08-14 15:24:30 +02:00
AdrianLxM	b8496e3208	insulincurves - working with default params	2017-08-14 15:22:27 +02:00
Milos Kozak	2d2ccde6e4	log Bundle	2017-08-14 12:11:53 +02:00
Timm Korte	e9672ff4aa	adjust setTempBasalAbsolute interface to include the new upstream 'force' parameter	2017-08-14 00:05:40 +02:00
Timm Korte	882f9d7869	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-13 23:57:07 +02:00
Milos Kozak	a49a496651	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force	2017-08-13 20:31:45 +02:00
Milos Kozak	d4642b3958	do not enforce stop for v2 driver	2017-08-13 20:31:15 +02:00
Johannes Mockenhaupt	2f3d362240	Use SystemClock.sleep() instead of Thread.sleep() throughout.	2017-08-12 15:22:55 +02:00
Timm Korte	6bbb785574	rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute	2017-08-12 13:36:35 +02:00
AdrianLxM	f861546e12	Quickfix to avoid crashes after staleData merge	2017-08-12 11:20:56 +02:00
Timm Korte	8db9cb8887	add cancelTempBasal to setTempBasal if forced	2017-08-11 23:06:35 +02:00
Milos Kozak	73b6235188	APSRequest Answers event	2017-08-11 22:46:08 +02:00
Timm Korte	7839299530	add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50	2017-08-11 22:08:33 +02:00
Milos Kozak	2770e93ed4	Merge pull request #337 from RoumenGeorgiev/dev ... Alarm for StaleData	2017-08-11 18:45:52 +02:00
Sandra Keßler	e2b09f9e42	recovered merge/unmerge damage	2017-08-11 17:35:58 +02:00
Johannes Mockenhaupt	089295188f	Revert merge which was committed due to a misunderstanding.	2017-08-11 17:35:58 +02:00
Sandra Keßler	6dba4e4956	fix >500% basal setting	2017-08-11 17:35:58 +02:00
Milos Kozak	f703c82ca7	microbolus calculation	2017-08-10 17:28:41 +02:00
Timm Korte	e7249bf72e	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-10 11:13:21 +02:00