4214 commits

Author	SHA1	Message	Date
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
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	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
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
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	34af5bc20b	Source code from ruffyscripter, ruffy-spi modules.	2018-01-28 22:03:32 +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