6658 commits

Author	SHA1	Message	Date
Milos Kozak	d4858305a9	fix double value	2019-06-14 12:09:27 +02:00
Milos Kozak	89fef312c5	Merge pull request #1830 from andyrozman/bug_1828 ... Solution for bug 1828	2019-06-14 11:44:24 +02:00
Milos Kozak	d9bd1c6c98	remove unneeded file	2019-06-14 10:53:13 +02:00
Milos Kozak	75c13cef8f	bus observeOn, Tandem as manufacture	2019-06-14 10:52:41 +02:00
Andy Rozman	125fa5fef9	Fix for problem 1631, problem with issueing of super bolus. We now check what type of TBR pump has, if its absolute it calles tempBasalAbsolute or else tempBasalPercent method	2019-06-13 23:57:36 +01:00
Andy Rozman	1432ad81e6	Solution for bug 1828 - If suspend is called from Overview, it checks which TBR type is supported by default and ... then starts correct TBR method...	2019-06-13 00:14:28 +01:00
Andy Rozman	85381af2fb	Fixing problem with history ... Fix for log	2019-06-09 22:26:50 +01:00
Andy Rozman	bb466595e6	Minor change with collection	2019-06-09 18:54:19 +01:00
Andy Rozman	a19d71df89	0.10.5-SNAPSHOT ... - added custom comnand for reseting RL configuration - removed guava Splitter and use my own code - remove old unsused code	2019-06-09 16:58:23 +01:00
Milos Kozak	9d90c36a94	process TBR correctly	2019-06-09 15:17:16 +02:00
Milos Kozak	243e6c5801	pump manufacters etc	2019-06-09 14:02:33 +02:00
Milos Kozak	c49da9a818	conditional upload	2019-06-08 23:39:14 +02:00
Milos Kozak	d2e7cc9041	Provide manufacter, model, SN for pump	2019-06-08 22:39:26 +02:00
Milos Kozak	edb4844b7a	more kotlin, less java	2019-06-07 16:09:10 +02:00
Milos Kozak	7d6ed94491	Scrollview	2019-06-07 15:40:05 +02:00
Milos Kozak	a7451c9b16	CompositeDisposable	2019-06-07 14:46:24 +02:00
Milos Kozak	10584d9b00	RxBus	2019-06-07 12:46:08 +02:00
Milos Kozak	643ddfae52	cleanup, hook to preferences change	2019-06-07 11:07:08 +02:00
Milos Kozak	01006b32ce	remove explicit enable checkbox, test login	2019-06-07 09:13:29 +02:00
Milos Kozak	5dbdd5e437	layout improvement	2019-06-06 23:25:21 +02:00
Milos Kozak	ba0b7ec83d	code tweaking, upload profile	2019-06-06 22:15:57 +02:00
Milos Kozak	21a49f731c	code cleanup, set uuid properly	2019-06-05 16:29:19 +02:00
Milos Kozak	a0c00273bc	remove window latency	2019-06-05 10:47:32 +02:00
Milos Kozak	8ea5968f4d	reset time button	2019-06-05 00:22:57 +02:00
Milos Kozak	e32801ca6b	preferences, button	2019-06-04 07:38:17 +02:00
Milos Kozak	4a07e01b7d	fix NPE	2019-06-03 22:07:38 +02:00
Milos Kozak	5ab79f7f5a	New login after removed dataset	2019-06-03 22:00:53 +02:00
Roumen Georgiev	116865896b	Automation (#69) (#70) ... * Adding trigger AutosensValue * new trigger and tests * AS value in % * adding tests * fixed tests * fix for maxValue and tests * Using InputDouble * icon added * unavailable data and IS_NOT_AVAILABLE case * Fixing after comments * Autosens !=0 && IS_NOT_AVAILABLE doesn't exist enymore * cleanup	2019-06-03 15:06:40 +03:00
Milos Kozak	048ea4d489	Tidepool test UI	2019-06-03 00:03:06 +02:00
Milos Kozak	e2364561ed	transform to kotlin, cleanup, sort	2019-06-02 16:24:51 +02:00
Andy Rozman	43c472da17	0.10.4-SNAPSHOT ... - fixed Tune up - displaying power	2019-06-01 22:18:30 +01:00
Milos Kozak	42ceaac0f7	remove activeandroid	2019-06-01 22:29:57 +02:00
Milos Kozak	6f4d79bca8	fix copy paste errors	2019-06-01 18:51:41 +02:00
Milos Kozak	9b1acf6958	add missing classes. convert to use AAPS data	2019-06-01 18:40:33 +02:00
Andy Rozman	86ffc3370a	Merge branch 'dev' into medtronic_andy	2019-06-01 17:34:30 +01:00
Milos Kozak	dd637021f7	tidepool xdrip port	2019-06-01 00:48:37 +02:00
Milos Kozak	15e997abb3	cleanup	2019-05-31 10:44:38 +02:00
Roumen Georgiev	5c4910ed5b	added trigger Delta	2019-05-30 12:16:42 +03:00
Andy Rozman	67862d3385	- fix for task #126 - battery display, it will work for Alakaline and Lithium battery, but probably not for recharchargables	2019-05-26 14:44:33 +01:00
Roumen Georgiev	af739a3b66	Fixing after comments	2019-05-23 10:59:28 +03:00
Roumen Georgiev	27eb11e5df	unavailable data and IS_NOT_AVAILABLE case	2019-05-20 11:21:51 +03:00
Andy Rozman	5a7146d3a9	- fix bolus saving	2019-05-18 20:28:25 +01:00
Andy Rozman	26d02c0062	0.10.3-SNAPSHOT ... - fix for error	2019-05-18 18:25:40 +01:00
Andy Rozman	a897a72142	0.10.2-SNAPSHOT ... - added functionality so that encoding can be changed on the fly - chnaged TretmentService, rewrote method for createOrUpdate entry (fix for #125)	2019-05-18 14:49:44 +01:00
Milos Kozak	a20efab567	remove deprecated calls	2019-05-16 19:54:35 +02:00
Roumen Georgiev	ccd66d498c	icon added	2019-05-16 16:03:05 +03:00
Milos Kozak	9a76f3386d	androidx transition	2019-05-16 13:57:37 +02:00
Roumen Georgiev	4aaca7acb1	Using InputDouble	2019-05-16 12:08:36 +03:00
Andy Rozman	fe73eba2a2	0.10.1-SNAPSHOT ... - Bolus Wizard entries (CH) is processed - Better RSSI calculation for Tunning - #124: Added retries to pump command (extended current retry functionality) that should take care of this problem - Removed all un-needed logging and brining it under correct logging context (PUMP, PUMPCOMM, PUMPBTCOMM) - added RileyLink Hardware encoding	2019-05-15 23:04:44 +01:00
Milos Kozak	5a478578e0	targetsdk 28	2019-05-15 23:26:07 +02:00
Milos Kozak	2ed1afa7c0	Merge pull request #1795 from MilosKozak/notiffix ... Notification fix	2019-05-15 22:03:26 +02:00
Milos Kozak	2aea732326	Merge pull request #1796 from MilosKozak/basalrenderfix ... fix basal rendering	2019-05-15 22:02:48 +02:00
Roumen Georgiev	3280f220ad	fix for maxValue and tests	2019-05-15 17:11:47 +03:00
Roumen Georgiev	5d86ca742a	AS value in %	2019-05-15 14:52:17 +03:00
Roumen Georgiev	e220a42e4b	new trigger and tests	2019-05-14 16:50:07 +03:00
Roumen Georgiev	6e63d340cd	reworked to use DBHelper	2019-05-13 14:18:10 +03:00
Milos Kozak	2505999a25	Merge pull request #1794 from MilosKozak/pumpcontrol-fix ... Pump control: Fix crash when opening Insight paring activity	2019-05-12 14:56:56 +02:00
Milos Kozak	45d0d8ce13	Merge branch 'dev' into automation	2019-05-12 13:18:18 +02:00
Milos Kozak	4fda6c4c4f	fix basal rendering	2019-05-12 10:52:25 +02:00
Milos Kozak	f4138a2fc0	fix index out of bouns	2019-05-12 10:43:32 +02:00
Tebbe Ubben	552298496f	Pump control: Fix crash when opening Insight paring activity	2019-05-12 02:20:00 +02:00
Milos Kozak	62b2d83a18	cleanup (#68)	2019-05-10 09:47:32 +03:00
Andy Rozman	bf49678572	- removed encoding for now, since it doesn't work correctly yet	2019-05-05 19:42:48 +01:00
Andy Rozman	7aedfde1c9	- added migration for settings for encoding	2019-05-05 18:00:55 +01:00
Andy Rozman	2ae7d0a292	- fixed problem with TDD ... - added new command/action for Reset RileyLink (not working yet) - added Hardware encoding for RileyLink	2019-05-05 17:22:10 +01:00
Milos Kozak	bf8870fdf4	Merge pull request #1767 from MilosKozak/devbranchcheck ... better check for dev branch	2019-05-05 17:08:17 +02:00
Andy Rozman	cff20f78c8	- added functionality to map TBRs to Pump History Records (similar to Bolus) ... - changed log size to 5 MB (as it was before)	2019-05-04 20:34:46 +01:00
Andy Rozman	b5da57e20f	Merge branch 'dev' into medtronic_andy	2019-05-03 21:35:18 +01:00
Milos Kozak	a33e1f6d3c	TriggerLocation	2019-05-03 07:37:49 +02:00
Andy Rozman	5cca0b821b	Some gradle changes and fixes after merge.	2019-05-02 23:27:49 +01:00
Milos Kozak	3ab2a142d1	Merge remote-tracking branch 'origin/dev' into automation	2019-05-02 22:27:54 +02:00
Milos Kozak	75d469a9db	Merge pull request #1781 from MilosKozak/NPEfixes ... NPE fixes from Firebase	2019-05-02 22:24:20 +02:00
Andy Rozman	26f837397d	Merge branch 'dev' into medtronic_andy	2019-05-02 20:51:55 +01:00
Milos Kozak	a303d71d25	scanning = false if no adapter present	2019-05-02 21:51:44 +02:00
Andy Rozman	7f61f45b78	- RileyStatusGeneral fixed in case fimrware is not set (no connection to RL yet, when page is opened) - Crashalytics ... - Possible fix for SMB problem - Possible fix for Treatments saving - If last History entry has no date set, system doesn't crash (it crashed because it tryied to parse date and setting wrong values	2019-05-02 20:22:44 +01:00
Milos Kozak	6c7a18067f	remove misplaced @Nullable	2019-05-01 22:59:48 +02:00
Tebbe Ubben	85ea146c8b	Allow : in rovoked_certs.txt	2019-05-01 16:46:49 +02:00
Tebbe Ubben	2de4383535	Improve code style	2019-05-01 16:33:49 +02:00
Tebbe Ubben	a2d108b4c4	finally block to close input stream	2019-05-01 16:25:41 +02:00
Tebbe Ubben	de64b1ecf7	Fix typo	2019-05-01 16:24:11 +02:00
Tebbe Ubben	d744d1a732	Update header	2019-05-01 16:22:05 +02:00
Tebbe Ubben	609309ab47	Signature Verifier	2019-05-01 16:08:47 +02:00
Roumen Georgiev	85bf1fd6bd	Fix + more tests	2019-04-30 15:07:43 +03:00
Milos Kozak	b7119b31e9	Merge pull request #1779 from MilosKozak/loop-on-LOW ... Include 39 as valid value	2019-04-29 12:24:34 +02:00
Milos Kozak	4336b47431	NPE fixes from Firebase	2019-04-29 11:36:30 +02:00
AdrianLxM	3a7b00f424	Include 39 as valid value	2019-04-28 14:33:04 +02:00
AdrianLxM	f2c18cbc1f	Don't warn if next loop invocation is prior to update check	2019-04-25 22:13:31 +02:00
Milos Kozak	26c236a79e	better check for dev branch	2019-04-25 16:13:21 +02:00
Tebbe Ubben	ffbb373481	Insight: Update sqlite_sequence on DB update	2019-04-24 22:36:29 +02:00
AdrianLxM	7c890f2129	Merge pull request #1757 from MilosKozak/update-checker ... update logic version checker	2019-04-23 21:58:52 +02:00
AdrianLxM	0cab8c1d89	warn at date	2019-04-23 21:40:10 +02:00
AdrianLxM	249121f80d	outdated on install edge case	2019-04-23 21:22:44 +02:00
Roumen Georgiev	87a6e006b2	GlucoseStatus changes	2019-04-23 10:08:52 +03:00
Roumen Georgiev	a51113cfdf	try to calculate direction of BG if missing	2019-04-23 10:07:32 +03:00
Milos Kozak	a678c6509c	TriggerWifiSsid, UI tweaking	2019-04-22 22:47:59 +02:00
AdrianLxM	0361ee8589	update logic version checker	2019-04-22 14:10:12 +02:00
Milos Kozak	1840ddabb3	TriggerTempTarget	2019-04-22 12:42:19 +02:00
Milos Kozak	bef170699f	Merge pull request #1756 from schmitzn/automation-patch1 ... Check value after setting unit	2019-04-22 09:37:17 +02:00
Milos Kozak	45312d9ffe	ActionProfileSwitchPercent	2019-04-21 23:48:05 +02:00
Milos Kozak	42cd2ddaa3	TriggerProfilePercent	2019-04-21 22:32:06 +02:00
Nico Schmitz	3fec2ce16c	Check value after setting unit ... This makes sure that the value is in the range of minValue and maxValue. Also, it sets an inital value != 0 as it's called in the constructor.	2019-04-21 20:01:29 +02:00
Milos Kozak	e679f5eaff	ActionNotification	2019-04-21 16:17:25 +02:00
Milos Kozak	5f32eea488	Merge branch 'dev' into automation	2019-04-21 10:39:24 +02:00
Milos Kozak	8ca3d7cba2	TriggerIob, refactoring, lint cleanup, tests	2019-04-21 10:04:30 +02:00
Milos Kozak	27783fe33e	TriggerIob, more fixes	2019-04-19 09:20:59 +02:00
Milos Kozak	715a59bfba	Merge pull request #1749 from MilosKozak/update-checker ... Update checker	2019-04-18 22:26:18 +02:00
Milos Kozak	a08f01e69b	more TriggerBg tests	2019-04-18 21:06:16 +02:00
Milos Kozak	a5979bb485	fix test after merge	2019-04-18 20:01:13 +02:00
Milos Kozak	46c6cdf98f	Merge remote-tracking branch 'origin/dev' into automation	2019-04-18 19:48:51 +02:00
Milos Kozak	89ec81a850	UI and logic tweaking	2019-04-18 19:33:23 +02:00
AdrianLxM	092400f7a0	check regularly	2019-04-17 22:45:21 +02:00
AdrianLxM	4bde759a50	version checker plugin logic	2019-04-17 22:23:35 +02:00
AdrianLxM	84573cc0cc	refactor constraints checker	2019-04-17 21:29:16 +02:00
Milos Kozak	4b71be4992	Merge pull request #1747 from MilosKozak/glucosestatusfix ... Fix GlucoseStatus calcuation	2019-04-17 20:30:18 +02:00
Milos Kozak	d7af6f6cc1	Merge pull request #1735 from MilosKozak/insight-seq ... Insight: Set SQLite sequence to current time millis on table creation	2019-04-17 20:29:17 +02:00
Tebbe Ubben	39412ae032	Fix initial sqlite_sequence for Insight driver	2019-04-17 17:31:10 +02:00
Milos Kozak	a828bcba53	pass last execution time to triggers	2019-04-16 23:52:30 +02:00
Milos Kozak	a6bd81a1b9	fix tests	2019-04-16 21:28:21 +02:00
Milos Kozak	4ae7efc75f	Merge branch 'dev' into automation	2019-04-16 21:08:08 +02:00
Milos Kozak	952a6fe509	fix GlucoseStatus calculation	2019-04-16 20:36:18 +02:00
Milos Kozak	985f562518	calculate iob prediction based on autosens	2019-04-15 23:07:13 +02:00
Lee Braiden	78f2da405f	Fix potential NPE in AlarmSoundService destructor.	2019-04-15 19:17:44 +01:00
Milos Kozak	76932d6899	EventProfileSwitchChange -> EventProfileNeedsUpdate	2019-04-15 16:48:18 +02:00
Milos Kozak	be252c9374	Clear basalDataTable on significant change	2019-04-15 16:47:42 +02:00
Milos Kozak	7e54db64be	Glucose logging	2019-04-15 15:19:19 +02:00
AdrianLxM	f739980988	testing and SP logic	2019-04-15 08:04:56 +02:00
Milos Kozak	d70f2b6f75	Merge pull request #1742 from jotomo/1740 ... Split up receivers for local BG broadcasts and SMS.	2019-04-15 07:56:26 +02:00
Johannes Mockenhaupt	e27f16f5f8	Javadoc.	2019-04-14 17:55:43 +02:00
Andy Rozman	dbb9c132f4	- Fix for Unabsorbed and items without date set	2019-04-14 14:53:00 +01:00
Milos Kozak	0f6b05206f	clear MidnightTime cache	2019-04-13 21:49:15 +02:00
Johannes Mockenhaupt	59d3c79ed5	Split up receivers for local BG broadcasts and SMS. ... Receiving local BG values probably fails silently when SMS permission is not granted (due to SMS plugin not being used).	2019-04-13 14:20:27 +02:00
Andy Rozman	c7f6eb79f0	- fixes for Bolus problems	2019-04-12 21:20:09 +01:00
AdrianLxM	04618156cc	restructure and test version checker	2019-04-11 12:43:52 +02:00
Milos Kozak	1286aabb5b	log remote	2019-04-11 10:16:52 +02:00
Andy Rozman	ad17c66b1b	Merge branch 'dev' into medtronic_andy	2019-04-10 17:05:56 +01:00
Andy Rozman	7392eaeb58	- gradle fixes ... - remove formatting changes - moved plugins/general/overview/Dialogs/ to plugins/general/overview/dialogs/ - fixing treatment changes that are received from NS, and extending copying of data to ignore pumpId	2019-04-10 16:24:16 +01:00
Tebbe Ubben	d786a2a898	Insight: Set SQLite Sequence to current time millis on table creation	2019-04-10 16:15:18 +02:00
Johannes Mockenhaupt	a33afc99f6	JUST PLAYING AROUND	2019-04-10 14:51:50 +02:00
AdrianLxM	c34cf576e5	VersionCheckerPlugin nightly stub	2019-04-10 00:41:48 +02:00
AdrianLxM	bd5d31a4a3	check version Java -> Kotlin	2019-04-10 00:36:02 +02:00
Andy Rozman	26a50bbbc4	- gradle fix, that might fix ClassNotFound Exception with Wear ... - fix for duplicated entries - trying to fix overwriting of data from NS (not done yet)	2019-04-09 23:14:06 +01:00
Milos Kozak	9ca179ec14	Merge pull request #1725 from Lexsus/fix_big_sms_bg ... fix error with big sms text in UTF-8	2019-04-09 15:41:43 +02:00
Milos Kozak	4d8ee19abe	check for null	2019-04-09 15:34:02 +02:00
Milos Kozak	a75c60f573	fix NPE ActionStringHandler	2019-04-09 12:51:06 +02:00
Milos Kozak	398868f34b	fix NPE TreatmentsInterface	2019-04-09 12:46:46 +02:00
Milos Kozak	e53047d4bc	fix NPE WatchUpdaterService	2019-04-09 12:43:36 +02:00
Andy Rozman	2397c8e0d2	- fixes to bolus decoding ... - PumpType set MedtronicCapabilities	2019-04-08 22:42:02 +01:00
Lucass	b2e70fd801	applied formatting	2019-04-08 22:51:22 +03:00
Milos Kozak	eee3bc4838	LINT: WakeLocks	2019-04-08 16:48:19 +02:00
Milos Kozak	190b9408bd	fixed package name	2019-04-08 15:38:20 +02:00
Milos Kozak	a06c21b585	LINT: locale	2019-04-08 15:34:02 +02:00
Lexsus	b9056384f9	fix error with big sms text in UTF-8	2019-04-08 15:23:40 +03:00
Andy Rozman	03b3bf7388	Merge branch 'dev' into medtronic_andy	2019-04-07 23:48:20 +01:00
Milos Kozak	a076b00363	check for NPE	2019-04-07 23:47:53 +02:00
Andy Rozman	8bf284f86d	- Changes made in CGMS ... - Finished support for Bolus history mapping - fixed 20 crashalytics errors	2019-04-07 22:27:18 +01:00
Milos Kozak	e8b46e7880	Merge branch 'firebase' into dev	2019-04-07 23:15:09 +02:00
AdrianLxM	6378d0a6bf	Merge branch 'dev' into 221-fix	2019-04-07 18:16:42 +02:00
AdrianLxM	5fbc274c5b	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into 221-fix	2019-04-07 17:00:36 +02:00
AdrianLxM	5e720f8081	deactivate TT raises/lowers target	2019-04-07 16:57:51 +02:00
Milos Kozak	3636480c61	Answers -> Analytics migration	2019-04-05 00:32:26 +02:00
Milos Kozak	f4b2a88862	fix typo	2019-04-03 16:53:34 +02:00
Milos Kozak	ec93045d84	fix parsin TT - missing duration	2019-04-03 16:43:56 +02:00
Milos Kozak	64c9196a5c	Merge pull request #1710 from TebbeUbben/insight-fix ... Insight: Fix automatic Careportal entries	2019-04-03 16:10:03 +02:00
Tebbe Ubben	e3f45aa6be	Fix automatic careportal entries	2019-04-03 00:07:20 +02:00
Milos Kozak	78ecb80488	Merge pull request #1703 from rob-andy/wip/libre-delta-fixes ... Calculate deltas correctly with 1 minute spaced data	2019-04-02 15:11:28 +02:00
Milos Kozak	1f62c820ca	Automation: split recurring and nonrecurring time	2019-04-02 00:05:12 +02:00
Milos Kozak	dc0846eab9	ActionStopTempTarget	2019-04-01 22:36:15 +02:00
AdrianLxM	8604d41323	reformat code	2019-04-01 21:37:20 +02:00
AdrianLxM	98a3d64c41	Merge pull request #1704 from TebbeUbben/insight-fix ... Insight fix	2019-04-01 09:36:10 +02:00
Milos Kozak	1e1c74f420	Fix SMS CAL command	2019-03-31 23:49:01 +02:00
Milos Kozak	5a555cdfba	AutomationPlugin:processActions and some tweaking	2019-03-31 21:54:31 +02:00
Andy Rozman	3489f4a746	Merge branch 'medtronic_andy' of https://github.com/andyrozman/AndroidAPS into medtronic_andy	2019-03-31 20:13:14 +01:00
Andy Rozman	bd3529e650	Merge branch 'dev' into medtronic_andy	2019-03-31 20:03:49 +01:00
Tebbe Ubben	2371034a49	Update basal profile precision handling in Insight driver v3	2019-03-31 20:26:31 +02:00
Tebbe Ubben	67fe402447	Update basal profile precision handling in Insight driver v2	2019-03-31 19:58:59 +02:00
Tebbe Ubben	e26f0fef3f	Do not overwrite detailedBolusInfo.insulin	2019-03-31 19:38:31 +02:00
Tebbe Ubben	78a3224d05	Update basal profile precision handling in Insight driver	2019-03-31 19:36:58 +02:00
Tebbe Ubben	3894e44cc7	Fix Insight DST pump time update	2019-03-31 03:47:08 +02:00
rob	25950fc6cf	Libre/miaomiao delta modifications ... * Remove hard limit of processing 9 records. Processing will now stop at first value outside of time range of interest * Keep a list of all values within 2.5 minutes. Average this value to use as the now value * Don't change the now value date. Always use the time of the latest value * Added new test for data spaced at 1 minute intervals, to mimic libre data from glimp * Fix existing test results for average < 2.5 minute data. Deltas are different due to not updating the now value time	2019-03-31 11:03:48 +10:00
Tebbe Ubben	4b86a07eac	Set result.bolusDelivered in Insight driver	2019-03-31 01:39:08 +01:00
Tebbe Ubben	ae60d68719	Fix Insight limits	2019-03-31 01:37:28 +01:00
Tebbe Ubben	c12ec4817f	Proper rounding for basal rate	2019-03-31 01:23:05 +01:00
Andy Rozman	4b144f282b	Some compile fixes and translation problems.	2019-03-30 23:31:02 +00:00
Milos Kozak	350e23647e	ActionStartTempTargetTest	2019-03-31 00:03:31 +01:00
Milos Kozak	bad6edfb8b	Action:applyTest	2019-03-30 23:08:25 +01:00
Andy Rozman	eb85cd2588	Merge branch 'dev' into medtronic_andy	2019-03-30 22:06:43 +00:00
Milos Kozak	77dd32a14f	ActionLoopSuspendTest	2019-03-30 22:47:22 +01:00
Andy Rozman	afcedc83d1	0.8.2 ... - done some fixes according to Crashalytics (most common problem from last month) - extended custom actions, to have enabled flag, and if entry is enabled=false button is not added. Added EventCustomActionsChanged event that can refresh custom actions - #111 - do not put multiple statuses into queue - #110 - set driver busy if wake up and tune is running - #104 - when bolus is delivering driver is set to busy, and custom action was added to remove this block	2019-03-30 18:36:50 +00:00
Milos Kozak	6357dd40d7	fix tests	2019-03-30 17:10:21 +01:00
Milos Kozak	cabdb1d2fb	Merge branch 'dev' into automation	2019-03-30 15:47:23 +01:00
Milos Kozak	361ffa91c8	revert changes and disable test	2019-03-30 11:11:44 +01:00
Milos Kozak	bc23ca30e2	fix test 2	2019-03-30 10:04:22 +01:00
AdrianLxM	ebc8303cc6	isSuspended -> is NOT suspended	2019-03-28 22:13:57 +01:00
AdrianLxM	d856b87703	rewrite DST logic	2019-03-28 19:38:58 +01:00
Adrian AndroidAPS	cdd3c25929	only run DST helper on certain pumps	2019-03-28 17:25:57 +01:00
Nico Schmitz	9b19907388	Replace "lower" with "lesser"	2019-03-27 00:32:10 +01:00
Nico Schmitz	236349a063	Bugfixes. Add remove icon for actions.	2019-03-26 23:28:46 +01:00
Nico Schmitz	c6766c972c	Fix AutomationEventTest	2019-03-26 22:56:17 +01:00
Nico Schmitz	dcb57ac11d	Remove clone() for Trigger	2019-03-26 22:42:21 +01:00
Nico Schmitz	7b5c26bbb9	Remove clone() for AutomationEvent and Action	2019-03-26 22:37:19 +01:00
Nico Schmitz	e1523ee82d	Introduce LayoutBuilder	2019-03-26 22:13:01 +01:00
Nico Schmitz	ba0625b03f	Update to recent upstream/dev	2019-03-26 00:47:00 +01:00
Nico Schmitz	97a7a75c86	work on automation plugin ... - implement clone() methods for actions and triggers - add AutomationEventTest - improve ui	2019-03-26 00:06:37 +01:00
Milos Kozak	0ee121d916	Merge pull request #1521 from MilosKozak/smsrefactor ... Smsrefactor	2019-03-25 08:41:09 +01:00
Milos Kozak	a0bddbdec9	Merge pull request #1690 from jotomo/show-applied-max-iob-constraints ... OpenAPSSSMBPlugin: show applied max IOB constraints.	2019-03-24 23:01:57 +01:00
Johannes Mockenhaupt	9dc02e3fa5	OpenAPSSSMBPlugin: show applied max IOB constraints.	2019-03-24 22:01:21 +01:00
Nico Schmitz	fc7e65c4d1	Update to recent upstream/dev	2019-03-22 23:08:13 +01:00
Milos Kozak	a060af8b0e	SmsCommunicator separator	2019-03-22 22:53:16 +01:00
Milos Kozak	fdbb76cb92	SmsCommunicator show COB	2019-03-22 22:45:41 +01:00
Milos Kozak	ca3c6b4093	SmsCommunicator detect commands	2019-03-22 22:18:51 +01:00
Nico Schmitz	f017b7a7a2	Work on automation plugin. ... - Remove unused imports - Add icons for actions and triggers	2019-03-21 23:38:56 +01:00
Milos Kozak	b7b9e175eb	Merge branch 'dev' into smsrefactor	2019-03-21 22:12:08 +01:00
Milos Kozak	fcc4a4edd3	SmsCommunicatorPluginTest 12	2019-03-21 21:54:46 +01:00
Milos Kozak	a9992503f6	SmsCommunicatorPluginTest 10	2019-03-21 21:00:42 +01:00
Milos Kozak	751e87ca5e	Merge pull request #1688 from AdrianLxM/dev-wear ... Dev wear	2019-03-21 10:52:14 +01:00
Nico Schmitz	6dc87db73e	Improve EditEventDialog	2019-03-21 00:38:06 +01:00
Milos Kozak	30bfa1ca1f	SmsCommunicatorPluginTest 9	2019-03-20 23:12:07 +01:00
Nico Schmitz	87cf62e8f6	Refactoring. Fixes for screen rotation.	2019-03-20 23:09:46 +01:00
Nico Schmitz	c074ec36c4	Implement temp target dialog for automation action	2019-03-20 00:39:00 +01:00
Milos Kozak	381ae67829	Merge pull request #1420 from tanja3981/improvement/#1269 ... [2.0] Improvement: Allow some objectives to go back.	2019-03-19 23:42:38 +01:00
Nico Schmitz	91e4b01f10	Display actions and merge recent upstream/dev ... - Add ActionListAdapter - Add ChooseActionDialog - Merge upstream/dev branch	2019-03-19 19:08:46 +01:00
AdrianLxM	d4d499587b	Merge remote-tracking branch 'andyremote/wear_upgrade' into dev-wear	2019-03-18 23:51:20 +01:00
Milos Kozak	db1a6bc71e	wait for finished calculations instead of acting on new BG	2019-03-18 20:59:39 +01:00
Milos Kozak	18ba5878d2	Fix1660	2019-03-17 18:51:16 +01:00
Milos Kozak	546f99f471	SmsCommunicatorPluginTest 6	2019-03-13 23:30:41 +01:00
Milos Kozak	74391eefdc	SmsCommunicatorPluginTest 5	2019-03-13 21:10:52 +01:00
Milos Kozak	4c0554f61a	SmsCommunicatorPluginTest 4	2019-03-13 19:35:48 +01:00
Milos Kozak	11ee9f54c3	Merge branch 'dev' into smsrefactor	2019-03-13 19:22:02 +01:00
Milos Kozak	826497c9f6	Fix superbolus test & allow APS plugin to be constraint	2019-03-13 18:50:37 +01:00
Milos Kozak	bb5cec95ea	SmsCommunicatorPluginTest 3	2019-03-13 14:33:28 +01:00
Andy Rozman	b1baaf48f5	remove wear warning	2019-03-12 23:57:57 +00:00
Andy Rozman	f7c4db35b5	Merge branch 'dev' into wear_upgrade	2019-03-12 22:46:38 +00:00
Milos Kozak	b24217491b	SmsCommunicatorPluginTest 1	2019-03-12 22:58:04 +01:00
Tanja Schmidt	dc89d0dfcf	Fixed: Use bage instead of pgage variable for coloring the battery age.	2019-03-12 21:30:23 +01:00
Milos Kozak	bb22b00245	AuthRequestTest	2019-03-12 19:55:47 +01:00
Milos Kozak	f6d85bdd96	correct wakelock in iob calculation	2019-03-12 11:31:21 +01:00
Milos Kozak	e1a82cc78e	SMS eleminate I and l from passcode	2019-03-11 18:33:43 +01:00
Milos Kozak	b9ea583d3d	SMS read status after bolus	2019-03-11 18:29:43 +01:00
Andy Rozman	0c27b8c6e3	fixing OverviewFragment	2019-03-10 22:24:38 +00:00
Andy Rozman	6fcb1ce230	Medtronic 0.8.1-SNAPSHOT ... - wear changes - refactoring of decoder - started work on bolus, tbr, resumes	2019-03-10 19:08:54 +00:00
Milos Kozak	c7c3506b53	SMS PROFILE command	2019-03-10 07:59:14 +01:00
Milos Kozak	f30f4cbee2	SMS code cleanup	2019-03-09 18:46:22 +01:00
Milos Kozak	53721d5d2c	SMS Plugin extended bolus support	2019-03-09 09:52:58 +01:00
Andy Rozman	8594525d2c	Merge branch 'dev' into ench_1455_custom_actions	2019-03-08 23:49:56 +00:00
Milos Kozak	79b6bc6c43	SMS Plugin allow duration in basal command	2019-03-08 23:56:35 +01:00
Milos Kozak	56f977df3c	SMS Plugin allow basal in %	2019-03-08 23:48:41 +01:00
Milos Kozak	95da55724e	SMS Plugin show ignored too	2019-03-08 23:30:25 +01:00
Milos Kozak	592d04af1d	Merge pull request #1669 from harispoljo/feature-TTRunLoop ... [Enhancement] Run loop when TemporyTarget is changed	2019-03-08 23:16:09 +01:00
Milos Kozak	9e2cb7d047	allow any non letter for SMS to ignore command	2019-03-08 23:01:33 +01:00
Milos Kozak	1eea170ead	SMS Plugin correct response for % TBR	2019-03-08 22:07:20 +01:00
Milos Kozak	6ea49f17bc	SMS Plugin add missing fragment refresh	2019-03-08 21:08:21 +01:00
Milos Kozak	791d5dbd1b	add missing files after merge	2019-03-08 19:42:48 +01:00
Milos Kozak	0051830b25	Merge branch 'dev' into smsrefactor	2019-03-08 19:41:32 +01:00
harispoljo	537c241e76	Made the intent easier to read.	2019-03-07 16:33:36 +01:00
Tebbe Ubben	286be1e78f	Insight: Enforce using first profile	2019-03-07 15:22:51 +01:00
Milos Kozak	f7c6f60131	Low storage notification	2019-03-07 11:32:09 +01:00
Roumen Georgiev	2b10e0f9e9	initial work	2019-03-07 11:32:29 +02:00
Andy Rozman	a148f5d21d	Fixed some files after merge.	2019-03-07 00:01:19 +00:00
Andy Rozman	6e500c1e75	On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out. ... On AAPS side: - added some capabilites - fully refactored SendToDataLayerThread (copied from xdrip) - updated code - all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent On Wear side: - added capabilities and refactored code in ListenerService (by looking at xdrip code)	2019-03-06 23:38:18 +00:00
Tanja Schmidt	c40907b951	Allow some objectives to go back.	2019-03-06 19:03:42 +01:00
Tanja Schmidt	a5d1905be8	Allow some objectives to go back.	2019-03-06 19:03:42 +01:00
Tanja Schmidt	92cbe45341	Fixed status noticication for charging/uncharging: check battery not power state.	2019-03-06 19:00:11 +01:00
harisp	605601bcc6	Run loop when TemporyTarget is changed	2019-03-06 12:10:28 +01:00
Milos Kozak	02db9b681d	fix MidnightTime crash + tests	2019-03-05 23:12:35 +01:00
Milos Kozak	39ddde5844	Merge pull request #1664 from MilosKozak/AdrianLxM-patch-2 ... fix version check	2019-03-05 21:24:34 +01:00
AdrianLxM	7f3924a7cb	fix version check	2019-03-05 21:06:14 +01:00
Tebbe Ubben	6cd37520c3	Fix #1661	2019-03-04 23:21:26 +01:00
Andy Rozman	011aaf5336	Moved medtronic to correct package	2019-03-02 20:39:14 +00:00
Andy Rozman	f7395c7a2c	Changes after merge, compilable, but medtronic is still in old structure.	2019-03-02 20:24:53 +00:00
AdrianLxM	5826084cf9	capitalization fix	2019-03-02 19:22:56 +01:00
Andy Rozman	289902633e	Merge branch 'dev' into medtronic_andy	2019-03-02 18:20:37 +00:00
Milos Kozak	987b3d9dd0	move dstPlugin to contraints package	2019-03-02 15:13:42 +01:00
Milos Kozak	e27c0c4b8b	Merge branch 'DstHelperPlugin' of https://github.com/PoweRGbg/AndroidAPS into PoweRGbg-DstHelperPlugin	2019-03-02 15:07:48 +01:00
Milos Kozak	e67e431526	Merge pull request #1649 from TebbeUbben/patch-1 ... Disable engineering mode for Insight	2019-03-02 14:44:43 +01:00
Milos Kozak	5938c5659b	Pumpcontrol icon	2019-03-02 14:37:53 +01:00
Tebbe Ubben	82bbf17f0e	Update MainApp.java	2019-03-02 12:18:06 +01:00
Milos Kozak	d9a9c933bc	package refactor	2019-02-28 23:16:50 +01:00
Milos Kozak	fa3d66ff8e	Merge pull request #1645 from jotomo/smb-parent-pref ... Bugfix: only allow SMB if parent preference is enabled.	2019-02-28 16:30:56 +01:00
Johannes Mockenhaupt	9c14e4eadd	Bugfix: only allow SMB if parent preference is enabled.	2019-02-28 12:41:51 +01:00
Milos Kozak	395faa7dc9	pumps package refactor	2019-02-26 20:38:27 +01:00
Milos Kozak	e3e0a44d72	fix TBR formating in fragment	2019-02-25 20:18:10 +01:00
Milos Kozak	3287129eef	SP::putDouble	2019-02-25 20:17:02 +01:00
Milos Kozak	3d3fcde35d	Query for profile only once	2019-02-25 20:12:31 +01:00
Milos Kozak	86b494229e	Fix graph scale with no data	2019-02-25 20:11:21 +01:00
Milos Kozak	94d96cbc80	Use memory records for glucose data instead of DB	2019-02-25 20:10:38 +01:00
Milos Kozak	c122618317	use key_smbmaxminutes instead of string	2019-02-25 20:08:34 +01:00
Milos Kozak	337d350ce2	Use memory record for lastBg instead of DB query	2019-02-25 20:04:29 +01:00
Milos Kozak	b0dd2f464b	Insight driver (Sight remote) removal	2019-02-25 19:33:01 +01:00
Milos Kozak	c94dda1f0a	Merge branch 'dev' into ench_1455_custom_actions	2019-02-22 15:27:00 +01:00
Andy Rozman	b0fe8fc5aa	Merge branch 'dev' into ench_1455_custom_actions	2019-02-20 23:41:09 +00:00
Andy Rozman	8b3b1e67ea	First implementation	2019-02-20 22:57:31 +00:00
Andy Rozman	a441a7e35e	Release 0.7 ... - finished decoding DailyTotals records - fixed some of most common bugs from Crashalytics	2019-02-20 15:28:14 +00:00
Milos Kozak	582101a3e9	Merge pull request #1639 from MilosKozak/fixes ... Fix applying basal constraints in non APS mode	2019-02-19 18:24:16 +01:00
Milos Kozak	95297a6292	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2019-02-19 16:26:35 +01:00
Milos Kozak	1f3696608e	Tomato BGSource plugin	2019-02-19 16:26:16 +01:00
TebbeUbben	71f73210c9	Send dismiss event in main thread	2019-02-17 22:02:51 +01:00
TebbeUbben	8f7a29bd7a	Only show notification after three timeouts during handshake	2019-02-17 22:01:01 +01:00
TebbeUbben	5fb0fe62f4	Remove timeout during handshake notification when connection was successful	2019-02-17 21:58:17 +01:00
Andy Rozman	5aa5d9f749	Merge branch 'dev' into medtronic_andy	2019-02-16 20:50:36 +00:00
TebbeUbben	361cc158e8	Timeout during handshake notification	2019-02-16 20:28:49 +01:00
TebbeUbben	d2b0665af1	Merge branch 'master' into insight-dev2	2019-02-12 15:01:29 +01:00
TebbeUbben	e49cc10e1c	Log exceptions that occur in alert service	2019-02-12 14:57:14 +01:00
TebbeUbben	a4312acb3e	Incremental recovery duration	2019-02-12 14:54:27 +01:00
TebbeUbben	c564cc2214	Reuse socket of failed connection	2019-02-12 14:36:56 +01:00
TebbeUbben	ee704c3988	Merge branch 'master' into insight-dev	2019-02-10 00:05:43 +01:00
TebbeUbben	4a11723a61	Fix zero-temp for pump stopped periods	2019-02-10 00:03:59 +01:00
TebbeUbben	7a4d721c29	Fix bolus progress dialog with bolus cancel	2019-02-09 23:50:12 +01:00
TebbeUbben	4146c8a770	Don't send final bolus event after bolus cancel	2019-02-09 23:14:57 +01:00
TebbeUbben	a8a182dc9d	Change way of checking operating mode during bolus delivery	2019-02-09 23:12:36 +01:00
TebbeUbben	0b1e181662	Quick wizard fix 2	2019-02-09 23:06:11 +01:00
TebbeUbben	05aa369bae	Merge branch 'master' into insight-dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java	2019-02-09 22:52:01 +01:00
TebbeUbben	f5d65e044c	Fix wear bolus for Insight	2019-02-09 22:49:38 +01:00
TebbeUbben	7035b9a5f2	Fix Quick Wizard for Insight pump	2019-02-09 22:47:45 +01:00
TebbeUbben	2ad4670f07	Refresh overview when pump is unpaired	2019-02-09 22:43:05 +01:00
TebbeUbben	7a7bebc5fe	Return false in isConnected and isConnecting when connection lock is not held.	2019-02-09 22:30:41 +01:00
TebbeUbben	317f171286	Fetch pump status after pairing	2019-02-09 22:25:07 +01:00
TebbeUbben	baac836d64	Don't read past history events when pump is newly paired.	2019-02-09 22:14:10 +01:00
TebbeUbben	e4fd293027	Stop fetching bolus progress when pump has switched operating mode ... (e.g. because of an empty cartridge)	2019-02-09 22:08:49 +01:00
TebbeUbben	c5241b6cad	Remove unneeded variable	2019-02-09 22:04:09 +01:00
Milos Kozak	f540c70f22	Merge branch 'dev' into G6	2019-02-08 19:11:38 +01:00
Andy Rozman	72eae6e6b8	- refactored commands, removed version out of it ... - finished Medtronic History Dialog (middle button) - refactored Set/Get Basal functionality	2019-02-07 22:41:05 +00:00
TebbeUbben	c730d3244f	Log app error codes	2019-02-04 23:56:24 +01:00
TebbeUbben	183e9a321e	Add getReservoirLevel() and getBatteryLevel() to LocalInsightPlugin	2019-02-02 17:02:03 +01:00
TebbeUbben	cc189d360f	Merge remote-tracking branch 'nico/dev-wip' into dev-nico	2019-02-02 16:58:21 +01:00
Milos Kozak	5988910d2c	Merge branch 'insight' into dev	2019-02-02 12:56:33 +01:00
AdrianLxM	3c029906db	Merge pull request #1593 from MilosKozak/AdrianLxM-patch-1 ... Wear bug with Insight-pump: ignore rounding deviations	2019-02-02 12:31:37 +01:00
TebbeUbben	71c4c411b2	Fix race condition for bolus cancel	2019-02-02 11:41:16 +01:00
TebbeUbben	a282124497	Return pump enact failure when base basal ist 0 duration execution of setTempBasalAbsolute	2019-02-02 01:38:01 +01:00
TebbeUbben	1ffd63c83a	Hide operating mode button by default	2019-02-02 01:14:27 +01:00
TebbeUbben	b0f72fc736	Only update first basal profile	2019-02-02 01:11:26 +01:00
Andy Rozman	78abf7299a	0.7.0 ... - refactored BasalProfile functionality - extended SetProfile command - fixed processing of settings for 554	2019-01-31 23:09:39 +00:00
TebbeUbben	9b45c6b291	Only enable Insight driver in engineering mode	2019-01-31 13:09:40 +01:00
TebbeUbben	d1f7086651	Merge branch 'master' into insight-dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java	2019-01-31 13:08:33 +01:00
TebbeUbben	2cde70e584	Update status of final bolusing event as well	2019-01-30 20:37:35 +01:00
TebbeUbben	827d26a39a	Insight history fix	2019-01-30 20:25:48 +01:00
TebbeUbben	e23657bfe5	Set alertActivity to null onDestroy	2019-01-27 23:02:57 +01:00
TebbeUbben	68f4a20c2b	Final bolusing event	2019-01-27 16:40:56 +01:00
TebbeUbben	0c93679ed2	Fix initial EventOverviewBolusProgress	2019-01-26 09:32:29 +01:00
TebbeUbben	5475d9bceb	Withdraw connection request when deleting pairing	2019-01-25 22:55:15 +01:00
TebbeUbben	53f7cf0dcf	Revert "Improve connection routine" ... This reverts commit 8116a24	2019-01-25 22:53:35 +01:00
TebbeUbben	8116a24fc6	Improve connection routine	2019-01-25 22:32:22 +01:00
TebbeUbben	ffc1db3c95	Add short status	2019-01-25 22:28:36 +01:00
TebbeUbben	6ac02f96cb	Fix NullPointerException	2019-01-22 13:55:38 +01:00
TebbeUbben	f6d829e575	Fix silent alert canceling	2019-01-19 15:18:41 +01:00
TebbeUbben	7724092843	Fix TBR logging	2019-01-19 15:15:56 +01:00
TebbeUbben	eb96209950	Disable old Insight driver	2019-01-19 11:59:17 +01:00
TebbeUbben	258034ca8d	Don't refresh status twice when setting TBR ... Return duration in TBR PumpEnactResult	2019-01-19 11:54:05 +01:00
TebbeUbben	2a126783b7	Upload JSON status	2019-01-19 06:31:11 +01:00
TebbeUbben	356feb5be0	Only cancel TBR if needed	2019-01-19 06:09:11 +01:00
TebbeUbben	f0a2307517	Fix race condition in alert service	2019-01-19 05:36:02 +01:00
TebbeUbben	437dee288e	Make TBR emulation setting working	2019-01-19 05:02:00 +01:00
TebbeUbben	65400560dd	Properly show TBR duration in fragment	2019-01-19 03:08:14 +01:00
TebbeUbben	4d213eae7d	Fix disconnect routine	2019-01-19 00:58:08 +01:00
TebbeUbben	cc364a0cec	Read configuration for getting active basal profile instead of using status result	2019-01-19 00:47:32 +01:00
TebbeUbben	f27ace7568	Fix PumpStoppedException while fetching status	2019-01-19 00:43:58 +01:00
TebbeUbben	85ae946296	Indicate in fragment if cartridge is not inserted	2019-01-19 00:41:29 +01:00
TebbeUbben	58a8845ec3	Don't update fragment of destroying view	2019-01-18 23:44:26 +01:00
TebbeUbben	2770a49869	Local Insight driver	2019-01-18 22:40:22 +01:00
Andy Rozman	9c08bfb8bf	[0.6] ... - bolus finalized: added delay before bolus is delivered (configurable 5, 10, 15s) and if cancel is issued, after delay, and bolus was already sent to pump, message is displayed saying that you need to manually stop the pump to cancel bolus - BLE Scanner refactored and finished (removed un-needed code) - fixed 5 most common Crashalytics errors found - fixed Basal Profile problem (I hope)	2019-01-15 20:08:31 +00:00
Andy Rozman	8fc694e812	Merge branch 'dev' into medtronic_andy	2019-01-04 22:24:44 +01:00
Andy Rozman	8698e14076	Merge branch 'dev' into medtronic_andy	2019-01-04 22:12:14 +01:00
Andy Rozman	8935abf8a5	Some changes...	2019-01-04 22:08:22 +01:00
AdrianLxM	11b8b83651	ignore rounding deviations	2019-01-04 19:27:44 +01:00
Andy Rozman	56eaacb3a2	[0.6] ... Configuration: - added delay for Bolus delivery - added choice for decoding (done on RL or in software) Code: - encoding DailyTotals for 522 and 523 - some minor fixes reported by Crashalytics - refactoring history - added history display - changes to delivering Bolus (canceling) - started adding 6b4b hardware decoding	2019-01-04 14:02:10 +01:00
Milos Kozak	2b9b3b4f16	Eversense support	2018-12-11 21:56:57 +01:00
Nico Schmitz	9e03f0f8ca	Update to current dev branch	2018-12-11 14:51:26 +01:00
Milos Kozak	8610dcc21d	G5 2018 app version support	2018-12-10 19:35:01 +01:00
Andy Rozman	adc80d5cc7	Medtronic 0.5 ... - added DailyTotalsDTO and started with work on parsing (522 done) - split encoding into 3 classes, and added exception when encoding fails - added code for retries, when in communication with pump - added analysis of history data for several occassions (profile changed, configuration changed, etc) - little refactoring all arround	2018-12-09 14:44:48 +00:00
Milos Kozak	40ad066346	Fix applying basal constraints in non APS mode	2018-12-09 10:45:56 +01:00
triplem	2693797bbd	fix duplication of resume and reconnect	2018-12-07 22:36:22 +01:00
Nico Schmitz	49b0e3ab71	Add EditTriggerDialog	2018-12-05 21:22:32 +01:00
TebbeUbben	e075a73c87	Add unit to Careportal bgcheck entries	2018-12-01 16:52:46 +01:00
TebbeUbben	dfe1e032be	Complete G6 plugin	2018-12-01 16:51:12 +01:00
Milos Kozak	a4c690e7c2	G6 register plugin	2018-12-01 10:51:53 +01:00
Milos Kozak	d664136b6e	G6 overview button support	2018-12-01 00:26:04 +01:00
Milos Kozak	946b2bfd12	Initial G6 support	2018-12-01 00:16:15 +01:00
Milos Kozak	d750438cd3	Merge pull request #1488 from schmitzn/fix-switem ... Simplify SWItem.generateLayout()	2018-11-29 15:25:38 +01:00
Milos Kozak	b8a83216a7	Merge pull request #1556 from gregorybel/gregorybel-android-auto3 ... Gregorybel: Add android auto	2018-11-29 15:24:31 +01:00
Milos Kozak	b1606d2452	Merge pull request #1551 from triplem/pr_1550 ... Total Basal in NS Profile	2018-11-25 22:40:03 +01:00
gregorybel	a23b820f3e	create 3 special lines for android auto in order to simplify view and give a more natural text to speech	2018-11-19 22:16:47 +01:00
Milos Kozak	b6cd214006	Merge pull request #1562 from MilosKozak/fixes ... Fixes	2018-11-19 19:55:34 +01:00
Milos Kozak	bc41814946	Merge pull request #1358 from quizzmaster/fix1318 ... Notifications about tbr suggestions. Fixes #1318	2018-11-18 22:39:27 +01:00
Milos Kozak	8110bef68f	Merge pull request #1540 from jotomo/upstream-1480 ... Profile switch name mangling for NS up/download	2018-11-18 22:37:57 +01:00
Milos Kozak	6e1a01e9d3	Merge pull request #1543 from triplem/suspend_with_loop_disabled ... Allow disconnection/suspend of pump even while Loop is deactivated	2018-11-18 21:24:39 +01:00
Grégory Beloncle	3310c6d618	Update PersistentNotificationPlugin.java ... - remove double call from addMessage - add comments	2018-11-14 11:07:00 +01:00
Grégory Beloncle	7497eade82	Update PersistentNotificationPlugin.java ... add comments regarding intents	2018-11-14 10:54:43 +01:00
gregorybel	9124788c4e	first commit	2018-11-12 22:38:49 +01:00
Milos Kozak	abb1dd956c	Fix sending SMS in Android 8	2018-11-12 19:00:06 +01:00
triplem	eea79c5d0f	fixes PR#1550	2018-11-08 21:14:44 +01:00
Roumen Georgiev	4ac687cc72	change constraint to isLoopInvocationAllowed	2018-11-06 13:40:56 +02:00
Roumen Georgiev	f0b5643044	revert	2018-11-06 11:45:29 +02:00
Roumen Georgiev	707a9e62d8	revert dev changes	2018-11-06 11:40:08 +02:00
Roumen Georgiev	43a61f312a	WIP DstHelper	2018-11-06 11:25:39 +02:00
Andy Rozman	b4ce95902b	0.5.1 ... - Added history reading and parsing - Added evaulation of history data (still work in progress) - Added custom actions (#1455), so that we can manually do "Wake Up and Tune" (new button in actions) - Started decoding DailyTotals records (need TDD for bolus and basal).	2018-11-05 16:49:59 +00:00
Milos Kozak	d9b9c2f5f8	Merge pull request #1538 from triplem/prepare_db_update ... enable downgrading to enable future db updates	2018-11-05 16:39:29 +01:00
Milos Kozak	0abdd1488f	Merge pull request #1539 from jotomo/overview-ui-blocking ... Overview: don't block the UI waiting for IobCob thread.	2018-11-05 16:39:05 +01:00
triplem	6ef777f411	enable downgrading to enable future db updates	2018-11-04 20:50:55 +01:00
triplem	c2d1506451	allow to reconnect	2018-11-04 19:34:46 +01:00
triplem	4cd9b19868	REname pump reconnection	2018-11-04 19:29:44 +01:00
triplem	e524c43138	Show only one resume	2018-11-04 19:23:58 +01:00
triplem	7a77571803	update logic	2018-11-04 19:06:19 +01:00
triplem	c4bbb62d0b	Initial implementation 2	2018-11-04 18:51:24 +01:00
Milos Kozak	fd2893e934	Merge pull request #1525 from MilosKozak/dev2_1 ... [WIP] 2.1 code	2018-11-03 21:25:34 +01:00
Milos Kozak	fda934c3cb	limit logging for 2.0	2018-11-02 23:24:57 +01:00
Milos Kozak	5a5d89563f	Fix BolusProgressDialog	2018-11-02 19:04:16 +01:00
Milos Kozak	0a545dc92b	Merge pull request #1532 from MilosKozak/dev ... Dev	2018-11-02 10:40:11 +01:00
Tim Gunn	0f3d932747	correct var spelling	2018-11-01 20:16:01 +13:00
Tim Gunn	f24318c105	use diff plugin	2018-11-01 20:05:14 +13:00
Milos Kozak	23a58c2fc1	== -> equals	2018-11-01 07:54:29 +01:00
Milos Kozak	b73cbacbf5	fix NPE	2018-10-31 08:05:57 +01:00
Milos Kozak	ca27843dd7	fix NPE	2018-10-31 08:02:16 +01:00
Milos Kozak	ad3794d32f	fix NPE	2018-10-31 07:59:04 +01:00
Milos Kozak	62aa49dd5b	fix loading BGs <39 #2	2018-10-30 21:25:34 +01:00
Milos Kozak	871b9b6b3d	fix loading BGs <39	2018-10-30 21:24:53 +01:00
Nico Schmitz	75d0bd9761	Fix tests	2018-10-29 21:34:03 +01:00
Nico Schmitz	04574d759f	Improve dialogs. Add JSON serialization for actions and events.	2018-10-29 21:24:30 +01:00
AdrianLxM	667cbe0b12	Get device name before setting up the callback ... In case the callback is very quick, the name might not have been set yet?	2018-10-28 20:35:37 +01:00
Milos Kozak	d54651e916	cache midnight time calculation	2018-10-28 12:21:35 +01:00
Milos Kozak	00349527e1	calculate IobCobThread execution time	2018-10-28 11:47:12 +01:00
Milos Kozak	05dcb58f0a	check for future timestamp while loading history (RS,Rv2)	2018-10-28 11:24:59 +01:00
Andy Rozman	5b9bd2adfc	[0.4.1-SNAPSHOT] ... - little change in scanning - added error checking into RadioResponse and BasalProfile, also added events - disabled quick scan - synchronized RileyLink state changes - proofed MedtronicConverter - fixed 10 errors found on fabric - fixed SetBasalProfile, after merge	2018-10-27 14:04:46 +01:00
Tim Gunn	7a95adca29	Find Bolus incrument on pump, make sure the pump can support the minSMB bolus setting	2018-10-27 12:33:32 +13:00
Tim Gunn	11fe1cb1bd	SMB Interval addition	2018-10-26 20:23:25 +13:00
Tim Gunn	84716eb777	change to using key convention	2018-10-26 18:49:18 +13:00
Nico Schmitz	0364d3c039	Refactor code. Some minor fixes.	2018-10-25 22:08:04 +02:00
Nico Schmitz	7698923fe8	Clean up code. Improve ux.	2018-10-25 21:12:26 +02:00
Andy Rozman	03e38158f4	[0.4.0] ... - refactored Broadcast receiving - implementation of SetProfile finished - added additional null checking in RadioResponse class	2018-10-25 16:22:31 +01:00
Tim Gunn	4592f290db	remove stuff thats not needed	2018-10-25 20:13:19 +13:00
Tim Gunn	39c3938cf7	get SMB bolus limits working	2018-10-25 20:02:02 +13:00
Tim Gunn	4bc8025ad4	Make min SMB Bolus configurable	2018-10-25 18:27:21 +13:00
Tim Gunn	ff2f6a8bfb	Add UAMSMB Basal Minutes with Min Bolus Increment	2018-10-25 16:33:29 +13:00
Nico Schmitz	c40dc583a3	Fix trigger order when merging connectors	2018-10-25 01:01:50 +02:00
Nico Schmitz	8dc40fb795	Change trigger composition logic	2018-10-24 23:37:14 +02:00
Nico Schmitz	d863e39046	Add changeConnector()	2018-10-24 23:13:55 +02:00
triplem	43fcfaf5d6	solve #1449	2018-10-24 20:46:22 +02:00
Andy Rozman	43f2f69133	Changes needed after merge (sorry I didn't test merge after I did it and there were few problems)	2018-10-24 13:07:06 +01:00
Andy Rozman	07eef5adae	Added Notification types needed for Medtronic ... Added Notification types needed for Medtronic (reserving this two numbers)	2018-10-24 12:45:54 +01:00
Andy Rozman	75d3f3b4bc	Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018)	2018-10-24 12:18:20 +01:00
Andy Rozman	f228475617	Merge the code from RileyLinkAAPS ... - First real results with Pump History (not complete yet) - Set Basal Profile changes (not complete yet) - version set to medtronic-0.4.0-SNAPSHOT	2018-10-24 11:25:18 +01:00
Andy Rozman	88b75d3496	[0.3] RELEASE ... - WakeAndTune fixed, it runs in separate thread (in task) - Fixed Frequency scan results - fixing connection statuses - postprocessing fixed/extended with MedtronicUIResponseType - Basal profile fixes	2018-10-21 22:11:55 +01:00
Andy Rozman	ca536ee97e	[0.3.1] ... - removed code that sends wakeup on every command - added checking if device is present - fixed reading data when no data present (PostProcessingUI) - work done on showing hardware in configuration (added RileyLinkSelectPreference) - fixing configuration (in wizard)	2018-10-20 13:24:36 +01:00
AdrianLxM	5465e8f5aa	try to catch bad devicenames	2018-10-19 10:31:57 +02:00
Milos Kozak	786a91f7e1	Merge pull request #1508 from jotomo/fabric-attributes ... Fabric: don't report disabled plugins.	2018-10-17 22:33:59 +02:00
Johannes Mockenhaupt	eaf849e625	Fabric: don't report disabled plugins. ... Effectively reverts 91cbe1dd63.	2018-10-17 15:54:33 +02:00
Nico Schmitz	7659f58776	Fix tests	2018-10-16 01:57:59 +02:00
Nico Schmitz	6fb4de6752	Bugfix json serialization	2018-10-16 01:49:11 +02:00
Nico Schmitz	3f5d795e15	Fix bug in TriggerConnector.shouldRun()	2018-10-16 01:33:08 +02:00
Nico Schmitz	2e4f18794f	Add ChooseTriggerDialog	2018-10-16 00:07:13 +02:00
Nico Schmitz	f98d40f71b	Work on automation plugin. ... - Add MainApp.dpToPx() helper function - Remove trigger layout resources - Generate trigger layout programmatically - Improve ux (when composing trigger logic) - Refactoring	2018-10-15 23:20:06 +02:00
Milos Kozak	fee3b33d81	Merge pull request #1499 from jotomo/upstream-1482+1489 ... Combo: allow records created by the combo to be merged with existing records.	2018-10-14 23:33:08 +02:00
Milos Kozak	6ae98e5177	add comment	2018-10-14 22:55:21 +02:00
AdrianLxM	f9fa82f1ef	replace swedish minus sign with default minus sign	2018-10-14 20:47:00 +02:00
Johannes Mockenhaupt	c326e7a483	Overview: don't block the UI waiting for IobCob thread.	2018-10-14 16:24:07 +02:00
Johannes Mockenhaupt	b0fcbf3013	Update JavaDoc.	2018-10-14 14:36:05 +02:00
Milos Kozak	26cb25893e	remove fabric logging for SMS	2018-10-14 12:01:14 +02:00
Milos Kozak	cc25520770	ignore SMS starting #	2018-10-14 11:58:19 +02:00
Milos Kozak	bedb79c461	Merge branch 'dev' into smsrefactor	2018-10-14 11:16:14 +02:00
Milos Kozak	a546586df1	fix asking for SMS permission	2018-10-14 11:10:12 +02:00
Milos Kozak	903504d72d	SMSPlugin refactor & cleanup	2018-10-14 10:55:11 +02:00
Milos Kozak	94ef8f4a76	Merge branch 'dev' into smsrefactor	2018-10-14 09:55:51 +02:00
Johannes Mockenhaupt	4f896fccdb	Refactor and clean up.	2018-10-13 20:56:40 +02:00
Johannes Mockenhaupt	51315fc942	GH#1480: Improve conversion of incoming NS-PS name.	2018-10-13 20:38:26 +02:00
Milos Kozak	9309729ca1	Merge pull request #1502 from jotomo/upstream-1501 ... [For review] Correct off-by-one error calculating average.	2018-10-13 18:19:57 +02:00
Milos Kozak	c1bbaab8e1	allow UAM only if oref1 sensitivity plugin is selected	2018-10-13 18:07:01 +02:00
Milos Kozak	94233d28e1	fix sms command LOOP SUSPEND	2018-10-13 17:31:10 +02:00
Milos Kozak	ea1e78b169	prepare new classes	2018-10-13 16:50:47 +02:00
Milos Kozak	5c9baa31f3	fix different colors BG vs target range	2018-10-13 14:27:09 +02:00
Milos Kozak	9ee329b7db	log bucketed_data(0)	2018-10-13 11:40:19 +02:00
Milos Kozak	20fa8ed371	fix fallback to createBucketedDataRecalculated	2018-10-13 09:59:25 +02:00
Johannes Mockenhaupt	682b56198a	Queue: correct removal of queued command by type.	2018-10-12 16:30:45 +02:00
Johannes Mockenhaupt	c17ed80a34	Correct off-by-one error calculating average.	2018-10-12 16:05:32 +02:00
Johannes Mockenhaupt	34182b81a1	Combo: allow records created by the combo to be merged with existing records.	2018-10-12 00:46:05 +02:00
Milos Kozak	a0a60ea2d6	log carbs to pastSensitivity	2018-10-11 18:39:23 +02:00
Milos Kozak	898d7ef134	typo	2018-10-11 17:48:19 +02:00
Milos Kozak	9a84dade9a	Fix libre data, add more bucketed data test	2018-10-06 22:00:43 +02:00
Milos Kozak	817a89c39b	Better autosens logging and COB bug fix	2018-10-05 00:49:04 +02:00
Milos Kozak	c68783afd3	maintenance strings cleanup	2018-10-04 23:19:29 +02:00
Milos Kozak	97cc9a6370	log language used to fabric	2018-10-04 23:04:32 +02:00
Nico Schmitz	fb4da4859a	Simplify SWItem.generateLayout()	2018-10-03 22:36:21 +02:00
Milos Kozak	52e6f6bde5	fix Korean driver	2018-09-26 20:03:40 +02:00
AdrianLxM	126f3925e0	don't send carbs entered in the past to the pump	2018-09-26 13:59:04 +02:00
AdrianLxM	e9883dcc3a	Revert "fix carb generator" ... This reverts commit 6403c5d997.	2018-09-26 13:37:24 +02:00
AdrianLxM	95ea377d71	Revert "fix addToHistoryTreatment" ... This reverts commit d707ea7fb0.	2018-09-26 13:37:05 +02:00
Nico Schmitz	c60aae8630	Work on implementation for automation plugin. ... - Use butterknife - Import weekdays selector - Implement layout for trigger connection and trigger time - Implement view holders - Implement adapters - Implement dummy code for quick testings - Refactor code	2018-09-25 00:00:09 +02:00
Milos Kozak	794c80f7e3	Fix accesing wrong DanaRPump instance	2018-09-24 22:43:23 +02:00
Milos Kozak	d707ea7fb0	fix addToHistoryTreatment	2018-09-23 18:58:13 +02:00
Milos Kozak	1c44981494	Fix wrong message during refill	2018-09-22 21:25:07 +02:00
Milos Kozak	6403c5d997	fix carb generator	2018-09-21 23:24:50 +02:00
Julius de Bruijn	84e41122fc	Fix TBR maximum for Animas Vibe ... Animas actually supports 300% TBR, but uses a different way of displaying it: 0% is the same as 100% in AAPS. -100% (OFF) is 0% in AAPS 200% therefore is 300% in AAPS. Maybe there should be a better indicator for this in AAPS, but for now this fix gives better control of the TBR values, if using the open loop.	2018-09-21 11:09:41 +02:00
Andy Rozman	e2ddb48498	Some extension on VirtualPump for testing.	2018-09-20 18:04:06 +01:00
Andy Rozman	48e4a041f8	- First changes for CustomActions ... - changed PumpInterface to add CustomActions - added class CustomActions and CustomActionType - changed all PumpImplementations to use new methods - started changing ActionsFragment (most should be done)	2018-09-20 17:23:36 +01:00
Nico Schmitz	b5f30a0f46	Add some content to automation plugin fragment	2018-09-19 22:29:35 +02:00
Nico Schmitz	4985864343	Add title. Generate getters.	2018-09-19 22:27:30 +02:00
Andy Rozman	70065c1343	- merge RileyLink2 support from RileyLinkAAPS	2018-09-19 20:51:40 +01:00
Nico Schmitz	e32050d565	Replace constants by comparator enum	2018-09-19 21:13:02 +02:00
Milos Kozak	3eee5b13c7	LocationService	2018-09-19 15:26:58 +02:00
Milos Kozak	efec01c6e5	Some Actions	2018-09-18 23:17:00 +02:00
Milos Kozak	2bf07eb0d4	TriggerBg	2018-09-18 20:17:45 +02:00
Milos Kozak	ca7e9d2a7f	TriggerAnd-Or json saving, loading	2018-09-18 12:32:34 +02:00
Milos Kozak	4ba1adabf4	TriggerAnd, TriggerOr	2018-09-18 10:38:12 +02:00
Milos Kozak	d317ec94ad	AutomationPlugin	2018-09-18 10:05:19 +02:00
Milos Kozak	9a96d29dc3	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-09-17 19:57:15 +02:00
Milos Kozak	a7e64c79f0	remove static MainApp.sConfigBuilder	2018-09-17 19:56:56 +02:00
Milos Kozak	924bc97e3b	remove static ConfigBuilderPlugin.commandQueue	2018-09-17 19:29:01 +02:00
Milos Kozak	f6c113550f	remove static ConfigBuilderPlugin.activeSensitivity	2018-09-17 18:30:57 +02:00
Milos Kozak	dc563df5f0	remove static ConfigBuilderPlugin.activeInsulin	2018-09-17 18:18:50 +02:00
Milos Kozak	1b086e6776	remove static ConfigBuilderPlugin.activeAPS	2018-09-17 17:59:44 +02:00
Milos Kozak	0b32431f9e	remove static ConfigBuilderPlugin.activeProfile	2018-09-17 17:48:11 +02:00
Milos Kozak	bc19973ce0	remove static ConfigBuilderPlugin.activePump	2018-09-17 17:43:42 +02:00
Milos Kozak	dcbf093514	Merge pull request #1399 from MarkMpn/temp-target-units ... Assume md/dl units for temp targets created through Nightscout	2018-09-17 16:46:33 +02:00
dmelliott20	167ed27659	Update PumpType.java ... Ammended the basebasalstep values fro the insight and the combo. this was preventing AAPS from implementing zero basals where the basalstep was higher than the current running basal rate e.g. basal of 0.06u\hr running and a basalstep 0f 0.1u\hr resulted in no zero temp being enacted because of logic in the loop plugin.	2018-09-17 12:26:00 +00:00
Sebastian Lenz	6323f2dd49	fixed typo	2018-09-16 18:32:51 +02:00
Andy Rozman	da75ed643d	Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable	2018-09-14 18:14:45 +01:00
Milos Kozak	53389fea3b	fix import settings	2018-09-14 17:54:32 +02:00
Milos Kozak	9d4674faff	FillDialog formating fix	2018-09-14 14:29:25 +02:00
Milos Kozak	241d3f0c7c	fix MsgSetExtendedBolusStart.java	2018-09-14 14:10:24 +02:00
Milos Kozak	bcda4c93bf	Merge pull request #1428 from PoweRGbg/dev ... DanaR.comm tests	2018-09-14 14:08:55 +02:00
Milos Kozak	cc804ac36f	Merge pull request #1360 from MilosKozak/insightfix ... WIP Insightfix	2018-09-14 14:06:18 +02:00
Milos Kozak	514bdcda31	copy pumpId when converting EB -> TRB	2018-09-14 10:04:48 +02:00
Milos Kozak	7025d021f5	Insight logging	2018-09-14 09:06:03 +02:00
PoweRGbg	3a078c4084	DanaR.comm tests	2018-09-14 10:00:00 +03:00
Milos Kozak	665958d59c	false errors removed from DbAccessReceiver	2018-09-14 08:57:57 +02:00
Sebastian Lenz	b02921b23f	use profilename of currently active profile	2018-09-14 01:00:19 +02:00
Milos Kozak	dd90051b97	Insight get rid of Date.class	2018-09-13 19:00:57 +02:00
Milos Kozak	57e7d63794	Insight EB handling	2018-09-13 18:53:16 +02:00
Milos Kozak	65ffc3cdd2	Merge branch 'dev' into insightfix	2018-09-12 14:59:15 +02:00
Milos Kozak	bbb6c5f3cc	fix rounding in dialogs	2018-09-12 14:58:47 +02:00
Milos Kozak	f51de7da81	fix wizard test	2018-09-12 10:55:34 +02:00
Milos Kozak	2fc9b40f9d	Merge branch 'dev' into insihgtfix	2018-09-12 08:56:58 +02:00
Milos Kozak	fb4582a888	request issue description in email with logs	2018-09-12 08:44:21 +02:00
Milos Kozak	fd2b9bdf94	request time in email with logs	2018-09-12 08:40:56 +02:00
Milos Kozak	0a52bc9976	VirtualPump: do not cancel percent temp prior adding new	2018-09-11 23:23:59 +02:00
Milos Kozak	874be7ff48	openloop mode fix	2018-09-11 22:32:04 +02:00
Milos Kozak	f7269a806d	nsclient allow general preferences	2018-09-11 20:08:59 +02:00
Milos Kozak	98b8d67e3b	Merge branch 'dev' into insightfix	2018-09-11 19:06:35 +02:00
Milos Kozak	37c384e1c9	better wizard and constraint logging	2018-09-11 19:03:36 +02:00
Milos Kozak	0563420996	Constraints logging	2018-09-11 14:56:42 +02:00
Milos Kozak	018a5f5e43	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-09-11 14:27:51 +02:00
Milos Kozak	e9f8862776	maintenance plugin logging	2018-09-11 14:27:38 +02:00
Milos Kozak	48c8863ccb	fix NPE	2018-09-11 10:09:29 +02:00
Milos Kozak	d2c35173dc	fix NPE	2018-09-11 00:19:34 +02:00
Milos Kozak	3416f77a04	fix EXTENDEDBOLUS search in db	2018-09-10 23:57:24 +02:00
Milos Kozak	2fbf4324d5	typo in logging	2018-09-10 23:55:52 +02:00
Milos Kozak	39f1b130b6	Insight proper removing TBR from NS	2018-09-10 23:20:31 +02:00
Milos Kozak	52c85501c6	Merge pull request #1407 from jwoglom/dev ... update other "G5 Native" source reference for G6	2018-09-10 21:17:03 +02:00
Milos Kozak	a97c66169b	Merge branch 'dev' into insightfix	2018-09-10 20:31:33 +02:00
Milos Kozak	93a4afd567	Insight add 1 sec between cancel TBR and EB	2018-09-10 20:28:45 +02:00
Milos Kozak	7070c0a72b	allign Insight logging with AAPS	2018-09-10 19:28:03 +02:00
James Woglom	1823371433	update other "G5 Native" source reference for G6	2018-09-10 11:56:33 -04:00
Milos Kozak	0f2a620ebe	fix NewInsulinDialog message	2018-09-10 12:41:57 +02:00
Milos Kozak	6f53afbbe3	Objectives: remove static code, cleanup	2018-09-10 12:23:24 +02:00
Milos Kozak	c380b3dcc7	catch exception in LoggingBus	2018-09-09 22:08:26 +02:00
Milos Kozak	640a7d3b87	fix NPE	2018-09-09 13:13:34 +02:00
Milos Kozak	3c8b7f10be	fix NPE	2018-09-09 12:22:23 +02:00
Milos Kozak	e577e8555d	openloop mode min change threshold configurable	2018-09-09 12:15:44 +02:00
Milos Kozak	55d1dd0847	Merge pull request #1392 from MilosKozak/openloop ... Openloop	2018-09-07 12:55:25 +02:00
Mark Carrington	be7693a73d	Assume md/dl units for temp targets created through Nightscout	2018-09-06 22:50:35 +01:00
Milos Kozak	ecae6af151	reset autosens on profileswitch with zero duration	2018-09-06 16:30:57 +02:00
Milos Kozak	f5873f9f87	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-09-06 11:18:27 +02:00
Milos Kozak	e4f95c7a4e	more logging for bucketed data	2018-09-06 11:18:15 +02:00
Milos Kozak	a8bed0096d	fix NPE	2018-09-04 22:34:36 +02:00
Milos Kozak	5499396661	fix NPE	2018-09-04 22:26:59 +02:00
Milos Kozak	e36499f9d4	more tests	2018-09-04 22:08:35 +02:00
Milos Kozak	6f5332af0a	Omnipod max tbr 30U	2018-09-04 20:42:33 +02:00
Milos Kozak	4ca9d22062	Virtual pump descriptions used for APS requests in open loop mode	2018-09-04 19:55:31 +02:00
Milos Kozak	42714afeb1	fix false constraint warning	2018-09-04 15:38:04 +02:00
Milos Kozak	f5e7d28aa6	fix WizardInfoDialog 2nd	2018-09-01 23:34:35 +02:00
Milos Kozak	91695614f4	Merge branch 'andyrozman-virtual_pump_bug_1372' into dev	2018-09-01 22:46:16 +02:00
Milos Kozak	315c83069d	apply bolus description settings in constraints	2018-09-01 22:45:15 +02:00
Milos Kozak	316f001cbc	PumpUtil cleanup	2018-09-01 11:45:29 +02:00
triplem	b9fda827bd	Add version information to emails	2018-08-31 11:25:57 +02:00
Milos Kozak	7fd0d2fe56	Merge branch 'dev' into insightfix	2018-08-31 08:26:59 +02:00
Andy Rozman	e2182528fd	- changed calls of PumpUtil.setPumpDescription to use enums directly	2018-08-30 22:03:09 +01:00
Andy Rozman	bbffa703df	reverting some formater changes	2018-08-30 20:54:15 +01:00
Andy Rozman	679b4b2668	- added methods to return correct Extended bolus size ... - using exetended bolus size	2018-08-30 16:22:25 +01:00
Roumen Georgiev	c3e1dff345	also don't show UserOptions for pumps with code 3 ... until debugged	2018-08-30 12:08:45 +03:00
Milos Kozak	063ead4c17	RS text bolus error codes	2018-08-29 20:14:36 +02:00
Milos Kozak	178c2b90fe	min_5m_carbimpact to AMA settings	2018-08-29 18:17:11 +02:00
Milos Kozak	a172458e76	catch bus errors, enable only for dev	2018-08-29 08:10:06 +02:00
Milos Kozak	105485c9b6	do not use FEATURE_CUSTOM_TITLE	2018-08-29 08:00:15 +02:00
Andy Rozman	124f3d8ac1	- small bug in determineCorrectBasalSize	2018-08-28 22:41:31 +01:00
Milos Kozak	8c2ad32ad8	fix NPE	2018-08-28 23:33:09 +02:00
Andy Rozman	07495ccfdd	- added bolus and basal amount rounding (rounding to pump specification)	2018-08-28 16:57:14 +01:00
Milos Kozak	abc374193a	Merge branch 'dev' into insightfix	2018-08-28 14:11:34 +02:00
Milos Kozak	980e4998e2	send HEAD to fabric	2018-08-27 20:19:30 +02:00
Milos Kozak	bb18fad654	Merge pull request #1370 from jotomo/upstream-combo-fabric-removal ... Upstream combo fabric removal	2018-08-27 20:09:13 +02:00
Johannes Mockenhaupt	3fd3d0f059	Combo: remove dead code.	2018-08-27 19:56:07 +02:00
Johannes Mockenhaupt	0eb08c2eaf	Combo: remove fabric logging.	2018-08-27 19:10:08 +02:00
Milos Kozak	4fd4d71187	fix min percent value in careportal	2018-08-27 16:05:30 +02:00
Milos Kozak	e5d96e5c17	fix bucketed data	2018-08-25 20:03:48 +02:00
Milos Kozak	72f7b244c5	Merge pull request #1361 from MilosKozak/g6-xdrip-filtered ... Also count "G6 Native" in xDrip as filtered	2018-08-25 19:27:56 +02:00
Milos Kozak	ead57748aa	more autosens logging	2018-08-25 19:22:45 +02:00
Milos Kozak	8c4c5a291e	is5minData detection improvement	2018-08-25 18:13:32 +02:00
Milos Kozak	324ba072bb	fix Dana password handling	2018-08-25 14:08:04 +02:00
AdrianLxM	972eeeda29	Also count "G6 Native" in xDrip as filtered	2018-08-24 20:57:52 +02:00
Milos Kozak	d330764d9f	Merge branch 'dev' into insightfix	2018-08-24 10:40:31 +02:00
Milos Kozak	7da4e4fd70	log (SITECHANGE)	2018-08-24 10:36:01 +02:00
Milos Kozak	2e9da51daf	register VP plugin on start	2018-08-24 10:24:04 +02:00
Milos Kozak	9419b8c4d1	reuse predefined descriptions in real drivers	2018-08-23 19:36:56 +02:00
Milos Kozak	b7950322c8	virtual pump lifecycle	2018-08-23 18:59:46 +02:00
Milos Kozak	b0f8ab9922	extract key_virtualpump_type	2018-08-23 18:46:06 +02:00
Milos Kozak	243755d1b1	virtualpump: fix string, fix formatter	2018-08-23 18:41:55 +02:00
Milos Kozak	2c5837a235	Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863	2018-08-23 17:53:28 +02:00
Milos Kozak	fa4934ba0e	Merge pull request #1357 from PoweRGbg/patch-3 ... don't show User oprtions if firmware is OLD	2018-08-23 17:33:44 +02:00
Milos Kozak	8a4e1d8efd	fix ISE	2018-08-23 07:37:31 +02:00
Milos Kozak	8f9d0269c1	better TREATMENT logging	2018-08-22 22:04:47 +02:00
Sebastian Lenz	1935d5b011	send notification about tbr to watch if wearcontrol is false. Fixes #1318	2018-08-22 19:22:30 +02:00
Milos Kozak	15741b2a02	more logging on extended bolus	2018-08-22 15:49:22 +02:00
Milos Kozak	45321f889a	Merge branch 'dev' into insihgtfix	2018-08-22 15:47:32 +02:00
Roumen Georgiev	ca96791059	don't show User oprtions if firmware is OLD	2018-08-22 14:04:57 +03:00
Milos Kozak	653a98fd5b	better layout for nsclient mode	2018-08-21 23:19:04 +02:00
Milos Kozak	5114335005	more logs	2018-08-21 19:53:59 +02:00
Milos Kozak	32d9a8b4d6	Fix connection handshake for DanaR pumps	2018-08-21 17:25:20 +02:00
Milos Kozak	cd90bab877	fix NPE	2018-08-21 11:39:32 +02:00
Milos Kozak	8ec3649cea	key_nsclient_localbroadcasts default to false	2018-08-20 23:01:11 +02:00
Milos Kozak	8fec60ea35	fix NPE	2018-08-20 22:13:01 +02:00
Milos Kozak	004a9193bb	AUTOSENS logging on by default	2018-08-20 19:39:39 +02:00
Milos Kozak	414c3416dd	WizardInfoDialog	2018-08-20 19:32:18 +02:00
Milos Kozak	e9d7a917d2	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-08-20 14:46:20 +02:00
Milos Kozak	98b9a52a9a	remove catch to get more data from people	2018-08-20 14:46:08 +02:00
Milos Kozak	28ff01978f	fix NPE	2018-08-20 08:04:35 +02:00
Milos Kozak	200c75d421	fix NPE	2018-08-20 08:02:57 +02:00
Nico Schmitz	5386c7db4a	Update to upstream/dev and resolve conflicts	2018-08-19 14:37:42 +02:00
Milos Kozak	a6e25df543	log version check	2018-08-17 21:58:00 +02:00
Milos Kozak	1b6e54f8a8	iobplugin tests	2018-08-17 19:49:39 +02:00
Milos Kozak	4133bc9ad1	iobplugin tests	2018-08-17 19:00:35 +02:00
Milos Kozak	d198de94c0	fix sending logs	2018-08-17 17:01:48 +02:00
Milos Kozak	94b1fa3552	fix bucketed data, add some tests, fix failing tests	2018-08-17 16:41:12 +02:00
Milos Kozak	1d67f124fc	get rid of Date.class	2018-08-17 15:11:43 +02:00
Milos Kozak	15e69a478e	RS,Rv2: thread safe history	2018-08-17 13:58:06 +02:00
Milos Kozak	9c1e52bd17	RS,Rv2: more logging on storing boluses	2018-08-17 13:28:37 +02:00
Milos Kozak	91cbe1dd63	update PluginStats	2018-08-17 10:27:46 +02:00
Milos Kozak	b42d604606	false pump unreachable alert workaround	2018-08-16 22:46:20 +02:00
Milos Kozak	c927b8f061	storing extended bolus fix for insight	2018-08-16 15:02:45 +02:00
Milos Kozak	54930fee02	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-08-15 22:44:31 +02:00
Milos Kozak	9642ff7cac	use local broadcast for dbaccess	2018-08-15 22:09:13 +02:00
Milos Kozak	e2896cbc5d	SW: less aggressivity on nsclient connections	2018-08-14 18:33:29 +02:00
Milos Kozak	31e050be4a	loop mode in setup wizard	2018-08-14 17:06:09 +02:00
Milos Kozak	04af3eb806	source selection in nsclient after dropping g5 uploader	2018-08-14 16:06:02 +02:00
Milos Kozak	17b9a4b951	add logging	2018-08-13 23:58:07 +02:00
Milos Kozak	7f17110d98	fix NPE	2018-08-13 23:57:16 +02:00
Milos Kozak	d925011380	WATCHDOG_RECONNECT_IN = 15	2018-08-12 21:27:45 +02:00
Andy Rozman	6a73937b2a	- merges of bug fixes from RileyLinkAAPS	2018-08-12 16:30:32 +01:00
Milos Kozak	1abeb51b4f	fix NPE	2018-08-12 09:29:41 +02:00
Milos Kozak	26a24d384e	fix NPE	2018-08-12 08:53:57 +02:00
Milos Kozak	0ab5981665	Roumen's Unit tests (#1325) ... * initializer * aading some tests * ading some tests * removed try-catch but added testingMode boolean for the test to run * update to latest dev * formatting * cleanup tests * More test classes * some more * upd * more coverage in comm * 50% class coverage in comm * Delete crashlytics-build.properties * remove of crashlytics * removed unneeded checks * removet mocking of treatmentsService * removed treatmentsService mock from newNSTreatmentTest * more testing classes * tests of _History_ packets * tests of _Notify_ packets * 64 / 65 classes covered * 100% class coverage in comm	2018-08-10 22:17:44 +02:00
Andy Rozman	c9d35696cf	- various changes ... - reformatting everything	2018-08-10 16:13:40 +01:00
Andy Rozman	e62fbfb189	Merge branch 'virtual_pump_Bug863' of github.com:andyrozman/AndroidAPS into virtual_pump_Bug863	2018-08-09 15:16:13 +01:00
Andy Rozman	fa1a08367f	- Changed one string ... - Removed one pump that was just wrongly named (553 doesn't exists, 523 is actually Revel one)	2018-08-09 15:11:34 +01:00
Milos Kozak	27bfab5e15	fix NPE	2018-08-08 00:41:31 +02:00
Milos Kozak	60d5567c91	verify plugins after import	2018-08-08 00:39:40 +02:00
Milos Kozak	d793135339	fixed stack overflow	2018-08-07 23:50:43 +02:00
Milos Kozak	671a8030b5	Merge pull request #1313 from jotomo/revert-behavioral-change ... [Regression] Only log about records with duplicate pump id.	2018-08-07 23:33:26 +02:00
Milos Kozak	8e83ff2390	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-08-07 21:45:56 +02:00
Milos Kozak	fff2e84608	remove g5uploader flavor	2018-08-07 21:45:35 +02:00
Milos Kozak	fcf47ecc03	NSClient2 flavor	2018-08-07 21:07:43 +02:00
Milos Kozak	9dde50f93f	Merge pull request #1316 from jotomo/fixingthefix ... TT context menu fixes	2018-08-07 19:46:46 +02:00
Johannes Mockenhaupt	27cf03f39a	Context TT menu fixes. ... Default values where previously correctly converted for mmol/l, but user-defined settings in the prefs (in mmol/l) where not. This works for default settings and user-defined preference for both mg/dl as well as mmol/l.	2018-08-07 18:50:09 +02:00
Johannes Mockenhaupt	1c7777e5eb	Revert "Fix #1254 double mmol/l conversion." ... This reverts commit 0b280ce	2018-08-07 18:35:31 +02:00
Johannes Mockenhaupt	ca003fbdd7	Only log about records with duplicate pump id.	2018-08-07 14:17:47 +02:00
Johannes Mockenhaupt	9af0bc2976	Fix target line performance regression.	2018-08-06 17:34:09 +02:00
Milos Kozak	409acd0721	Merge pull request #1305 from triplem/fix_stackoverflow ... Fix stackoverflow	2018-08-05 23:08:29 +02:00
triplem	b7ffb2c847	Should fix stackoverflow	2018-08-05 22:11:30 +02:00
Milos Kozak	aa97583daa	fix NPE	2018-08-05 20:50:20 +02:00
Milos Kozak	2677f3cca7	fix NPE in NsClientService	2018-08-05 20:46:52 +02:00
Milos Kozak	ab4ca5fa13	log wrong bundles	2018-08-04 12:08:43 +02:00
Milos Kozak	a16fa7ee0f	normalize bucketed data, fix doubled cob	2018-08-04 11:56:29 +02:00
Milos Kozak	9a2df7b04c	fix #1145 non-consistent singleton-pattern in DanaRPump	2018-08-03 23:35:24 +02:00
Milos Kozak	294253797c	fix NPE	2018-08-03 21:13:19 +02:00
Milos Kozak	d2f8cfa6c2	fix logging, bolus delivered must not be only smb	2018-08-03 13:15:29 +02:00
Milos Kozak	cbed615f90	fix typo in logging	2018-08-03 13:10:33 +02:00
Milos Kozak	8cc7fb03d1	UI log category, BolusProgressDialog detailed log	2018-08-03 12:32:10 +02:00
Milos Kozak	580e05e8eb	close progress dialog when stop was pressed prior connection	2018-08-03 11:02:46 +02:00
Milos Kozak	3bcd656c14	Maintenance plugin cleanup	2018-08-02 15:19:13 +02:00
Milos Kozak	ddff05da75	Merge pull request #1262 from triplem/logshipper ... Logshipper	2018-08-02 14:40:54 +02:00
Mark Carrington	7be49571ae	Get profile for specific time for percentage -> absolute conversion	2018-08-02 12:27:56 +01:00
Mark Carrington	f9fb4c1bc5	Include rate property in temp basal records	2018-08-01 22:32:04 +01:00
Milos Kozak	6544191c78	fix state plugin change handling	2018-08-01 23:26:01 +02:00
Milos Kozak	c0a3eb67ba	check for new version on github	2018-08-01 23:03:01 +02:00
Markus M. May	47fa33c1a9	Use lambdas	2018-08-01 20:45:58 +02:00
Markus M. May	2bc462aa13	use correct methods for context handling	2018-08-01 20:44:16 +02:00
Markus M. May	3306e14ca1	Merge branch 'dev' into logshipper	2018-08-01 20:42:05 +02:00
Milos Kozak	eee187a71f	NSClient watchdog	2018-08-01 19:16:31 +02:00
Andy Rozman	5d4dc7ea61	Changes requested after review. ... - added additional parameter for extended_note - changed how extended_note is set - created positional formatting	2018-08-01 16:19:57 +01:00
Andy Rozman	bf34a3b41f	Merge branch 'dev' into virtual_pump_Bug863	2018-08-01 15:16:43 +01:00
Milos Kozak	2859860d0d	use EventConfigBuilderChange in xdrip status line	2018-08-01 14:54:35 +02:00
Milos Kozak	e6fae87abf	use EventAppInitialized in xdrip status line	2018-08-01 14:46:19 +02:00
Milos Kozak	796c1becc2	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-08-01 14:31:04 +02:00
Milos Kozak	22881e17a2	fix NPE on temp target sync	2018-08-01 14:30:32 +02:00
Milos Kozak	c6bc15e311	Merge branch 'dev' into virtual_pump_Bug863	2018-08-01 11:57:48 +02:00
Milos Kozak	e26f33081a	fix wrong merge	2018-08-01 11:41:36 +02:00
Milos Kozak	3ccf2e51f7	Merge branch 'tbr_wear_accept' of https://github.com/quizzmaster/AndroidAPS into quizzmaster-tbr_wear_accept	2018-08-01 11:28:58 +02:00
Milos Kozak	44c50804a8	resolve NPE on app start in xdrip status line	2018-08-01 11:16:46 +02:00
Milos Kozak	7c9b81fbbf	Merge branch 'dev' into tbr_wear_accept	2018-08-01 08:18:29 +02:00
Milos Kozak	9d686adf7e	finish apllication after clicking Exit	2018-07-31 19:11:32 +02:00
Milos Kozak	ce16dd747b	remove ALARM logging	2018-07-31 18:00:31 +02:00
Markus M. May	5d1fc92e44	code cleanup - use lambdas	2018-07-30 23:10:58 +02:00
Markus M. May	aca9b3ff65	reflect code revieww	2018-07-30 23:05:46 +02:00
Markus M. May	883bbf46e1	use fragment insteaad of activity, move pref im/export to maintenance plugin	2018-07-30 22:56:00 +02:00
Markus M. May	9f90d31f35	Merge latest dev changes	2018-07-30 19:39:38 +02:00
Markus M. May	93e0c72b17	Refactor logshipper to maintenance	2018-07-30 19:33:57 +02:00
Milos Kozak	073b522b93	user defined level of logging	2018-07-30 17:04:43 +02:00
Milos Kozak	35b51af09c	logging cleanup	2018-07-30 15:46:20 +02:00
Milos Kozak	6a9bf04a98	move APS function from ConfigBuilder to Loop	2018-07-30 14:46:15 +02:00
Milos Kozak	4ec0ebfa74	move profile function from ConfigBuilder to extra class	2018-07-30 14:21:11 +02:00
Milos Kozak	188a9b6313	PROFILE logging	2018-07-29 15:37:28 +02:00
Milos Kozak	54c83dc374	L.class	2018-07-29 14:39:56 +02:00
Milos Kozak	ce9e5b9165	APS logging	2018-07-29 11:10:06 +02:00
Milos Kozak	5ef9bc7948	cleanup	2018-07-29 00:20:41 +02:00
Milos Kozak	75bb38ba1f	move activities to new package	2018-07-29 00:08:28 +02:00
Milos Kozak	a4935b5d38	Services refactor	2018-07-29 00:00:48 +02:00
Milos Kozak	5efad35721	NSUpload refactor	2018-07-28 23:57:25 +02:00
Milos Kozak	6e902cb9ca	PUMP logging	2018-07-28 23:38:39 +02:00
Markus M. May	f70909d6c6	Refactore logshipper to maintenance, move funcs from menu to plugin	2018-07-28 22:45:40 +02:00
Milos Kozak	8a66b4db2e	OBJECTIVES logging	2018-07-28 18:07:06 +02:00
Milos Kozak	cfff357e6b	NSCLIENT logging	2018-07-28 17:58:52 +02:00
Milos Kozak	a7efa317be	DATA logging & refactor	2018-07-28 16:26:36 +02:00
Milos Kozak	b8a41e5f5b	ALARM logging	2018-07-28 13:55:16 +02:00
Milos Kozak	8e60e07b7c	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-07-28 11:39:37 +02:00
Milos Kozak	15694a3b8b	fix NPE	2018-07-28 11:31:37 +02:00
Milos Kozak	9141e0f66d	OVERVIEW & NOTIFICATION logging cleanup	2018-07-27 14:01:56 +02:00
Milos Kozak	6a058f5036	BGSOURCE refactor & logging	2018-07-27 13:41:25 +02:00
Milos Kozak	bfccda21cb	QUEUE logging cleanup	2018-07-27 12:17:29 +02:00
Milos Kozak	3d57d52271	EVENTS logging cleanup	2018-07-27 11:40:27 +02:00
Milos Kozak	1e68165c82	AUTOSENS logging cleanup	2018-07-27 11:35:32 +02:00
Andy Rozman	fcdb2f9708	- change to tunning	2018-07-26 23:34:28 +01:00
Andy Rozman	8e99482723	Some fixes in merge	2018-07-26 17:31:38 +01:00
Andy Rozman	1b8ceb83cf	Merge branch 'dev' into medtronic_andy	2018-07-26 16:48:52 +01:00
Andy Rozman	318436f417	- some changes from RileyLinkAAPS project: ... - refactored RfSpy and underlaying classes so that we can read Version (which is not encoded and has no CRC) - added functionality to be able to recover RL if BT is disabled and re-enabled - some minor refactorings here and there - TBR enabled - Bolus delivery - Medtronic Pump Plugin is working (able to deliver TBRs and Bolus), there are still a lot of things to work on but we have base implementation here...	2018-07-26 16:31:23 +01:00
Sebastian Lenz	ee06d1119d	clear Notification if tbr is accepted from wearable	2018-07-26 13:07:08 +02:00
Sebastian Lenz	79abcdb0d7	moved tbr accepting to a new method of the LoopPlugin	2018-07-26 11:47:39 +02:00
Sebastian Lenz	971e258265	cancel TBR request notification on wearable if accepted or no longer valid	2018-07-25 23:48:54 +02:00
Sebastian Lenz	8c49119b15	processing the acceptance of the TBR request from the wearable	2018-07-25 23:47:59 +02:00
Sebastian Lenz	e2ef8f2d74	send notification about TBR request to the wearable	2018-07-25 23:46:06 +02:00
Sebastian Lenz	5bb6635cab	dismiss notification for TBR request if it's no longer requested	2018-07-25 23:32:23 +02:00
Sebastian Lenz	2db63d4be4	dismiss notification when accepting a TBR request	2018-07-25 23:28:15 +02:00
Tanja Schmidt	0a29e8a055	delete now value even if empty/deleted	2018-07-25 22:04:44 +02:00
Markus M. May	c34104b906	move log shipment to own plugin	2018-07-25 22:00:58 +02:00
Milos Kozak	088c423208	Merge pull request #1253 from jotomo/hypo-tt-correction ... NewCarbsDialog: correct situation where Hypo TT can't be unchecked.	2018-07-25 10:30:19 +02:00
Milos Kozak	87de4bce5b	Merge pull request #1257 from jotomo/1254 ... Fix #1242 double mmol/l conversion.	2018-07-25 10:29:13 +02:00
Markus M. May	60721c8395	First working version	2018-07-24 22:34:10 +02:00
Johannes Mockenhaupt	0b280ce4d4	Fix #1254 double mmol/l conversion.	2018-07-24 19:19:01 +02:00
Milos Kozak	96e101aa80	logging	2018-07-24 14:38:12 +02:00
Johannes Mockenhaupt	39dc914c2c	NewCarbsDialog: correct situation where Hypo TT can't be unchecked.	2018-07-24 12:48:50 +02:00
Milos Kozak	026c9f4788	fix ratio scale #2	2018-07-24 12:00:16 +02:00
Milos Kozak	9fc54f4e0c	fix ratio scale	2018-07-24 11:01:33 +02:00
Milos Kozak	503d61e1be	Merge pull request #1227 from PoweRGbg/rotation ... fix for carbs and wizard dialogs on screen rotation	2018-07-24 10:34:27 +02:00
Roumen Georgiev	166d58fa3e	fix for timeDisplayFormat in Dana RS	2018-07-24 10:39:46 +03:00
Milos Kozak	4052725096	Merge pull request #1249 from MilosKozak/hypoTT-checkable ... react to HypoTT on first click	2018-07-24 09:26:10 +02:00
Milos Kozak	7e2d3fd8be	historybrowser, rendering optimizations	2018-07-24 00:46:08 +02:00
Markus M. May	2090b3c7e1	First draft	2018-07-23 20:58:20 +02:00
AdrianLxM	fa67aa69d5	react to HypoTT on first click ... onClickListener, not OnCheckedListener was set for HypoTT	2018-07-23 18:43:26 +02:00
Milos Kozak	130fca4c2a	RS onConnectionStateChangeSynchronized	2018-07-23 16:33:51 +02:00
Milos Kozak	d7b29db626	fix NPE	2018-07-23 16:19:11 +02:00
Milos Kozak	90729cffe6	RS disconnect synchronized	2018-07-23 16:17:17 +02:00
Milos Kozak	49e8a0b7c4	some logging conditional	2018-07-22 21:19:59 +02:00
Milos Kozak	cede7dd4b9	log JSON data with exception	2018-07-22 21:14:42 +02:00
Milos Kozak	0616c16e9f	Merge pull request #1243 from jotomo/patchpatchpatch ... Abort APS run if AS requested but not yet available.	2018-07-22 18:09:02 +02:00
Johannes Mockenhaupt	a2e17c05c6	So here's the thing ...	2018-07-22 18:06:11 +02:00
Milos Kozak	a0f261ba0c	fix NPE	2018-07-22 18:02:00 +02:00
Johannes Mockenhaupt	777542dbb8	Abort APS run if AS requested but not yet available. ... Should only occur during startup or when something else is broken already, so just return.	2018-07-22 17:57:17 +02:00
Andy Rozman	0b180d3d65	- tbr start is succesful, but tbr is not displayed	2018-07-22 16:45:26 +01:00
AdrianLxM	b435c09771	preserve carbs	2018-07-22 14:26:56 +02:00
AdrianLxM	9824b45640	NSClient -> owl	2018-07-22 01:32:09 +02:00
Milos Kozak	213a45c1e5	unique autosens debug tag	2018-07-21 22:56:08 +02:00
AdrianLxM	e3c4de8f7b	Merge pull request #1236 from MilosKozak/RShistory ... Rshistory	2018-07-21 22:22:11 +02:00
AdrianLxM	77d2326331	remove debug toasts	2018-07-21 22:21:12 +02:00
AdrianLxM	983e9c3658	allow updated Treatments for insight 2	2018-07-21 19:21:40 +02:00
AdrianLxM	bcbf432236	allow update for insight -> don't alarm	2018-07-21 18:34:48 +02:00
Milos Kozak	b52c1f3aa6	postpone EventAutosensCalculationFinished	2018-07-20 22:40:44 +02:00
Milos Kozak	ab70d5b67d	use Thread.isAlive()	2018-07-20 17:52:31 +02:00
Milos Kozak	cfee405914	use thread.join	2018-07-20 10:52:58 +02:00
Milos Kozak	d17ffc334d	autosens call refactor	2018-07-20 00:19:13 +02:00
Milos Kozak	8f8e91f2de	report TreamtentClash to Fabric	2018-07-18 17:10:21 +02:00
Milos Kozak	dd687fbb40	RS,Rv2: load only recent history	2018-07-18 17:02:28 +02:00
PoweRGbg	bf22b88123	some work for all the CP dialogs	2018-07-18 13:52:15 +03:00
Milos Kozak	b15da5a5cf	Merge pull request #1213 from MilosKozak/insight-constraints ... insight constraints	2018-07-18 11:21:55 +03:00
Milos Kozak	048c1c6cfc	Merge pull request #1226 from jotomo/hb-is-wip ... Disable history browser unless on dev-branch.	2018-07-18 11:20:55 +03:00
Milos Kozak	e6baf3ff47	Merge branch 'dev' into last-2.0-something-stuff-update1	2018-07-17 23:05:08 +02:00
Milos Kozak	ebb97be8c5	Dana pumps: better detect wrong profile in pump	2018-07-17 22:56:25 +02:00
Johannes Mockenhaupt	54be28388b	Disable history browser unless on dev-branch.	2018-07-17 21:57:06 +02:00
Milos Kozak	5f4db31e80	fix multiple code	2018-07-17 19:42:18 +02:00
Milos Kozak	7d6674267b	Merge branch 'dev' into last-2.0-something-stuff-update1	2018-07-17 19:53:43 +03:00
PoweRGbg	141bfda099	wizard is ready also	2018-07-17 15:04:07 +03:00
PoweRGbg	edbeddf8b0	carbsDialog done also	2018-07-17 14:43:34 +03:00
PoweRGbg	15b9cb5b3c	removed dummy message	2018-07-17 12:19:36 +03:00
Roumen Georgiev	cd4e7c2d4f	Save & restore dialog state on screen rotate	2018-07-17 12:01:21 +03:00
AdrianLxM	6054501b5f	Merge pull request #1219 from jotomo/auto-hypo-tt ... fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.	2018-07-16 13:27:06 +02:00
Johannes Mockenhaupt	f5ecb9811e	fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.	2018-07-15 22:33:42 +02:00
Milos Kozak	97d9f7866c	Rv2: prevent carbs x insulin	2018-07-15 19:48:33 +02:00
Milos Kozak	357b947c1d	RS: prevent carbs x insulin	2018-07-15 19:45:51 +02:00
Milos Kozak	8f641f994f	RSv3 firmware error reporting	2018-07-13 18:03:04 +03:00
Milos Kozak	695997ebb9	RS: delay before reading history	2018-07-13 09:50:04 +03:00
Milos Kozak	8a3d3d580f	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-07-12 22:03:28 +03:00
AdrianLxM	5f5a2b6a0d	insight constraints	2018-07-12 20:30:19 +02:00
Milos Kozak	efefe8ed18	Merge pull request #1211 from jotomo/pluginstats ... PluginStats: used simple class named instead of translated name.	2018-07-12 21:30:12 +03:00
Milos Kozak	35e93ffafd	more debug to autosens	2018-07-12 21:28:35 +03:00
AdrianLxM	cb826da403	Revert "Fixed problem with Corr numberpicker when using Insightpump"	2018-07-12 19:37:21 +02:00
Johannes Mockenhaupt	5b9ede15ea	PluginStats: used simple class named instead of translated name.	2018-07-12 15:47:45 +02:00
Milos Kozak	e8c1dd5e3b	Merge pull request #1209 from harispoljo/CorrInsight ... Fixed problem with Corr numberpicker when using Insightpump	2018-07-12 16:10:10 +03:00
Milos Kozak	ba945f334b	Merge pull request #1204 from jotomo/pluginstats ... Fabric-log enabled plugins once a day.	2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt	6302769652	Log app usage type daily.	2018-07-11 20:51:09 +02:00
harispoljo	8b200ba9de	Fixed bug	2018-07-11 19:53:19 +02:00
harisp	395f2313fd	Implemented feedback	2018-07-11 18:17:09 +02:00
Milos Kozak	d97e195ad1	revert wrong autosens fix	2018-07-11 18:23:58 +03:00
Milos Kozak	e4e0e64eef	another fix of displaying ext bolus	2018-07-11 18:02:20 +03:00
Milos Kozak	613802b12c	Merge pull request #1183 from triplem/autosens_fix ... Autosens fix	2018-07-11 17:30:29 +03:00
harisp	b42ce70daa	Fixed problem with corr numberpicker when using insight pump	2018-07-11 14:14:01 +02:00
Johannes Mockenhaupt	09a1d23bc8	Move logging of app start to Fabric class.	2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt	ccaf68d043	Fabric-log enabled plugins once a day.	2018-07-10 13:00:20 +02:00
Milos Kozak	5a6b7f9dad	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-07-09 18:16:55 +03:00
Johannes Mockenhaupt	2cd3ec82de	Create note for eCarbs, so it's easier to see what amount/time was used. ... Otherwise iterating on parameters is tedious with only the generated carbs.	2018-07-07 12:02:44 +02:00
Milos Kozak	506971292e	cleanup	2018-07-05 15:36:13 +02:00
Markus M. May	afaf729df1	Try to rework the ugly fix	2018-07-04 20:42:31 +02:00
Markus M. May	c78117e356	recall getAutosensData, if it is null	2018-07-03 22:35:06 +02:00
Markus M. May	a978225428	Cleanup Imports	2018-07-03 22:11:01 +02:00
Markus M. May	5422a8bc20	Cleanup Imports, added a TODO	2018-07-03 22:10:33 +02:00
AdrianLxM	e5d8eb163b	Update Treatment.java	2018-07-03 19:25:23 +02:00
AdrianLxM	006528ae4c	Update TreatmentService.java	2018-07-03 19:24:44 +02:00
Milos Kozak	3a0fb59aee	Merge branch 'dev' into last-2.0-something-stuff	2018-07-02 18:54:32 +02:00
Milos Kozak	60e9ea05a8	fix objectives typo	2018-07-02 15:52:20 +02:00
Milos Kozak	4919986dc0	setup wizard for pumpcontrol	2018-07-02 12:18:49 +02:00
Milos Kozak	bb30171777	fix typo in poctech driver	2018-07-02 10:53:09 +02:00
AdrianLxM	297fe487f7	update with data from pump	2018-07-02 06:54:02 +02:00
AdrianLxM	b39fa514c2	alarm on clashes, not on identical treatments	2018-07-02 02:11:25 +02:00
Nico Schmitz	2ce38702e2	Merge branch 'dev' into dev-wip	2018-07-01 22:44:11 +02:00
Milos Kozak	98dedf117f	Merge pull request #1167 from triplem/date_util ... Do calculations in a central place	2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt	bf3b4502bf	log origin of offending call	2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt	21313bd418	obligatory format specifier fixes	2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt	290effcd7c	simplyify defaulting to hypo tt.	2018-07-01 18:53:45 +02:00
Johannes Mockenhaupt	5df054a999	more fixes	2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt	9b7d36ffed	bugfix	2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt	6ebb13d28d	alarm on failure to add treatment to db.	2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt	658af4bcfd	combo: don't attempt to add a bolus record if it already exists in db.	2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt	f12db81f96	treatmentservice: add method to check if record with pump id exists.	2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt	780a4dda36	fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.	2018-07-01 17:21:40 +02:00
Markus M. May	6bc60cd8a8	Rework to use already existing method	2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt	33b66e2ce7	Revert "Merge pull request #1131 from jotomo/901" ... This reverts commit 268dec0059, reversing changes made to ab41541c69.	2018-06-29 22:43:54 +02:00
Milos Kozak	2291472b01	Merge pull request #1168 from MilosKozak/milosremote/dev ... ask user if he switches to a HW pump for the first time	2018-06-29 15:43:48 +02:00
AdrianLxM	5a1d696ab1	ask user if he switches to a HW pump for the first time	2018-06-29 03:52:58 +02:00
Milos Kozak	268dec0059	Merge pull request #1131 from jotomo/901 ... Don't loop for values from non-active BG sources	2018-06-28 22:51:56 +02:00
Markus M. May	468b645486	Do calculations in a central place	2018-06-28 22:36:08 +02:00
Milos Kozak	ab41541c69	fix NPE	2018-06-28 22:31:42 +02:00
Milos Kozak	720e938ebf	allow longer lowtemp on RS an Rv2	2018-06-28 10:30:45 +02:00
Milos Kozak	a99b478eea	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-27 20:13:37 +02:00
Milos Kozak	29032e658f	show predictions in nsclient mode	2018-06-27 20:13:25 +02:00
Milos Kozak	2b799d9f71	SW: ask for import after storage permission	2018-06-26 13:15:50 +02:00
Milos Kozak	4df3561b4b	setup wizard cleanup	2018-06-26 12:53:43 +02:00
Milos Kozak	520f2e1518	plugin descritpions to setup wizard	2018-06-26 12:28:53 +02:00
Milos Kozak	77245c027e	prevent NPE	2018-06-26 10:45:56 +02:00
Milos Kozak	f7f4385d5d	cleanup	2018-06-26 00:20:43 +02:00
Milos Kozak	d55612b290	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-26 00:16:31 +02:00
Milos Kozak	44cf82abde	fix iob graph axis labels	2018-06-26 00:16:26 +02:00
Johannes Mockenhaupt	b6a621528a	Autosens: show 'u's for UAM in output.	2018-06-26 00:01:31 +02:00
Johannes Mockenhaupt	50ffebc679	BgReading.copyFrom: don't update local data. ... Like the 'valid' flag, which is not copied and is not synced with NS, don't sync sourcePlugin or isFiltered. Otherwise there might be a race condition if the NS-roundtrip of a locally received BG updates the sourcePlugin field to null, thus leaving no values for the loop to loop with.	2018-06-25 23:02:58 +02:00
Johannes Mockenhaupt	069f0fb7b1	Fix method name.	2018-06-25 22:51:59 +02:00
Milos Kozak	81ad4c54f3	fix bug when uncomplete autosens was stored to the cache	2018-06-25 22:20:00 +02:00
Milos Kozak	6d1fa2ffda	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-25 20:04:03 +02:00
Milos Kozak	4b777f8dcc	fix extendedBolusView	2018-06-25 20:03:54 +02:00
Johannes Mockenhaupt	e4a72c8175	Fix name of incoming profile from NS with timeshift/percentage.	2018-06-25 12:07:12 +02:00
AdrianLxM	619ba32840	configbuilder fix	2018-06-25 00:07:43 +02:00
Milos Kozak	385f0c7bfe	Merge pull request #1148 from triplem/1133 ... 1133	2018-06-24 19:32:18 +02:00
Milos Kozak	ee2d6b71d1	add delay to sms bolus command	2018-06-24 18:28:38 +02:00
Markus M. May	07f7c00d85	Move Algo to abstract class	2018-06-24 18:20:28 +02:00
Milos Kozak	15607dc9be	follow autosens min/max for clearing cache	2018-06-24 17:54:23 +02:00
Milos Kozak	cf8bf419e2	Merge pull request #1147 from TebbeUbben/cb-fix ... Config builder cleanup	2018-06-24 17:29:29 +02:00
Milos Kozak	eb9f489411	Merge pull request #1149 from jotomo/treatment-prefs ... Treatments don't have settings.	2018-06-24 17:20:59 +02:00
Johannes Mockenhaupt	dcdbe7791f	Treatments don't have settings. ... Before this, treatments preferences opened preferencs of the oref0 sensitivity plugin.	2018-06-24 16:39:56 +02:00
AdrianLxM	87d24b6e6e	re-initialize on time sync Rv2	2018-06-24 15:46:31 +02:00
AdrianLxM	54e647bbe1	re-initialize after time-sync	2018-06-24 15:43:42 +02:00
Markus M. May	faca79d13e	Add unit test to PR	2018-06-24 15:43:25 +02:00
TebbeUbben	2b5631e1e7	Config builder cleanup	2018-06-24 15:13:06 +02:00
AdrianLxM	02eceef134	De-initialize Rv2 if time is off by more than 1.5h	2018-06-24 15:03:46 +02:00
AdrianLxM	78949a34ab	De-initialize RS if time is off by more than 1.5h	2018-06-24 15:03:03 +02:00
Milos Kozak	c5841063a2	Merge branch 'dev' into rs-sync-warn	2018-06-24 14:03:12 +02:00
Milos Kozak	8c695255d6	Merge pull request #1143 from jotomo/strings ... Rename "Lock screen" -> "Keep screen on".	2018-06-24 13:58:35 +02:00
AdrianLxM	5f2f0fff40	time sync in Rv2 as in RS	2018-06-24 13:32:19 +02:00
AdrianLxM	3e53c66365	don't set time on large diff, just warn	2018-06-24 13:27:55 +02:00
AdrianLxM	d72cb96d2b	Oref0 sensitivity 24 hours	2018-06-24 13:12:15 +02:00
Johannes Mockenhaupt	a8d783874c	Rename "Lock screen" -> "Keep screen on".	2018-06-24 12:50:11 +02:00
Milos Kozak	f7609317ba	Merge branch 'dev' into rs-sync-warn	2018-06-24 11:45:33 +02:00
Milos Kozak	2963f0a698	Merge pull request #1140 from triplem/issue_1130_backwards ... Issue 1130 backwards	2018-06-24 11:44:41 +02:00
Johannes Mockenhaupt	784c071f53	Small oref1 sens corrections.	2018-06-24 01:03:38 +02:00
Markus M. May	8bdaddb389	Allow backwards compatibility to previous solution to add quotes	2018-06-23 22:41:01 +02:00
Markus M. May	e32f33a8d3	fixes #1130	2018-06-23 21:36:18 +02:00
Milos Kozak	de2273836e	OpenAPS Offline visualization fix	2018-06-23 21:16:08 +02:00
Milos Kozak	a4b3b7b2e9	Clean AndroidAPS started button	2018-06-23 20:28:20 +02:00
AdrianLxM	11b8587768	Warn on long time diffs on Rv2	2018-06-23 20:05:59 +02:00
AdrianLxM	1b047bba69	Warn on large time offsets RS	2018-06-23 20:05:05 +02:00
Milos Kozak	0d48cc8770	fix parsing SSID	2018-06-23 19:59:11 +02:00
Milos Kozak	fb94c93ba6	Merge pull request #1110 from TebbeUbben/foreground-service ... Use a foreground service for the ongoing notification and enforce using it on Oreo and up	2018-06-23 19:37:33 +02:00
Milos Kozak	a3c3c52249	Merge branch 'dev' into sens-cutoff	2018-06-23 18:59:33 +02:00
Milos Kozak	bbfe1d2f83	fix NPE in #1136	2018-06-23 18:52:58 +02:00
Milos Kozak	f7309c9ff1	Merge branch 'dev' into sens-cutoff	2018-06-23 18:34:46 +02:00
Milos Kozak	470487375d	Merge pull request #1136 from TebbeUbben/profile-invalid-fix ... Mark profile as invalid if high target < low target	2018-06-23 18:24:40 +02:00
Milos Kozak	586665e19f	nsclient table mode improvements	2018-06-23 18:24:04 +02:00
TebbeUbben	8adc333ade	Mark profile as invalid if high target < low target	2018-06-23 16:02:10 +02:00
AdrianLxM	064a8915a0	downweight Autosens if not enough data	2018-06-23 14:05:12 +02:00
Milos Kozak	53ba6d46d5	fix adding zero deviations	2018-06-23 12:27:18 +02:00
Milos Kozak	9c5e389afb	move sensitivity plugins to one package	2018-06-23 12:19:55 +02:00
Johannes Mockenhaupt	6cb09d4fcb	Remove BgReading.noise for now, clashes with existing NS data. ... I believe NS uses 'noise' to store the noise level (1 through 3?).	2018-06-23 11:41:03 +02:00
Johannes Mockenhaupt	73e8a0c876	Rename BgReading.filtered to BgReading.isFiltered and add to NS. ... Avoids collision with 'filtered' value in NS data.	2018-06-23 11:36:23 +02:00
Johannes Mockenhaupt	6d437b4afa	Test stubs.	2018-06-23 11:35:01 +02:00
Johannes Mockenhaupt	c18effd893	Fix detecting BG source from NS entry.	2018-06-23 11:27:56 +02:00
Johannes Mockenhaupt	b4db98fa1d	Process xDrip noise data if provided (engineering mode only).	2018-06-23 11:21:05 +02:00
Johannes Mockenhaupt	34ee125666	Add message to constraints if BG is not filtered.	2018-06-23 11:07:16 +02:00
Johannes Mockenhaupt	79dec2e871	Fixes.	2018-06-23 02:59:11 +02:00
Johannes Mockenhaupt	986d9fb01c	Detect source from NSClient BG.	2018-06-23 01:33:13 +02:00
Johannes Mockenhaupt	906cc8a76a	Clean up assigning sourcePlugin, filtered properties.	2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt	53b9d5cae3	Fix column type.	2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt	aab171932c	Have Bgsource.processNewData return added BGs.	2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt	922f9ff83d	Refactor DataService to delegate BG processing to BgSources.	2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt	7a331e0c94	Don't loop with readings coming from non-active BG source.	2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt	6abad56b1f	Replace BgSourceInterface.advancedFilteringSupported. ... Replaced by 'filtered' property on BgReading.	2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt	98c933af57	BgReading: add sourcePlugin and filtered fields.	2018-06-23 01:24:26 +02:00
Milos Kozak	4efb115209	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-22 22:52:23 +02:00
Milos Kozak	8e08a293c1	detect bg source in nsclient	2018-06-22 22:30:03 +02:00
Milos Kozak	8a74646b67	set positive deviations to zero if bg < 80	2018-06-22 21:18:59 +02:00
Milos Kozak	c139942981	reset autosens on site change (AAPS,WA)	2018-06-22 20:11:45 +02:00
Milos Kozak	8237456030	reset autosens on site change	2018-06-22 20:05:49 +02:00
Milos Kozak	9360151100	Merge branch 'dev' into oref1	2018-06-22 17:55:38 +02:00
Milos Kozak	7bed827f4b	Merge pull request #1119 from jotomo/delete-future-treatments ... Treatments tab: add button (if applicable) to delete future treatments.	2018-06-22 17:47:37 +02:00
Milos Kozak	9dc667817b	Merge pull request #1120 from schmitzn/sync-butterknife-eventbus ... Synchronize Butterknife / Eventbus (#1090)	2018-06-22 17:45:55 +02:00
Milos Kozak	a3cf7622b6	Merge pull request #1121 from jotomo/tt-context-menu ... TT context menu	2018-06-22 17:28:20 +02:00
Johannes Mockenhaupt	9b4f3f6e0e	Don't apply loop result if a bolus is in progress. ... While an SMB is rejected by the queue in this scenario, a temp basal would still be applied, so don't apply loop results if a bolus is progress or queued at this point.	2018-06-21 22:58:15 +02:00
Johannes Mockenhaupt	3eed0afe61	Move 'eating soon' TT to top (ordering of dialog).	2018-06-21 22:29:16 +02:00
Johannes Mockenhaupt	58d79892ed	Overview: TT context menu.	2018-06-21 22:06:39 +02:00
Nico Schmitz	4d853c1435	Check for unbound variables	2018-06-21 21:58:12 +02:00
Johannes Mockenhaupt	41ce9677df	Remove duplicate string.	2018-06-21 09:57:35 +02:00
Milos Kozak	bd846e7526	Merge pull request #1117 from jotomo/1068-bolus-after-smb ... WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.	2018-06-21 09:30:56 +02:00
AdrianLxM	809ad97cb9	Merge pull request #1118 from jotomo/1096 ... Disable slope deviation unless on dev branch, fixes #1096.	2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt	6002c747e6	Treatments tab: add button (if applicable) to delete future treatments.	2018-06-21 00:38:22 +02:00
Johannes Mockenhaupt	49b84fb550	Reject SMB if bolus is queued/running or outdated. Fixes 1068.	2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt	8036f8bcde	Disable slope deviation unless on dev branch, fixes #1096.	2018-06-21 00:31:35 +02:00
Milos Kozak	5292e09535	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-20 23:56:50 +02:00
Milos Kozak	a02961da61	check for NPE	2018-06-20 23:56:38 +02:00
Nico Schmitz	c3050740a8	Synchronize Butterknife / Eventbus	2018-06-20 22:57:31 +02:00
Milos Kozak	3ed11f9002	oref1 autosens: count with extra deviations	2018-06-20 20:49:16 +02:00
Milos Kozak	6eef71c4c0	Merge pull request #1116 from TebbeUbben/cb-fix ... Fix for #1115	2018-06-20 20:43:29 +02:00
TebbeUbben	ed10c8cadc	Fix for #1115	2018-06-20 20:12:22 +02:00
Milos Kozak	370008f41e	oref 0.6.0 sens	2018-06-20 18:39:47 +02:00
Milos Kozak	e913cfe454	prepare oref1 plugin	2018-06-19 20:41:40 +02:00
Milos Kozak	df021a2dd2	Merge pull request #1111 from jotomo/combo-setup-notification ... Combo setup notification	2018-06-19 18:41:43 +02:00
Johannes Mockenhaupt	3ed4aa468d	Combo: fix ReadQuickInfoCommand to handle empty bolus history.	2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt	ef650b80a1	Combo: show notification on broken setup.	2018-06-18 20:19:30 +02:00
TebbeUbben	ef237ed378	DummyService javadoc	2018-06-18 19:43:40 +02:00
Milos Kozak	af8e1fb32f	Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1 ... restrict local profile DIA to min of 5 on the GUI	2018-06-18 18:58:29 +02:00
TebbeUbben	a590a8be42	Foreground service	2018-06-17 23:33:32 +02:00
Nico Schmitz	d88b4da5a9	Don't show statuslight preferences in NSCLIENT build	2018-06-17 22:41:34 +02:00
Andy Rozman	47427ec68e	- integration started ... - states visible - command framework added - we get currect profile and compare it with AAPS profile - setProfile command is disabled, if pumps profile is different we get warning - bolus is enabled and working - get remaining reservoir level	2018-06-16 18:13:29 +01:00
Milos Kozak	f14ba554f0	RS ble cleanup	2018-06-16 13:18:00 +02:00
Nico Schmitz	aa4f506961	Update to current upstream/dev branch	2018-06-16 02:51:33 +02:00
Nico Schmitz	db36d6e3f5	Change colors and refactor code	2018-06-16 02:18:03 +02:00
Tebbe Ubben	1e4c7178f4	Merge branch 'dev' into dev	2018-06-15 21:10:33 +02:00
Nico Schmitz	14a17efecc	Update colors	2018-06-15 19:36:49 +02:00
Milos Kozak	21b598edfa	Merge pull request #1100 from MilosKozak/rsoption ... Rsoption	2018-06-15 00:19:08 +02:00
Nico Schmitz	bf3ce735bc	Set colors of profile view	2018-06-14 23:22:15 +02:00
Nico Schmitz	1604b53327	Fix bugs, refactor code and add preferences	2018-06-14 20:49:58 +02:00
Nico Schmitz	d7db19bf2d	Merge branch 'fix-careportalevent' into dev-wip	2018-06-14 13:01:14 +02:00
Nico Schmitz	43d787ff88	Simplify isOlderThan()	2018-06-14 12:38:15 +02:00
Nico Schmitz	f82240a724	Fix bug in getHoursFromStart()	2018-06-14 12:34:42 +02:00
Nico Schmitz	217583d601	Use getBatteryLevel() for BAT status. Refactor code and layout.	2018-06-13 19:58:52 +02:00
Roumen Georgiev	904957d0d2	removing unneeded methods	2018-06-13 18:24:50 +03:00
PoweRGbg	a64364de4e	removed excessive debugging and unneeded source	2018-06-13 16:17:10 +03:00
PoweRGbg	5a197676fb	IT WORKS!!!	2018-06-13 15:57:42 +03:00
PoweRGbg	faab8fbc67	setting full userOptions	2018-06-13 11:43:44 +03:00
Milos Kozak	4d2e166620	try to fix crash	2018-06-13 10:41:15 +02:00
PoweRGbg	56651691a5	more more	2018-06-13 11:08:47 +03:00
PoweRGbg	64b5783e4a	more	2018-06-13 11:07:03 +03:00
PoweRGbg	71c474ef5f	danaR changes	2018-06-13 11:04:32 +03:00
PoweRGbg	5634aabd9f	more	2018-06-13 11:02:52 +03:00
PoweRGbg	2cb3c15d61	more update	2018-06-13 11:01:43 +03:00
PoweRGbg	cd337ecdc8	update to latest changes from Milos	2018-06-13 10:51:06 +03:00
PoweRGbg	434db333b1	reverting changes	2018-06-13 09:56:30 +03:00
PoweRGbg	87bc6ed798	Revert "more debugging output" ... This reverts commit 1adf8718ae.	2018-06-13 09:49:58 +03:00
PoweRGbg	0f067ef3a7	Revert "more debugging output" ... This reverts commit f1f8bae2d1.	2018-06-13 09:49:45 +03:00
PoweRGbg	90a3a66c30	Revert "Merge remote-tracking branch 'upstream/rsoption' into dev" ... This reverts commit 233fb33659, reversing changes made to f1f8bae2d1.	2018-06-13 09:49:37 +03:00
PoweRGbg	0e40d1e7ef	Revert "Revert "more debugging output"" ... This reverts commit 209fb79396.	2018-06-13 09:49:35 +03:00
PoweRGbg	209fb79396	Revert "more debugging output" ... This reverts commit f1f8bae2d1.	2018-06-13 09:34:57 +03:00
PoweRGbg	233fb33659	Merge remote-tracking branch 'upstream/rsoption' into dev	2018-06-13 09:14:46 +03:00
Roumen Georgiev	f1f8bae2d1	more debugging output	2018-06-13 09:00:04 +03:00
Milos Kozak	082918c776	remove unneded code	2018-06-13 07:44:26 +02:00
Milos Kozak	6fa759a395	remove unneded code	2018-06-13 07:42:57 +02:00
Nico Schmitz	a7aa4c2b5a	Implement getBatteryLevel() in PumpInterface and for all pump plugins	2018-06-13 00:28:17 +02:00
Nico Schmitz	f28fca668f	Integrate info fields from swissalpine/dev-work	2018-06-13 00:07:13 +02:00
Milos Kozak	ecdbe2ac37	setUserOptions cleanup	2018-06-12 23:43:04 +02:00
Nico Schmitz	5ba6f02b93	Remove reservoir TextView	2018-06-12 23:31:46 +02:00
Nico Schmitz	4ebc149783	Add changes of schmitzn/reservoir-view	2018-06-12 23:28:11 +02:00
Milos Kozak	d051e081e2	Merge branch 'dev' into rsoption	2018-06-12 21:59:20 +02:00
Milos Kozak	d4ed6539d8	poctech units mmol/L	2018-06-12 21:57:33 +02:00
Roumen Georgiev	1adf8718ae	more debugging output	2018-06-12 13:30:07 +03:00
Roumen Georgiev	06507bab2c	update method names	2018-06-12 12:41:40 +03:00
Roumen Georgiev	978d94499f	update method names	2018-06-12 11:03:23 +03:00
Roumen Georgiev	f044ab15c0	setting swithces in activity	2018-06-12 10:39:47 +03:00
Roumen Georgiev	01012d817c	getting userOptions from v2	2018-06-12 10:29:47 +03:00
Milos Kozak	e7eec8fe69	Poctech BG source	2018-06-11 17:26:31 +02:00
TebbeUbben	41a7f57b75	Update Objective views every minute	2018-06-11 16:35:47 +02:00
TebbeUbben	3ac10f4f7a	Improved MinimumDurationTask visualization	2018-06-11 16:24:46 +02:00
TebbeUbben	31cb68240b	Automatically scroll to currently active objective	2018-06-11 15:45:28 +02:00
Roumen Georgiev	2441214bb8	added SetUserOptions for DanaR	2018-06-11 11:36:32 +03:00
Andy Rozman	9bae53e53a	- update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working) ... - it will take some time until code is actually integrated into AAPS, but at least now all files are available	2018-06-10 21:50:50 +01:00
TebbeUbben	97984f8ef3	Improved leftover time display	2018-06-09 23:15:46 +02:00
TebbeUbben	6bc13d9cc0	Don't return false in isStarted if objective has been accomplished	2018-06-09 23:10:54 +02:00
TebbeUbben	0d21a0ab62	Fixed tests	2018-06-09 23:03:31 +02:00
TebbeUbben	005039effc	Objectives styling	2018-06-09 22:07:41 +02:00
TebbeUbben	531a926d00	Close navigation drawer on click	2018-06-09 13:17:26 +02:00
Milos Kozak	30dbbb12a8	Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3 ... Wizard: fully undo "ok" on constraints violation	2018-06-09 11:46:41 +02:00
TebbeUbben	f7597c93d7	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java	2018-06-08 23:30:39 +02:00
TebbeUbben	2d94133175	Plugin descriptions	2018-06-08 21:19:46 +02:00
AdrianLxM	bbf09a62f1	synchronize onDestroyView	2018-06-08 06:20:35 +02:00
AdrianLxM	97bbc00dcf	Don't set text onunbound gui elements	2018-06-08 06:19:02 +02:00
TebbeUbben	38526d64c6	These should not be changed	2018-06-07 23:24:10 +02:00
TebbeUbben	e25ebbdafa	Protection against callback looping	2018-06-07 23:23:10 +02:00
TebbeUbben	aa86a49339	Use real plugin descriptions	2018-06-07 22:55:13 +02:00
TebbeUbben	13cb4c28ed	ConfigBuilder styling	2018-06-07 22:54:27 +02:00
AdrianLxM	d6184cc151	Wizard: fully undo "ok" on constraints violation ... Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056	2018-06-07 22:44:09 +02:00
Roumen Georgiev	4b7f8615bf	Merge pull request #26 from MilosKozak/rsoption ... update	2018-06-07 09:30:22 +03:00
Roumen Georgiev	9e2074433e	remove button if pump is DanaR Korean	2018-06-07 09:26:33 +03:00
Milos Kozak	1d13712aec	nsclient setup wizard tweaking	2018-06-06 22:58:50 +02:00
Milos Kozak	f94d1e85e1	cleanup	2018-06-06 18:32:19 +02:00
Milos Kozak	04fffae811	addd setUserOption to Queue (Dana pumps)	2018-06-06 18:29:40 +02:00
Milos Kozak	d2830d1938	DanaRUserOptionActivity update on pump load	2018-06-06 17:13:58 +02:00
Milos Kozak	bbeca6b83e	cleanup	2018-06-06 16:57:00 +02:00
AdrianLxM	5ec828e16f	restrict local profile DIA to min of 5 on the GUI	2018-06-06 15:18:03 +02:00
Milos Kozak	4adcb88d12	Merge pull request #1067 from jotomo/fill-one-shot-guard ... One-short guards for Fill/Prime dialog.	2018-06-06 08:47:08 +02:00
Milos Kozak	65c8cb22ef	check for null context	2018-06-05 14:38:00 +02:00
Milos Kozak	7e7e921853	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-06-05 14:37:47 +02:00
Milos Kozak	5df51e8a6e	check for NPE	2018-06-05 14:35:18 +02:00
Roumen Georgiev	4a481bf294	Merge branch 'dev' into dev	2018-06-05 12:45:00 +03:00
Roumen Georgiev	c1b69404d0	files renamed and added icon	2018-06-05 12:19:47 +03:00
AdrianLxM	171209503e	remove unneeded log statement	2018-06-05 00:04:03 +02:00
AdrianLxM	4998ebae89	Merge pull request #1071 from TebbeUbben/new-design ... TabLayout + NavigationDrawer	2018-06-04 23:53:42 +02:00
TebbeUbben	f7b19e37a1	Button for plugin preferences	2018-06-04 21:56:31 +02:00
TebbeUbben	80e9d769e4	Compact version of toolbar	2018-06-04 21:34:21 +02:00
Roumen Georgiev	19e7d507b2	shutdown value can be 0	2018-06-04 10:24:20 +03:00
Roumen Georgiev	1147c28f04	use numberPicker instead of editText	2018-06-04 10:23:01 +03:00
TebbeUbben	9cf9da0d22	MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED	2018-06-03 23:33:49 +02:00
TebbeUbben	263275659a	TabLayout + NavigationDrawer	2018-06-03 23:28:04 +02:00
TebbeUbben	a86c654f8d	Use real TBR cancels and dismiss their alerts	2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt	ef6ee43c32	One-short guards for Fill/Prime dialog.	2018-06-02 18:06:04 +02:00
TebbeUbben	f151cbb0bf	TBR emulation	2018-06-02 16:37:53 +02:00
Roumen Georgiev	054003460c	push new settings to pump	2018-06-01 16:42:56 +03:00
Roumen Georgiev	75dbf71a70	Merge remote-tracking branch 'origin/dev' into dev	2018-06-01 12:11:29 +03:00
Roumen Georgiev	861f9bdd8d	Timeformat reverse	2018-06-01 12:10:08 +03:00
Roumen Georgiev	9569fbf183	Merge branch 'dev' into dev	2018-06-01 12:02:41 +03:00
Roumen Georgiev	85bef0036b	back to original	2018-06-01 11:45:31 +03:00
Roumen Georgiev	4581733cd7	some debugging output and forced getting user options	2018-06-01 11:41:37 +03:00
Roumen Georgiev	319e786988	display 666 in backlightontime if no settings read	2018-06-01 10:08:13 +03:00
Roumen Georgiev	f3d19aa6f4	convert int values to strings	2018-06-01 09:38:18 +03:00
swissalpine	dd60cadd5a	Fix broken cage age	2018-05-31 22:22:22 +02:00
Roumen Georgiev	bbb9c681e6	filling in some data	2018-05-31 17:16:30 +03:00
Roumen Georgiev	41af503104	filling in some data	2018-05-31 17:10:09 +03:00
Roumen Georgiev	da89ea1643	some formatting	2018-05-31 16:47:58 +03:00
Roumen Georgiev	39e704645b	create userOptionsActivity class	2018-05-31 14:45:26 +03:00
Markus M. May	a587f72de2	Fix wrong usage of event in refactored source	2018-05-30 18:09:41 +02:00
Milos Kozak	418f68153e	Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering ... NSClient as source without advanced filtering	2018-05-30 08:08:04 +02:00
Markus M. May	0fe744c3e6	Remove unnecessary assignment	2018-05-29 21:44:33 +02:00
Markus M. May	41503800e8	Remove some duplicate code lines	2018-05-29 20:57:55 +02:00
AdrianLxM	de1196f34b	NSClient as source without advanced filtering	2018-05-29 12:57:07 +02:00
Milos Kozak	35c07d1e60	SW scroll to the top on activity create	2018-05-24 00:13:59 +02:00
Milos Kozak	d642418e02	resolve NPE	2018-05-23 23:43:41 +02:00
Milos Kozak	683caf78f8	SW configure insulin button	2018-05-23 13:47:16 +02:00
Milos Kozak	a7cfcd56e3	SW fix return to 1st page	2018-05-23 13:20:24 +02:00
Milos Kozak	fa2c0ab003	Merge pull request #994 from MilosKozak/startupwizard ... Startupwizard	2018-05-22 23:07:04 +02:00
Milos Kozak	53bdb0bf09	asking permissions to notifications	2018-05-22 23:06:17 +02:00
Milos Kozak	5d27a28dc9	SW eula	2018-05-22 20:02:38 +02:00
Milos Kozak	250f9f74a0	move askForStoragePermission	2018-05-22 18:59:34 +02:00
Milos Kozak	2626e5bb63	SW android permissions	2018-05-22 17:34:09 +02:00
Milos Kozak	4fa24fb009	SW add more texts	2018-05-20 23:44:09 +02:00
Milos Kozak	c723deaf02	SW patient age screen finalization	2018-05-20 22:01:32 +02:00
Milos Kozak	b57683eaf5	SW rename package	2018-05-20 21:55:53 +02:00
Andy Rozman	e8f860be8b	- copied RL code ... - copied Medtronic code - added BLE Scan - added RL Stats activity - added RL configuration display	2018-05-20 20:53:55 +01:00
Milos Kozak	f24d296836	SW nsclient screen finalizing	2018-05-20 21:36:17 +02:00
AdrianLxM	953128ffe5	UAM without advanced filtering	2018-05-20 19:17:46 +02:00
Milos Kozak	52a4f9af14	SW loop screen update	2018-05-20 16:29:15 +02:00
Milos Kozak	d079052944	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard	2018-05-20 16:18:10 +02:00
Milos Kozak	de8557a115	SW sensitivity plugin	2018-05-20 16:17:53 +02:00
Milos Kozak	5b9594bdbb	SW create elements package	2018-05-20 15:09:32 +02:00
Milos Kozak	d0ed4bd717	SWString fix	2018-05-20 15:01:03 +02:00
Milos Kozak	7714aa9138	Merge branch 'dev' into startupwizard	2018-05-20 14:18:58 +02:00
Milos Kozak	53cbe05436	Merge pull request #1019 from McHoffi/obj.7-add-info ... Obj.7 add info about using SMB/maxIOB	2018-05-20 14:14:11 +02:00
Andy Rozman	4aefea0b28	Add constants file and modified status.	2018-05-17 14:21:35 +01:00
Roumen Georgiev	764e035666	remove wizard from backstack and fix the Exit -> returning to SW	2018-05-16 15:35:17 +03:00
Milos Kozak	66e50f5b62	Merge pull request #1038 from jotomo/upstreaming ... [Polish] Dialog/color consistency, translations and other small stuff	2018-05-15 13:09:50 +02:00
Milos Kozak	e58149379a	Merge pull request #1043 from jotomo/issue-646 ... [Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.	2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt	25aa6f859f	On bolus cancel request, cancel all boluses. Partially addresses #646.	2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt	29efe11ece	Combo: always send out progress updates (SMB or not). ... Without this, showing SMB progress on wear is broken. (cherry picked from commit 5ebff72)	2018-05-13 23:20:29 +02:00
TebbeUbben	3103a0f276	Some styling for SW	2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt	d80fecc390	Add T.now, plus, minus methods.	2018-05-13 12:44:47 +02:00
Johannes Mockenhaupt	1883ac06dd	Use TT color for TT confirmations in dialogs.	2018-05-13 12:14:49 +02:00
Andy Rozman	7a388a5715	Little bit of refactoring.	2018-05-12 14:29:02 +01:00
Andy Rozman	2cc4fe4450	Added options Max Bolus and Max Basal ... Little bit of refactoring in Medtronic code	2018-05-12 00:41:44 +01:00
Milos Kozak	4fae6c703c	SW autostart SetupWizard	2018-05-11 13:14:59 +02:00
Milos Kozak	ff2cc04408	SW warn if exported configuration is missing	2018-05-11 13:04:17 +02:00
Milos Kozak	337a3d9776	SW show ObjectivesFragment	2018-05-11 08:30:21 +02:00
Milos Kozak	0a51c86afb	SW Configure APS button	2018-05-11 00:09:35 +02:00
Milos Kozak	376fffa6ec	SW Import settings, Skip wizard	2018-05-10 23:59:20 +02:00
Milos Kozak	8d7df64050	Merge pull request #1016 from MilosKozak/pump-notifications ... Pump notifications	2018-05-10 23:24:45 +02:00
Milos Kozak	e105e5149e	Merge pull request #1032 from jotomo/wear-wizard-tt ... Wear wizard: add TT config option.	2018-05-10 16:53:34 +02:00
Andy Rozman	347d210d06	Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into virtual_pump_Bug863	2018-05-10 12:42:06 +01:00
Andy Rozman	6f19ad1407	Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging.	2018-05-10 12:40:31 +01:00
Roumen Georgiev	91c0b1a2ec	make Objectives visible	2018-05-10 14:36:05 +03:00
Milos Kozak	d5137a061b	Merge branch 'dev' into virtual_pump_Bug863	2018-05-10 13:19:44 +02:00
Roumen Georgiev	016aa1c069	Added insulin descriptions to SW screen	2018-05-10 13:56:50 +03:00
Roumen Georgiev	2fa77d2a8c	Added insulin descriptions to SW screen	2018-05-10 13:49:13 +03:00
Roumen Georgiev	33a6135e75	Added insulin descriptions to SW screen	2018-05-10 13:48:18 +03:00
Roumen Georgiev	06180e3bbd	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-10 12:51:12 +03:00
Milos Kozak	71b44edea6	SW enable loop	2018-05-09 19:34:15 +02:00
Milos Kozak	fb7067b207	SW profile switch	2018-05-09 19:24:20 +02:00
Milos Kozak	1ba828d20a	SWFragment	2018-05-09 18:49:42 +02:00
Roumen Georgiev	e3153230e0	added NSClient followup	2018-05-09 17:11:07 +03:00
Milos Kozak	0060a2ba7f	SW show pump status	2018-05-09 15:10:47 +02:00
Roumen Georgiev	50f8bf2d18	fix for screens adding up	2018-05-09 15:55:02 +03:00
Roumen Georgiev	bfd61a65a0	fix for screens adding up	2018-05-09 15:44:40 +03:00
Roumen Georgiev	41d736e176	updated to latest from Milos	2018-05-09 15:06:34 +03:00
Roumen Georgiev	a7bbf93599	Merge pull request #19 from MilosKozak/startupwizard ... Startupwizard	2018-05-09 14:49:17 +03:00
Roumen Georgiev	0e8f0669c5	Update SWDefinition.java	2018-05-09 14:48:35 +03:00
Milos Kozak	bacb3fb337	SW pump screen	2018-05-09 13:38:17 +02:00
Roumen Georgiev	1f2f2f54fc	added SWCheckbox item	2018-05-09 14:15:53 +03:00
Milos Kozak	ed43eddc83	SWInfotext	2018-05-09 11:55:21 +02:00
Milos Kozak	61a7d69a65	Merge branch 'dev' into startupwizard	2018-05-09 11:41:05 +02:00
Milos Kozak	8c2d0d80ee	Merge pull request #1017 from MilosKozak/notification-height ... Tests required: Notification height	2018-05-09 10:16:29 +02:00
Roumen Georgiev	d5a3177c35	trying pump followup screen -NOT WORKING	2018-05-09 11:06:52 +03:00
Milos Kozak	e29a590cad	Merge pull request #1020 from MilosKozak/dia-refactor ... default DIA	2018-05-08 23:43:54 +02:00
Roumen Georgiev	85d4ef4419	trying pump followup screen	2018-05-08 17:09:37 +03:00
Roumen Georgiev	e357c7fd1b	adding pump selection	2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt	ce6e53e9c6	Wear wizard: add TT config option.	2018-05-08 13:28:01 +02:00
Markus M. May	b0d8d547d8	Add isConnected, enable NSClient only, if really connected to internet	2018-05-07 20:43:13 +02:00
Andy Rozman	c03b4f6780	Minor change in plugin util.	2018-05-07 13:52:21 +01:00
Andy Rozman	41205d4ba7	Merge branch 'dev' into riley_link_medtronic	2018-05-07 12:11:38 +01:00
Andy Rozman	fb45bad8d9	Removed .orig	2018-05-07 12:06:47 +01:00
Andy Rozman	af56304669	Initial commit after dev was merged into here	2018-05-07 12:05:53 +01:00
Johannes Mockenhaupt	785c402848	LP: Don't notify about invalid values during editing.	2018-05-07 02:11:59 +02:00
AdrianLxM	cdc8e45f32	Merge pull request #1015 from jotomo/lemming-treatment ... Fix finding BG in graph for treatments before the first displayed BG.	2018-05-06 19:51:01 +02:00
McHoffi	9d367c1fa1	Update ObjectivesFragment.java	2018-05-06 18:18:34 +02:00
AdrianLxM	f0351834ff	default DIA	2018-05-06 12:49:03 +02:00
Johannes Mockenhaupt	56cbac3b4d	Leftover MainApp.gs rewrite.	2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt	ef70c1f244	MainApp.sResources.getColor -> MainApp.gc.	2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt	b9c649bd68	Uso blue/orange for carbs/insulin in confirmation dialogs. ... Aligns with the graph's use of using blueish colors insulin and orange for carbs stuff.	2018-05-06 11:46:09 +02:00
AdrianLxM	1ac41323e6	fix notification last line cutoff	2018-05-05 21:55:49 +02:00
AdrianLxM	116222858e	update lastApproachingDailyLimit	2018-05-05 21:12:09 +02:00
AdrianLxM	d99fafe375	restrict aproaching daily limit to once every 30 minutes RS	2018-05-05 21:10:15 +02:00
AdrianLxM	5458df0907	restrict aproaching daily limit to once every 30 minutes Rv2	2018-05-05 21:08:17 +02:00
AdrianLxM	c2315b7bea	restrict aproaching daily limit to once every 30 minutes R-Korean	2018-05-05 21:03:35 +02:00
AdrianLxM	b43eff8e55	restrict aproaching daily limit to once every 30 minutes R	2018-05-05 21:02:31 +02:00
AdrianLxM	70b2b1502f	restrict wrong password notification to once every 30 seconds	2018-05-05 20:59:11 +02:00
AdrianLxM	c8c7e12056	Wrong password notification	2018-05-05 20:54:10 +02:00
AdrianLxM	246c8922df	Korean wrong password notification	2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt	1e0b7d331a	Fix finding BG in graph for treatments before the first displayed BG. ... (cherry picked from commit 8bdafe3)	2018-05-05 19:13:38 +02:00
Johannes Mockenhaupt	d15ada5cd9	Combo: Fix visual glitch in fragment.	2018-05-04 21:27:54 +02:00
Milos Kozak	f5a23b2921	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 19:18:52 +02:00
AdrianLxM	f511b9ed39	Merge pull request #1000 from MilosKozak/bolusprogress-dismiss ... IDEA: dismiss bolus progress dialog when Queue is empty	2018-05-04 19:03:11 +02:00
Andy Rozman	4fb8e899c2	Feature Request/Bug #863 ... - merged with dev - extended PumpType with new setting in PumpDescription - added Insight pump settings for VirtualPump	2018-05-04 15:48:46 +01:00
Milos Kozak	57973d4d3a	Merge pull request #1001 from jotomo/carbs-gen-refactor ... Extract and deduplicate eCarbs generation	2018-05-04 16:10:23 +02:00
Milos Kozak	61e6404bbe	Merge pull request #995 from MilosKozak/wear-wizard ... Wear eCarbs	2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt	35a6bbb6a7	Set CareportalEvent.MEALBOLUS for eCarbs.	2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt	43cc3c4908	Extract CarbsGenerator class.	2018-05-04 14:18:55 +02:00
Milos Kozak	963f1e1abf	Merge branch 'dev' into startupwizard	2018-05-04 13:26:40 +02:00
swissalpine	10b67a0c11	Update GraphData.java	2018-05-04 12:31:11 +02:00
AdrianLxM	5c8e99b191	dismiss bolus progress dialog when Queue is empty	2018-05-04 12:24:37 +02:00
Andy Rozman	f2df13dbfb	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 10:06:18 +01:00
Milos Kozak	91f3db782d	SWButton rename option to text	2018-05-04 10:20:22 +02:00
Milos Kozak	55661ca7a0	SWButton	2018-05-04 10:17:50 +02:00
swissalpine	010a2f3fd8	Make deviation bars transparent	2018-05-04 10:04:45 +02:00
Milos Kozak	88d964f135	SW reuse save, cleanup	2018-05-04 09:35:57 +02:00
AdrianLxM	c34cc73b1e	fix wear wizard	2018-05-03 23:08:16 +02:00
AdrianLxM	8d6997f519	ecarb ignore 0 carbs	2018-05-03 22:08:54 +02:00
AdrianLxM	61f07da1a2	ecarb doECarb	2018-05-03 22:08:43 +02:00
AdrianLxM	c69a541b75	ecarb ash first response	2018-05-03 22:08:27 +02:00
Milos Kozak	d1958a3e2d	Merge branch 'dev' into startupwizard	2018-05-03 21:31:55 +02:00
Milos Kozak	02590ddd72	SW remove unneeded code	2018-05-03 21:29:34 +02:00
Milos Kozak	cc532b9107	SWRadioButton cleanup	2018-05-03 20:13:27 +02:00
Milos Kozak	94db444acb	SW validator, language, cleanup	2018-05-03 20:06:13 +02:00
Milos Kozak	36265ab1c6	SWPlugin	2018-05-03 18:41:47 +02:00
Andy Rozman	421946269a	Merge branch 'dev' into riley_link_medtronic	2018-05-03 17:23:23 +01:00
Andy Rozman	f6110bd096	Merge branch 'virtual_pump_Bug863' into riley_link_medtronic	2018-05-03 16:54:03 +01:00
AdrianLxM	62a38ed537	wearwizard fix NPE when CobInfo not available - missing part	2018-05-03 17:49:22 +02:00
AdrianLxM	b37b892eea	wearwizard fix NPE when CobInfo not available	2018-05-03 17:49:17 +02:00
AdrianLxM	fe0f2e3ce6	wearwizard settings on phone	2018-05-03 17:49:13 +02:00
AdrianLxM	c394c045c9	wearwizard reduced watch settings	2018-05-03 17:49:09 +02:00
AdrianLxM	bdfce784c0	wearwizard ensure watch apk is up to date	2018-05-03 17:49:05 +02:00
AdrianLxM	ec106726a7	wearwizard trend	2018-05-03 17:49:01 +02:00
AdrianLxM	24dd4e1710	wearwizard cob	2018-05-03 17:48:54 +02:00
Andy Rozman	f4648e44b2	- minor changes	2018-05-03 16:31:23 +01:00
Andy Rozman	5b8779f8a7	Feature Request/Bug #863 ... - added PumpCapability (to set boolean values) - added Dana Pumps to PumpType and to VirtulaPumps array	2018-05-03 15:10:34 +01:00
Roumen Georgiev	515590cdf6	other screens	2018-05-03 17:04:56 +03:00
Roumen Georgiev	425ba77200	other screens	2018-05-03 16:59:23 +03:00
AdrianLxM	012593a480	Update NotificationStore.java	2018-05-03 12:18:48 +02:00
Roumen Georgiev	083730f476	WIP: BGSOURCE screen	2018-05-03 09:02:16 +03:00
Andy Rozman	416bd2ff41	Feature Request/Bug #863 ... - added package PumpCommon for common pump files - added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType - added PumpType which contains all definitions for pumps - extended fragement to display Pump Type and Pump Type definitions - extended plugin to read configuration and set pumpDescription object - extended pref_virtualpump to add pump type selection	2018-05-02 23:59:33 +01:00
Milos Kozak	e5ed63a46f	fix name on future profile switches	2018-05-03 00:13:49 +02:00
Milos Kozak	a35c925930	Merge pull request #983 from jotomo/issue-939 ... WIP: Fix bolus progress dialog not closing with onPause/onResume cycle	2018-05-02 23:20:29 +02:00
Johannes Mockenhaupt	396268d9c8	Send invalid boluses (prime boluses) to watch.	2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt	599c87f794	Combo: better error message when initialization fails.	2018-05-02 22:48:57 +02:00
Milos Kozak	a64bfe7a39	Merge pull request #977 from MilosKozak/persistent-text ... show bg missing not no profile	2018-05-02 22:38:07 +02:00
Milos Kozak	f9bbb72831	Merge pull request #979 from MilosKozak/lp-ps-always ... LP: Allow ProfileSwitch before pump is connected.	2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt	79458a1c73	Ignore harmless errors (un)subscribing to the message bus.	2018-05-02 22:36:52 +02:00
Milos Kozak	28430cc757	fix cob calculation	2018-05-02 22:35:51 +02:00
Milos Kozak	e2f28e0ae4	fix rounding on bolus delivery	2018-05-02 22:20:27 +02:00
AdrianLxM	a3421316ac	Allow ProfileSwitch before pump is connected. ... https://github.com/MilosKozak/AndroidAPS/issues/969	2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt	3b19db14fd	Clean up.	2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt	22e90743aa	Fix #939.	2018-05-02 21:24:06 +02:00
AdrianLxM	eb594c1867	show bg missing not no profile	2018-05-02 21:09:04 +02:00
Milos Kozak	4cc952900d	show progress reason from iobcobthread	2018-05-02 18:39:37 +02:00
Johannes Mockenhaupt	c51635dba4	Watch: colored preds.	2018-05-02 16:01:40 +02:00
Milos Kozak	e562d0f437	Merge pull request #957 from triplem/charging_merged ... Charging merged	2018-05-02 15:04:00 +02:00
AdrianLxM	926ee535d5	use MainApp.gs instead of context 2	2018-05-02 14:28:16 +02:00
AdrianLxM	d289c5c7d7	use MainApp.gs instead of context	2018-05-02 14:27:23 +02:00
AdrianLxM	3f3959f785	use MainApp.gs instead of getString from Activity/Dialog 2	2018-05-02 14:21:53 +02:00
AdrianLxM	611d761a41	use MainApp.gs instead of getString from Activity/Dialog	2018-05-02 14:16:40 +02:00
AdrianLxM	4a22fd355d	Merge remote-tracking branch 'milosremote/dev' into use-gs	2018-05-02 14:11:45 +02:00
AdrianLxM	5aa3a88c7f	remove direct access to sResources 9	2018-05-02 13:59:27 +02:00
AdrianLxM	166f2843df	remove direct access to sResources 8	2018-05-02 13:58:52 +02:00
AdrianLxM	de4643d16f	remove direct access to sResources 8	2018-05-02 13:57:28 +02:00
AdrianLxM	74d0c71712	remove direct access to sResources 7	2018-05-02 13:51:24 +02:00
AdrianLxM	545d1d1586	remove direct access to sResources 6	2018-05-02 13:50:31 +02:00
AdrianLxM	0e4e36f2b1	remove direct access to sResources 5	2018-05-02 13:49:24 +02:00
AdrianLxM	3979913a6d	remove direct access to sResources 4	2018-05-02 13:46:38 +02:00
AdrianLxM	2af62d8e4e	remove direct access to sResources 3	2018-05-02 13:42:50 +02:00
AdrianLxM	a8382daefd	remove direct access to sResources 2	2018-05-02 13:36:56 +02:00
AdrianLxM	81ad2779bc	remove direct access to sResources 1	2018-05-02 13:32:41 +02:00
AdrianLxM	cfaa26d337	remove one more gs helper	2018-05-02 13:28:58 +02:00
AdrianLxM	20263c9fe4	remove other gs helper methods	2018-05-02 13:17:57 +02:00
AdrianLxM	73b41a7162	some more gs	2018-05-02 13:12:08 +02:00
AdrianLxM	7b6402de09	use gs function in MainApp to get strings	2018-05-02 13:05:22 +02:00
AdrianLxM	2749c1c853	refactor cob string	2018-05-02 11:19:03 +02:00
AdrianLxM	24bd509ec6	COB in ongoing notification	2018-05-02 08:30:37 +02:00
AdrianLxM	c445c078e1	add g to default COB as well	2018-05-02 08:30:34 +02:00
AdrianLxM	915dac8ef3	COB in external status	2018-05-02 08:30:28 +02:00
AdrianLxM	f75329f5dc	move COB string representation to CobInfo	2018-05-02 08:30:23 +02:00
Roumen Georgiev	15f4f64c4f	using View.generateId() instead of fixed value	2018-05-02 09:22:26 +03:00
Andy Rozman	4b121ae892	- copied roundtrip2 project into here (for easier use), some of it might be reused ... - added PumpCommon - added PumpMedtronic	2018-05-01 22:44:53 +01:00
Markus M. May	2d3d39d1dc	Use common helper method for day calculation	2018-05-01 23:43:18 +02:00
Markus M. May	a46b038381	use correct number format	2018-05-01 23:34:40 +02:00
Markus M. May	de92125967	Fixes wrong algo	2018-05-01 22:49:44 +02:00
Markus M. May	306d45bb3e	Fix Boolean thingy	2018-05-01 22:15:22 +02:00
Markus M. May	02e9ce105c	Add boolean thingie from Adrian ;-)	2018-05-01 22:01:08 +02:00
Markus M. May	12d80e96ef	Merge latest dev version	2018-05-01 21:56:33 +02:00
Markus M. May	e91fd00836	Add Unit-Test, as well as fixtures for SSID handling	2018-05-01 21:46:37 +02:00
Milos Kozak	dbca668afd	Merge pull request #952 from jotomo/rainbow ... Fix missing predictions in graph, color them.	2018-05-01 20:10:59 +02:00
Milos Kozak	537be09493	Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance ... Make persistent notification not peak on every update on Oreo.	2018-05-01 20:08:17 +02:00
Milos Kozak	eb7b67781c	Merge pull request #947 from jotomo/issue-940 ... Don't create empty future carbs records. Fixes #940.	2018-05-01 20:07:46 +02:00
Milos Kozak	c991673de1	Merge pull request #948 from MilosKozak/zerotempiob ... fix zeroTempIOB	2018-05-01 20:06:32 +02:00
Johannes Mockenhaupt	af563474d5	Skip predictions below 40.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	1e80ca22c6	Don't draw invalidated SMBs.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	ee61a71181	Sort predictions so they're properly displayed in the graph. ... GraphView library requires a series to be ordered by the x-value.	2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt	5ef7506e5f	Clean up prediction colors.	2018-05-01 19:16:28 +02:00
TebbeUbben	60d3cde0d3	Compat for SR 1.6.0	2018-05-01 17:29:21 +02:00
Johannes Mockenhaupt	4d1515769f	Make persistent notification not peak on every update on Oreo.	2018-05-01 14:59:40 +02:00
AdrianLxM	3d5fb96d7d	fix zeroTempIOB	2018-05-01 13:47:26 +02:00
Johannes Mockenhaupt	8c3df40fdf	Don't create empty future carbs records. Fixes #940. ... When very few carbs are stretched out (e.g. 10g over 4h), there are gaps, so that 1g is generated only every 30m. Don't create empty records in between.	2018-05-01 12:22:01 +02:00
Roumen Georgiev	3f0c2958c7	WIP: change of language works	2018-04-30 16:41:40 +03:00
Markus M. May	099cb6c4e4	add battery charging state	2018-04-29 22:49:43 +02:00
AdrianLxM	81037cde5c	Merge pull request #935 from jotomo/calculator-carb-only ... Calculator: carb-only handling.	2018-04-28 19:29:13 +02:00
Johannes Mockenhaupt	4813c9c163	Combo: minor cleanup.	2018-04-27 19:51:12 +02:00
Johannes Mockenhaupt	5746e37553	Enable Combo & extended carbs without engineering mode as well.	2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt	21f231e2b3	Calculator: carb-only handling. ... If only carbs where entered/calculated, send them to the pump only if the pump supports it, otherwise just add it to the DB.	2018-04-27 19:49:50 +02:00
Roumen Georgiev	a0463742fa	WIP: language set and validation	2018-04-27 17:04:08 +03:00
Roumen Georgiev	bb38d7644b	move onClick in SWRadioButton	2018-04-27 13:30:45 +03:00
Milos Kozak	8577a94571	Merge pull request #925 from MilosKozak/safety-loop ... Safety loop	2018-04-27 11:00:18 +02:00
Milos Kozak	e951a924c4	Merge pull request #931 from MilosKozak/cobchart ... align failoverToMinAbsorbtionRate to cobtime	2018-04-27 10:54:39 +02:00
AdrianLxM	3631f685e2	cleanup	2018-04-27 00:03:08 +02:00
AdrianLxM	9889d34512	Treat future IOB as if the current TBR was cancelled	2018-04-26 23:59:04 +02:00
AdrianLxM	5df59d8fe3	Merge pull request #927 from MilosKozak/lastBolusTime ... lastBolusTime - only treatments with insulin	2018-04-26 23:57:54 +02:00
Roumen Georgiev	11dc20faca	code cleanup	2018-04-26 16:59:56 +03:00
Roumen Georgiev	ef171dbccd	get SP value and check if it is already set	2018-04-26 16:13:08 +03:00
Roumen Georgiev	67ed699ca5	save() before showing next	2018-04-26 15:59:08 +03:00
Roumen Georgiev	59f654f918	show "NEXT" only when isValid() == true	2018-04-26 15:28:23 +03:00
Roumen Georgiev	d75de2f645	show "NEXT" only when isValid() == true	2018-04-26 15:18:01 +03:00
AdrianLxM	3356004065	don't hide IOB behind COB	2018-04-26 03:43:43 +02:00
AdrianLxM	c045a0a41e	align failoverToMinAbsorbtionRate to cobtime	2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt	f3bc59003e	Space-optimize COB on watch.	2018-04-26 01:33:09 +02:00
Johannes Mockenhaupt	8d4e9f0043	Add future carbs on watch.	2018-04-26 01:16:31 +02:00
Johannes Mockenhaupt	2f846bc417	WatchUpdaterService: use IobCob.getCobInfo().	2018-04-26 01:10:27 +02:00
AdrianLxM	1eb2e59043	lastBolusTime - only treatments with insulin	2018-04-26 00:16:15 +02:00
AdrianLxM	3ec5eaea63	don't trigger loop on treatment	2018-04-26 00:14:51 +02:00
AdrianLxM	b6cd56b90a	cleanup logs	2018-04-25 23:31:15 +02:00
Markus M. May	55ea10e88f	Catch NetworkState changes correctly	2018-04-25 22:22:37 +02:00
Markus M. May	3fb17e6869	First step to use network activity receiver	2018-04-25 20:49:03 +02:00
AdrianLxM	e79ef7f018	always call callback on TBR-Request	2018-04-25 16:28:54 +02:00
AdrianLxM	a14345bb1a	synchronized loop invoke	2018-04-25 16:14:21 +02:00
Roumen Georgiev	dc91e3a544	currentScreen not updating - fixed & center fields	2018-04-25 17:02:10 +03:00
Roumen Georgiev	8333fe8975	get radiobutton values from arrays.xml & no header	2018-04-25 16:45:15 +03:00
Roumen Georgiev	ddf3c44928	rename show() to generateDialog()	2018-04-25 15:34:07 +03:00
Roumen Georgiev	7fb1b32188	moved show() method to SWItem classes	2018-04-25 15:29:20 +03:00
AdrianLxM	18fc03ec78	Merge remote-tracking branch 'milosremote/safety-loop' into safety-loop	2018-04-25 12:54:35 +02:00
AdrianLxM	85bb085188	rename safety to tempBasalFallback	2018-04-25 12:51:27 +02:00
AdrianLxM	b5a6ef2ecc	make now part of the past	2018-04-25 12:15:29 +02:00
AdrianLxM	ac23750942	lastBolusTime - only treatments with insulin	2018-04-25 11:52:01 +02:00
Roumen Georgiev	dda7ca3f95	radio group is generated dynamically	2018-04-25 11:03:33 +03:00
AdrianLxM	2a50248ba5	travis re-invoke commit with cleanup	2018-04-25 01:37:48 +02:00
AdrianLxM	a6a4a8837d	safety run if SMB fails	2018-04-25 01:18:40 +02:00
Johannes Mockenhaupt	da96b2d87c	Round up to be sure.	2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt	60fbb1eeba	Fix another NPE.	2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt	f4bafc6260	Add IobCobCalculatorPlugin.getCobInfo().	2018-04-24 23:09:07 +02:00
Milos Kozak	4217e82e0a	Merge pull request #884 from swissalpine/patch-1 ... More generous values for colored iage warnings (careportal)	2018-04-24 09:13:34 +02:00
Milos Kozak	c490499d03	preferences cleanup	2018-04-24 00:11:52 +02:00
Andy Rozman	99544e1f2b	Pre start for Medtronic plugin	2018-04-23 19:47:51 +01:00
Roumen Georgiev	eef4423109	basic navigation works	2018-04-23 17:03:22 +03:00
Milos Kozak	c15a4b5efe	fix wrong error dialog when only carbs are delivered (R,KoreanR)	2018-04-23 15:24:32 +02:00
Roumen Georgiev	76685c3cff	WIP: initial work	2018-04-23 15:58:27 +03:00
Milos Kozak	545b4a51ee	Merge pull request #914 from jotomo/overview-extended-bolus-display ... Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 23:13:10 +02:00
Milos Kozak	a0036bfb79	Merge pull request #906 from jotomo/loop-invocations ... Don't loop with old BG value, don't loop twice for the same value.	2018-04-22 22:43:37 +02:00
Johannes Mockenhaupt	896f919f37	Disable roaming (pref) when wifi-only is enabled.	2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt	47770e9c6c	Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 21:31:53 +02:00
Milos Kozak	6851adbfd3	NSClient connection settings	2018-04-22 18:24:06 +02:00
Milos Kozak	b81d2ec6da	Merge pull request #909 from TebbeUbben/dev ... Don't create TBR record when pump has been paused	2018-04-22 15:42:30 +02:00
TebbeUbben	2844be85b5	Don't create TBR record when pump has been paused	2018-04-22 13:44:12 +02:00
Milos Kozak	be5a989c5e	Merge pull request #908 from jotomo/fresh-cob ... Fix delay in COB calculation.	2018-04-22 09:13:13 +02:00
Johannes Mockenhaupt	89a29d150f	Fix delay in COB calculation.	2018-04-22 00:08:41 +02:00
Tebbe Ubben	f4e02a4862	Merge branch 'dev' into dev	2018-04-21 23:22:02 +02:00
TebbeUbben	fd776a2a0e	Add 0%-TBR to history when pump has been started or stopped	2018-04-21 23:20:33 +02:00
Milos Kozak	c4db1c5e2d	move quickwizard preferences under overview	2018-04-21 21:58:07 +02:00
Milos Kozak	cab592efb5	overview preferences cleanup	2018-04-21 21:31:42 +02:00
Milos Kozak	6ad0c1f1d3	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-21 20:47:15 +02:00
Milos Kozak	ea59458383	nsclient preferences cleanup	2018-04-21 20:46:55 +02:00
Milos Kozak	3d7cdd3819	fix ns backfill bug	2018-04-21 19:51:52 +02:00
Milos Kozak	209623f9ea	Merge pull request #905 from jotomo/no-future-for-you ... Don't send future carbs to pumps.	2018-04-21 18:13:33 +02:00
Johannes Mockenhaupt	e4a4e07d21	Add javadoc.	2018-04-21 15:28:37 +02:00
Johannes Mockenhaupt	d0405014b2	Don't loop with old BG value, don't loop twice for the same value. ... Loop is potentially triggered twice when BG reading sent to NS comes back. This should also deal with backfilled data coming in, since any previous reading will be older than 9m, for which DatabaseHelper.actualBg() returns null. The previous approach to solve multiple invocations for the same value added a isNew flag to EventNewBG, but since DatabaseHelper.scheduleBgChange() drops excessive updates the event carrying that flag is not guarantued to be delivered, resulting in missed loop invocations. The approach taken now lets the receiver of the event fully decide how to deal with it. Should fix, or at least improve, #901, #671.	2018-04-21 14:28:47 +02:00
Johannes Mockenhaupt	9c6ee32586	Don't send future carbs to pumps.	2018-04-21 14:08:42 +02:00
Milos Kozak	c40aaed52f	allow to show dev slope in dev	2018-04-21 12:09:09 +02:00
Milos Kozak	c0250dd62c	show calculation cob progress on graph	2018-04-21 10:50:55 +02:00
Milos Kozak	cb65bed0a7	alling code to xdrip changes	2018-04-21 10:20:49 +02:00
Milos Kozak	c27ceb0a72	better bolus error handling for Dana pumps	2018-04-21 00:02:15 +02:00
Milos Kozak	870d23c08c	fix bolus step for Dana pumps	2018-04-20 22:13:20 +02:00
Milos Kozak	2f299bc670	Merge pull request #898 from MilosKozak/cob-rework ... Please review: Cob rework	2018-04-20 20:53:50 +02:00
AdrianLxM	69c8eea53b	Enforce TBRs on enforceNew	2018-04-20 18:05:37 +02:00
Milos Kozak	b554d641a7	setupwizard template	2018-04-20 17:27:31 +02:00
Milos Kozak	41b5636c13	clear autosens cache on new preferences change	2018-04-20 12:44:19 +02:00
Milos Kozak	fb71b64922	Merge branch 'cob-rework' of https://github.com/MilosKozak/AndroidAPS into cob-rework	2018-04-20 12:28:18 +02:00
Milos Kozak	0ab04c4d95	fix cob scaling	2018-04-20 12:28:07 +02:00
AdrianLxM	d8180cc52b	Merge remote-tracking branch 'milosremote/dev' into cob-rework	2018-04-19 23:54:36 +02:00
Milos Kozak	645e83b6e6	dismiss notification if pump is reachable	2018-04-19 23:42:37 +02:00
Milos Kozak	51530fbcf8	fix temptarget NS sync	2018-04-19 23:18:19 +02:00
Milos Kozak	e1dc69cd4d	visualize min carbs absorption	2018-04-19 22:31:07 +02:00
Milos Kozak	4f4f92ff76	Merge pull request #895 from triplem/mgdl_mmol_handling ... Cleanup mmol/mgdl TT handling in Dialogs	2018-04-19 21:00:47 +02:00
AdrianLxM	11b88c7947	Merge remote-tracking branch 'milosremote/dev' into cob-rework	2018-04-19 20:22:14 +02:00
AdrianLxM	dfa05711d3	Merge pull request #892 from MilosKozak/carbs-gen-pr ... Carbs gen pr	2018-04-19 20:19:10 +02:00
AdrianLxM	9e9270bff7	cleanups	2018-04-19 19:34:38 +02:00
AdrianLxM	6df614e7c6	Merge remote-tracking branch 'milosremote/dev' into cob-rework	2018-04-19 19:29:27 +02:00
AdrianLxM	eac6f15881	XDrip source description extra	2018-04-19 17:49:18 +02:00
AdrianLxM	572b308f6c	cleanup	2018-04-19 17:47:34 +02:00
AdrianLxM	a227a8b601	Push source to xDrip plugin	2018-04-19 17:45:52 +02:00
AdrianLxM	938040ae6b	xDrip plugin depend filtering on source	2018-04-19 17:44:52 +02:00
AdrianLxM	d810be9b6a	consider absorption time for carbs - not DIA	2018-04-19 14:03:30 +02:00
AdrianLxM	8d94acb051	more cleanups	2018-04-19 13:44:06 +02:00
AdrianLxM	d7bf3c563a	cleanup	2018-04-19 13:35:52 +02:00
AdrianLxM	09cc8c01b6	use min5min impact actually used for SMB	2018-04-19 13:31:34 +02:00
AdrianLxM	f4dea97f36	cutoff at max absorption time	2018-04-19 13:04:21 +02:00
AdrianLxM	00c05c0e23	totalMinCarbsImpact depending on sensitivty plugin	2018-04-19 12:57:13 +02:00
AdrianLxM	542cc9ac7f	Update Overview on Profile Switch	2018-04-19 01:38:27 +02:00
Markus M. May	83da3447ac	Cleanup mmol/mgdl handling in Dialogs	2018-04-18 22:11:32 +02:00
AdrianLxM	38a0dc5c05	Merge branch 'carbs-gen-pr' into carbsgen0418	2018-04-18 16:55:19 +02:00
Milos Kozak	2fb199ae6c	fix insulin dialog TT & TT sync from NS	2018-04-18 16:34:46 +02:00
AdrianLxM	dd8d907f4f	fix TT units	2018-04-18 16:23:40 +02:00
AdrianLxM	2561c3f8b6	Carbs only treatments in Queue	2018-04-18 16:13:02 +02:00
Johannes Mockenhaupt	49a836eda9	NewNSTreatmentDialog: add Hypo TT preset.	2018-04-18 16:03:23 +02:00
AdrianLxM	2cf438a064	Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418	2018-04-18 16:00:00 +02:00
swissalpine	ca5001e3a4	Update CareportalFragment.java	2018-04-17 14:42:41 +02:00
Milos Kozak	7063f4de8b	Merge pull request #879 from MilosKozak/temptargetfix ... NewNSTreatment dialog cleanup	2018-04-17 07:45:08 +02:00
Milos Kozak	abadcd4eaa	fix test	2018-04-16 23:29:53 +02:00
swissalpine	7ef5b4fb28	More realistic colored IAGE warnings ... Normaly Insulin should be stable at least 4-5 days. So I think a warning after two days and a red alarm after three is two early. I changed the default values to 72 hours for the yellow and 86 hours for the red warning.	2018-04-16 20:31:37 +02:00
Johannes Mockenhaupt	c7c90ea919	Proper fix.	2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt	0ef8af262f	NewInsulinDialog: fix botched notes field reference.	2018-04-16 01:40:52 +02:00
Johannes Mockenhaupt	58aa4f1323	Unbreak wizard xml, small fixes.	2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt	5d66ecc767	NewCarbsDialog: use correct 'constraint applied' messages. ... (cherry picked from commit a9e290e)	2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt	10604299e7	Cleanups.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	f420491611	NewCarbsDialog: cleanups.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	bf7e9e4bf3	NewInsulinDialog: add notes field, use relative time, align style.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	719d3d459b	NumberPicker: apply signed, decimal constraints for keyboard usage.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	efcc02775b	FillDialog: add missed validation, notes field, align style.	2018-04-13 21:35:25 +02:00
AdrianLxM	10b9171afe	Distribute carbs strictly within timeframe	2018-04-13 00:48:57 +02:00
Milos Kozak	d9ac199559	Merge pull request #878 from triplem/fix_objectives ... Fix Objectives Issue #842	2018-04-12 22:26:51 +02:00
Milos Kozak	54048b29c4	NewNSTreatment dialog cleanup	2018-04-12 21:45:59 +02:00
Johannes Mockenhaupt	bf02edd871	Make visibility of notes field a preference.	2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt	4acf0c713a	Merge remote-tracking branch 'origin/dev' into carbs-gen-pr ... * origin/dev: Adding notes to carbs and to wizard on overview	2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt	7e19aff121	Merge remote-tracking branch 'origin/dev' into carbs-gen-pr ... * origin/dev: Overview: fix rendering zero-temp covering entire displayed range. cleanup remove duplicate upload upload temptargets to NS properly fix NPE log profile conditional adding device name to AndroidAPS started note show tests in travis gradle 3.1.1 Remove CB.getActiveLoop(), use LoopPlugin.getPlugin(). added phone Manufacturer and model note to NS dummy-edit to re-trigger travis Fix for black number and labels on black background (aaps wear) Fix re-enabling the loop plugin from overview. Fixes #861. int to double in the isOlderThan() Get thresholds from NS # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java	2018-04-12 21:18:04 +02:00
Milos Kozak	7fafd59a5e	Merge pull request #872 from triplem/notes_wizard ... Notes wizard	2018-04-12 21:17:33 +02:00
Milos Kozak	c573bcc277	Merge pull request #876 from MilosKozak/temptargetfix ... upload temptargets to NS properly	2018-04-12 21:17:11 +02:00
Markus M. May	42e36ab818	Fix #842	2018-04-12 21:08:06 +02:00
Johannes Mockenhaupt	b04eee0b52	Overview: fix rendering zero-temp covering entire displayed range. ... (cherry picked from commit 525eaef)	2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt	a075d87da1	Remove help dialog. ... (cherry picked from commit b1ef8e1)	2018-04-12 20:59:24 +02:00
Milos Kozak	0a377eb98e	cleanup	2018-04-12 10:32:52 +02:00
Milos Kozak	5eee8054c4	remove duplicate upload	2018-04-12 10:21:38 +02:00
Milos Kozak	dfc869ba2b	upload temptargets to NS properly	2018-04-12 10:17:59 +02:00
Milos Kozak	80e81b1c25	fix NPE	2018-04-12 09:53:14 +02:00
Milos Kozak	613b8a2f30	log profile conditional	2018-04-12 09:40:12 +02:00
Johannes Mockenhaupt	5ef2502b4f	Saner types.	2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt	b1f66d086a	Fix overshoot on last carb record.	2018-04-12 00:42:12 +02:00
Markus M. May	ca53b94498	Merge branch 'dev' into notes_wizard	2018-04-11 20:05:47 +02:00
Milos Kozak	263263daf1	Merge pull request #869 from PoweRGbg/phoneModel ... Phone model note added to Ns #841	2018-04-11 17:57:30 +02:00
Roumen Georgiev	1acefaea3c	adding device name to AndroidAPS started note	2018-04-11 18:09:08 +03:00
Johannes Mockenhaupt	d0edd89b5b	Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().	2018-04-11 15:42:51 +02:00
Johannes Mockenhaupt	61cce65947	Revert "NewCarbsDialog: prefill with carbsReq." ... This reverts commit f8d022ba87.	2018-04-11 15:22:38 +02:00
Roumen Georgiev	564e87d782	added phone Manufacturer and model note to NS	2018-04-11 15:44:53 +03:00
Johannes Mockenhaupt	f8d022ba87	NewCarbsDialog: prefill with carbsReq.	2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt	d2491ca429	NewCarbsDialog: add duration, help.	2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt	80be7fb586	Fix re-enabling the loop plugin from overview. Fixes #861. ... Note that enabling a loop plugin is hardcoded against the only impl currently available LoopPlugin. Support for multiple loop plugins is incomplete (and not needed at this point), since there's no LoopInterface, but immediately LoopPlugin (as compared to APSInterface with OpenAPS* impls). When adding support, the last activated loop plugin must be remembered so the correct one is re-enabled.	2018-04-10 12:10:19 +02:00
Markus M. May	99c8bbc6c2	Adding notes to carbs and to wizard on overview	2018-04-09 22:10:08 +02:00
Milos Kozak	e9ac979a1b	fix NPE in TempBasal treatments tab	2018-04-09 19:52:01 +02:00
AdrianLxM	d1d46849ee	Merge pull request #832 from MilosKozak/lp-edit ... LocalProfile reset/save button	2018-04-09 14:08:22 +02:00
Milos Kozak	b2129fa48e	Merge pull request #857 from TebbeUbben/disable-tdd-load-button ... Hide TDD buttons	2018-04-09 00:36:48 +02:00
Milos Kozak	0f0d68e46a	Merge pull request #855 from TebbeUbben/automatic-careportal-events ... Automatic careportal events	2018-04-09 00:35:23 +02:00
Milos Kozak	82bb65560b	QuickWizardTest part1	2018-04-09 00:37:23 +02:00
Milos Kozak	9b91b4ab93	Merge branch 'dev' into automatic-careportal-events	2018-04-08 23:53:04 +02:00
Milos Kozak	05591cd762	missing conditional logging	2018-04-08 22:28:05 +02:00
Milos Kozak	44e923dd09	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-08 22:24:51 +02:00
Milos Kozak	4663bb3cf6	extended boluses NS sync fix	2018-04-08 22:24:04 +02:00
TebbeUbben	df7d93ab2a	Check for TDD support in updateGUI	2018-04-08 20:33:07 +02:00
Milos Kozak	d9279eed2a	split MaxIOB for SMB	2018-04-08 20:17:15 +02:00
TebbeUbben	42541fc7e3	Switched back to custom careportal code	2018-04-08 18:57:29 +02:00
TebbeUbben	b488e30459	Use uploadError for pump alarms	2018-04-08 18:46:29 +02:00
TebbeUbben	50458d1fbc	log.error("Unhandled exception", e);	2018-04-08 18:15:27 +02:00
TebbeUbben	b3c1bf6e7d	Hide TDD button if pump doesn't support them ... Hide reload button if pump doesn't need it	2018-04-08 17:54:16 +02:00
TebbeUbben	d3342d13f5	Added ACTION_OCCURENCE_OF_ALERT to IntentFilter	2018-04-08 17:28:48 +02:00
TebbeUbben	f8d4dbf6a1	Add pump alerts as notes	2018-04-08 17:22:53 +02:00
AdrianLxM	5c6e598cd6	Merge branch 'dev' into lp-edit	2018-04-08 16:14:43 +02:00
TebbeUbben	5022a77711	Automatic careportal events	2018-04-08 14:31:24 +02:00
TebbeUbben	ba83f7f499	Correct lastDataTime handling	2018-04-08 13:43:37 +02:00
Milos Kozak	7a74364af6	remove unused catch	2018-04-07 16:43:20 +02:00
Milos Kozak	485bbd5d68	Merge pull request #850 from TebbeUbben/dev ... Insight - Support for TDDs	2018-04-06 21:50:01 +02:00
TebbeUbben	1d2cd4b9cf	Support for TDDs	2018-04-06 21:39:42 +02:00
Milos Kozak	78ffae6e47	Merge pull request #849 from jotomo/combo-cleanup ... Combo cleanup	2018-04-06 21:14:50 +02:00
Milos Kozak	35decd0e53	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-06 21:12:14 +02:00
Milos Kozak	74edadd1e5	fix detailedbolusinfo for DanaRS	2018-04-06 21:07:29 +02:00
Milos Kozak	7cf2505276	Better time synchronization for DanaRS	2018-04-06 19:07:47 +02:00
Milos Kozak	fc56af7add	Fix detailedbolusinfo for DanaRv2	2018-04-06 18:58:13 +02:00
Milos Kozak	c94d01f22b	better time synchronization for danarv2	2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt	623a5e3da1	Combo: remove unused strings, minor code cleanups.	2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt	344d9c1f49	Combo: remove 'read history' button. ... History and basal rate profile are permanently checked and updated. This functionality would only be needed if driver was fundamentally broken.	2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt	db4439f1cc	Combo: remove half-backed alerts dialog.	2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt	e937a777ba	Combo: remove superseeded TDD button and dialog.	2018-04-06 11:35:34 +02:00
Milos Kozak	828b20e358	optimize notifications & overview, fix reporting profile update	2018-04-05 23:42:27 +02:00
Milos Kozak	a3811b503f	catch the thread	2018-04-05 23:28:17 +02:00
Milos Kozak	f2a7876466	Merge pull request #846 from swissalpine/patch-1 ... Overview fragment: Show "Disconnected" when disconnected not "Suspended"	2018-04-05 23:22:44 +02:00
Milos Kozak	e5bf36bfe3	code cleanup	2018-04-05 23:21:08 +02:00
Milos Kozak	36d94ecdef	Merge branch 'dev' into PoweRGbg/patch-15	2018-04-05 22:14:26 +02:00
Milos Kozak	b520a077f8	Merge branch 'dev' into PoweRGbg/patch-15	2018-04-05 22:05:47 +02:00
swissalpine	4ec959b0c4	Show "Disconnected (2d m)" on overview fragment	2018-04-05 21:53:09 +02:00
Markus M. May	a5a0a27db6	Xchange activity and eating soon temp target mgdl	2018-04-05 20:38:49 +02:00
Milos Kozak	ba7d0aebaa	show message ragarding closed loop mode only if closed mode is enabled in preferences	2018-04-05 10:46:23 +02:00
Milos Kozak	a615553047	check for profile already set before notification	2018-04-05 10:02:57 +02:00
Milos Kozak	aebaa76864	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-05 09:39:34 +02:00
Milos Kozak	f6cd1201e3	Treatments refactor	2018-04-05 09:39:18 +02:00
Roumen Georgiev	934fedaa73	added determineTextColor() to shorten source	2018-04-05 10:01:16 +03:00
Roumen Georgiev	6ace7080b2	changed isOlderThan() parameter to hours not days	2018-04-05 09:58:55 +03:00
Roumen Georgiev	269382f5ff	Default values of CAGE, SAGE .. like in NS	2018-04-05 09:37:20 +03:00
Milos Kozak	d235fc0bfb	show build flavor in about dialog	2018-04-05 00:08:59 +02:00
Milos Kozak	16319aeb52	logging options	2018-04-04 17:51:39 +02:00
AdrianLxM	8c303fd447	notifications for oreo quickfix	2018-04-04 14:55:25 +02:00
Roumen Georgiev	5e418c5916	adding color for warn levels of cage,sage...	2018-04-04 14:55:29 +03:00
Roumen Georgiev	29bbc9dfec	added method to get iage,cage,sage	2018-04-04 14:52:52 +03:00
Roumen Georgiev	2c42bad48d	change name of threshold to days to clarify	2018-04-04 12:22:54 +03:00
Roumen Georgiev	5e56e2afa0	Get thresholds from NS ... thresholds in NS are in hours	2018-04-04 12:16:01 +03:00
Roumen Georgiev	5e045264d5	changed isOlderThan(int) to double	2018-04-04 12:14:19 +03:00
Roumen Georgiev	f284483500	used isOlderThan	2018-04-04 09:37:08 +03:00
Roumen Georgiev	d50f31e7a6	change age(int) to boolean isOldetThan()	2018-04-04 09:35:45 +03:00
AdrianLxM	933b1acd7e	lp save button	2018-04-03 18:33:13 +02:00
AdrianLxM	f17deaedfb	lp isValid	2018-04-03 17:54:29 +02:00
AdrianLxM	b4c3c3f216	no lazy-loading of converted profile	2018-04-03 16:53:22 +02:00
AdrianLxM	75a91997b7	lp reset	2018-04-03 14:34:15 +02:00
Roumen Georgiev	ddf39e8d55	added color when values are old ... harcoded values fo SAGE, CAGE ...	2018-04-03 09:18:01 +03:00
Roumen Georgiev	f800d695ff	SAGE, CAGE ... change color if old - second try ... requested in #811	2018-04-03 09:15:28 +03:00
Milos Kozak	ad74a9ba9a	fix errors in tests	2018-04-02 10:29:19 +02:00
Milos Kozak	3cfc9c16fe	check 3min timeout SMB right before execution	2018-04-01 22:33:32 +02:00
Milos Kozak	0e9366c6fe	log existing db record	2018-04-01 22:21:46 +02:00
Milos Kozak	5a192d82d0	read pump status after pump driver change	2018-04-01 20:04:54 +02:00
Milos Kozak	5ce184e67d	fix time in dialogs during DST change	2018-04-01 18:44:58 +02:00
Milos Kozak	89ee73ef7d	fix state when new thread was not started during waiting for pump disconnection	2018-04-01 12:34:41 +02:00
Milos Kozak	5fa56b22c9	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-01 11:10:24 +02:00
Milos Kozak	0a03798de9	move treatments interface out of ConfigBuilder	2018-04-01 11:09:58 +02:00
Johannes Mockenhaupt	280ed14c6b	Unbreak WearPlugin.	2018-04-01 02:20:36 +02:00
Milos Kozak	8d35a89870	Merge pull request #818 from MilosKozak/insulin-plugins ... remove old insulin plugins	2018-03-31 22:51:18 +02:00
Milos Kozak	e9c7bdc7f4	add necessity of profile switch to objectives	2018-03-31 22:30:42 +02:00
Milos Kozak	34ec1225c6	fix NSCLIENT after plugin refactor	2018-03-31 21:41:14 +02:00
AdrianLxM	45c7753175	remove old insulin plugins	2018-03-31 19:36:44 +02:00
Milos Kozak	c57d14aa05	MainAppTest	2018-03-31 15:00:32 +02:00
Milos Kozak	6e69b25d8a	Merge branch 'wip' into dev	2018-03-31 12:41:43 +02:00
Milos Kozak	66f6ddf052	Subscribe fix	2018-03-31 12:12:49 +02:00
Milos Kozak	364364f205	ConfigBuilderTest	2018-03-31 11:31:09 +02:00
Milos Kozak	1c6c5f85f7	DanaR pumps lifecycle	2018-03-31 10:36:57 +02:00
Milos Kozak	3b3662af80	Merge branch 'dev' into wip	2018-03-31 00:39:35 +02:00
Milos Kozak	bcb733e42c	Plugins refactor	2018-03-31 00:36:03 +02:00
Markus M. May	314275d4b4	Remove unnecessary imports, rename method	2018-03-30 20:02:04 +02:00
Milos Kozak	e4f2049405	PumpEnactTestResult	2018-03-29 18:44:16 +02:00
Johannes Mockenhaupt	a36a9b0746	Move check for running setProfile command to KeepAlive.	2018-03-28 22:49:43 +02:00
Johannes Mockenhaupt	014864f0db	Trigger fabric event on user request, not queuing time.	2018-03-28 22:12:14 +02:00
Johannes Mockenhaupt	52c6d209af	Clean up initial profile push to pump.	2018-03-28 21:20:56 +02:00
Milos Kozak	259b5fa818	Merge pull request #809 from MilosKozak/tdds-again-merged ... Tdds again merged	2018-03-28 17:35:23 +02:00
Milos Kozak	fc2da20743	fix conflict	2018-03-28 10:25:58 +02:00
Milos Kozak	e9b499314d	PUMP SMS command, connect to pump before reporting SMS STATUS	2018-03-28 10:22:10 +02:00
Milos Kozak	7b43971618	fix NPE	2018-03-27 21:49:10 +02:00
Milos Kozak	27c4fe3309	fix NPE	2018-03-27 21:43:35 +02:00
Milos Kozak	e49d430a50	revert DetailedBulusInflo cloning	2018-03-27 20:16:33 +02:00
Milos Kozak	cb4b117152	fix extended bolus NS upload	2018-03-27 20:00:34 +02:00
Milos Kozak	eaecf48577	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-27 16:41:44 +02:00
Milos Kozak	95f2e5d913	IobTotalTest	2018-03-27 16:41:37 +02:00
Milos Kozak	6aa568a03e	Merge pull request #812 from jotomo/cleanups ... Cleanups	2018-03-27 16:38:49 +02:00
Johannes Mockenhaupt	dffdc49c3b	SMB fragement: trim superflous newlines.	2018-03-27 14:52:36 +02:00
Johannes Mockenhaupt	da6f6dfe72	Clean up missed spots w.r.t. to FabricPrivacy transition.	2018-03-27 14:52:31 +02:00
Milos Kozak	689fda5969	IobTest	2018-03-27 14:36:43 +02:00
Milos Kozak	1b9b20cd41	1st ProfileSwitch must be with zero duration, ProfileIntervalsTest	2018-03-27 14:19:52 +02:00
Milos Kozak	f8c9fac7b1	NonOverlapingIntervalsTest 2nd	2018-03-26 22:55:38 +02:00
Milos Kozak	cc436a09d9	TempBasal, TempTarget refactor; NonOverlapingIntervalsTest	2018-03-26 22:37:53 +02:00
Milos Kozak	a4cb4cbbd5	OverlapingIntervalsTest	2018-03-26 19:46:18 +02:00
Milos Kozak	d071ca5b88	GlucoseStatusTest & fix	2018-03-26 16:51:25 +02:00
Milos Kozak	5c5b8ee2f0	DetailedBolusInfo test & fix	2018-03-26 13:25:53 +02:00
Milos Kozak	cf619aa1fa	nicer scale on basal graph	2018-03-26 11:07:16 +02:00
Milos Kozak	d357b00ca6	display activate button properly	2018-03-26 10:56:56 +02:00
Milos Kozak	f0e779cb1f	set axisWidth based on dpi	2018-03-26 10:53:14 +02:00
Milos Kozak	8e6953cc92	activate button on NSProfile fragment	2018-03-26 09:25:57 +02:00
AdrianLxM	6c20d9b6c6	TDD 13 mergeconflict AbstractDanaPlugin	2018-03-26 08:51:17 +02:00
AdrianLxM	4a4982f6b8	TDD 12 mergeconflict Insight renaming	2018-03-26 08:47:44 +02:00
Milos Kozak	545debde92	fix displaying nsprofile	2018-03-26 08:46:26 +02:00
AdrianLxM	a5d0ec45cc	Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged	2018-03-26 08:39:24 +02:00
Milos Kozak	d5e60fa16f	fix negative correction in wizard	2018-03-26 07:49:09 +02:00
Milos Kozak	afe3d68a10	display SMB reasons	2018-03-25 23:56:52 +02:00
Milos Kozak	4d6d7941ac	try to catch getProfile errors	2018-03-25 18:51:16 +02:00
Milos Kozak	afb0249072	try to catch iobcalculation error	2018-03-25 18:03:55 +02:00
Milos Kozak	ca12124c10	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-25 17:33:17 +02:00
Milos Kozak	f939994afa	more synchronized access in treatments	2018-03-25 17:33:03 +02:00
Milos Kozak	8c5a2ab524	Merge pull request #799 from jotomo/prime-fill-refresh ... Prime/fill button refresh and some drive-by improvements	2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt	7c959ce335	Create careportal events with explicit time.	2018-03-25 15:43:48 +02:00
Johannes Mockenhaupt	593174d6d2	Revert all changes to NSUpload.	2018-03-25 15:39:34 +02:00
Milos Kozak	51e0774021	prevent creating careportal event of the same time	2018-03-25 15:02:51 +02:00
Johannes Mockenhaupt	8a2d49b833	Fix the correct method.	2018-03-24 20:13:50 +01:00
Johannes Mockenhaupt	5a6af7f6d5	Unbreak NSUpload.updateProfileSwitch methods.	2018-03-24 20:03:45 +01:00
Milos Kozak	2cfa2ae8cf	overview graph rendering update	2018-03-24 18:10:57 +01:00
Milos Kozak	bcf71d70dc	increase font size	2018-03-24 17:33:23 +01:00
Milos Kozak	b2db393436	fix rendering in nsclient mode	2018-03-24 17:21:55 +01:00
Milos Kozak	1dfa8eb1a4	hide deviation slope	2018-03-24 17:10:33 +01:00
Milos Kozak	62d775b78e	DEV warning only for APS builds	2018-03-24 17:09:56 +01:00
Milos Kozak	90390c91ab	fix NPE when profile doesn't exists	2018-03-24 15:13:31 +01:00
Milos Kozak	3d710dcf46	fix rendering TT in mmol	2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt	a4e9cb4976	Fixes.	2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt	8a7776fd74	Code dedup.	2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt	3700ad9813	Ensure new Careportal entries don't use the same second.	2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt	9838e2fabb	Rework prime/fill button.	2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt	e5bfa1fb1d	Show boluses with the precision the pump actually supports.	2018-03-23 23:02:35 +01:00
Milos Kozak	22f50198fc	rename nsclientinternal -> nsclient	2018-03-23 22:44:37 +01:00
Milos Kozak	cbd60cfdbe	synchronized access to log in nsclient	2018-03-23 22:37:27 +01:00
Milos Kozak	22d617cbc0	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-23 20:53:44 +01:00
Milos Kozak	9f67ad6b62	synchronized access to treatment data	2018-03-23 20:52:41 +01:00
Milos Kozak	044a3fc10f	LoopPluginTest	2018-03-23 20:10:45 +01:00
Milos Kozak	30f09dc416	show constraints on LoopFragment	2018-03-23 18:23:19 +01:00
Milos Kozak	661595792f	rename InsightPump -> Insight	2018-03-23 17:51:05 +01:00
Milos Kozak	15d8719508	collect most limited reason along with all reasons	2018-03-23 17:36:49 +01:00
Milos Kozak	3f5808eca3	show max basal limit on smb fragment	2018-03-23 09:59:07 +01:00
Milos Kozak	ad8ff15cdc	getMax... constraints functions	2018-03-22 23:20:10 +01:00
Milos Kozak	0f531a9954	objectives cleanup & basal hard limits to constraints	2018-03-22 23:05:00 +01:00
Milos Kozak	ba09538f46	AMA - Autosens cleanup	2018-03-22 22:18:40 +01:00
Milos Kozak	ae57241833	use default functions in constraint interface	2018-03-22 21:31:32 +01:00
Milos Kozak	76ee3c51e4	applyMaxIOBConstraints refactor & tests	2018-03-22 21:13:26 +01:00
Milos Kozak	1aba9a2564	applyCarbsConstraints refactor & tests	2018-03-22 10:31:07 +01:00
Milos Kozak	15158fb5ea	applyBolusConstraints refactor & tests	2018-03-21 23:01:30 +01:00
Milos Kozak	c68ab9f1ca	applyBasalPercentConstraints refactor & tests part2	2018-03-21 22:06:28 +01:00
Milos Kozak	e2ea44a8a8	applyBasalPercentConstraints reactor & tests part1	2018-03-21 20:24:02 +01:00
Milos Kozak	ca70cbdaec	Merge branch 'dev' into newconstraints	2018-03-21 10:48:23 +01:00
Milos Kozak	272fdb4747	Merge pull request #779 from jotomo/loop-results ... Loop results	2018-03-21 10:44:13 +01:00
Milos Kozak	15ebfc1193	applyBasalConstraints reactor & tests	2018-03-20 22:09:22 +01:00
Johannes Mockenhaupt	e117527257	Revert "Merge pull request #770 from jotomo/new-bg-processing" ... This reverts commit 7f0918d147, reversing changes made to 3f04d10f79.	2018-03-20 19:05:12 +01:00
Milos Kozak	d62a836f6c	resistant adult max bolus 25U	2018-03-20 10:07:52 +01:00
AdrianLxM	fd1e78acef	TDD 11 - fix DanaR	2018-03-19 23:15:13 +01:00
Milos Kozak	c2cfe4e7ea	isSMBModeEnabled reactor & tests	2018-03-19 23:14:04 +01:00
Milos Kozak	26ecc3dd60	isAMAModeEnabled reactor & tests	2018-03-19 22:59:25 +01:00
Milos Kozak	f8a3b7aee7	isAutosensModeEnabled reactor & tests	2018-03-19 22:36:08 +01:00
Milos Kozak	f6fdef7986	isClosedLoopAllowed & isLoopInvokationAllowed tests	2018-03-19 22:20:42 +01:00
AdrianLxM	fcf8569b1e	TDD 10 - split list and cumulative	2018-03-19 21:54:50 +01:00
AdrianLxM	9177307c37	TDD 09 - fix no data	2018-03-19 21:14:28 +01:00
AdrianLxM	088841ae23	TDD 08 - fix crash on empty	2018-03-19 20:23:45 +01:00
AdrianLxM	b6b7955dde	TDD 07	2018-03-19 20:03:15 +01:00
AdrianLxM	e0dac6f24e	TDD 06	2018-03-19 19:49:48 +01:00
AdrianLxM	954f73eabd	TDD 05	2018-03-19 19:10:54 +01:00
AdrianLxM	db7526a7b5	TDD 04	2018-03-19 19:10:40 +01:00
AdrianLxM	f33b4d4838	TDD 03	2018-03-19 19:10:24 +01:00
AdrianLxM	8700f20d5f	TDD 02 - combo	2018-03-19 19:10:09 +01:00
AdrianLxM	1e1a58468f	TDD 01	2018-03-19 19:08:51 +01:00
AdrianLxM	01a9e76827	refactor a bit	2018-03-19 18:45:23 +01:00
Milos Kozak	ce63655097	move constraints interface functions from ConfigBuilder to ConstraintsChecker class	2018-03-19 18:21:02 +01:00
Milos Kozak	52ffcba047	generic Constraint type	2018-03-19 17:38:48 +01:00
Milos Kozak	326229ebbb	limitClosedLoop & remove openloop flavor	2018-03-19 17:06:22 +01:00
Johannes Mockenhaupt	86b25174e2	Combo: unbreak basal rate conversion. ... This aligns the combo with the changes from the nodefaultprofile merge.	2018-03-19 15:59:23 +01:00
Milos Kozak	5a96b88499	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints	2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt	85d8730eae	Add missing return.	2018-03-19 14:33:57 +01:00
Johannes Mockenhaupt	ede1e719d2	CB.applyTBRRequest: enact same-rate TBR ... ... if requested duration is at least 30m longer than the currently running TBR.	2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt	f918a5f303	More loop results cleanup and i18n.	2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt	706bb913e9	LoopPlugin: fix 'waiting for pump' display for SMB.	2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt	fad10af11b	Clean ups around PumpEnactResult, APSResult.	2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt	379df79bf8	CB.applySMBRequest: return reason when skipping due to frequency.	2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt	213fc7ccb4	Combo: when suspended, create 0% TBR record, suppress checks. ... Fixes #774	2018-03-19 14:07:26 +01:00
Milos Kozak	b0a9f678f0	limitRunningLoop constraint	2018-03-19 13:11:25 +01:00
Milos Kozak	1c413cc49f	Merge pull request #771 from jotomo/remove-pre-bolus ... Next round of button updates	2018-03-19 09:29:27 +01:00
Milos Kozak	0266a79201	show invalid profiles in treatments tab	2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt	da014daec8	Merge branch 'dev' into remove-pre-bolus	2018-03-18 20:48:19 +01:00
Milos Kozak	7f0918d147	Merge pull request #770 from jotomo/new-bg-processing ... Trigger loop only for new and current BGs from the active BG source	2018-03-18 20:47:28 +01:00
Johannes Mockenhaupt	643f3aee6c	Merge branch 'dev' into dev-merge	2018-03-18 20:20:40 +01:00
Milos Kozak	106de14f9a	Merge branch 'dev' into nodefaultprofile	2018-03-18 19:58:36 +01:00
Johannes Mockenhaupt	946ce97dc2	Fix app init.	2018-03-18 19:57:28 +01:00
Johannes Mockenhaupt	89d59584d5	Merge remote-tracking branch 'origin/dev' into dev-merge ... * origin/dev: prepend line feed like suggested on jamoto code review Rename method to reflect jomoto code review Unit tests are always in engmode Fix boolean stuff in accordance to code review with adrian Cleanup boolean algrabra, add method for environment retrieval from logcontexxt Determine directory from logback more checks for null profile Disallow profile store on pump if on dev branch but not in engineering mode Disable profile switch if not in Engineering mode and on dev branch Add info to About dialog when engineering mode is enabled. On start, show notification if on dev-branch, but not EM, so CL is disabled. Add basic Engineering mode. # Conflicts: # app/src/main/java/info/nightscout/androidaps/MainActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java # app/src/main/res/values/strings.xml	2018-03-18 19:47:23 +01:00
Markus M. May	8b7b68003b	prepend line feed like suggested on jamoto code review	2018-03-18 17:39:55 +01:00
Markus M. May	f0bec534fa	Rename method to reflect jomoto code review	2018-03-18 17:38:05 +01:00
Milos Kozak	f7621c4cc5	Profile tests	2018-03-18 15:02:21 +01:00
Johannes Mockenhaupt	a2ac21ea67	Combo: only reject bolus requests if the requested bolus was delivered ... recently Since history is being read now (also just before starting to bolus), it's safe to only reject boluses if the previous request actually lead to insulin delivery. Fixes #700.	2018-03-18 14:36:58 +01:00
Johannes Mockenhaupt	c5ebb696a4	Extract EventNewBg.isCurrent() and use when relevant for decision making.	2018-03-18 11:26:15 +01:00
Milos Kozak	df3c226d5a	notify by SMS on new ProfileSwitch instead of profile	2018-03-18 10:35:37 +01:00
Milos Kozak	e6a606296d	profile comming from NS do not trigger EventNewBasalProfile	2018-03-18 10:14:27 +01:00
Milos Kozak	4f43feb12e	allow profile to be null	2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt	b54a010614	CarbsButton: replace suspend option with 'hypo tt'.	2018-03-17 22:22:26 +01:00
Markus M. May	c6e8ab35b6	Fix boolean stuff in accordance to code review with adrian	2018-03-17 21:35:16 +01:00
Markus M. May	0d4e8772a9	Cleanup boolean algrabra, add method for environment retrieval from logcontexxt	2018-03-17 21:23:45 +01:00
Markus M. May	72e8e5fd05	Determine directory from logback	2018-03-17 21:14:01 +01:00
Markus M. May	9b020f68db	Correct merge	2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt	eae6c73671	Buttons: explicitely state that no action will be taken if nothing selected.	2018-03-17 20:39:58 +01:00
Johannes Mockenhaupt	766fe105b2	InsulinButton: remove broken pre-bolus calculation.	2018-03-17 20:02:24 +01:00
Johannes Mockenhaupt	17d5945a91	Don't run loop for back-filled BG either.	2018-03-17 19:46:15 +01:00
Milos Kozak	9a1d7b2c9f	remove duplicated code	2018-03-17 18:46:11 +01:00
Milos Kozak	3f29ca3b96	more checks for null profile	2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt	612fc09e52	Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: Don't overlap time ticks with current time history browser chart selection Insulin button: allow negative presets, fix adding TT insulin. Overview: symetric spacing. Carbs button: send carbs to pump if pump supports carbs. Carbs button: fix visibility pref, input type, allow negative increments. Smallscreen fix chart menu 4 chart menu 3 chart menu 2 chart menu 1 # Conflicts: # app/src/main/res/values/strings.xml	2018-03-17 16:45:08 +01:00
Milos Kozak	6e5d5c4a26	Merge pull request #769 from jotomo/button-refinement ... Button refinement	2018-03-17 15:28:41 +01:00
Milos Kozak	2cd1d2014d	Merge pull request #768 from AdrianLxM/chart-menu2 ... Chart menu - also for history-browser	2018-03-17 15:24:54 +01:00
AdrianLxM	42e1c61c90	Merge pull request #766 from AdrianLxM/chart-menu ... Chart menu	2018-03-17 14:07:20 +01:00
Johannes Mockenhaupt	30a191c6eb	Combo: ruffyscripter: abort a command if an unparsable menu is encountered. ... This happens when the pump is misconfigured (e.g. quick info is labeled wrong), or the bolus history has no entries yet.	2018-03-17 14:06:39 +01:00
Johannes Mockenhaupt	926bea55c0	Combo: align with dev changes.	2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt	1b38c9cf5e	Join pumps under Config.HWPUMPS switch.	2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt	8457cd3843	Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: check for null profile remove profile dependency from pump drivers, TRB optimalization split enacting TRB and SMB	2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt	6a6359f1ee	Combo: Show count of boluses delivered and TBRs set on pump.	2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt	a7ca483565	Rename isActiveBgSource -> isFromActiveBgSource.	2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt	8849df639f	Invoke loop only for new BGs from active BG source.	2018-03-17 13:31:33 +01:00
Johannes Mockenhaupt	ad3bf19e4c	Handle received EventNewBg depending on args. ... (cherry picked from commit 79b7a7b)	2018-03-17 13:28:49 +01:00
Johannes Mockenhaupt	7f45316a24	Add isActiveBg to EventNewBg. ... (cherry picked from commit a8291ff)	2018-03-17 13:28:47 +01:00
Johannes Mockenhaupt	063505fdb3	Only invoke the loop for new BGs.	2018-03-17 13:27:56 +01:00
Milos Kozak	1e359184a9	check for null profile	2018-03-17 08:12:07 +01:00
AdrianLxM	a2ecfa89a0	history browser chart selection	2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt	7c9824e37d	Insulin button: allow negative presets, fix adding TT insulin.	2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt	8564cf172e	Carbs button: send carbs to pump if pump supports carbs.	2018-03-16 22:11:15 +01:00
Johannes Mockenhaupt	32108a7c2f	Carbs button: fix visibility pref, input type, allow negative increments.	2018-03-16 22:11:15 +01:00
AdrianLxM	47c6c2d9a8	chart menu 4	2018-03-16 19:26:18 +01:00
AdrianLxM	067b264ae8	chart menu 3	2018-03-16 19:16:47 +01:00
AdrianLxM	21c3853461	chart menu 2	2018-03-16 18:10:13 +01:00
AdrianLxM	32894a092e	chart menu 1	2018-03-16 17:23:02 +01:00
Milos Kozak	b6ce7c03c6	remove profile dependency from pump drivers, TRB optimalization	2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt	0205dc40b3	Combo: set SMB flag on bolus progress update for wear.	2018-03-16 15:56:31 +01:00
Johannes Mockenhaupt	6bebb30da0	Combo: use PrivacyFabric to align with dev.	2018-03-16 15:52:21 +01:00
Johannes Mockenhaupt	30d522e1a8	Combo: update PumpDescription to align with dev.	2018-03-16 15:49:12 +01:00
Johannes Mockenhaupt	db00404e43	Merge commit 'origin/dev^' into combo-dev-merge ... * commit 'origin/dev^': (313 commits) cleanup draw profile in dana profile viewer optimize imports draw basal in profile viewer BG autobackfill configurable travis 2nd try Save new profile when updating it Add environment variable to handle testCoverage do not pass DIA to SMB determine_basal show Dana model properly after communication error fix deviation slope calculations Read maximum basal and bolus amount from pump update maxIOB hard limits Allow bolus record only in new treatment dialog use safeGetString JsonHelper test food code cleanup Show bolus progress Missing import statement Insight: add treatment to progress event ...	2018-03-16 15:44:54 +01:00
Markus M. May	2c3f28670c	Disallow profile store on pump if on dev branch but not in engineering mode	2018-03-15 23:00:08 +01:00
Markus M. May	39aae28101	Disable profile switch if not in Engineering mode and on dev branch	2018-03-15 21:51:43 +01:00
Markus M. May	e38f10dba0	Merge jamoto/engineering-mode	2018-03-15 21:10:18 +01:00
Milos Kozak	db7671cd23	split enacting TRB and SMB	2018-03-15 18:30:18 +01:00
AdrianLxM	5fd05158ac	cleanup	2018-03-15 17:00:57 +01:00
AdrianLxM	b481e77008	draw profile in dana profile viewer	2018-03-15 16:56:59 +01:00
AdrianLxM	d31c9a6ed6	optimize imports	2018-03-15 14:13:21 +01:00
AdrianLxM	212a9dcc94	draw basal in profile viewer	2018-03-15 14:08:00 +01:00
Milos Kozak	e9313c5b28	BG autobackfill configurable	2018-03-14 20:21:48 +01:00
Milos Kozak	e92e05cfbd	Merge pull request #759 from TebbeUbben/dev ... Save new profile when updating it to fix "endless loop"	2018-03-13 20:31:38 +01:00
TebbeUbben	11295b1e96	Save new profile when updating it	2018-03-13 20:15:58 +01:00
Johannes Mockenhaupt	a398d95bb4	Add info to About dialog when engineering mode is enabled.	2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt	637b0c6189	On start, show notification if on dev-branch, but not EM, so CL is disabled.	2018-03-12 23:01:58 +01:00
Milos Kozak	8219332a2c	do not pass DIA to SMB determine_basal	2018-03-12 22:23:15 +01:00
Milos Kozak	4ff09a0125	show Dana model properly after communication error	2018-03-12 22:16:10 +01:00
Milos Kozak	5b064cd8f8	Merge pull request #756 from TebbeUbben/dev ... Read maximum basal and bolus amount from pump	2018-03-12 21:46:29 +01:00
Milos Kozak	e134b94f13	fix deviation slope calculations	2018-03-12 21:13:48 +01:00
TebbeUbben	ffb7b068a8	Read maximum basal and bolus amount from pump	2018-03-12 20:53:39 +01:00
Milos Kozak	30d12622f7	update maxIOB hard limits	2018-03-12 17:59:42 +01:00
Milos Kozak	eb2b6f9bd8	Allow bolus record only in new treatment dialog	2018-03-12 17:52:52 +01:00
Milos Kozak	fc070c95a7	use safeGetString	2018-03-12 11:22:19 +01:00
Milos Kozak	a5830cc452	Merge branch 'foodrefactor' into dev	2018-03-12 10:56:14 +01:00
Milos Kozak	38999d6598	food code cleanup	2018-03-12 10:53:23 +01:00
Tebbe Ubben	d4ede0a5b3	Merge branch 'dev' into dev	2018-03-11 22:59:11 +01:00
TebbeUbben	8fd68a082c	Show bolus progress	2018-03-11 22:53:18 +01:00
TebbeUbben	21dbeb299e	Missing import statement	2018-03-11 21:00:08 +01:00
AdrianLxM	3068089297	Insight: add treatment to progress event	2018-03-11 20:56:11 +01:00
AdrianLxM	f2d6b92394	Merge pull request #750 from TebbeUbben/dev ... Improved rounding	2018-03-11 18:34:10 +01:00
TebbeUbben	ccabb099f0	Improved rounding	2018-03-11 17:52:53 +01:00
Milos Kozak	3ad783260b	max_daily_basal min value 0.1 -> 0.05	2018-03-11 17:17:34 +01:00
Milos Kozak	bd03c678d1	Merge pull request #748 from TebbeUbben/dev ... Added some debug lines and missing digit in isThisProfileSet	2018-03-11 16:54:55 +01:00
TebbeUbben	46a1be97f7	Added some debug lines and missing digit in isThisProfileSet	2018-03-11 16:42:47 +01:00
Milos Kozak	2c21571cf4	fix NPE	2018-03-11 16:38:30 +01:00
Milos Kozak	6cf849ce76	allow 30min basal rates when pump supports it	2018-03-11 16:03:21 +01:00
Roumen Georgiev	60c4986ffa	Removed unneeded conversion to Md/dl which leads to a mgDl targets always	2018-03-11 09:06:50 +02:00
TebbeUbben	51da08bf97	Undo history sync delay change	2018-03-10 21:27:50 +01:00
TebbeUbben	7329d3abff	Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev	2018-03-10 21:24:04 +01:00
TebbeUbben	cd309780d1	Update to Asclepenius ... Ability to change basal profile	2018-03-10 21:21:53 +01:00
Milos Kozak	2cd7a8e8df	Merge pull request #738 from MilosKozak/unify-target ... Unify target	2018-03-10 21:19:49 +01:00
Milos Kozak	8a197f41dc	Merge branch 'dialogmmol' into dev	2018-03-10 19:25:41 +01:00
Milos Kozak	ec1c43b905	carbs dialog: defaults for mmol, i18n	2018-03-10 19:22:31 +01:00
Milos Kozak	951ad26590	cleanup	2018-03-10 17:58:45 +01:00
AdrianLxM	6904cb8807	Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true ... enable SMB notify by default	2018-03-08 15:17:28 +01:00
AdrianLxM	5a5e0ca8b6	Merge pull request #734 from MilosKozak/watchsmb2 ... Watchface overhaul	2018-03-08 15:10:53 +01:00
AdrianLxM	b880a9bb10	unify target calculation 2	2018-03-08 15:04:48 +01:00
AdrianLxM	768f61bc07	unify target calculation	2018-03-08 15:04:38 +01:00
AdrianLxM	5f614b4072	TT unify target calculation	2018-03-08 15:04:30 +01:00
swissalpine	2d797e8ce3	Update StatuslinePlugin.java	2018-03-06 16:23:56 +01:00
swissalpine	237d55ee85	Add whitespace to xDrip status line ... ... which was removed by the last fix.	2018-03-06 11:21:44 +01:00
Johannes Mockenhaupt	090e1b13f8	Add basic Engineering mode. ... - Insight plugin disabled unless EM enabled - Closed loop constrainted unless EM enabled.	2018-03-05 22:45:00 +01:00
AdrianLxM	414f92bdf8	no double whitespace	2018-03-05 20:50:21 +01:00
AdrianLxM	d2919f9577	Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2	2018-03-04 19:25:26 +01:00
PoweRGbg	ca9150ba5b	more readable low TT message	2018-03-04 16:06:54 +02:00
PoweRGbg	37b96d7e31	remove unused import (RadioButton)	2018-03-04 15:59:17 +02:00
AdrianLxM	7d8674aa61	fix 5m-impact parameter - always was 0	2018-03-02 21:09:09 +01:00
Roumen Georgiev	6443502808	reduced if...else to single line as Adrian suggested	2018-03-02 16:41:25 +02:00
Roumen Georgiev	ea29b6ad82	propper conversion from MMOL to MgDl	2018-03-02 16:33:53 +02:00
Roumen Georgiev	6c75b1b317	more readable var names and	2018-03-02 15:28:32 +02:00
Roumen Georgiev	e923bf2156	As Adrian asked .... Profile.toMgDl()	2018-03-02 15:09:03 +02:00
Roumen Georgiev	f3a12be0be	renaming ESMCheckbox to startEsTTCheckbox	2018-03-02 14:53:19 +02:00
Roumen Georgiev	9dd129bbe6	Revert "Update MainApp.java" ... This reverts commit d3a7176209. reverting changess to app/src/main/java/info/nightscout/androidaps/MainApp.java	2018-03-02 10:37:12 +02:00
Roumen Georgiev	ab39536876	Only one TT can be selected	2018-03-02 10:12:05 +02:00
Milos Kozak	ed11bb1d70	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-02 00:00:09 +01:00
Milos Kozak	c61fcdbe3f	allow 15 & 30 pump disconnection	2018-03-01 23:59:44 +01:00
PoweRGbg	b3a10b47ce	undo the RadioButton tests	2018-03-01 21:57:30 +02:00
PoweRGbg	3edec79b8d	fixing identation and equals() to ==	2018-03-01 21:41:52 +02:00
PoweRGbg	2fb0e6edc1	format using the Profile class method and Constants	2018-03-01 18:40:06 +02:00
PoweRGbg	c6a46129df	format using the Profile class method and Constants	2018-03-01 18:38:56 +02:00
PoweRGbg	65ddf5ced5	format using the Profile class method and Constants	2018-03-01 18:31:29 +02:00
Johannes Mockenhaupt	d679481698	Remove unused method.	2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt	8f813d52fa	WatchUpdaterService: process requests in a separate thread. ... Previously, requests were executed on the main thread (base class is Service, not IntentService), which prompted Android to kill AAPS multiple times a day due to timeouts (of currently unknown origins). (cherry picked from commit 5ae45d5)	2018-03-01 16:12:41 +01:00
Roumen Georgiev	bea486d816	Don't show confirmation on empty message/input	2018-03-01 16:57:36 +02:00
Roumen Georgiev	38933ac323	Adding Eating soon TT check to carbs ... I use that a lot for meal anouncement only	2018-03-01 16:27:52 +02:00
Roumen Georgiev	d3a7176209	Update MainApp.java	2018-03-01 15:20:00 +02:00
Roumen Georgiev	5b003c62e2	added fix for mmol profiles & targets	2018-03-01 14:07:35 +02:00
AdrianLxM	e5e76113cc	Disable Insight by default	2018-03-01 11:09:57 +01:00
Roumen Georgiev	7ca1fdc36e	removed unused var	2018-03-01 11:54:24 +02:00
Roumen Georgiev	9baea01225	Not everybody's profile & targets are in mg/dl :)	2018-03-01 11:32:00 +02:00
Milos Kozak	bd6fab3ca3	Merge pull request #721 from jamorham/floatmaxbasal ... Make openapsama_current_basal_safety_multiplier Double instead of Int	2018-02-26 10:46:29 +01:00
Jamorham	805548dd1e	Make openapsama_current_basal_safety_multiplier Double instead of Integer	2018-02-25 21:30:11 +00:00
Milos Kozak	e93cfacb4f	fix insulin pattern	2018-02-25 21:55:22 +01:00
Milos Kozak	a1a3b14b18	fix displaying profile name if Ignore profile switch is checked	2018-02-25 21:13:27 +01:00
Milos Kozak	f62cac1b66	make new i & c buttons visible by default	2018-02-25 17:52:30 +01:00
Milos Kozak	7b91f0d490	allow to open G5 app from CGM button	2018-02-25 17:33:46 +01:00
Milos Kozak	32f2f4d6fa	Merge branch 'g5cal' into buttons	2018-02-25 15:31:43 +01:00
Milos Kozak	cb8fc905bb	catch if G5 app is missing	2018-02-25 15:23:25 +01:00
Milos Kozak	7e49f9039c	access overview preferences from configbuilder	2018-02-25 11:15:26 +01:00
Milos Kozak	a7da0bb67a	Merge pull request #719 from jotomo/buttons ... Moar buttons.	2018-02-25 11:05:21 +01:00
Milos Kozak	b18c16ce3b	Merge pull request #708 from jotomo/watch-carb-only-request ... Watch: don't bother pump with carbs if pump doesn't support it.	2018-02-25 10:10:09 +01:00
AdrianLxM	436e03aa03	wear only print valid boluses	2018-02-24 18:10:59 +01:00
AdrianLxM	6d3048a9b1	wear predictions update on loop run	2018-02-24 17:58:05 +01:00
Milos Kozak	31f7670f43	Merge pull request #716 from jamorham/dev ... Improve Insight Connector life-cycle handling	2018-02-23 22:26:52 +01:00
Jamorham	4b630a1ac6	Remove inactive experimental code	2018-02-23 09:16:48 +00:00
Jamorham	7854a51cc0	Remove commented out old code	2018-02-23 09:15:47 +00:00
Jamorham	cd95a0f5dd	Insight: better connector lifecycle handling	2018-02-23 09:00:08 +00:00
Milos Kozak	9d3c69e1b4	Merge pull request #709 from jamorham/dev ... Add Fabric Privacy option	2018-02-23 07:30:46 +01:00
Jamorham	b989cf5a3c	Revert NSClient service to previous for PR	2018-02-22 13:27:43 +00:00
Jamorham	9d985ec3b7	Add FabricPrivacy	2018-02-22 12:30:36 +00:00
Milos Kozak	dbab6b6809	Merge pull request #705 from jamorham/dev ... Updated Insight plugin	2018-02-21 22:56:02 +01:00
Johannes Mockenhaupt	87a7249997	Watch: don't bother pump with carbs if pump doesn't support it.	2018-02-21 21:09:23 +01:00
Johannes Mockenhaupt	b6b86e8f4a	Show SMBs in graph on lower end of target area.	2018-02-21 16:54:57 +01:00
AdrianLxM	c22c22f1d7	wear settings for predictions	2018-02-21 15:56:13 +01:00
JamOrHam	bc2f749ef3	Merge branch 'dev' into dev	2018-02-21 13:43:18 +00:00
AdrianLxM	c6a3efb60e	wear adaptive prediction timeframe	2018-02-21 14:23:52 +01:00
Jamorham	67b397b417	Insight: preemptive connection preference option	2018-02-21 12:23:19 +00:00
AdrianLxM	88ea215f66	add boluses to wear payload	2018-02-20 12:27:47 +01:00
Milos Kozak	59744fbd1d	fix NPE	2018-02-19 23:28:07 +01:00
McHoffi	6ed8aceff3	Update WearPlugin.java	2018-02-19 20:52:10 +01:00
Milos Kozak	220c099591	last connection fix RS,Rv2	2018-02-19 20:37:51 +01:00
Milos Kozak	d3c23f6c33	allow to override zero base basal on combo	2018-02-19 10:44:15 +01:00
Milos Kozak	eeeda92857	do not add 30s to carbs time in Rv2 and RS	2018-02-19 07:44:31 +01:00
Milos Kozak	a063fb05b4	G5 calibration button	2018-02-19 00:22:27 +01:00
Milos Kozak	92c7f2ee75	log pump unreachable	2018-02-18 22:55:04 +01:00
Jamorham	2f1efc7d06	Duplicate Visibility fix from dev	2018-02-18 15:07:36 +00:00
Jamorham	208c3ed9b1	Don't wake screen in QueueThread use PARTIAL_WAKE_LOCK instead	2018-02-18 15:00:24 +00:00
Jamorham	9a76cdb3a1	Insight: add preemptive connection, keep-alive, statistics	2018-02-18 14:57:28 +00:00
Jamorham	448ebbc7bf	Add FeatureRunning event triggered by activities	2018-02-18 14:27:30 +00:00
Johannes Mockenhaupt	a42d95df14	Unbreak unit test.	2018-02-18 13:33:24 +01:00
Milos Kozak	8812428078	Merge pull request #690 from triplem/rework_configbuilder ... Minor cleanup based on feedback of jomoto	2018-02-18 12:51:02 +01:00
Milos Kozak	0fe287bb79	Merge pull request #689 from AdrianLxM/smb-wear2 ... no wear vibrations on SMB (optional)	2018-02-18 12:39:36 +01:00
Milos Kozak	bc440817b8	Merge pull request #691 from swissalpine/patch-2 ... Set a higher hard limit for IC ratio	2018-02-18 12:36:10 +01:00
Johannes Mockenhaupt	832138398f	Crappy hack to deal with applying the first profile switch.	2018-02-18 11:53:41 +01:00
Johannes Mockenhaupt	bf2e567f9c	Moar buttons.	2018-02-18 11:06:36 +01:00
Johannes Mockenhaupt	1e3f6dd192	Disable wear plugin by default.	2018-02-18 02:20:49 +01:00
AdrianLxM	36b838fc49	remove switch-missing notification on profile switch	2018-02-18 02:13:21 +01:00
AdrianLxM	7b3d370564	Notification on missing profile switch	2018-02-18 01:10:27 +01:00
AdrianLxM	59a1e007ad	block if no profile switch is set	2018-02-18 00:55:37 +01:00
Johannes Mockenhaupt	d155616c0b	Minor fixes.	2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt	2bccf13213	Add shortname for G5.	2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt	52aa27de05	Sanity check bolus timestamp on start, after bolusing.	2018-02-16 17:33:59 +01:00
swissalpine	2613f6735f	Set a higher hard limit for IC ratio ... As written in a comment and in the AAPS thread, I think the new upper hard limit of the IC ratio is to low, for childs but also for me (that's why I found the problem). I run a profile with IC = 60 g when I do long lasting sports activities, the limit of 40 is much to low - and I'm shure that there are childs which have a higher IC ratio in real life. I propose the value of 100 which is relativly compared not as high as the hard limit MAXISF = 720 mg/dl.	2018-02-16 06:43:47 +01:00
Markus M. May	b5969d4279	Minor cleanup based on feedback of jomoto	2018-02-15 20:33:03 +01:00
AdrianLxM	a23c76f473	Merge branch 'dev' into smb-wear2	2018-02-14 15:03:45 +01:00
AdrianLxM	c821ef97d8	option to enable wear/SMB notifications	2018-02-14 15:02:04 +01:00
AdrianLxM	7270b0b2f5	no wear vibrations on SMB	2018-02-14 14:59:26 +01:00
Milos Kozak	bf6e3a9061	run calculation after interval change	2018-02-14 07:47:22 +01:00
Johannes Mockenhaupt	df4ad822fc	Make new behaviour configurable, default on. ... (cherry picked from commit f807592)	2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt	1cd4e72541	Create NS-anouncements for error dialogs and local alerts. ... (cherry picked from commit 0df796d)	2018-02-13 20:44:50 +01:00
Johannes Mockenhaupt	c5e0eb9968	Don't disconnect after history read when queue is busy. ... Temporary hack, ComboPlugin.runCommand will still run commands synchronously.	2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt	aae9f7d153	Show notification to check pump date if last bolus is older than 24h.	2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt	3ff56c7fa2	Disable unfinished dialogs.	2018-02-13 19:30:48 +01:00
Milos Kozak	4cdadaf0c4	IobCobPlugin specify loading time	2018-02-13 19:12:02 +01:00
Milos Kozak	31d493d8ae	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-13 18:38:55 +01:00
Milos Kozak	3e06b6a4ed	Merge pull request #687 from jotomo/error-announcements ... Create NS-anouncements for error dialogs and local alerts.	2018-02-13 18:08:14 +01:00
Johannes Mockenhaupt	f8075927f2	Make new behaviour configurable, default on.	2018-02-13 00:34:24 +01:00
Jamorham	d3bf4fd026	History intent updates for Asclepius compatibility	2018-02-12 21:27:35 +00:00
Milos Kozak	a6a937ba20	IobCobCalculatorPlugin as a param for GraphData	2018-02-12 20:07:39 +01:00
Milos Kozak	0ab2d5ba38	unstatic IobCobCalculatorPlugin	2018-02-12 19:49:08 +01:00
Johannes Mockenhaupt	0df796d3f4	Create NS-anouncements for error dialogs and local alerts.	2018-02-12 15:42:58 +01:00
Milos Kozak	97834e3fef	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-12 13:44:57 +01:00
Milos Kozak	5d408daefd	remove displaying deviation slope	2018-02-12 13:42:50 +01:00
Johannes Mockenhaupt	b6c5326524	NotificationStore: clean up access to store, avoid potential deadlock.	2018-02-12 12:43:23 +01:00
Johannes Mockenhaupt	ee1efa4f7f	NotificationStore: add synchronisation when accessing internal store.	2018-02-12 11:15:59 +01:00
Milos Kozak	d92a7e8ef1	Merge branch 'history' into dev	2018-02-11 23:46:20 +01:00
Milos Kozak	fa2e46fbe5	remove CPP profile	2018-02-11 23:02:21 +01:00
Milos Kozak	943205c782	HardLimits refactor	2018-02-11 22:41:10 +01:00
Milos Kozak	5dd0f70686	Merge pull request #682 from jotomo/insight-hide-your-constraint ... Only show Insight as pump plugin in config tab.	2018-02-11 21:09:54 +01:00
Johannes Mockenhaupt	e80559c948	Only show insight as pump plugin in config tab.	2018-02-11 19:51:03 +01:00
Milos Kozak	e4891683b5	fix NPE in profile	2018-02-11 14:40:07 +01:00
Milos Kozak	23396ed80b	Merge pull request #675 from triplem/configbuilder ... Refactoring ConfigBuilder - cleanup fragment visibility	2018-02-10 23:48:07 +01:00
Johannes Mockenhaupt	d40a4bf57e	Merge pull request #55 from AdrianLxM/comborc01 ... links unten in über	2018-02-10 15:19:17 +01:00
Milos Kozak	359b8401b2	Merge pull request #678 from jamorham/dev ... Updates to Insight plugin	2018-02-10 15:13:35 +01:00
AdrianLxM	c5057f3d5a	remove unused import	2018-02-10 14:55:29 +01:00
AdrianLxM	4587a47840	add links to about	2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt	573c818eb7	Combo: Answer detected TBR mismatches.	2018-02-10 14:33:44 +01:00
Jamorham	046de51496	Insight few small changes	2018-02-10 09:29:23 +00:00
Markus M. May	a1bb67d425	Refactoring ConfigBuilder - cleanup fragment visibility	2018-02-08 22:23:48 +01:00
Johannes Mockenhaupt	1985ed379d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message. (cherry picked from commit 43755f0)	2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt	7fa51a9248	Revert: Combo: retry twice to establish connection before giving up. ... Only increases number of failed connection attempts.	2018-02-08 22:15:36 +01:00
Milos Kozak	538f70a725	Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered ... Don't treat an extended bolus as bolus if it emulates basal	2018-02-08 21:08:10 +01:00
Milos Kozak	5c7c430ee4	Merge pull request #673 from jotomo/bolus-error-dialog-sound ... Bolus error dialog / sound	2018-02-08 21:07:21 +01:00
Milos Kozak	6f487aded5	Merge pull request #674 from jotomo/ext-bolus-query-race-condition ... Avoid race condition using active extended bolus.	2018-02-08 21:06:26 +01:00
Johannes Mockenhaupt	f888e0d7ab	Avoid race condition using active extended bolus. ... (cherry picked from commit 5b7c0cc)	2018-02-08 20:44:42 +01:00
Johannes Mockenhaupt	483ecadede	Fix dutch translation for Combo's last bolus, minor cleanup. ... (cherry picked from commit c0cf06a)	2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt	46ea4be4eb	ComboFragment: display last bolus regardless of age. ... (cherry picked from commit 197874e)	2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt	6b36dd27d8	Don't create a cancel record for requests to cancel a TBR when none is running. ... (cherry picked from commit a46b475)	2018-02-07 22:08:16 +01:00
Johannes Mockenhaupt	43755f071d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message.	2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt	6fb5f5bad4	Check result.success when hard cancelling TBR. ... (cherry picked from commit 654f984)	2018-02-07 15:30:02 +01:00
Jamorham	bda1866c6d	Do our own history merging for TBRs	2018-02-07 13:36:06 +00:00
AdrianLxM	599b04c4ff	Don't treat an extended bolus as bolus if it emulates basal	2018-02-06 19:31:04 +01:00
Johannes Mockenhaupt	c781601cbb	Commit missing string.	2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt	e9f0fa3c04	Warn when finding multiple boluses in the same minute with same amount. ... Not much can be done if the user manages to bolus multiple boluses within the same minute, with the same amount. This should almost never happen, but if it does, at least warn the user one of those boluses isn't accounted for wrt to IOB.	2018-02-05 23:58:19 +01:00
Johannes Mockenhaupt	a861afa208	Log bolus amount when saving to DB failed.	2018-02-05 23:19:43 +01:00
AdrianLxM	0c0f68d510	Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault ... Don't enable Insight by default	2018-02-05 23:16:48 +01:00
Johannes Mockenhaupt	5b21844423	Did it again.	2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt	e812c7119f	Fix setting 'pumpHistoryChanged'.	2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt	f07017a4f6	Document global state variables.	2018-02-05 23:14:25 +01:00
Jamorham	693c3ef8ad	Store in history exactly what we enact	2018-02-05 22:11:26 +00:00
AdrianLxM	8e69573710	Merge pull request #668 from savek-cc/careportal-bg-update ... fix display unit when updating careportal entry for historic bg value	2018-02-05 22:47:46 +01:00
Timm Korte	9713836e69	fix display unit when updating careportal entry for historic bg value	2018-02-05 22:35:08 +01:00
Jamorham	6a9b293e49	Improved TBR cancelling	2018-02-05 14:39:55 +00:00
AdrianLxM	36608559af	Don't enable Insight by default	2018-02-05 14:11:54 +01:00
Jamorham	44ba10e00c	Insight treat 100% TBR from absolute as cancel	2018-02-05 11:33:00 +00:00
Milos Kozak	9fd8ad8705	Merge pull request #665 from jotomo/graph-target-line-fix ... Graph: fix rendering target line for ranges from profiles.	2018-02-04 22:32:33 +01:00
Johannes Mockenhaupt	b5c35dea71	Graph: fix rendering target line for ranges from profiles.	2018-02-04 22:01:30 +01:00
Milos Kozak	4b061d1a51	Merge pull request #652 from savek-cc/careportal-bg-update ... update bg for treatment in the past via careportal	2018-02-04 21:54:33 +01:00
Jamorham	1d169bc27f	Better calculation for Absolute basal from Tebbe	2018-02-04 19:14:02 +00:00
Jamorham	501ca5c597	Fix for some TBR cancels getting through	2018-02-04 12:57:10 +00:00
Johannes Mockenhaupt	8c25bc4002	Answers cleanup.	2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt	f573265bc2	Add target line to graph. ... Uses the middle if a range is specified to show what the loop aims for.	2018-02-04 00:34:14 +01:00
Johannes Mockenhaupt	87771e8753	A few fixes.	2018-02-03 23:44:17 +01:00
Johannes Mockenhaupt	956a611af4	Fix checking/updating history. ... (cherry picked from commit 5413a0f)	2018-02-03 22:07:42 +01:00
Johannes Mockenhaupt	2a5c28cf6b	ReadQuickInfoCommand: only read as many boluses as are available. ... (cherry picked from commit 7857abb)	2018-02-03 22:07:41 +01:00
Johannes Mockenhaupt	183edfcc09	When checking for changed pump history, compare the last two records. ... This ensures changes are also detected if a bolus was added on the pump within the same minute of the previous record.	2018-02-03 20:03:30 +01:00
Johannes Mockenhaupt	1e8e2a59fd	ReadHistoryCommand: fetch records including the requested timestamp. ... To ensure we retrieve records with the same timestamp.	2018-02-03 19:56:27 +01:00
Johannes Mockenhaupt	6fded4c1bd	ComboPlugin.deliverBolus: avoid creating boluses within the same minute.	2018-02-03 19:32:00 +01:00
Johannes Mockenhaupt	72e4cd29c4	Extend ReadQuickInfoCommand to read more history records. ... Also remove switch to forego quick info, which really isn't the cause of the infamous bug, but is now required with the updated history check logic against timestamp dups. (cherry picked from commit 18aa827)	2018-02-03 19:31:01 +01:00
Johannes Mockenhaupt	ec4280bc2e	Fix creating a seconds-based bolus record based on minute and bolus. ... (cherry picked from commit f8848be)	2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt	f6c5b95904	Merge remote-tracking branch 'origin/master' into combo-scripter-v2 ... * origin/master: Revert "Update strings.xml" bump 1.58 Update strings.xml Add issue template. Enhance insulin plugin test filter null BT devices BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. ES translations Dana plugin refactoring KO language cleanup Update strings.xml Update strings.xml Bg translation add RO language CS translations ButterKnife to Dana fragment bump 1.57a-dev Add a unit test for Insulin Plugin # Conflicts: # app/build.gradle # app/src/main/res/values-de/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml	2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt	435c4dee85	Create Answer events when adding bolus to DB fails. ... (cherry picked from commit 947ea4f)	2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt	6c9effd027	Minor cleanup to reduce merge noise. ... (cherry picked from commit 4015f73)	2018-02-03 16:33:50 +01:00
Timm Korte	c33232108d	remote unused import	2018-02-03 14:57:36 +01:00
Timm Korte	c4a5285c24	update bg for treatment in the past via careportal	2018-02-03 12:00:59 +01:00
AdrianLxM	b21fac92e9	revert min_5m_carbimpact to int	2018-02-02 22:46:52 +01:00
AdrianLxM	4f05917467	autosens deactivated -> 1	2018-02-02 22:45:18 +01:00
Milos Kozak	0832ae9491	Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change ... Do not loop for SMB treatment change	2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt	5adaff6bc6	Don't run loop on treatment change if it's an SMB.	2018-02-02 21:27:05 +01:00
Johannes Mockenhaupt	eedd2ee28b	Add bg/treatment to EventNewBG/EventTreatmentChange.	2018-02-02 19:04:28 +01:00
Jamorham	8e2fe7eaec	Insight ConstraintsInterface and Mstatus response type	2018-02-02 15:09:20 +00:00
Milos Kozak	9797f6e5f4	fix NPE	2018-02-02 15:33:19 +01:00
Milos Kozak	bb21f2ae7b	fix NPE	2018-02-02 15:31:25 +01:00
Milos Kozak	d9cfe15b87	fix rendering absolute basal line	2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt	a07a4beaf8	Combo: update timestampOfLastKnownPumpBolusRecord after bolusing.	2018-02-02 11:59:11 +01:00
Milos Kozak	6312b81e10	Merge branch 'smb060' into dev	2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt	1f06d801a2	Combo: retry twice to establish connection before giving up. ... (cherry picked from commit a16560a)	2018-02-02 10:06:04 +01:00
Milos Kozak	411add616b	Merge pull request #632 from jamorham/dev ... Add Insight Pump Plugin	2018-02-02 09:21:57 +01:00
Milos Kozak	72eed13932	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-02 09:17:51 +01:00
Milos Kozak	727ace4cc1	check for NPE	2018-02-02 09:17:26 +01:00
Johannes Mockenhaupt	26e7834093	Clean up, no behavioral changes and a bigger bed.	2018-02-02 00:40:24 +01:00
Milos Kozak	c953086e3d	Merge branch 'smb-events' into 'smb060' ... Let IobCob handle EventNewBg and loop act on IobCob result. See merge request MilosKozak/AndroidAPS!379	2018-02-01 22:13:59 +00:00
Milos Kozak	36cb4fc474	recover deviation slope calculation	2018-02-01 22:57:58 +01:00
Jamorham	cdb3bc24c2	Use Config.DANAR to enable Insight	2018-02-01 21:37:21 +00:00
AdrianLxM	96668cbf9b	check for null profile	2018-02-01 18:45:48 +01:00
Jamorham	b3c0daaeae	Enable isRefillingCapable	2018-02-01 17:39:28 +00:00
Milos Kozak	416c9f817b	fix smb iob calculation	2018-02-01 17:12:19 +01:00
Milos Kozak	d088bfccc8	remove unused microBolusInsulin	2018-02-01 16:35:04 +01:00
Jamorham	6a12b0a931	Use bolus id for history entry	2018-02-01 14:37:16 +00:00
Jamorham	73ea3628b2	Extracted insight strings	2018-02-01 10:33:54 +00:00
Milos Kozak	fa46798fdf	remove unused microBolusIOB	2018-02-01 10:57:05 +01:00
Milos Kozak	e779dbf221	fix merge conflict	2018-02-01 10:29:00 +01:00
Jamorham	7f73c59530	Nightscout + UI performance improvements	2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt	c62ca89931	Fix adding a partial bolus to treatments.	2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt	b32351145a	Fix 'last bolus' not being displayed on start.	2018-01-31 13:55:25 +01:00
Johannes Mockenhaupt	98d666098b	Remove now unused PumpState.delivered field.	2018-01-31 13:54:42 +01:00
Johannes Mockenhaupt	1ba3a85655	Add DetailedBolusInfo.copy() method.	2018-01-31 13:54:15 +01:00
Johannes Mockenhaupt	1aee181f62	RuffyScripter: fix reading basal rate when no TBR is active	2018-01-31 12:54:25 +01:00
Johannes Mockenhaupt	344984e201	Fix recording partially delivered boluses.	2018-01-31 12:36:41 +01:00
Johannes Mockenhaupt	5bb8bdde3e	BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now.	2018-01-31 11:59:30 +01:00
Jamorham	d07d9d309e	Implement additional methods	2018-01-31 09:53:31 +00:00
Johannes Mockenhaupt	8be8f961ae	Answer ruffy warnings. ... (cherry picked from commit b73a822)	2018-01-31 02:02:02 +01:00
Johannes Mockenhaupt	4defd40023	RuffyScripter: clean up answers. ... (cherry picked from commit 0c30e1b)	2018-01-31 01:35:31 +01:00
Jamorham	ce0650a495	Check remote protocol version	2018-01-31 00:33:10 +00:00
Jamorham	c3b07d2a0f	Match library refactoring	2018-01-31 00:31:55 +00:00
Johannes Mockenhaupt	6108e9f17a	Fix basal rate check.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	1107d00571	Fix pump state display during init. ... (cherry picked from commit 3967c4b)	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	6981c0fec6	Pump needs rest. ... (cherry picked from commit 2e88fb9)	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	154902acdc	Fix ReadHistoryCommand not reading errors, TDDs.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	e790c87940	Cleanups and strings.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	34db941c29	Remove unused code to import TBRs from the pump.	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	3db7aedb06	Fix activity indicator during on-connect-checks.	2018-01-31 00:09:38 +01:00
Johannes Mockenhaupt	c7cccf3220	Read quick info first when checking history.	2018-01-31 00:08:39 +01:00
Johannes Mockenhaupt	ecd16c26b8	ComboFragment: disable buttons when running.	2018-01-31 00:04:17 +01:00
Johannes Mockenhaupt	d08958e43f	Remove dead ruffyscripter code.	2018-01-30 23:16:45 +01:00
Johannes Mockenhaupt	a8cca7fcea	Remove duplication in ruffyscripter commands.	2018-01-30 23:16:27 +01:00
Milos Kozak	fada51c380	Merge pull request #597 from triplem/test ... Add a unit test for Insulin Plugin	2018-01-30 22:47:33 +01:00
Markus M. May	f68d8f1626	Cleanup Refactoring	2018-01-30 19:33:10 +01:00
AdrianLxM	3a0d5d73f8	filter null BT devices	2018-01-30 01:02:21 +01:00
Jamorham	ff0256345f	Display more live pump data	2018-01-29 22:55:53 +00:00
Milos Kozak	af3b77e646	history browser initial work	2018-01-29 22:48:47 +01:00
Jamorham	ef2189fec6	Insight faux cancel tbr option	2018-01-29 21:31:06 +00:00
Markus M. May	2a1bfe1f6c	merge changes on foodhelper	2018-01-29 22:23:20 +01:00
Markus M. May	9a7e57f0a0	rename event to stay in compliance to naming conventions	2018-01-29 22:20:18 +01:00
Markus M. May	147448afca	#557 - Encapsulate food plugin	2018-01-29 22:20:18 +01:00
Markus M. May	7d669fbeb8	Make food working, adopt category selection slightly	2018-01-29 22:20:18 +01:00
Markus M. May	a78652f737	This needs to get reverted, but for testing purposes...	2018-01-29 22:20:18 +01:00
Markus M. May	f31eabcefe	Minor update to show off the possiblities for the refactoring. This is just a short step, major improvements are still to come.	2018-01-29 22:20:18 +01:00
Markus M. May	9cb019f5ca	#557 - showoff of possible refactorings - see REFACTOR.md for additonal details	2018-01-29 22:20:18 +01:00
Johannes Mockenhaupt	216359312a	Minor non-code tweaks.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	2468f23e97	ComboFragment: i18n last bolus.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	5fbd9097d8	Rename ReadReservoirLevelAndLastBolus to ReadQuickInfoCommand.	2018-01-29 20:02:17 +01:00
Johannes Mockenhaupt	739e52dc47	Remove CommandResult.lastBolus in favour of CR.history.bolusHistory.	2018-01-29 20:01:53 +01:00
Roumen Georgiev	5e24289387	show output in mmol like in AMA	2018-01-29 16:43:45 +00:00
Johannes Mockenhaupt	3adda9bf6e	Clean up bolus delivery code.	2018-01-29 13:18:49 +01:00
Milos Kozak	c2dc3f9848	Merge branch 'danas' into smb060	2018-01-29 12:01:53 +01:00
Milos Kozak	d6f9dd819c	Merge branch 'smb-misc' into 'smb060' ... Smb misc See merge request MilosKozak/AndroidAPS!381	2018-01-29 10:50:27 +00:00
Milos Kozak	e55f88a255	Merge branch 'smb-apsresult' into 'smb060' ... Clean up parsing OpenAPS result and applying it See merge request MilosKozak/AndroidAPS!383	2018-01-29 10:46:40 +00:00
Milos Kozak	4cef8db54b	Dana plugin refactoring	2018-01-29 11:24:03 +01:00
Johannes Mockenhaupt	038ea06abc	Log history reads. ... (cherry picked from commit 7326f29)	2018-01-29 10:08:28 +01:00
Johannes Mockenhaupt	449dbd79f7	Rename TBR to 'temp basal'	2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt	6fa1badcdb	Clean up parsing of SMB result and applying the requests.	2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt	0655e4e676	SMB: clean up APSResult.toSpanned a bit. ... (cherry picked from commit 10d7c79)	2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt	b1fd66aae5	Make TreatmentsPlugin.getLastBolusTime robust. ... Ignore carb-only treatments, ignore future records. (cherry picked from commit cba015e)	2018-01-29 03:05:12 +01:00
Jamorham	742ee5b762	Insight plugin updates	2018-01-28 23:16:30 +00:00
Johannes Mockenhaupt	2b995a8a73	RufyfScripter: log active/previous command in error routines.	2018-01-28 23:56:27 +01:00
Johannes Mockenhaupt	864100299d	Set activity indicator for refresh button.	2018-01-28 23:39:57 +01:00
Johannes Mockenhaupt	262fdf92c8	Check pump basal rate matches cached profile, force re-read otherwise.	2018-01-28 23:39:53 +01:00
Jamorham	07cdee0533	Insight CancelBolusTaskRunner refactor	2018-01-28 22:35:26 +00:00
Johannes Mockenhaupt	9f5ffc6646	Actually do something with the basal rate profile after force-reading.	2018-01-28 23:23:44 +01:00
Jamorham	c019b4c533	Insight Cstatus add success helper	2018-01-28 22:04:21 +00:00
Jamorham	cbe827ac07	Add History Receivers	2018-01-28 22:03:40 +00:00
Jamorham	9a8521b809	Insight Live History	2018-01-28 21:52:58 +00:00
Jamorham	e704f130bc	Add Insight HistoryLogAdapter	2018-01-28 21:52:18 +00:00
Johannes Mockenhaupt	eb7ec24335	Don't read pump TBR history.	2018-01-28 22:33:05 +01:00
Johannes Mockenhaupt	3fde47d283	Move ruffyscripter to combo plugin package.	2018-01-28 22:16:58 +01:00
Johannes Mockenhaupt	6c4c662c31	Remove RuffyCommandsV1Impl.	2018-01-28 22:14:31 +01:00
Johannes Mockenhaupt	10d2b8739f	Log commands to Fabric.	2018-01-28 22:10:11 +01:00
Johannes Mockenhaupt	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
Milos Kozak	54ac28bdf9	typo fix	2018-01-15 16:56:30 +01:00
Johannes Mockenhaupt	0569addc55	Set enableSMB_always if using a non-noisy BG source.	2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt	0e4c72e790	Fix check for DexcomG5 Bg source.	2018-01-15 13:58:25 +01:00
Milos Kozak	91a6c7a96c	Merge branch 'dev' into smb060	2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt	723bcc4ee3	Remove 'queued activities' from ComboFragment. ... (cherry picked from commit 57a4449)	2018-01-15 11:11:58 +01:00
Milos Kozak	5a00b68f68	remove readstatus prior every command	2018-01-14 21:42:36 +01:00
Milos Kozak	99d83a60f4	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-01-14 17:12:35 +01:00
Milos Kozak	89b7b9c24a	better log build verison to Fabric	2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt	d54b99c559	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cleanup gradle build files Add null check in ConfigBuildPlugin.getTempBasalFromHistory. Avoid race condition checking for an active TBR. Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). # Conflicts: # app/build.gradle	2018-01-13 23:18:44 +01:00
Milos Kozak	fdbd2a2cb1	Merge pull request #596 from jotomo/tbr-active-check-race-condition ... Avoid race condition checking for an active TBR.	2018-01-13 22:43:41 +01:00
Johannes Mockenhaupt	be8534db51	Add strings for the Combo pump, including some renames. ... Some virtualpump_* strings have been renamed to pump_* since they're now used for multiple pumps.	2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt	27dcb40f48	Add null check in ConfigBuildPlugin.getTempBasalFromHistory.	2018-01-10 22:44:18 +01:00
Markus M. May	d4365a2352	Add a unit test for Insulin Plugin	2018-01-10 22:11:20 +01:00
Johannes Mockenhaupt	b4998feee1	Disable reading reservoir level units.	2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt	06d949cd82	Avoid race condition checking for an active TBR.	2018-01-10 10:48:44 +01:00
Johannes Mockenhaupt	9a74b0fb95	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix canceling temp in open loop mode. credits to @warstar2187 prevent basal updated messages on virtual pump added BolusWizardTest prefill profile switch JSON from local store if not exists PARTIAL_WAKE_LOCK for NSClientService	2018-01-09 20:59:37 +01:00
Milos Kozak	70e22487b2	fix canceling temp in open loop mode. credits to @warstar2187	2018-01-09 19:47:32 +01:00
Milos Kozak	1ce6f32c39	Merge branch 'dev' into smb060	2018-01-09 19:45:45 +01:00
Milos Kozak	bdd1a85d26	fix canceling temp in open loop mode. credits to @warstar2187	2018-01-09 19:44:42 +01:00
Milos Kozak	7e625918ac	Merge branch 'dev' into smb060	2018-01-08 14:27:39 +01:00
Milos Kozak	d7dfe8942e	prevent basal updated messages on virtual pump	2018-01-08 14:27:27 +01:00
Milos Kozak	144315ba61	pass enableSMB_always to determinebasal	2018-01-08 14:19:21 +01:00
Milos Kozak	db3369865a	Merge branch 'dev' into smb060	2018-01-08 14:09:23 +01:00
Milos Kozak	6ebd6bcdc0	Merge branch 'nsc' into dev	2018-01-08 14:09:02 +01:00
Milos Kozak	fbb120673f	Merge branch 'dev' into smb060	2018-01-07 15:32:14 +01:00
Milos Kozak	1ff99c4814	prefill profile switch JSON from local store if not exists	2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt	968431d931	i18n reservoir unit.	2018-01-07 13:02:50 +01:00
Milos Kozak	ab89e16acd	PARTIAL_WAKE_LOCK for NSClientService	2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt	d72c243140	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check 30min interval only for basal rates	2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt	117b79619b	Check reservoir level before bolus and abort if not enough left.	2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt	836abd74ab	Read reservoir level.	2018-01-07 11:21:56 +01:00
Milos Kozak	8cf69006b2	check 30min interval only for basal rates	2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt	3369d84de8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: basal updated notification Dialogs usability tweaks	2018-01-06 16:27:02 +01:00
AdrianLxM	6c53fd11e9	Merge pull request #586 from MilosKozak/basalupdate-notif ... basal updated notification	2018-01-06 09:10:00 +01:00
AdrianLxM	4dd238097f	basal updated notification	2018-01-06 07:37:39 +01:00
AdrianLxM	b9ad3a71fd	Dialogs usability tweaks	2018-01-06 06:52:30 +01:00
Johannes Mockenhaupt	3aafcc9854	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cockpit watch face: Double-tap opens MainMenuActivity prevent processing incomplete profiles set defaults for display range actual bg in objective 1 warn if wrong profile is detected	2018-01-06 00:30:04 +01:00
Milos Kozak	144292576a	Merge branch 'dev' into watchfaces-steampunk	2018-01-05 11:36:48 +01:00
Milos Kozak	aff0e6f5a8	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-01-04 23:12:40 +01:00
Milos Kozak	b7df21c7d0	prevent processing incomplete profiles	2018-01-04 23:12:35 +01:00
Johannes Mockenhaupt	ead299442a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: allow old data on the wf request new data on preference change accept local NS data broadcast even when ns_upload_only is selected remove logging	2018-01-04 21:38:19 +01:00
Milos Kozak	955ecc6d64	set defaults for display range	2018-01-04 21:33:18 +01:00
AdrianLxM	95bca1a92d	actual bg in objective 1	2018-01-04 18:53:38 +01:00
AdrianLxM	468426bd31	Merge pull request #581 from MilosKozak/watchfaces-steampunk ... request new data on preference change	2018-01-04 17:41:30 +01:00
AdrianLxM	c3d14b506d	allow old data on the wf	2018-01-04 16:20:49 +01:00
Milos Kozak	d7200d1e8e	warn if wrong profile is detected	2018-01-04 11:06:57 +01:00
Milos Kozak	4643cdc3b9	accept local NS data broadcast even when ns_upload_only is selected	2018-01-04 09:45:17 +01:00
Milos Kozak	ed3f076bd7	Merge branch 'dev' into smb060	2018-01-03 22:40:34 +01:00
Milos Kozak	de1475dbba	remove logging	2018-01-03 22:28:48 +01:00
Milos Kozak	230ec7177b	Merge branch 'dev' into smb060	2018-01-03 21:22:38 +01:00
Johannes Mockenhaupt	bf25af8c42	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Check activity != null before drawing graph.	2018-01-03 21:18:12 +01:00
Johannes Mockenhaupt	f09d68ad59	Check activity != null before drawing graph.	2018-01-03 20:58:49 +01:00
Milos Kozak	ff5d42522c	Merge branch 'dev' into smb060	2018-01-03 20:31:36 +01:00
Johannes Mockenhaupt	abdad220f6	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: improve GUI response narrower temp basal line for steampunk watchface darker and gracile steampunk-chart Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. move steampunk md to main dir Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit. Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). Steampunk watch face - unit testing complete. Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low"). Steampunk watchface (moto360 support - ignores the chin) Steampunk watchface (mmol support) Includes delta granularity in the watch preferences. Steampunk watchface (interim commit) Steampunk watch face addition of mmol/L drawable Steampunk watch face layout changes Steampunk watch face (for testing) Steampunk watch face (not yet functional) Steampunk watch face (not yet functional)	2018-01-03 20:16:50 +01:00
Milos Kozak	094737adde	improve GUI response	2018-01-03 19:59:18 +01:00
AdrianLxM	0b76290091	Merge pull request #578 from andrew-warrington/watchfaces ... Steampunk watch face	2018-01-03 19:58:40 +01:00
Johannes Mockenhaupt	fd8f2c0801	Clean up unintended diversions from upstream.	2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt	53a8cd4eac	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing file illegalState crash fix combo-bolus-fix	2018-01-03 18:28:17 +01:00
AdrianLxM	e0abd1b816	Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk	2018-01-03 13:53:38 +01:00
AdrianLxM	28a52b3ab7	Merge pull request #574 from MilosKozak/illegalstate-fix ... illegalState crash fix	2018-01-03 13:45:31 +01:00
Andrew Warrington	8b37826335	Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).	2018-01-03 10:41:18 +01:00
AdrianLxM	1bbd9012cb	Merge pull request #37 from jotomo/the-clock-strikes-midnight ... Correctly infer pump date when crossing midnight. Fixes #35.	2018-01-02 13:28:30 +01:00
Milos Kozak	cc1cd675c7	Merge pull request #573 from MilosKozak/combo-bolus-fix ... combo-bolus-fix	2018-01-02 10:05:20 +01:00
Andrew Warrington	7475b1ba3a	Merge remote-tracking branch 'origin/dev' into watchfaces	2018-01-01 22:36:07 +01:00
Johannes Mockenhaupt	cbf005a11e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: another cob fix	2018-01-01 15:07:34 +01:00
Milos Kozak	d2753e0dad	another cob fix	2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt	1617d6698d	Update ComboPlugin for updated ContstraintsInterface.	2018-01-01 13:26:16 +01:00
Johannes Mockenhaupt	8fb8182f4f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Objectives update	2018-01-01 13:25:36 +01:00
AdrianLxM	3bfffdb1b0	brackets on string format	2018-01-01 01:23:30 +01:00
AdrianLxM	4a01b14b35	missing file	2017-12-31 16:51:44 +01:00
AdrianLxM	e190f1b9ef	illegalState crash fix	2017-12-31 16:44:13 +01:00
Milos Kozak	d27d1b1821	Objectives update	2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt	8ee95077a8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix objective 1 upload aps status and iob when loop is suspended fully offline CP Queue: synchronize creating queue thread to avoid multiple threads. Wear: No guard for RS	2017-12-31 11:41:41 +01:00
Milos Kozak	458d812e2e	fix objective 1	2017-12-31 11:07:21 +01:00
Milos Kozak	fcbe8555a6	upload aps status and iob when loop is suspended	2017-12-31 10:22:18 +01:00
AdrianLxM	d3127bc97b	Merge pull request #571 from MilosKozak/offline-treatments ... fully offline CP	2017-12-31 09:52:29 +01:00
AdrianLxM	3a7fe56f64	combo-bolus-fix	2017-12-31 09:50:51 +01:00
Milos Kozak	7b0a4d2ce7	Merge pull request #570 from jotomo/queue-starts ... Queue: synchronize creating queue thread to avoid multiple threads.	2017-12-31 09:27:27 +01:00
Johannes Mockenhaupt	a6b938d98a	Correctly infer pump date when crossing midnight. Fixes #35. ... (cherry picked from commit bda2551)	2017-12-31 00:27:41 +01:00
AdrianLxM	937872e80c	fully offline CP	2017-12-30 23:01:25 +01:00
AdrianLxM	fb2271e758	Merge pull request #568 from MilosKozak/AdrianLxM-patch-3 ... Wear: No guard for RS	2017-12-30 22:20:37 +01:00
Johannes Mockenhaupt	99f3fb6216	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: autofix error in profile	2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt	58d5c25703	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing cob fix missing inheritance	2017-12-30 19:57:53 +01:00
Milos Kozak	f3db104979	autofix error in profile	2017-12-30 19:56:37 +01:00
Johannes Mockenhaupt	5ecc0ea430	Fix crash in Combo fragment when accessing resoures.	2017-12-30 19:53:22 +01:00
Milos Kozak	8c213cbc11	missing cob fix	2017-12-30 19:42:07 +01:00
Milos Kozak	b39fe2ee5e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-30 16:25:18 +01:00
Milos Kozak	cc50a6fb99	missing inheritance	2017-12-30 16:25:08 +01:00
Johannes Mockenhaupt	f658da42a7	Abort bolusing when reading initial state fails. ... Otherwise request time is zero and and any old bolus will be regarded as the last bolus delivered when recovery kicks in. Also add a safety check to not count a bolus bigger than the requested bolus as a partially delivered bolus.	2017-12-30 15:51:26 +01:00
Johannes Mockenhaupt	facdc51f6f	Queue: synchronize creating queue thread to avoid multiple threads.	2017-12-29 16:36:19 +01:00
Andrew Warrington	c43afd9d28	Merge remote-tracking branch 'origin/dev' into watchfaces	2017-12-28 01:03:02 +01:00
Johannes Mockenhaupt	d0f876659e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Ensure basal rate shown as a percentage if required according to user preferences. Show watch basal rates, whether temporary or normal.	2017-12-28 00:15:05 +01:00
AdrianLxM	bd4e51e1f9	Merge pull request #546 from andrew-warrington/dev ... Always show basal rates on watch, whether temporary or normal.	2017-12-27 23:17:52 +01:00
AdrianLxM	774203605f	Wear: No guard for RS	2017-12-27 21:19:57 +01:00
Johannes Mockenhaupt	f970e5e20e	Minor cleanups.	2017-12-27 21:16:03 +01:00
Johannes Mockenhaupt	0e61032dec	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml	2017-12-27 18:19:51 +01:00
Milos Kozak	3df0e8f9ce	Merge branch 'dev' into smb060	2017-12-27 18:02:06 +01:00
Johannes Mockenhaupt	ee1236c4e4	ComboPlugin: assume valid BR unless proven otherwise. ... (cherry picked from commit bc93a4b)	2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt	3333d7a6b7	Clean up all the basal rate sanity checks. ... * Disable loop entirely if no valid basal rate is set on the pump. Neither closed nor open loop mode makes sense without it. * Check active BR before updating the pump profile * Show 'loop disabled' state in Combo fragement. * Cancel active TBR when basal profile switch to profile != 1 is detected or when an unsupported bolus is active.	2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt	88b3857fb9	Clean up pump init.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	6af28479d6	Disable loop if unsupported basal rate profile is selected. Fixes #31.	2017-12-27 12:28:01 +01:00
AdrianLxM	79d05488c3	RS create bond	2017-12-27 02:24:26 +01:00
Johannes Mockenhaupt	c84ba24c77	Provide message when setting basal profile fails. Fixes #29.	2017-12-27 01:33:54 +01:00
Johannes Mockenhaupt	715ffa28d2	Remove empty Combo prefs.	2017-12-27 01:33:42 +01:00
Johannes Mockenhaupt	3266cb4944	Don't show ComboPlugin as constraints plugin.	2017-12-27 01:33:38 +01:00
Milos Kozak	162e73e64d	Merge branch 'dev' into smb060	2017-12-26 00:35:16 +01:00
Milos Kozak	8fdd16c305	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt	a8e0a4dfe8	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: don't show single connection timeouts on the watch	2017-12-25 20:52:16 +01:00
Milos Kozak	e2f6e6a450	Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2 ... don't show single connection timeouts on the watch	2017-12-25 20:44:39 +01:00
AdrianLxM	e50c6fc8ed	RS BLE modifications	2017-12-25 20:39:14 +01:00
Johannes Mockenhaupt	ea5629fc86	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: fix non smooth ratio graph fix of fix fix wrong button type fix doubled percentage when comming from NS proper select last used profile when using profile percentage limit basal rate to minimal value supported by pump SingleClickButton RS fix crash when pairing is not confirmed on pump Double -> double use joda-time Use autosensdata for wizard instead of APSResult	2017-12-25 20:29:32 +01:00
Milos Kozak	dd58952b42	Merge pull request #548 from MilosKozak/COB-Wizard-idea ... Use autosensdata for wizard instead of APSResult	2017-12-25 19:22:02 +01:00
Milos Kozak	b0bf9b5c79	Merge branch 'dev' into smb060	2017-12-25 17:01:53 +01:00
Milos Kozak	f968ec630c	fix non smooth ratio graph	2017-12-25 17:01:31 +01:00
Johannes Mockenhaupt	d081345da2	Define lowest non-zero basal rate as minimum basal rate for the Combo.	2017-12-25 11:05:51 +01:00
Milos Kozak	7380065bd9	Merge branch 'dev' into smb060	2017-12-22 21:11:38 +01:00
Milos Kozak	2bb37a4bfc	fix doubled percentage when comming from NS	2017-12-22 21:03:36 +01:00
Milos Kozak	248d3d1697	proper select last used profile	2017-12-22 20:34:53 +01:00
Milos Kozak	93b954fffe	when using profile percentage limit basal rate to minimal value supported by pump	2017-12-22 20:17:31 +01:00
Milos Kozak	600e2ade1c	SingleClickButton	2017-12-22 19:50:16 +01:00
Milos Kozak	0851581f7f	Merge branch 'dev' into smb060	2017-12-22 12:03:11 +01:00
Milos Kozak	25667bc79e	RS fix crash when pairing is not confirmed on pump	2017-12-22 11:57:59 +01:00
Johannes Mockenhaupt	7073688920	Update ComboPlugin to match updated PumpInterface.	2017-12-22 10:46:54 +01:00
Johannes Mockenhaupt	bd0ae23e30	Merge branch 'dev' into csv2-staging ... * dev: fix disconnecting pump format output date to be displayed on iDevices correctly BolusWizard use 0 for insulin correction if in range LocalProfile TimeListEdit min, max remove string with no default translation Rv2,RS fix loading events initialize lastCommandTime too after BT reset allow to read status after every command	2017-12-22 10:39:30 +01:00
Milos Kozak	e77e7ffbbd	Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060	2017-12-22 10:35:33 +01:00
Milos Kozak	99e5a39b33	Merge branch 'dev' into smb060	2017-12-22 10:34:45 +01:00
Milos Kozak	5bc6ea04c2	Double -> double	2017-12-22 03:27:13 +01:00
Milos Kozak	31975396a2	use joda-time	2017-12-22 02:55:40 +01:00
Milos Kozak	74abdc0271	fix disconnecting pump	2017-12-22 01:35:52 +01:00
Milos Kozak	6b23ba10bd	format output date to be displayed on iDevices correctly	2017-12-22 00:37:22 +01:00
Milos Kozak	a5c4495a5d	BolusWizard use 0 for insulin correction if in range	2017-12-22 00:17:46 +01:00
Milos Kozak	771f9eac1a	LocalProfile TimeListEdit min, max	2017-12-22 00:12:40 +01:00
Johannes Mockenhaupt	42418d4146	ComboFragment: make warning/error bold for a better readability. ... On lower DPI devices they're already bold, but on higher DPI devices the yellow "Low" is hardly discernible from white. (cherry picked from commit 693ba73)	2017-12-21 22:45:27 +01:00
Andrew Warrington	176c5f46ff	Ensure basal rate shown as a percentage if required according to user preferences.	2017-12-21 09:50:16 +01:00
Milos Kozak	fb12c0bc96	enable SMB for G5	2017-12-21 09:02:49 +01:00
Milos Kozak	cb2368f535	Merge branch 'dev' into smb060	2017-12-21 08:58:33 +01:00
Milos Kozak	2bdda9af43	Rv2,RS fix loading events	2017-12-21 07:45:56 +01:00
Milos Kozak	5d3b307672	Merge branch 'dev' into smb060	2017-12-20 22:37:29 +01:00
Milos Kozak	adff0329dd	initialize lastCommandTime too after BT reset	2017-12-20 20:55:14 +01:00
Milos Kozak	0f43e95644	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-20 20:45:35 +01:00
Milos Kozak	63b0efede3	allow to read status after every command	2017-12-20 20:45:21 +01:00
Johannes Mockenhaupt	3b43e4d06a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: RS enable BT before scanning BG viewer NSOffline remove from queue as well NS offline # Conflicts: # app/src/main/res/values/strings.xml	2017-12-20 20:21:12 +01:00
Milos Kozak	beb87acc9f	Merge pull request #552 from MilosKozak/nsoffline ... Nsoffline	2017-12-20 20:17:30 +01:00
Milos Kozak	c33dd1e7d7	RS enable BT before scanning	2017-12-20 19:50:44 +01:00
Johannes Mockenhaupt	4094b0dd61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wait a few sec before disconnection for another command	2017-12-20 19:42:13 +01:00
Milos Kozak	70f4b72ff9	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-20 18:26:52 +01:00
Milos Kozak	096b2e93a3	wait a few sec before disconnection for another command	2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt	7c04f528cc	Revert "Handle edge case of setting basal rate in range 0.00 - 0.05." ... This reverts commit 2054e76cde.	2017-12-20 18:06:50 +01:00
Johannes Mockenhaupt	7651107167	Merge branch 'bolus-progress-dialog' into 'smb060' ... Only show progress dialog for normal boluses, not SMBs. See merge request MilosKozak/AndroidAPS!375	2017-12-20 16:58:33 +00:00
Johannes Mockenhaupt	c5089d821e	Merge branch 'disappearing-predections-checkbox' into 'smb060' ... Overview: fix predictions checkbox disappearing after unchecking it. See merge request MilosKozak/AndroidAPS!370	2017-12-20 16:58:12 +00:00
Johannes Mockenhaupt	2955dd7ec6	Only show progress dialog for normal boluses, not SMBs. ... (cherry picked from commit b3d4607)	2017-12-20 17:42:39 +01:00
Johannes Mockenhaupt	57944fb4b5	Merge remote-tracking branch 'origin/dev' into smb060 ... * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status G5 upload to xdrip fake Esel new file fake Esel Apply bolus constraint before applying. Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java	2017-12-20 17:28:08 +01:00
Johannes Mockenhaupt	3880c5ff61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent	2017-12-20 16:46:35 +01:00
Milos Kozak	3975ce4cbe	Merge pull request #551 from jotomo/profile-switch-on-actions-tab ... Actions tab: show profile switch button for single profile too.	2017-12-20 16:45:10 +01:00
Johannes Mockenhaupt	2054e76cde	Handle edge case of setting basal rate in range 0.00 - 0.05.	2017-12-20 16:40:45 +01:00
Johannes Mockenhaupt	d1085c876e	Actions tab: show profile switch button for single profile too.	2017-12-20 16:31:28 +01:00