3621 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Warrington	02e7752c3e	Cockpit watch face: Double-tap opens MainMenuActivity	2018-01-05 11:58:57 +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
Johannes Mockenhaupt	d47b2f8b4b	Swallow exception on disconnect.	2018-01-04 21:20:12 +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
AdrianLxM	41fb92815b	request new data on preference change	2018-01-04 12:22:08 +01:00
Johannes Mockenhaupt	9457fb61e5	RuffyScripter.isConnected: longer wait. ... Declare the connection dead if no menu update was sent within 10s. Occassionally it takes up 4s for regular updates to come in (possibly due to other busy background threads? Iob/Cob calc is suspiscously often running when the error occurs). With the previous timeout, commands were killed too early when things (pump, ruffy, aaps ...) needed some time to think).	2018-01-04 11:38:34 +01:00
Milos Kozak	d7200d1e8e	warn if wrong profile is detected	2018-01-04 11:06:57 +01:00
Johannes Mockenhaupt	2d769ccf9a	Remove debug code.	2018-01-04 11:03:47 +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	de1475dbba	remove logging	2018-01-03 22:28:48 +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
Milos Kozak	cb1df61d88	Merge pull request #579 from jotomo/activity-npe-guard ... Activity NPE guard	2018-01-03 21:17:01 +01:00
Johannes Mockenhaupt	f09d68ad59	Check activity != null before drawing graph.	2018-01-03 20:58:49 +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
AdrianLxM	0b76290091	Merge pull request #578 from andrew-warrington/watchfaces ... Steampunk watch face	2018-01-03 19:58:40 +01:00
Milos Kozak	094737adde	improve GUI response	2018-01-03 19:59:18 +01:00
Andrew Warrington	96c41881fd	Merge pull request #17 from AdrianLxM/watchfaces-steampunk ... darker and gracile steampunk-chart	2018-01-03 19:50:13 +01:00
Johannes Mockenhaupt	fd8f2c0801	Clean up unintended diversions from upstream.	2018-01-03 19:07:10 +01:00
AdrianLxM	5270f2cc69	narrower temp basal line for steampunk watchface	2018-01-03 18:58:02 +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	a75ff0d1f6	darker and gracile steampunk-chart	2018-01-03 18:13:38 +01:00
Johannes Mockenhaupt	7afb557b76	Note on DST changes.	2018-01-03 17:13:57 +01:00
Johannes Mockenhaupt	c125e9265f	Strings: TDD.	2018-01-03 16:57:56 +01:00
Andrew Warrington	267bdd6a43	Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.	2018-01-03 16:33:39 +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
Andrew Warrington	512341e603	Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.	2018-01-03 15:24:06 +01:00
Andrew Warrington	7c73a72c66	Merge pull request #16 from AdrianLxM/watchfaces-steampunk ... fix build issues and updates from upstream	2018-01-03 14:16:08 +01:00
AdrianLxM	99f0bbb478	move steampunk md to main dir	2018-01-03 14:00:57 +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
Johannes Mockenhaupt	bcb94eb161	Merge pull request #40 from swissalpine/patch-3 ... Delete unnecessary translated strings, replace Historik with Historie	2018-01-03 13:07:01 +01:00
Andrew Warrington	7ac413553b	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.	2018-01-03 10:58:10 +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
Andrew Warrington	37f262efdc	Steampunk watch face - unit testing complete.	2018-01-03 01:18:13 +01:00
Andrew Warrington	7b0cc80369	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").	2018-01-02 15:11:59 +01:00
AdrianLxM	1e602ef4ba	domain links	2018-01-02 13:40:37 +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	5609fbf738	Steampunk watchface (moto360 support - ignores the chin)	2018-01-02 00:30: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