caspervk/AndroidAPS

Author	SHA1	Message	Date
Johannes Mockenhaupt	33ad68d26a	Fix string.	2018-01-29 20:13:53 +01:00
Milos Kozak	9255b93800	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history	2018-01-29 20:06:16 +01:00
Milos Kozak	b11e301391	ES translations	2018-01-29 20:05:16 +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
Milos Kozak	1eba5b79b8	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-01-29 13:28:36 +01: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	af31c29134	Merge branch 'dev' into smb060	2018-01-29 12:01:02 +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	afd7fc5769	Update sightparser library	2018-01-28 22:36:24 +00:00
Jamorham	07cdee0533	Insight CancelBolusTaskRunner refactor	2018-01-28 22:35:26 +00:00
Milos Kozak	f54452515b	KO language cleanup	2018-01-28 23:29:33 +01:00
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	cd7af6c5fe	Set custom version.	2018-01-28 22:31:43 +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	9ba6f2144b	Strings fix-up.	2018-01-28 19:30:59 +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
warstar2187	c297ce88bb	Update strings.xml	2018-01-28 11:01:56 +09:00
warstar2187	76d606fddf	Update strings.xml	2018-01-28 10:51:09 +09:00
Johannes Mockenhaupt	3be65319d7	AlarmSoundService: don't set volume to 100% if music is playing. Have mercy with my ears.	2018-01-27 20:12:17 +01:00
Johannes Mockenhaupt	db5ee7067a	PumpEnactResult.toSpanned: add SMBs, handle SMB-only enact.	2018-01-27 19:58:37 +01:00
Johannes Mockenhaupt	7e264b1bfd	Let IobCob handle EventNewBg and loop act its result.	2018-01-27 19:04:03 +01:00
Radoslav Radev	d4fe03ac30	Bg translation	2018-01-27 16:12:51 +02:00
Milos Kozak	b4d13c727e	let nsclient bg source be with advanced filtering temporary	2018-01-27 15:07:15 +01:00
Milos Kozak	5b11c5630c	hide deviation slope graphs	2018-01-27 14:47:35 +01:00
Milos Kozak	296d5059d6	SMB options in preferences	2018-01-27 14:47:04 +01:00
Milos Kozak	4af8e14417	Merge branch 'dev' into smb060	2018-01-27 13:47:41 +01:00
Milos Kozak	ce3c888246	add RO language	2018-01-27 13:40:19 +01:00
Jamorham	2c9cd89ff3	Add unit test	2018-01-26 22:44:12 +00:00
Jamorham	b831fd7dfb	Insight Temporary basal absolute	2018-01-26 22:34:43 +00:00
Jamorham	f036ca4547	Attempt to eliminate duplicate connectors	2018-01-26 22:27:04 +00:00
Jamorham	3150e7d00f	Add double rounding helper	2018-01-26 22:26:29 +00:00
Milos Kozak	b2d9ad8986	Merge branch 'dev' into smb060	2018-01-26 22:49:25 +01:00
Milos Kozak	d634ee7d4b	CS translations	2018-01-26 22:10:27 +01:00
Jamorham	0966bea1e8	InsightPumpFragment: add redundant casting for travis	2018-01-26 17:17:04 +00:00
Jamorham	ee0a53976f	StatusItemViewAdapter add redundant casting for travis	2018-01-26 17:10:43 +00:00
Jamorham	f30efd0224	Insight fragment use status list	2018-01-26 16:59:14 +00:00
Jamorham	076685992c	Insight status list and connector	2018-01-26 16:58:19 +00:00
Jamorham	f2cfc3cdbd	Update helpers	2018-01-26 16:56:09 +00:00
Jamorham	2f7dc11b9f	Update Insight fragment layouts	2018-01-26 16:46:09 +00:00
Milos Kozak	e5d20ca996	ButterKnife to Dana fragment	2018-01-26 17:18:40 +01:00
Jamorham	31b0ce21e5	StatusItem ui elements	2018-01-26 16:12:37 +00:00
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	a7a4693e9c	Merge pull request #621 from jotomo/disable-release-checks Disable release build checks until wear lib upgrade (#620).	2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt	3100447167	Disable release build checks until wear lib upgrade (#620 ).	2018-01-26 15:57:26 +01:00
Milos Kozak	d8a6c0d111	Rv2,RS: use safe carb diff 30s	2018-01-26 15:47:45 +01:00
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	69da0cf57a	Always connected option	2018-01-25 23:21:42 +00:00
Jamorham	4be1f52254	Cancels for TBR + extended	2018-01-25 23:21:11 +00:00
Jamorham	8ee75c5c72	Try to get missing status	2018-01-25 23:20:14 +00:00
Jamorham	07d17ede5f	Lower reconnect threshold	2018-01-25 21:26:11 +00:00
Jamorham	d421ceffa6	Insight automatic reconnector	2018-01-25 20:55:55 +00:00
Jamorham	c8ba4076c6	Update Helpers	2018-01-25 20:55:02 +00:00
Johannes Mockenhaupt	0067eb75d5	Fix format specifiers in Spanish translation, add MainApp.gs(id, args).	2018-01-25 20:28:21 +01:00
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	91bd21131d	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-01-25 11:27:17 +01:00
Milos Kozak	ca01168474	Merge pull request #611 from MilosKozak/min_unreachable minimum of 30 min for unreachable alert	2018-01-25 11:24:09 +01:00
Milos Kozak	1ba793304f	Merge pull request #616 from jotomo/check-that-box Overview: make checkbox labels toggle state as well.	2018-01-25 11:23:06 +01:00
Milos Kozak	8d792a24db	bump 1.57a-dev	2018-01-25 11:21:27 +01:00
Milos Kozak	893c64e2e4	fix not attached to the activity	2018-01-25 11:17:23 +01:00
Milos Kozak	a3e6794138	check for no profile	2018-01-25 11:09:58 +01:00
Milos Kozak	7be0bfb27e	check for no profile	2018-01-25 11:06:35 +01:00
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	8f1feefce9	Add sightparser library	2018-01-24 21:18:34 +00:00
Jamorham	c85854fe93	initial InsightPumpPlugin rough and untested	2018-01-24 21:12:12 +00:00
Milos Kozak	bd5c7c396f	sdk27 & butterknife	2018-01-24 21:54:24 +01:00
Jamorham	979dc2d5e2	More pieces for Insight Pump	2018-01-24 16:51:05 +00:00
Milos Kozak	801182eccd	fix cob calculation for history records	2018-01-24 17:03:45 +01:00
Johannes Mockenhaupt	0f98c49876	Fix namespace errors.	2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt	2a4f1950b3	Add missing ids to other overview layouts.	2018-01-24 16:53:40 +01:00
Jamorham	7a4bc3b694	Initial bits for Insight Pump	2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt	3a02f01374	Overview: make checkbox labels toggle state as well.	2018-01-24 14:10:17 +01:00
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	80f13553dc	Add missing placeholder in Dutch translation.	2018-01-23 12:45:47 +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
Johannes Mockenhaupt	17d7eaa883	Fix missing/extra string resources.	2018-01-21 20:28:43 +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	e4ad33659b	Add missing formatters in Dutch translation. (cherry picked from commit 90dcc9d)	2018-01-21 12:12:58 +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
Johannes Mockenhaupt	8109900e9b	Overview: move checkboxes before label. (cherry picked from commit 4825e16)	2018-01-19 20:13:53 +01:00
Milos Kozak	97e0aaa380	fix pump unreachable for virtual pump	2018-01-16 23:28:09 +01:00
Milos Kozak	7fdc146b91	getLastAutosensData improvement and logging	2018-01-16 19:28:25 +01:00
Milos Kozak	54ac28bdf9	typo fix	2018-01-15 16:56:30 +01:00
Johannes Mockenhaupt	0569addc55	Set enableSMB_always if using a non-noisy BG source.	2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt	0e4c72e790	Fix check for DexcomG5 Bg source.	2018-01-15 13:58:25 +01:00
Milos Kozak	c501d8e3c5	Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060	2018-01-15 12:47:28 +01:00
Milos Kozak	91a6c7a96c	Merge branch 'dev' into smb060	2018-01-15 12:46:50 +01:00
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	44381288f4	bump 1.57-dev	2018-01-14 17:12:18 +01:00
Milos Kozak	89b7b9c24a	better log build verison to Fabric	2018-01-14 17:11:39 +01:00
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	12fe8bcfdd	Merge branch 'dev' into smb060	2018-01-13 22:50:41 +01:00
Milos Kozak	24909bf59c	Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060	2018-01-13 22:50:10 +01:00
Milos Kozak	390cef5174	remainingCATime fix	2018-01-13 22:49:58 +01:00
Milos Kozak	fdbd2a2cb1	Merge pull request #596 from jotomo/tbr-active-check-race-condition Avoid race condition checking for an active TBR.	2018-01-13 22:43:41 +01:00
Milos Kozak	4f9df99ffb	Merge pull request #601 from jotomo/combo-strings Add strings for the Combo pump, including some renames.	2018-01-13 22:29:46 +01:00
Markus M. May	f5cc2debd7	Cleanup gradle build files	2018-01-13 21:34:38 +01:00
Johannes Mockenhaupt	7d4d6374be	Merge branch 'combo-strings' into combo-scripter-v2 * combo-strings: Add strings for the Combo pump, including some renames. # Conflicts: # app/src/main/res/values/strings.xml	2018-01-11 21:48:01 +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	61174d1b0a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Update build.gradle update badge more round tests coverage	2018-01-11 17:50:07 +01:00
AdrianLxM	51ca0e0d12	Update build.gradle	2018-01-11 14:14:53 +01:00
Milos Kozak	1d5d44e008	Merge pull request #598 from MilosKozak/coverage Coverage	2018-01-11 00:09:07 +01:00
Milos Kozak	99eef3b19a	more round tests	2018-01-10 23:57:02 +01:00
Johannes Mockenhaupt	864a5e6d81	Missing string resources (en/de).	2018-01-10 23:41:56 +01:00
Simon Pauwels	0ffc61a1ba	Added dutch combo translations (#42 ) * Added and improved Dutch translations * typo fix * double string removal * Typo fix * added translations * Update strings.xml * Added Dutch combo translations	2018-01-10 23:36:20 +01:00
Milos Kozak	a430a7d70d	coverage	2018-01-10 23:31:31 +01:00
swissalpine	8f91f37f73	Übersetzungen RUN und STOP MODE	2018-01-10 23:24:49 +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	9ece407f32	Integrate dutch translation with Combo changes. The lesson to learn here: don't rename string resources in a long- running branch, but do it after the merge. Note that Multiwave is a Combo-specific term, the more general term to describe the combination of a bolus and an extended bolus is combo bolus, ironically and confusingly ;-)	2018-01-10 11:37:42 +01:00
Johannes Mockenhaupt	0c0a58f16b	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: typo and added dutch translations	2018-01-10 11:20:15 +01:00
Johannes Mockenhaupt	06d949cd82	Avoid race condition checking for an active TBR.	2018-01-10 10:48:44 +01:00
Simon Pauwels	2df19b85a5	typo and added dutch translations	2018-01-09 21:16:37 +01:00
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	b31504ac83	Merge pull request #590 from kuchjir/BolusWizard_fix_for_bg_bellow_targetBGLow added BolusWizardTest	2018-01-07 22:58:22 +01:00
kuchjir	e5b21ccc3e	added BolusWizardTest	2018-01-07 22:16:08 +01:00
Milos Kozak	fbb120673f	Merge branch 'dev' into smb060	2018-01-07 15:32:14 +01:00
Milos Kozak	1ff99c4814	prefill profile switch JSON from local store if not exists	2018-01-07 15:29:50 +01:00
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	a08a6cbb70	patch SMB determine_basal to not produce error	2018-01-03 22:59:26 +01:00
Milos Kozak	ed3f076bd7	Merge branch 'dev' into smb060	2018-01-03 22:40:34 +01:00
Milos Kozak	de1475dbba	remove logging	2018-01-03 22:28:48 +01:00
Milos Kozak	230ec7177b	Merge branch 'dev' into smb060	2018-01-03 21:22:38 +01:00
Johannes Mockenhaupt	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
Johannes Mockenhaupt	c125e9265f	Strings: TDD.	2018-01-03 16:57:56 +01:00
Johannes Mockenhaupt	2946e2a485	Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2 * swissalpine/patch-2: Update strings.xml # Conflicts: # app/src/main/res/values-de/strings.xml	2018-01-03 16:26:35 +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
swissalpine	5fdd88ae75	Shortname: OBJ -> ZIEL	2018-01-03 09:42:49 +01:00
swissalpine	61cc7fc64e	Historie statt Historik "Historik" meint "Geschichtswissenschaft" bzw. die "Lehre von der historischen Methode der Geschichtswissenschaft". "Historie" meint das zwar auch, ist aber insgesamt ein wenig weiter gefasst und meint (bildungssprachlich) auch allgemein die Geschichte, nicht nur die Wissenschaft.	2018-01-03 09:38:17 +01:00
swissalpine	fd27e6c9f8	Delete unnecessary / not used translated strings In this branch this 4 lines are not used, but indeed in Milos dev branch. This lines make it impossible to compile the app.	2018-01-03 09:16:20 +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	8e659f5f97	A few minor corrections on the German translation.	2018-01-01 19:11:49 +01:00
Johannes Mockenhaupt	eb51e43d70	Remove duplicate strings after merge.	2018-01-01 16:04:35 +01:00
Johannes Mockenhaupt	8eeb8b748c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: update German Revised German Translation	2018-01-01 16:02:05 +01:00
AdrianLxM	c8fa729d8d	update German	2018-01-01 15:45:01 +01:00
swissalpine	bccfd66874	Update strings.xml	2018-01-01 15:16:23 +01:00
swissalpine	62da90011a	Revised German Translation	2018-01-01 15:10:38 +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	728abbe224	Clean up strings.xml, finish German translation.	2017-12-27 12:28:01 +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	0ab259f61f	Merge branch 'dev' into smb060	2017-12-26 01:22:49 +01:00
Milos Kozak	72d6c4494b	add scrollview	2017-12-26 01:22:35 +01:00
Milos Kozak	162e73e64d	Merge branch 'dev' into smb060	2017-12-26 00:35:16 +01:00
Milos Kozak	8fdd16c305	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00
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	ae30046c95	Merge branch 'dev' into smb060	2017-12-23 11:18:37 +01:00
Milos Kozak	3ce260dfe9	fix of fix	2017-12-23 11:18:17 +01:00
Milos Kozak	51de0f16c1	Merge branch 'dev' into smb060	2017-12-23 11:07:48 +01:00
Milos Kozak	6e09bfbbe4	fix wrong button type	2017-12-23 11:07:29 +01:00
Milos Kozak	7380065bd9	Merge branch 'dev' into smb060	2017-12-22 21:11:38 +01:00
Milos Kozak	2bb37a4bfc	fix doubled percentage when comming from NS	2017-12-22 21:03:36 +01:00
Milos Kozak	248d3d1697	proper select last used profile	2017-12-22 20:34:53 +01:00
Milos Kozak	93b954fffe	when using profile percentage limit basal rate to minimal value supported by pump	2017-12-22 20:17:31 +01:00
Milos Kozak	600e2ade1c	SingleClickButton	2017-12-22 19:50:16 +01:00
Milos Kozak	0851581f7f	Merge branch 'dev' into smb060	2017-12-22 12:03:11 +01:00
Milos Kozak	25667bc79e	RS fix crash when pairing is not confirmed on pump	2017-12-22 11:57:59 +01:00
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
Johannes Mockenhaupt	6a3184bc39	ComboFragment: use history icon for history, not bolus icon.	2017-12-21 11:36:25 +01:00
Andrew Warrington	176c5f46ff	Ensure basal rate shown as a percentage if required according to user preferences.	2017-12-21 09:50:16 +01:00
Milos Kozak	fb12c0bc96	enable SMB for G5	2017-12-21 09:02:49 +01:00
Milos Kozak	cb2368f535	Merge branch 'dev' into smb060	2017-12-21 08:58:33 +01:00
AdrianLxM	2d2bd6d77a	remove string with no default translation	2017-12-21 08:26:55 +01:00
Milos Kozak	2bdda9af43	Rv2,RS fix loading events	2017-12-21 07:45:56 +01:00
Milos Kozak	5d3b307672	Merge branch 'dev' into smb060	2017-12-20 22:37:29 +01:00
Milos Kozak	adff0329dd	initialize lastCommandTime too after BT reset	2017-12-20 20:55:14 +01:00
Milos Kozak	0f43e95644	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-20 20:45:35 +01:00
Milos Kozak	63b0efede3	allow to read status after every command	2017-12-20 20:45:21 +01:00
Johannes Mockenhaupt	3b43e4d06a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: RS enable BT before scanning BG viewer NSOffline remove from queue as well NS offline # Conflicts: # app/src/main/res/values/strings.xml	2017-12-20 20:21:12 +01:00
Milos Kozak	beb87acc9f	Merge pull request #552 from MilosKozak/nsoffline Nsoffline	2017-12-20 20:17:30 +01:00
Milos Kozak	c33dd1e7d7	RS enable BT before scanning	2017-12-20 19:50:44 +01:00
Johannes Mockenhaupt	4094b0dd61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: wait a few sec before disconnection for another command	2017-12-20 19:42:13 +01:00
Milos Kozak	70f4b72ff9	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-20 18:26:52 +01:00
Milos Kozak	096b2e93a3	wait a few sec before disconnection for another command	2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt	7c04f528cc	Revert "Handle edge case of setting basal rate in range 0.00 - 0.05." This reverts commit `2054e76cde`.	2017-12-20 18:06:50 +01:00
Johannes Mockenhaupt	7651107167	Merge branch 'bolus-progress-dialog' into 'smb060' Only show progress dialog for normal boluses, not SMBs. See merge request MilosKozak/AndroidAPS!375	2017-12-20 16:58:33 +00:00
Johannes Mockenhaupt	c5089d821e	Merge branch 'disappearing-predections-checkbox' into 'smb060' Overview: fix predictions checkbox disappearing after unchecking it. See merge request MilosKozak/AndroidAPS!370	2017-12-20 16:58:12 +00:00
Johannes Mockenhaupt	2955dd7ec6	Only show progress dialog for normal boluses, not SMBs. (cherry picked from commit b3d4607)	2017-12-20 17:42:39 +01:00
Johannes Mockenhaupt	57944fb4b5	Merge remote-tracking branch 'origin/dev' into smb060 * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status G5 upload to xdrip fake Esel new file fake Esel Apply bolus constraint before applying. Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java	2017-12-20 17:28:08 +01:00
Johannes Mockenhaupt	3880c5ff61	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent	2017-12-20 16:46:35 +01:00
Milos Kozak	3975ce4cbe	Merge pull request #551 from jotomo/profile-switch-on-actions-tab Actions tab: show profile switch button for single profile too.	2017-12-20 16:45:10 +01:00
Johannes Mockenhaupt	2054e76cde	Handle edge case of setting basal rate in range 0.00 - 0.05.	2017-12-20 16:40:45 +01:00
Johannes Mockenhaupt	d1085c876e	Actions tab: show profile switch button for single profile too.	2017-12-20 16:31:28 +01:00
AdrianLxM	81ca35515f	Old NS-Version non-urgent	2017-12-20 14:34:30 +01:00
Johannes Mockenhaupt	a3db2136e1	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java	2017-12-20 13:28:41 +01:00
Milos Kozak	eb34345ee2	Merge pull request #539 from jotomo/queue-bolus-constraints Apply bolus constraint before issuing the bolus	2017-12-20 13:25:02 +01:00
Johannes Mockenhaupt	40edb9ff5c	Don't update pump basal profile during startup. * Avoids issues of no profile being set yet * Making startup take minutes * KeepAlive will update profile as needed every 5m.	2017-12-20 13:01:24 +01:00
Milos Kozak	0d7e950b73	Merge pull request #505 from jotomo/sync-to-pump Remove sync to pump pref, always sync	2017-12-20 10:49:47 +01:00
Johannes Mockenhaupt	181338e9e2	Another NPE check for failure scenarios.	2017-12-20 00:04:14 +01:00
AdrianLxM	e11a4f6d42	Use autosensdata for wizard instead of APSResult	2017-12-19 22:41:43 +01:00
Johannes Mockenhaupt	715366b2b4	Don't consider pump initialized if updating basal profile on start failed.	2017-12-19 22:24:46 +01:00
Johannes Mockenhaupt	0e20a148e2	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status # Conflicts: # app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java	2017-12-19 21:18:18 +01:00
AdrianLxM	3342d9daa3	don't show single connection timeouts on the watch	2017-12-19 14:47:55 +01:00
AdrianLxM	88adc31dbc	Add SP to imports	2017-12-19 07:16:41 +01:00
Johannes Mockenhaupt	28961da253	Declare profile switches being supported by the Combo.	2017-12-19 00:00:00 +01:00
Andrew Warrington	b180569695	Show watch basal rates, whether temporary or normal.	2017-12-18 21:58:02 +01:00
Johannes Mockenhaupt	9eefae4f67	Merge branch 'queue-bolus-constraints' into combo-scripter-v2 * queue-bolus-constraints: Apply bolus constraint before applying. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java	2017-12-18 21:06:31 +01:00
Johannes Mockenhaupt	8e68a23225	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: G5 upload to xdrip fake Esel new file fake Esel Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications # Conflicts: # app/src/main/res/values/strings.xml	2017-12-18 20:22:26 +01:00
AdrianLxM	00f13d0479	refactor cancelAlarm back to KeepAliveReceiver	2017-12-17 15:46:43 +01:00
AdrianLxM	9bd0a1f144	push next alert on read status	2017-12-17 15:46:33 +01:00
Johannes Mockenhaupt	34f3428d99	ComboPlugin.setTempBasal: clean up, fix potential bug. (cherry picked from commit 41c45a1)	2017-12-17 15:39:38 +01:00
Andrew Warrington	a0983a99b9	Merge remote-tracking branch 'origin/dev' into watchfaces	2017-12-17 11:52:34 +01:00
AdrianLxM	ca9b68da0d	refactor cancelAlarm back to KeepAliveReceiver	2017-12-17 01:40:27 +01:00
AdrianLxM	14810a142d	push next alert on read status	2017-12-17 01:37:27 +01:00
Johannes Mockenhaupt	fd71ab6b68	Update fake reservoir numbers to trigger default NS warnings. (cherry picked from commit 6e5f9fc)	2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt	92d0630c55	Fix partial bolus displayed in error popup.	2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt	a6a87d0790	Minor fixes and polish around bolus cancellation.	2017-12-15 10:41:07 +01:00
Milos Kozak	8cb4921bab	BG viewer	2017-12-15 01:03:31 +01:00
Milos Kozak	a05c1f947e	Merge branch 'nsoffline' into bgsource	2017-12-14 23:35:01 +01:00
Milos Kozak	5f60e7cf2b	G5 upload to xdrip	2017-12-14 21:49:11 +01:00
AdrianLxM	9602bde6a1	fake Esel new file	2017-12-13 22:39:44 +01:00
AdrianLxM	0151dbd496	fake Esel	2017-12-13 22:14:47 +01:00
Johannes Mockenhaupt	b6bc957813	Minor tewaks and cleanups.	2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt	618e00d71d	Update bolus progress dialog when recovery kicks in.	2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt	67eb6b20ed	Handle errors when reading the history for verification fails.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	25f46fe601	Cleanup.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	7eb40653b2	The pump doesn't accept connections while a bolus delivery is in progress. Remove the code which checked for a bolus delivery in progress and waited.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	a169245dc3	On bolusing failure, attempt verify by reading last bolus from history.	2017-12-13 20:39:08 +01:00
Milos Kozak	fa4e80444d	NSOffline remove from queue as well	2017-12-13 20:03:24 +01:00
Johannes Mockenhaupt	71355f0421	Typo that typo and other minor cleanups.	2017-12-13 16:29:53 +01:00
Milos Kozak	2a284ce052	Merge pull request #532 from AdrianLxM/adrain156work01 remove wear-overview notifications as replaced by system notifications	2017-12-13 00:00:20 +01:00
Andrew Warrington	9e6f124097	Steampunk watchface (interim commit)	2017-12-12 23:17:25 +01:00
Johannes Mockenhaupt	f6721f628c	Apply bolus constraint before applying.	2017-12-12 22:30:42 +01:00
Milos Kozak	e14272c083	Rv2,RS: always load last 45 min	2017-12-12 18:18:41 +01:00
Johannes Mockenhaupt	f83dd1cb67	Unbreak RuffyCommandsV1Impl.readHistory, cleanups.	2017-12-12 00:57:04 +01:00
Milos Kozak	b98c321cbc	NS offline	2017-12-12 00:12:35 +01:00
Milos Kozak	b1c4f28eb7	OpenAPS 0.6.0 1st part	2017-12-11 18:45:04 +01:00
Milos Kozak	c714fead24	add deliverAt safety	2017-12-10 17:04:22 +01:00
Milos Kozak	890ef5978b	safety check for multiple SMBs	2017-12-10 16:25:56 +01:00
Milos Kozak	20414c81c9	update minDeviationSlope default val	2017-12-10 16:14:10 +01:00
Milos Kozak	8822dcecd3	update smb execution in configbuilder	2017-12-10 15:48:28 +01:00
Johannes Mockenhaupt	a5ea94de7d	Fix #12 : properly update TBR from pump on mismatch.	2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt	ca9fe3e755	Fixes around bolus cancellation.	2017-12-10 01:39:58 +01:00
Milos Kozak	cd1327fc9e	Merge branch 'dev' into smb	2017-12-10 00:36:47 +01:00
Johannes Mockenhaupt	fe281b9224	Minor cleanups.	2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt	26fa63d571	ComboFragment: always show refresh button. To allow force starting a conecting attempt if the pump is still in disconnected state.	2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt	471beae14c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: remove unused imports adapt wear actions to command queue RS report unsupported firmware removing the whole if() statement fix NPE when profile not loaded fix of extended bolus size Added profile's target BG in NSClient mode	2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt	c386d0ba03	Fix TDDS dialog title.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	3316ab2081	ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	8699d9a384	Add missing listener registration.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	27e9cfda6f	Overhaul Combo tab buttons and dialogs.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	063a5ba6b9	Only read Tdd and Alerts through buttons on Combo tab, not treatment history.	2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt	b164793f42	Shorten/make clearer message on pump clock being off.	2017-12-09 19:44:28 +01:00
Johannes Mockenhaupt	a7f07b26f9	Pump time warning: urgency level based on how much the time is off.	2017-12-09 19:43:53 +01:00
AdrianLxM	4d356096cf	Check pump time not last connection time	2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt	d2f2266a2b	Re-add warning if pump time is off (needed for basal rates).	2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt	cf142a4538	Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel Verify and return delivered bolus amount in BolusCommand	2017-12-09 19:41:16 +01:00
Milos Kozak	88defc9f7b	Merge pull request #533 from AdrianLxM/adrian156work01 adapt wear actions to command queue	2017-12-09 17:36:16 +01:00
Johannes Mockenhaupt	b409b737e5	On connect, take over TBR CANCELLED warning and raise message. Fixes #9 .	2017-12-09 17:33:11 +01:00
AdrianLxM	21f91b9b29	remove unused imports	2017-12-08 14:58:13 +01:00
Johannes Mockenhaupt	f09464e5d6	Move detection of partial bolus delivery to BolusCommand. Have BolusCommand verify delivered bolus if needed and return the actually delivered bolus amount. This makes more sense now, given history is only read if unavoidable.	2017-12-08 12:56:15 +01:00
Milos Kozak	e8c3a0cf91	Merge pull request #525 from PoweRGbg/patch-5 Added profile's target BG in NSClient mode	2017-12-08 08:20:37 +01:00
AdrianLxM	874915e7b4	adapt wear actions to command queue	2017-12-08 06:00:49 +01:00
Milos Kozak	696dd4c592	Merge branch 'dev' into smb	2017-12-07 23:54:37 +01:00
Johannes Mockenhaupt	a38afe7a2a	Merge pull request #2 from AdrianLxM/ghostbusters bend translations	2017-12-07 22:04:15 +01:00
AdrianLxM	795292d891	bend translations	2017-12-07 20:51:17 +01:00
Milos Kozak	dc3c853aca	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-07 18:48:18 +01:00
Milos Kozak	9d7e2f1bec	RS report unsupported firmware	2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt	81bde2cbde	Set version to 1.56-combo-csv2-test	2017-12-07 18:20:11 +01:00
Johannes Mockenhaupt	87ab6432c6	Revert "Custom: Disable Crashlytics." This reverts commit `015a852ab5`.	2017-12-07 18:19:27 +01:00
AdrianLxM	0013050860	remove wear-overview notifications as replaced by system notifications	2017-12-07 17:07:32 +01:00
Roumen Georgiev	1d8dd5e35e	removing the whole if() statement	2017-12-07 17:11:54 +02:00
Milos Kozak	d3e11d9331	Merge pull request #530 from PoweRGbg/patch-7 fix of extended bolus size	2017-12-07 15:24:55 +01:00
AdrianLxM	aea47420e1	fix NPE when profile not loaded	2017-12-07 10:40:00 +01:00
Roumen Georgiev	242ed7217a	fix of extended bolus size	2017-12-07 10:08:26 +02:00
Johannes Mockenhaupt	60d6f305b5	Debug code.	2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt	de06c54f1d	Minor cleanups in ComboPlugin.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	b0d55b09d4	Minor cleanups around the Command queue.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	86b63cb27d	Combo tab: show command queue if non-empty.	2017-12-06 17:14:30 +01:00
Milos Kozak	648b918e3a	Merge pull request #528 from jotomo/log-packages Log full class name (not just filename), so logs can be filtered by p…	2017-12-06 14:16:20 +01:00
Johannes Mockenhaupt	51b51c159c	Clean up earlier merge blunder.	2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt	ab456d5966	Remove missed reference to pref in NSProfilePlugin.	2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt	d58bb75d01	Add missing synchronized so guard works properly.	2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt	7d07982181	Log full class name (not just filename), so logs can be filtered by package name.	2017-12-06 11:53:51 +01:00
Johannes Mockenhaupt	b548d092d1	Remove unneeded dependencies.	2017-12-06 11:50:44 +01:00
Johannes Mockenhaupt	d21a2bd691	Overview: fix predictions checkbox disappearing after unchecking it.	2017-12-06 11:35:58 +01:00
Johannes Mockenhaupt	32b7df39f9	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Update strings.xml Update strings.xml	2017-12-06 11:34:32 +01:00
AdrianLxM	525adddc5e	Merge pull request #527 from osodebailar/dev Dev	2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt	5caec45760	Fix add bolus record from pump history when bolus was cancelled.	2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt	0f034dd662	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: check for duration in json untranslatable strings greek language check for null queue logging	2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt	960cb92789	Remove idle-disconnect-monitor and let the command queue take care of that.	2017-12-05 23:17:05 +01:00
Milos Kozak	7be5c041cc	Merge pull request #526 from MilosKozak/untranslatable untranslatable strings greek	2017-12-05 22:37:34 +01:00
Milos Kozak	455383cfd5	check for duration in json	2017-12-05 22:08:37 +01:00
AdrianLxM	50cbff6fa4	untranslatable strings	2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt	21fc05a707	Remove ComboPlugin.checkHistory().	2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt	f9867c69fb	Remove warning if pump time is off.	2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt	7b88ec9e93	Device-Status: provide pseudo-levels or reservoir.	2017-12-05 21:07:49 +01:00
Milos Kozak	a293f86978	Merge branch 'dev' into smb	2017-12-05 17:36:44 +01:00
Milos Kozak	a47fe757b9	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-05 17:03:58 +01:00
Milos Kozak	188762519c	greek language	2017-12-05 17:03:40 +01:00
Milos Kozak	1adbee5c9e	check for null	2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt	23874ebbd6	Remove 'sync to profile' pref. (cherry picked from commit `01c52e7`)	2017-12-05 10:00:31 +01:00
Roumen Georgiev	5e597f03d0	Added profile's target BG in NSClient mode	2017-12-05 09:23:57 +02:00
Milos Kozak	202d260ad2	Merge branch 'dev' into smb	2017-12-05 07:34:48 +01:00
Milos Kozak	6c714261d0	queue logging	2017-12-05 07:34:34 +01:00
Johannes Mockenhaupt	01c52e753c	Remove 'sync to profile' pref.	2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt	ada5301361	Cleanups.	2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt	68af342eeb	Update combo stuff to work with new queue.	2017-12-05 00:54:08 +01:00
Johannes Mockenhaupt	e7d49f2300	Merge branch 'no-history-for-you' into combo-scripter-v2 * no-history-for-you: When bolusing, only read history in case of error or cancellation. Cleanups. Remove lastBolus, reservoirLevel. Use timestamp for TBR, not pump minutes. Rework checkAndResolveTbrMismatch to update from pump to AAPS only. ComboFragment: move forced history read to long-pressing the TDD button. More steps towards reducing comms amount. Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. Remove last bolus, units display of reservoir level from Combo fragment. # Conflicts: # app/src/main/res/values/strings.xml	2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt	bf9f877b3d	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: (68 commits) max connection time to 120 sec make chart zoomable again fix NPE lowest priority for background calculations wear timestamps long remove unneeded code fix landscape overview synchronized wait fix build tools for travis try to fix travis upgrade build tools R: resolve thread deadlock during bolus stop remove unsupported code from korean pump handle bolus stop prior to delivery correctly fix translations better logging Revert unnecessary change. Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face. gradle update parse more iso formats ... # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/info/nightscout/androidaps/Config.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java # app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java # app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_others.xml # app/src/main/res/xml/pref_wear.xml # gradle/wrapper/gradle-wrapper.properties # wear/build.gradle	2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt	98ba0fbf87	When bolusing, only read history in case of error or cancellation.	2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt	8c04d12904	Cleanups.	2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt	85e20a8977	Remove lastBolus, reservoirLevel.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	4c1c1c43a3	Use timestamp for TBR, not pump minutes.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	1735842e57	Rework checkAndResolveTbrMismatch to update from pump to AAPS only.	2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt	141c116db6	ComboFragment: move forced history read to long-pressing the TDD button. To avoid accidentally doing this when a short press on Refresh was intended.	2017-12-05 00:08:42 +01:00
Milos Kozak	1986594877	hide deviation slope graph	2017-12-04 23:34:55 +01:00
Milos Kozak	ef16174e5b	fix NPE	2017-12-04 23:31:35 +01:00
Milos Kozak	d4d194f7f0	Merge branch 'dev' into smb	2017-12-04 23:30:24 +01:00
AdrianLxM	17867478fb	Merge pull request #524 from MilosKozak/watchfaces Watchfaces Andrew	2017-12-04 23:19:52 +01:00
Milos Kozak	bce6d976b0	max connection time to 120 sec	2017-12-04 20:26:57 +01:00
AdrianLxM	2f235385e0	fix NPE	2017-12-04 20:04:58 +01:00
Milos Kozak	620c56e4cb	lowest priority for background calculations	2017-12-04 19:57:09 +01:00
AdrianLxM	c83f966d92	wear timestamps long	2017-12-04 18:40:13 +01:00
Milos Kozak	23e37a8be7	remove unneeded code	2017-12-04 18:13:20 +01:00
AdrianLxM	aefb0d62df	Merge pull request #522 from MilosKozak/dev Dev	2017-12-04 17:53:36 +01:00
Milos Kozak	34fe8d8b60	Merge branch 'staledata' into dev	2017-12-04 13:02:23 +01:00
Milos Kozak	812583059a	Merge pull request #512 from PoweRGbg/patch-3 ProfileSwitch on graph depending on ScreenSize	2017-12-04 12:49:01 +01:00
AdrianLxM	53723411c4	fix landscape overview	2017-12-04 10:42:34 +01:00
Johannes Mockenhaupt	fe40ebd4a5	More steps towards reducing comms amount. (cherry picked from commit 3ba6079)	2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt	471c813bb4	Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. (cherry picked from commit bcd1ac3)	2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt	0c7b2e1953	Remove last bolus, units display of reservoir level from Combo fragment. (cherry picked from commit 42847cb)	2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt	afdcf0b1c5	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt	1b91684c65	Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.	2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt	1e19f19cd2	Hide buttons on Combo tab until plugin is initialized.	2017-12-03 22:25:43 +01:00
AdrianLxM	42c61f4e6f	synchronized wait	2017-12-03 21:58:35 +01:00
Milos Kozak	5a12d15c8c	upgrade build tools	2017-12-03 21:15:12 +01:00
Milos Kozak	4c3e26d19c	R: resolve thread deadlock during bolus stop	2017-12-03 20:10:54 +01:00
Milos Kozak	2b2d729f42	remove unsupported code from korean pump	2017-12-03 19:55:23 +01:00
Milos Kozak	4185bb347d	handle bolus stop prior to delivery correctly	2017-12-03 19:34:01 +01:00
Milos Kozak	9e0241aebc	fix translations	2017-12-03 19:12:07 +01:00
Milos Kozak	5d217cf1b3	better logging	2017-12-03 19:02:11 +01:00
Andrew Warrington	eea5082278	Revert unnecessary change.	2017-12-03 19:01:56 +01:00
Andrew Warrington	9dca53f968	Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.	2017-12-03 18:53:52 +01:00
Andrew Warrington	cefe93d0a0	Merge remote-tracking branch 'origin/dev' into watchfaces	2017-12-03 17:48:36 +01:00
Milos Kozak	f25334273a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-03 17:34:58 +01:00
Milos Kozak	0101bc0a81	parse more iso formats	2017-12-03 17:34:29 +01:00
AdrianLxM	7777143b07	scrollable overview on Jelly	2017-12-03 17:30:20 +01:00
AdrianLxM	7958dc9dce	jelly overview	2017-12-03 13:55:54 +01:00
AdrianLxM	0a8d89db8a	Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview	2017-12-03 11:48:14 +01:00
AdrianLxM	07c1084287	Merge branch 'watchfaces' into dev	2017-12-02 21:45:39 +01:00
Milos Kozak	38ecd88f6c	Merge pull request #513 from AdrianLxM/btwatchdog-pr	2017-12-02 16:19:46 +01:00
AdrianLxM	14bb0e6ac4	Only do pump alarms in APS mode	2017-12-02 10:21:42 +01:00
Milos Kozak	8a7f0f22d9	min NS version 0.10.2	2017-12-01 22:51:25 +01:00
AdrianLxM	98777579c8	delta granularity and NPE fix	2017-12-01 20:32:26 +01:00
Milos Kozak	67c89f5d98	distinguish between common and SMB bolus in queue	2017-12-01 18:41:24 +01:00
Milos Kozak	622ac15c50	Merge branch 'dev' into smb, fix compile, add queue features	2017-12-01 18:13:05 +01:00
Milos Kozak	faea3a5147	RS proper evaluate extended bolus result	2017-12-01 17:37:49 +01:00
Milos Kozak	2a04505862	fix compile	2017-12-01 16:18:46 +01:00
AdrianLxM	090127012c	Merge branch 'dev' into btwatchdog-pr	2017-12-01 14:03:44 +01:00
AdrianLxM	09dac632f9	bluetooth watchdog	2017-12-01 13:57:53 +01:00
AdrianLxM	4b063a7766	fix SP for long with string-ressource-id	2017-12-01 13:49:50 +01:00
Milos Kozak	aa210970ec	Merge branch 'g5' into dev	2017-12-01 10:18:53 +01:00
Milos Kozak	77e855ec61	fix NPE	2017-12-01 10:18:27 +01:00
Roumen Georgiev	ecbac7ea96	Make ProfileSwitch text 20% larger	2017-12-01 10:30:18 +02:00
Andreas	29d9d20605	Update strings.xml Add german text for local alerts	2017-12-01 08:03:33 +01:00
Andreas	e07c5fb50d	Update strings.xml Change "Temp basal" to "Temp Basal"	2017-11-30 15:04:40 +01:00
Roumen Georgiev	d683ea2f0c	All labes scaled COB is not here	2017-11-30 11:28:26 +02:00
Roumen Georgiev	24b9326602	Update PointsWithLabelGraphSeries.java	2017-11-30 09:57:16 +02:00
Roumen Georgiev	418a7f7094	ProfileSwitch depending on ScreenSize Text size in ProfileSwitch events depends on screen resolution	2017-11-30 09:45:18 +02:00
Milos Kozak	04742c60cd	G5 fix time value	2017-11-29 23:00:41 +01:00
Milos Kozak	b73e12b731	G5: accept arrays	2017-11-29 17:22:45 +01:00
Milos Kozak	7fc9efde40	G5 offline/uploader	2017-11-29 16:07:26 +01:00
Roumen Georgiev	c56330cae7	Less than, not moreThan15	2017-11-29 09:21:55 +02:00
Milos Kozak	b1a214b9e7	Merge branch 'dev' into dev	2017-11-28 21:50:32 +01:00
Milos Kozak	d1aec1ff18	Localalerts settings by adrian	2017-11-28 21:48:46 +01:00
Milos Kozak	7d5d327c5d	fix compile	2017-11-28 21:06:50 +01:00
Milos Kozak	9b135cc4e4	Merge branch 'queue' into dev	2017-11-28 20:52:49 +01:00
Milos Kozak	694e90960e	reenable RS driver	2017-11-28 20:52:24 +01:00
Milos Kozak	b4187c84ed	bump 1.56-dev	2017-11-28 20:51:54 +01:00
Milos Kozak	bf4ffaed8f	bump 1.55	2017-11-28 20:31:31 +01:00
Milos Kozak	70621837d9	disable RS driver	2017-11-28 20:29:30 +01:00
Milos Kozak	b8df1fcec4	Merge branch 'dev' into queue	2017-11-28 20:27:58 +01:00
Roumen Georgiev	542cedff9d	check for sgv older than 15 mins	2017-11-28 16:29:18 +02:00
Roumen Georgiev	723cb33497	Disabling staledata alarm on new sgv values fromNSClient	2017-11-28 16:15:25 +02:00
Roumen Georgiev	eb593a4557	Update Notification.java	2017-11-28 16:09:23 +02:00
Andrew Warrington	dcf79c710c	Update following testing! Bug fixes: - Detailed IOB always shown in older watch faces (fixed) - Cockpit: Loop graphic stays red once set (fixed) Design changes: - AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic) - Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces. - Changed to 1 decimal point in BGI to gain space. This will affect older watches as well. - Changed order of preferences to match screen layout more closely New features: - Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2	2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt	b03202f3d3	Bug notes. (cherry picked from commit c553626)	2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt	dc6c91fd87	Set Source.PUMP when setting/cancelling TBR. While technically, the history isn't read, we can be reasonably sure a TBR was set/cancelled by reading the main menu (and for TBR starts that's the only way to do so). Reading the history might cause (more) problems with the pump's minute-precision and not yield much safety. Besides, command mode is expected to take over yesterday. (cherry picked from commit 04fb1c8)	2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt	383750d5e8	Set Source.PUMP when bolusing (already reading from history). (cherry picked from commit d747415)	2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt	720e64e541	Fix checkTbrMismatch tolerance for TBRs up to 2m off. (cherry picked from commit 46c1e00)	2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt	ffb5ee3b22	Show min/avg/max in Combo TDD dialog. (cherry picked from commit 348b53a)	2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt	b46165e52a	Abort reading all pump data if history read fails. (cherry picked from commit 9f679bc)	2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt	9ce57e7076	Fix bolus verification.	2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt	a0ba857279	Move WarningOrErrorCode class to parent package. (cherry picked from commit 38922ba)	2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt	c36eac1ff3	More logging around bolusing. (cherry picked from commit df89b7f)	2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt	0f8442d65c	Issue a history read when bolusing fails. (cherry picked from commit cafed14)	2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt	1d83abc0d2	Fix rejecting multiple TBRs. (cherry picked from commit c1e9800)	2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt	1e9d0d08c3	Reject requents to enact TBRs if one was already started within this minute. (cherry picked from commit 3805413)	2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt	e13f29e615	Use correct key in prefs.	2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt	b148b334b2	Adhere to 'Sync to profile' setting in ConfigBuilder.	2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt	ac935b19de	SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead.	2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt	5e79900411	Small robustness improvements.	2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt	1a00f8c661	Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.	2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt	44ccbc06a0	Retry reading/writing basal profile, cleanups, notes.	2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt	28f31414ba	Update pump profile during Combo init.	2017-11-23 20:54:28 +01:00
AdrianLxM	5b9fd6fd78	set basal rate overview notifications	2017-11-23 03:06:10 +01:00
AdrianLxM	b3f0951d1f	isThisProfileSet - same behaviour on uninitialized pump as DanaR	2017-11-23 02:19:29 +01:00
AdrianLxM	3f10c316a4	combo set basal: account for different granularity > 1 U/h	2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt	61d1028011	Update local basal profile after setting it on pump.	2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt	1a8c0fcf52	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Cancel ongoing notification when plugin is disabled. Fix typo in fragment name. Nitpicky symmetry. PersistentNotification unregister workaround. Make PumpEnactResult fluent. Minor code cleanup. # Conflicts: # app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java # app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java	2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt	83be0a8315	Setting basal rate on pump (combo side).	2017-11-22 22:16:28 +01:00
Milos Kozak	a13661400f	DanaRv2 queue & pump autodection	2017-11-22 22:09:58 +01:00
AdrianLxM	681add11a9	remove translations without english default	2017-11-22 21:06:31 +01:00
Milos Kozak	8818afe033	KoreanDanaR queue	2017-11-22 20:11:25 +01:00
Milos Kozak	dfd0218a6a	Merge branch 'dev' into queue	2017-11-22 19:44:16 +01:00
Milos Kozak	a9f1acf7a7	Merge pull request #502 from jotomo/combo-extractions Combo extractions	2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt	e28e5685f6	Cancel ongoing notification when plugin is disabled.	2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt	9f946229bc	Slightly improve the dialogs.	2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt	cf430b84cf	Extract some string resources.	2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt	1e4070e862	Fix typo in fragment name.	2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt	5690772946	Nitpicky symmetry.	2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt	d202976251	PersistentNotification unregister workaround.	2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt	9442c56eb8	Make PumpEnactResult fluent.	2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt	60324ac6c6	Minor code cleanup.	2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt	c6ad1b59f3	Clean up string resources.	2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt	813f857306	Rename fragment 'error history' -> 'alert history'.	2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt	2861509d07	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. BolusProgressDialog: hide stop button once pressed. fix RU translation use MIN_DIA instead of DEFAULT_DIA	2017-11-22 10:56:57 +01:00
Milos Kozak	62527ab33b	Merge pull request #500 from jotomo/prevent-gaps-in-tbr ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…	2017-11-22 10:52:15 +01:00
Milos Kozak	63dbe2bd52	Merge pull request #501 from jotomo/hide-stop-button-once-pressed BolusProgressDialog: hide stop button once pressed.	2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt	4c66199142	Cleanups based on Android Studio analysis.	2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt	8b81925ccb	Only raise notification to check pump time when the latter could be read.	2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt	b4d2d9f71d	Rename 'error' to 'alert' when referring to Combo pump alerts.	2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt	a8a7d47da2	ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.	2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt	b49a4c57ba	BolusProgressDialog: hide stop button once pressed.	2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt	b27ee06ebe	Fix issues during history read.	2017-11-22 00:05:59 +01:00
Milos Kozak	252c0b3db9	DanaR queue driver	2017-11-21 23:00:53 +01:00
Milos Kozak	f134163a76	Merge branch 'dev' into queue	2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt	066d138e59	Double comparisons.	2017-11-21 22:31:28 +01:00
Milos Kozak	a6bf18244a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-11-21 22:31:22 +01:00
Milos Kozak	ca44ae9a0b	fix RU translation	2017-11-21 22:31:02 +01:00
Milos Kozak	4007049118	use MIN_DIA instead of DEFAULT_DIA	2017-11-21 22:29:50 +01:00
Milos Kozak	d2cba61354	allign dana plugin code	2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt	bf52352224	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: missing return log profiles if different fix setting of TRB when low basal rate is running fix format and add test for fromISODateString use mills from status if available	2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt	d6938c20e6	Updating README.	2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt	426379c6d3	Remoe SetBasalProfileCommand. Too slow, unclear usage (ProfileInterface), likely superseeded soon.	2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt	4b1a774544	Optimize fetching full history.	2017-11-21 00:43:17 +01:00
Johannes Mockenhaupt	63607d169d	Polish dialogs.	2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt	1b50b43fbb	Add headers to dialogs.	2017-11-21 00:22:16 +01:00
Johannes Mockenhaupt	75855f3f05	Implement reading basal profile.	2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt	971a97a9e3	Some minor tweaks.	2017-11-20 23:53:39 +01:00
Milos Kozak	3ab235f829	refactor pump interface out of ConfigBuilder, remove handlers	2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt	3cccf287da	Only update pumpState cache if menu could be read.	2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt	dbd442e8ea	ComboPlugin.checkTbrMismatch: allow for deviations to compensenate inprecise times used by pump for tbr duration.	2017-11-20 18:59:59 +01:00
Milos Kozak	21ae42d37b	Merge branch 'dev' into queue	2017-11-20 17:50:49 +01:00
Milos Kozak	1335887957	Merge branch 'dev' into dev2	2017-11-20 17:40:45 +01:00
Milos Kozak	2f0599fbc7	missing return	2017-11-20 17:38:06 +01:00
Milos Kozak	d8d8b150b6	Merge branch 'dev2' into queue	2017-11-20 17:34:03 +01:00
Milos Kozak	973b9d50c1	Merge branch 'dev' into dev2	2017-11-20 17:28:15 +01:00
Milos Kozak	0f0f39dfb4	log profiles if different	2017-11-20 17:26:03 +01:00
Milos Kozak	777aedd5db	fix setting of TRB when low basal rate is running	2017-11-20 15:25:44 +01:00
Milos Kozak	297617467e	fix format and add test for fromISODateString	2017-11-20 13:34:13 +01:00
Milos Kozak	d8798e0bcf	use mills from status if available	2017-11-20 13:23:25 +01:00
Johannes Mockenhaupt	aadb7c5728	Update TODO, javadoc.	2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt	dafb6d225b	Display active alert in Combo tab.	2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt	9d3625e78c	Show bolus/TBR percent and duration with activity.	2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt	46fdd47ac0	Fixes and cleanups.	2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt	2c0975994d	Fixes.	2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt	9459dfe321	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 * origin/dev: Remove dead code. Ctors Android-style. Fix NPE initialising MyPreferencesFragment. RS fix last bolus time RS remove duplicated message RS fix extended bolus result show timeshift if not zero CS translation removed unneeded code long click on name to open settings add link to advanced settings # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt	99db38a8e0	Fix displaying connection problems in Combo tab.	2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt	deb566c1bd	Align ComboPlugin with merged changes.	2017-11-18 16:42:56 +01:00
Johannes Mockenhaupt	d92540a17c	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 * adrian/localalerts-settings: remove already commented out code upper case literals use correct setting Don't alarm while disconnected disconnect state remove deprecated wear notification settings no-urgent notification title presnooze missed readings/pump on startup system notifications for non-urgent Notification bugfixes use ID as request code guard double clicks refactor notifications: subpackage initialized only when maxBasal >0 Dismiss notification service local alert thresholds as settings Extract local alerts for unreachable pump, missed BG readings. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/res/values/strings.xml	2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt	f03b9669d5	Minor improvements.	2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt	b85b6f85f4	Major cleanup and some new features. * PumpState.timestamp: round to second (format used in DB) * Raise notification about wrong pump clock time since setting clock isn't possible with current ruffy * Set TempBasal.pumpId when setting/cancelling TBR * Checking state of pump on connect * Better checks whether pump is ready to execute command * Rework dynamic command timeout * Confirm benign warnings on connect and turn into notifications * Some groundwork for reading/setting basal profile * Check pump history every 15m	2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt	76cc08c1a9	BolusProgressDialog: hide stop button once pressed.	2017-11-16 00:23:37 +01:00
Andrew Warrington	bc485a4783	Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces. Inclusion of Home2 ("AAPSv2") watch face for round.	2017-11-15 23:07:44 +01:00
Johannes Mockenhaupt	5ed97d297f	Minor code cleanup.	2017-11-15 11:23:20 +01:00
Johannes Mockenhaupt	e27730229e	Update TODO-Combo, nicer icon in fragment.	2017-11-14 10:43:36 +01:00
Johannes Mockenhaupt	21a2c688c6	Cleanups.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	104cead555	Lots of work around properly reading pump history.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	a52e159bf6	Fire EventInitializationChanged after pump init.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	c22d18eabc	ComboFragment: alert button for pump alerts (instead of alarms).	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	ef0c5b9138	Dialog cleanups.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	c21799fe0f	Treatments tab: display extended bolus tab if active pump supports it or there are any ext bolus records.	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	e0df4646f9	Remove dead code.	2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt	5839ad6a93	Ctors Android-style.	2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt	9a4acbe052	Fix NPE initialising MyPreferencesFragment.	2017-11-13 01:12:05 +01:00
Andrew Warrington	45a26da8b3	Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu. Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.	2017-11-12 21:46:32 +01:00
Johannes Mockenhaupt	9606df13b7	Fix false error popup when cancelling bolus after confirmation on the pump, during the wait before delivery starts.	2017-11-12 02:06:32 +01:00
Johannes Mockenhaupt	11777f8b7f	Cleanups.	2017-11-12 00:58:16 +01:00
Johannes Mockenhaupt	02af439dd7	Minor tweaks.	2017-11-12 00:37:03 +01:00
Milos Kozak	7374545046	refactor all deliverTreatment	2017-11-12 00:08:25 +01:00
Johannes Mockenhaupt	c11086d9ea	Stuff: * Read all history * Simple viewer for TDDs, errors * Clean up cancelling TBR (incomplete) * Initializing pump robustness	2017-11-12 00:01:01 +01:00
Milos Kozak	620a54a31b	bolus from wizard to queue	2017-11-11 23:44:30 +01:00
Milos Kozak	c7faf2a5e7	bolus progress dialog during connection	2017-11-11 23:03:31 +01:00
Milos Kozak	25aa5094a4	alarm for failed bolus	2017-11-11 22:32:00 +01:00
Johannes Mockenhaupt	3072a42cd7	Initial dialog to display pump alerts.	2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt	9804f004f5	Remove unreachable code.	2017-11-11 17:29:39 +01:00
Johannes Mockenhaupt	a9970a9efe	Cleanups	2017-11-11 16:52:07 +01:00
Johannes Mockenhaupt	ee6f29dd75	Revert more local alerts	2017-11-11 16:29:46 +01:00
Milos Kozak	a5227fc773	add bolus sound	2017-11-11 16:20:34 +01:00
Johannes Mockenhaupt	2f8febabb8	Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.	2017-11-11 16:15:03 +01:00
Johannes Mockenhaupt	fb65aca081	ComboFragment: hack to make battery display look pretty before init.	2017-11-11 16:13:06 +01:00
Johannes Mockenhaupt	355a973727	Empty activity instead of 'Idle' in combo tab.	2017-11-11 16:12:19 +01:00
Milos Kozak	86b11edd58	RS connection and status reading	2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt	e6a29e5214	Reorder items in fragments.	2017-11-10 02:23:21 +01:00
Johannes Mockenhaupt	7163fbae54	ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.	2017-11-10 01:26:17 +01:00
Johannes Mockenhaupt	5d077c329a	fix the fix with the fix from the fix that fixes the fix.	2017-11-10 01:16:01 +01:00
Johannes Mockenhaupt	bfc6f0b618	another fi	2017-11-10 00:59:40 +01:00
Johannes Mockenhaupt	5ce956b5fc	quick fix for cancelling tbr to fake neutral temp.	2017-11-10 00:57:40 +01:00
Johannes Mockenhaupt	8983143bff	Cleanup.	2017-11-10 00:57:40 +01:00
Milos Kozak	a186ce6468	more command queue code	2017-11-10 00:27:18 +01:00
AdrianLxM	d0806802eb	compile fixes	2017-11-10 00:19:13 +01:00
Johannes Mockenhaupt	a17cff7adf	Some work around refreshing pump data.	2017-11-08 23:41:53 +01:00
Milos Kozak	d40e0c97c4	simplify active pump access where possible	2017-11-08 23:40:54 +01:00
Johannes Mockenhaupt	cc6db3a059	Some ComboFragment cleanups.	2017-11-08 23:31:40 +01:00
Milos Kozak	8bae1a18e4	CommandQueue	2017-11-08 22:22:51 +01:00
Milos Kozak	3a773feeeb	RS fix last bolus time	2017-11-08 19:23:48 +01:00
Milos Kozak	676dfcc5d1	RS remove duplicated message	2017-11-08 19:18:17 +01:00
Milos Kozak	30f16c7d3e	RS fix extended bolus result	2017-11-08 19:13:44 +01:00
AdrianLxM	ec81f124e9	remove already commented out code	2017-11-08 18:53:33 +01:00
Johannes Mockenhaupt	ff3707d201	Fix NPE initialising MyPreferencesFragment, part 2	2017-11-08 15:07:10 +01:00
Johannes Mockenhaupt	cda621f32b	Disable loop when selected basal rate is not 1.	2017-11-08 14:28:02 +01:00
Johannes Mockenhaupt	dd98d9f7ae	wip	2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt	324b68717f	Fix NPE initialising MyPreferencesFragment.	2017-11-08 10:20:49 +01:00
Milos Kozak	0af51bb6ea	show timeshift if not zero	2017-11-07 13:24:08 +01:00
Johannes Mockenhaupt	5bd2911754	wip ..	2017-11-07 09:36:21 +01:00
Johannes Mockenhaupt	445392ee69	add pretty time dep.	2017-11-07 09:22:29 +01:00
AdrianLxM	4e53b4b1a4	upper case literals	2017-11-07 00:00:38 +01:00
AdrianLxM	d6b534b3b6	use correct setting	2017-11-06 23:47:39 +01:00
Johannes Mockenhaupt	be5f7e68a7	unsafe usage checks update.	2017-11-06 23:15:16 +01:00
AdrianLxM	a864703c76	Don't alarm while disconnected	2017-11-06 22:24:25 +01:00
AdrianLxM	b9ad90a51b	disconnect state	2017-11-06 22:04:48 +01:00
AdrianLxM	ccad0c18b1	remove deprecated wear notification settings	2017-11-06 21:44:01 +01:00
AdrianLxM	f2e44e8ab9	no-urgent notification title	2017-11-06 21:38:42 +01:00
AdrianLxM	2e6a136de6	presnooze missed readings/pump on startup	2017-11-06 20:32:33 +01:00
AdrianLxM	2f56687e82	system notifications for non-urgent	2017-11-06 20:16:17 +01:00
AdrianLxM	2b06e9e63e	Notification bugfixes	2017-11-06 17:12:33 +01:00
AdrianLxM	ef425563bf	use ID as request code	2017-11-06 15:24:52 +01:00
AdrianLxM	e4f15c0e0d	guard double clicks	2017-11-06 15:07:39 +01:00
AdrianLxM	8c8674ed63	refactor notifications: subpackage	2017-11-06 14:26:06 +01:00
AdrianLxM	3ea4bfaf37	initialized only when maxBasal >0	2017-11-06 14:16:50 +01:00
AdrianLxM	d990d59ddf	Dismiss notification service	2017-11-06 14:09:03 +01:00
AdrianLxM	87ea412516	local alert thresholds as settings	2017-11-06 12:58:44 +01:00
AdrianLxM	ffd912e32b	Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings	2017-11-06 11:56:41 +01:00

... 12 13 14 15 16 ...

3767 commits