2978 commits

Author	SHA1	Message	Date
Milos Kozak	f08809ff9e	rename button to activate profile	2017-10-04 23:33:02 +02:00
Milos Kozak	3d58fe6bb5	cleanup	2017-10-04 23:24:56 +02:00
Milos Kozak	96edac5ddf	LocalProfile fix	2017-10-04 23:17:19 +02:00
AdrianLxM	d6089bef73	Rv2 percent fix	2017-10-04 19:39:41 +02:00
AdrianLxM	7ce282dc4e	korean percent fix	2017-10-04 19:38:42 +02:00
Milos Kozak	9f6962cee5	serialize reload of treatments	2017-10-04 18:04:34 +02:00
AdrianLxM	3d2647321b	getTempBasalFromHistory -> getRealTempBasalFromHistory	2017-10-04 16:51:54 +02:00
AdrianLxM	9e2968f21a	Do not misinterpret a fake-extended as 0% temp.	2017-10-04 16:00:48 +02:00
Milos Kozak	8bf5933c88	refactor TimeListEdit	2017-10-04 15:46:23 +02:00
Milos Kozak	6d08a608a2	dana layout	2017-10-03 22:37:53 +02:00
Milos Kozak	58ed0416d1	fix conflict	2017-10-03 22:33:35 +02:00
Milos Kozak	067494fae1	RS hightempbasal	2017-10-03 22:27:06 +02:00
Milos Kozak	2a98a7e9ba	RS bolus code	2017-10-03 21:47:36 +02:00
Milos Kozak	f5dfff7491	RS APS messages	2017-10-03 20:58:09 +02:00
Milos Kozak	3a014949e9	remove firmware check	2017-10-03 18:45:54 +02:00
Milos Kozak	a5730cb982	initialize only with proper protocol	2017-10-02 22:44:10 +02:00
Milos Kozak	97f69c50fd	store pairing key per pump	2017-10-02 22:21:11 +02:00
Milos Kozak	8cecac0a7f	more LocalProfile work	2017-10-02 19:57:41 +02:00
Milos Kozak	1a5b72f745	Fix time parsing	2017-10-02 17:38:45 +02:00
Roumen Georgiev	ef803d6a41	In one line	2017-09-29 15:06:23 +03:00
Roumen Georgiev	e004b95a60	Update danar_fragment.xml	2017-09-29 09:50:07 +03:00
Roumen Georgiev	7444bc11fa	text identation	2017-09-29 09:47:29 +03:00
Roumen Georgiev	2e61bc136f	Add files via upload	2017-09-29 09:44:25 +03:00
Roumen Georgiev	3c0a509541	Add files via upload	2017-09-29 09:43:42 +03:00
Roumen Georgiev	a152f94f53	Add files via upload	2017-09-29 09:42:42 +03:00
Roumen Georgiev	cb982477cd	Add files via upload	2017-09-29 09:41:32 +03:00
Roumen Georgiev	271534a64b	Add files via upload	2017-09-29 09:40:58 +03:00
Roumen Georgiev	92e2008692	Adding button Icons	2017-09-29 09:40:11 +03:00
Milos Kozak	ba54dacffb	1.54-dev	2017-09-25 19:51:05 +02:00
Milos Kozak	8bbee37b70	fix TB & EB is not set	2017-09-25 19:38:27 +02:00
Milos Kozak	73687442c8	Merge branch 'dev' into rs	2017-09-25 19:36:01 +02:00
Milos Kozak	dc6cbadbdf	fix TB & EB is not set	2017-09-25 19:34:49 +02:00
Milos Kozak	d9f59840b6	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food	2017-09-24 22:47:50 +02:00
Milos Kozak	4fbe7d1000	food database support	2017-09-24 22:47:18 +02:00
Milos Kozak	91b02d4d39	fill dialog refactor & code clean	2017-09-24 14:51:16 +02:00
Milos Kozak	3c7abff88d	remove unused imports	2017-09-24 14:28:26 +02:00
Milos Kozak	1823cd3f24	extended bolus dialog refactor	2017-09-24 13:00:59 +02:00
Milos Kozak	547f09ffbd	allow to view profile from overview	2017-09-24 11:45:32 +02:00
Milos Kozak	c79b750a9c	reactor OptionsToShow	2017-09-24 11:08:04 +02:00
Milos Kozak	082414f0d3	CPP support to profile switch	2017-09-24 10:39:54 +02:00
Milos Kozak	349b27e31a	NS profile fragment shows all profiles	2017-09-23 23:54:43 +02:00
Milos Kozak	6393ee5e10	CPP functionality to Profile.class	2017-09-23 23:12:08 +02:00
Milos Kozak	b3bcb778e0	check for NPE in posted dialogs	2017-09-23 20:12:53 +02:00
Milos Kozak	c3a0f5ddad	split BLE to separate class	2017-09-23 15:03:07 +02:00
Milos Kozak	144a227d14	more progress logging on R	2017-09-23 12:53:41 +02:00
Milos Kozak	8cd8c6b5d9	more progress logging on RS	2017-09-23 12:28:11 +02:00
Milos Kozak	4ed2896f76	remove duplicated code	2017-09-23 10:56:00 +02:00
Milos Kozak	1eeb1c6f7a	RS history OK	2017-09-22 14:57:23 +02:00
SMUSTAF1	81fe9ebdcc	Clear the SMS text field if the user removes the old number.	2017-09-20 13:54:05 +02:00
Milos Kozak	e1903840dd	handle received foods in nsclient	2017-09-20 10:20:50 +02:00
Johannes Mockenhaupt	99c2f797ea	Fix imports.	2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt	1bd5dc3719	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (53 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/res/values/strings.xml	2017-09-18 22:54:35 +02:00
Milos Kozak	fdc3c49a2a	fix merge conflits	2017-09-18 22:03:26 +02:00
Milos Kozak	cd7c7733ea	bump 1.53	2017-09-18 21:59:01 +02:00
Milos Kozak	b797530c9d	BG & IOB contribution on by default in wizard	2017-09-18 21:57:35 +02:00
Milos Kozak	d2815e4045	check for NaN	2017-09-18 21:52:06 +02:00
Milos Kozak	d7f8d75d06	Revert "Rounding issues visible in nightscout insulin field"	2017-09-18 21:24:22 +02:00
Milos Kozak	a98d2e846f	Merge pull request #419 from dylanleonard/feature_time_spinner_fix ... Time Spinner Local Profile Fix	2017-09-18 21:06:34 +02:00
Dylan Leonard	d8590fe8f1	Clarified boolean logic with parentheses :)	2017-09-18 15:04:46 -04:00
Milos Kozak	bf748f3d4b	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:56:42 +02:00
Milos Kozak	8785bc63d5	loadEvents after bolus in separate thread	2017-09-18 20:54:53 +02:00
Milos Kozak	c2afa328e3	Merge branch 'dev' into tt-in-wizard	2017-09-18 20:44:54 +02:00
Milos Kozak	42ee7c668e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:43:24 +02:00
Milos Kozak	8daf9e5c2c	use notification for bolus delivery failed message when window has been destroyed	2017-09-18 20:40:03 +02:00
Milos Kozak	17fa2617f7	fix null pointer exception	2017-09-18 20:23:05 +02:00
Dylan Leonard	4f5987b72a	Added cases to accept both a.m./p.m. and AM/PM	2017-09-18 14:20:28 -04:00
Milos Kozak	3f7819937b	split JSON arrays to 50 elements	2017-09-18 20:10:53 +02:00
Milos Kozak	aa89e8f886	Merge pull request #421 from wouterla/dev ... Rounding issues visible in nightscout insulin field	2017-09-18 19:46:40 +02:00
Milos Kozak	04994924c5	GUI tweaking, small fixes	2017-09-18 18:41:45 +02:00
Milos Kozak	7f4888978e	warn if basal step is not 0.01	2017-09-18 13:28:00 +02:00
Milos Kozak	6cee6c0f51	RS extended disabled warning	2017-09-18 12:59:56 +02:00
Milos Kozak	e3ad396f65	more work on service	2017-09-18 12:57:07 +02:00
Milos Kozak	ee4d8b7748	some work on history	2017-09-18 09:10:27 +02:00
boysim	81aadcc1be	Update strings.xml	2017-09-17 17:02:27 +02:00
Wouter Lagerweij	02c2213545	Changed rounding to use BigDecimals to avoid noisy long doubles in output	2017-09-17 14:27:49 +02:00
Dylan Leonard	91f0c21306	Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called	2017-09-16 19:30:07 -04:00
Wouter Lagerweij	aaa3f648d0	Removed unused imports	2017-09-17 00:56:00 +02:00
Wouter Lagerweij	e350c8c3c3	Rounding fix	2017-09-17 00:53:16 +02:00
Milos Kozak	6662c9dd6c	bolus ok	2017-09-15 13:52:28 +02:00
Milos Kozak	08fca41b5f	partial bolus code, messages blocked by sleep :(	2017-09-14 22:53:11 +02:00
Milos Kozak	01002f11e7	Merge pull request #416 from jotomo/vpump-enact ... VirtualPump: set PumpEnactResult.enacted.	2017-09-14 10:06:01 +02:00
Milos Kozak	13fd6136c3	refactor connectivity notifications	2017-09-14 00:29:34 +02:00
Johannes Mockenhaupt	cb3b472488	VirtualPump: set PumpEnactResult.enacted. ... (cherry picked from commit ec49bc3)	2017-09-13 13:16:48 +02:00
Milos Kozak	ed6cabe7fa	initial RS work	2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt	07b04b8abf	Use correct units for low/high from TT.	2017-09-12 01:23:38 +02:00
Milos Kozak	69b04fdf26	Merge pull request #413 from samihusseingit/dev ... Dev	2017-09-11 20:12:51 +02:00
Johannes Mockenhaupt	936ce42cc0	Remove duplicate logging.	2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt	612efa6a13	Revert "Make the BolusProgress dialog a bit more self-contained." ... Breaks dismissal of dialog (only one invocation of EventDismissBolusprogressIfRunning also sets bolusEnded=true). This reverts commit c11455dff1.	2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt	c11455dff1	Make the BolusProgress dialog a bit more self-contained. ... (cherry picked from commit 75db72a)	2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt	c227e0e5fa	Dead code be gone. ... (cherry picked from commit bb626ce)	2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt	5c3ec9a086	Use SystemClock.sleep instead of Thread.sleep. ... Gets rid of all those pointless InterruptedException catching. (cherry picked from commit 6acaa2b)	2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt	c50fad81bb	Log exceptions in catch blocks rather than printing to console. ... The default code used by Android Studio when generating a try/catch can be altered in Settings under Editor->File and Code Templates->Catch Statement body to log.error("Unhandled exception", e); to also do this for newly generated code. (cherry picked from commit c2ae29f) (cherry picked from commit 6031a25)	2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt	627cb8e9b2	WizardDialog: don't persist state of tt checkbox, default to false. ... This assumes that a default is not useful, as it needs to be decided whether this is needed on each case (using tt when bolusing to start eating soon, but not using it when bolusing for the meal at the end of a tt).	2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt	b1e3b45ce9	Add temp target to Wizard dialog ... Also, store checkboxes' state as prefereces. (cherry picked from commit 6e1c66e)	2017-09-09 16:30:17 +02:00
Milos Kozak	e3ae7bbeaf	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-05 22:47:37 +02:00
Milos Kozak	98848b61ec	send max 30 at once to NS	2017-09-05 22:47:10 +02:00
SMUSTAF1	1fd99a9582	changing the color of the bolus value, for visual clarify and confirmation. Reducing errors.	2017-09-05 13:29:43 +02:00
Milos Kozak	90496d0a02	Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh ... Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…	2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt	3bebea37ae	Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab.	2017-09-03 01:53:30 +02:00
Milos Kozak	fa24368701	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-02 10:26:07 +02:00
Milos Kozak	7801db5a29	fix danar bolus step	2017-09-02 10:25:46 +02:00
AdrianLxM	15a40cba80	Split treatments into smaller packages before broadcasting	2017-09-01 14:02:47 +02:00
fedor apanasenko	ed8582b36a	update russian	2017-09-01 10:37:59 +03:00
Milos Kozak	46f111076f	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-31 22:01:25 +02:00
Milos Kozak	db952759e1	Insulin fragments consolidation	2017-08-31 22:00:45 +02:00
Milos Kozak	c312b51fcf	consolidate DanaR fragments	2017-08-31 19:32:28 +02:00
Radoslav Radev	e1c4074663	Update strings.xml	2017-08-31 09:09:26 +03:00
Milos Kozak	7da8b2de5c	visibility icon	2017-08-29 21:40:06 +02:00
Milos Kozak	7dfe77dc9c	single line in configbuilder	2017-08-29 19:47:32 +02:00
Milos Kozak	13b8a9ecf2	Merge pull request #404 from kakoni/master ... Adding out_units support for determine-basal.js	2017-08-29 18:23:36 +02:00
Milos Kozak	981a96aa16	ConfigBuilder layout	2017-08-29 17:59:46 +02:00
Karri Niemelä	034faa4f6e	Adding support out_units	2017-08-29 15:06:53 +03:00
Johannes Mockenhaupt	448f527525	Splitted boluses: add a wait, so that boluses are delivered with 40s between them.	2017-08-28 21:02:37 +02:00
Johannes Mockenhaupt	f903b83315	Simplify.	2017-08-28 20:32:41 +02:00
Johannes Mockenhaupt	7d5571ffd2	SetTbrCommand: rewrite inputing duration. ... Inputs all steps at once, including 'alignment' step, thereby removing a wait between the initial step and subsequent step where a bad timing could break the command.	2017-08-28 20:13:20 +02:00
Johannes Mockenhaupt	4c313a6a14	Small cleanup. ... (cherry picked from commit b0b533e)	2017-08-28 12:43:12 +02:00
Johannes Mockenhaupt	6f8e0fc257	Remove hack to cancel a request for a TBR that is already running (localized issue). ... (cherry picked from commit a671536)	2017-08-28 12:43:11 +02:00
Johannes Mockenhaupt	cff4bc1abe	Add temporary fix for edge case resulting in SetTbrCommand failing to set TBR_DURATION, where duration is not correctly pumped up to a multiple of 15. ... (cherry picked from commit df9952f)	2017-08-28 12:43:09 +02:00
Johannes Mockenhaupt	a53564fcae	Add wait in loop to check for update from pump. ... (cherry picked from commit fe8d09e)	2017-08-28 12:43:08 +02:00
Johannes Mockenhaupt	11332391b8	Clean up (Cancellable)BolusCommands, to use dynamic scroll wait as well. ... (cherry picked from commit 711cc58)	2017-08-28 12:43:06 +02:00
Johannes Mockenhaupt	03ff15d533	Remove unused test class.	2017-08-28 00:57:47 +02:00
Johannes Mockenhaupt	381a26119b	Crap, don't enable experimental bolus by default.	2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt	a42b671965	Update version.	2017-08-27 20:40:29 +02:00
Johannes Mockenhaupt	e3a732d53d	Small refactoring.	2017-08-27 20:30:58 +02:00
Johannes Mockenhaupt	b85f5324de	Restore bolus splitting hack.	2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt	ecd05bef2d	Make new BolusCommand configurable.	2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt	b53db22ae1	Report bolus delivered if the pump raised a warning/error during delivery. ... Most likely this is due to a low cartridge warning, but might also be an occlusion alert. This lets the alarm ring and asks the user to check it. The treatment is also recorded in the db as enacted. (cherry picked from commit 6cc017a)	2017-08-27 19:08:27 +02:00
Johannes Mockenhaupt	fea1309fa3	Cleanup merge.	2017-08-27 19:05:33 +02:00
Johannes Mockenhaupt	3d2732a68e	Restore bolus comands alongside.	2017-08-27 19:05:08 +02:00
Johannes Mockenhaupt	95fda165a3	Merge fixes without changes to behaviour.	2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt	e399fac8dc	Try to be clever about slow screen updates when scrolling.	2017-08-27 18:45:25 +02:00
Johannes Mockenhaupt	ad44b356c4	Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0" ... This reverts commit 8720c08cdd4a7f89b77816d849da9c585fb8f1ef.	2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt	f70cbbc6c0	Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0	2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt	7bd7c7d035	Workaound for #27 (TBR issued twice).	2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt	0705755368	Revert "Retry with current ruffy." ... This reverts commit f9281c1f996679a2c8065aa52cbb8cb4698353bc.	2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt	2a80111034	Retry with current ruffy.	2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt	c8f7b535c2	Remove code to determine pump capabilities for the time being.	2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt	40941996c2	Don't provide status JSON until we can provide it properly.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	ff088ddd3f	ComboPlugin: don't implement ConstraintsInterface, ProfileInterface.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	1d53305ff9	Use string resource.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	c2ae0b7289	Cleanup.	2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt	fdab7daf2c	Only display Extended Bolus tab in Treatments if pump supports them. ... (cherry picked from commit e862c35)	2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt	4046305380	Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4.	2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt	bc68f2cc1b	Better log output.	2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt	99b98f1dec	Set custom version	2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt	fce696b51d	Cleanup, fix merge issues.	2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt	4d2fa19ad4	Merge branch 'bolus-progress' into rework ... * bolus-progress: wip wip wip more more Remove TODOs for extended bolus. wip cancelling Initial take on bolus cancellation. Initial take on bolus progress reporting. Add alternative SetTbrCommand for pumps with different behaviour. Formatting.	2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt	e6ba99b02f	Fix reading blinking values, use alternate SetTbrCommand by default, ... cleanups	2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt	37523fbdd1	ComboPlugin: Extract fields into ComboPump.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	3fdac4b23e	Small refactoring.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	9f57f82b6a	Remove wait for carb-only treatment.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	c301d6585c	ComboPlugin: implement Constraint, ProfileInterface.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	eb74a24e54	Misc cleanups.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	5eea6d7b8d	Fix waiting between reconnects.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	7a41117a64	Experiments.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	6b19759a9f	Command stubs.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	9349662f8e	Rename ReadPumpStateCommand -> GetPumpStateCommand.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	de693c0f76	Add reservoirLevel to PumpState.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	785a01a056	Extract methods to read blinking values.	2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt	7537048a96	Finish injecting scripter.	2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt	3238cf9c35	Remove pumpState arg from Command.execute.	2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt	fe7f831429	Inject scripter into commands.	2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt	04a03dedc3	Extract BaseCommand.	2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt	1d3411ba56	Show connection, execution time in combo fragment. ... (cherry picked from commit 4078c23)	2017-08-27 12:36:28 +02:00
Milos Kozak	03bf1abdd4	add WakeLock#isHeld()	2017-08-27 11:57:06 +02:00
Milos Kozak	1417410dbb	add WakeLock#isHeld()	2017-08-27 11:53:36 +02:00
Milos Kozak	162389a7e0	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-27 11:46:25 +02:00
Milos Kozak	ba967df2e3	disable careportal buttons until profile is set	2017-08-27 11:44:39 +02:00
Milos Kozak	c9bfd27d93	Merge pull request #396 from warstar2187/dev ... KR translation update	2017-08-27 00:38:44 +02:00
warstar2187	761f9f5075	Update strings.xml	2017-08-27 06:09:17 +09:00
Radoslav Radev	6bf120e9da	Update strings.xml	2017-08-26 22:59:14 +03:00
Milos Kozak	e4c98e6cd1	make dev 1.52	2017-08-26 21:28:08 +02:00
Milos Kozak	b02b1829ad	put back sensitivity plugins	2017-08-26 21:26:40 +02:00
Milos Kozak	491378caf5	1.51 bump	2017-08-26 20:42:53 +02:00
Milos Kozak	3369ce1759	temporary remove untested plugin for release	2017-08-26 20:42:25 +02:00
Milos Kozak	40d86eb87a	fix strings	2017-08-26 14:37:38 +02:00
Milos Kozak	6ea7549e4f	update languages	2017-08-26 12:07:37 +02:00
boysim	196e0bb309	Update strings.xml	2017-08-24 23:18:21 +02:00
Milos Kozak	4e8d92a74b	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-23 23:04:10 +02:00
Milos Kozak	ad3d175b02	better handling DetailedBolusInfo in v2 driver	2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt	d100509648	Log action about to be performed before the operation.	2017-08-23 16:38:28 +02:00
Johannes Mockenhaupt	6b99bb8ed1	Log ruffy messages on debug level, see if that helps debug things.	2017-08-23 16:36:31 +02:00
Johannes Mockenhaupt	fdf974cb3c	Better error message on connect attempt failure.	2017-08-23 16:36:20 +02:00
Johannes Mockenhaupt	52d2b425b8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (21 commits) 1.5h Don't change schema. Fix comparing non-primitives. Generify MainApp.getSpecificPlugin. Fix some warnings / simplify a bit. Remove now unused dia, insulinInterfaceId from Treatment. correct supercall Use bolusstep granularity in fill dialog bugfix: fill as invalid treatments if triggered from phone add invalid treatments to charts in "invalid" colour Use bolusstep as step for insulin correction in wizard Update strings.xml fix of fix :( small refactoring Multiply time passed instead of divide dia. Update strings.xml Fix initalizing profile with default values. moved the code of the bg update to the top before all the loop logic happens, so there would be no delay Update strings.xml Update strings.xml ...	2017-08-23 16:36:06 +02:00
Milos Kozak	d6a27c1af0	1.5h	2017-08-23 13:28:07 +02:00
Milos Kozak	c98cd3c834	Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume ... Delay in bg update on resume	2017-08-22 20:33:56 +02:00
Milos Kozak	0551f7f16d	Merge pull request #387 from MilosKozak/invalid-overview ... Fill treatments in Overview	2017-08-22 20:20:28 +02:00
Milos Kozak	5b17eee586	Merge pull request #389 from jotomo/cleanups ... Cleanups	2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt	bde57fde5f	Don't change schema.	2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt	56423028f6	Fix comparing non-primitives.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	30372897c0	Generify MainApp.getSpecificPlugin.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	59c7dbef27	Fix some warnings / simplify a bit.	2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt	97d0140614	Remove now unused dia, insulinInterfaceId from Treatment.	2017-08-22 13:47:02 +02:00
AdrianLxM	d5ea2a2f08	correct supercall	2017-08-22 13:26:48 +02:00
AdrianLxM	4d33e1df97	Use bolusstep granularity in fill dialog	2017-08-22 13:02:56 +02:00
AdrianLxM	7ea33c7de4	bugfix: fill as invalid treatments if triggered from phone	2017-08-22 12:57:03 +02:00
AdrianLxM	3f8dea1197	add invalid treatments to charts in "invalid" colour	2017-08-22 12:56:17 +02:00
AdrianLxM	6b0bf5860c	Use bolusstep as step for insulin correction in wizard	2017-08-22 00:41:23 +02:00
Johannes Mockenhaupt	2eb86e1bd8	wip	2017-08-21 18:33:40 +02:00
Patrik Nilsson	c91988081f	Update strings.xml ... Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)	2017-08-21 00:01:12 +02:00
Johannes Mockenhaupt	6cc73dcc1c	wip	2017-08-20 23:15:24 +02:00
Milos Kozak	33cf707d45	Merge pull request #380 from MilosKozak/dia-divisor-fix ... Dia divisor / bolussnooze fix	2017-08-20 21:52:42 +02:00
Milos Kozak	ab035e3949	Merge pull request #371 from diabetesdt1/patch-2 ... Update strings.xml	2017-08-20 21:44:21 +02:00
Johannes Mockenhaupt	b162fcce01	wip	2017-08-20 20:47:58 +02:00
Milos Kozak	a18e2b4641	fix of fix :(	2017-08-20 19:42:41 +02:00
Milos Kozak	86d791d93f	Merge pull request #378 from jotomo/profile-default-values ... Fix initalizing profile with default values.	2017-08-20 19:08:55 +02:00
Johannes Mockenhaupt	bffcd3ceee	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (35 commits) fix displaying target in mmol Profile.getValuesList: don't add trailing newline. Fix some warnings. Use OK/Cancel buttons for profile removal dialog. static variables -> object variables Avoid npe if no string is assigned to the profile switch isValid implementation Show profile on tap in Treatments->ProfileSwitch Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt	387ceff525	Add config options: ... * alternate SetTbrCommand impl (original impl) * split bolus (quick hack) to split up boluses to slow delivery	2017-08-19 22:29:48 +02:00
AdrianLxM	9c2808bf6f	small refactoring	2017-08-19 20:37:25 +02:00
AdrianLxM	d49eea854c	Multiply time passed instead of divide dia.	2017-08-19 20:12:37 +02:00
warstar2187	36c25cbd45	Update strings.xml	2017-08-19 21:35:03 +09:00
Johannes Mockenhaupt	ce4aee67d0	Fix initalizing profile with default values.	2017-08-19 12:28:10 +02:00
Susan	4f3b5f551a	moved the code of the bg update to the top before all the loop logic happens, so there would be no delay	2017-08-18 20:58:54 +02:00
Johannes Mockenhaupt	d851637d4f	more	2017-08-18 11:55:19 +02:00
Milos Kozak	6b8dd5868d	fix displaying target in mmol	2017-08-18 11:46:04 +02:00
diabetesdt1	efb9bed3fa	Update strings.xml	2017-08-17 22:21:09 +02:00
diabetesdt1	ef42193d95	Update strings.xml ... Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab) objectives_*_ updated dia_too_short updated	2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt	5991f307af	Profile.getValuesList: don't add trailing newline.	2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt	a6351f4455	Fix some warnings.	2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt	4f2357e9fb	Use OK/Cancel buttons for profile removal dialog.	2017-08-17 22:01:59 +02:00
AdrianLxM	5d6327bfaa	static variables -> object variables	2017-08-17 21:34:30 +02:00
AdrianLxM	5769915f8c	Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer	2017-08-17 21:29:15 +02:00
AdrianLxM	0cc9ee4193	Avoid npe if no string is assigned to the profile switch	2017-08-17 21:24:31 +02:00
Milos Kozak	ca3d94a8ca	fix merge conflict	2017-08-17 21:21:38 +02:00
Milos Kozak	73c2be5248	isValid implementation	2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt	fabaf7c2ef	more	2017-08-17 19:04:43 +02:00
AdrianLxM	92077dcb6a	Show profile on tap in Treatments->ProfileSwitch	2017-08-17 17:03:08 +02:00
diabetesdt1	64446f07c5	Update strings.xml ... added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right. Then, the most german varibles are translated.	2017-08-17 12:40:14 +02:00
Johannes Mockenhaupt	738dd72f5b	Remove TODOs for extended bolus.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	22e3517cd6	wip cancelling	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	a664bdeaaa	Initial take on bolus cancellation.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	c1ecad1ed6	Initial take on bolus progress reporting.	2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt	a230501f74	Add alternative SetTbrCommand for pumps with different behaviour.	2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt	f41d597c07	Formatting.	2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt	b000824b8a	Merge branch 'remove-cmd-retry-with-reconnect' into develop ... * remove-cmd-retry-with-reconnect: Don't rebind ruffy and retry command in case of failure.	2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt	a19e49e5f8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (27 commits) Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. Overview: format target using unit specific format. Dutch language insulincurves - notification on short DIA insulincurves - forgotten string updated insulincurves - rename peak to peak time insulincurves - remove unused base fragment insulincurves - i18n insulincurves - ActivityGraph fix double plotting ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-17 10:08:15 +02:00
AdrianLxM	47e295b3c1	Check for tempbasal not RealTempbasla	2017-08-17 00:42:26 +02:00
AdrianLxM	776ae3f424	Overlapping interval - regard first element on cut	2017-08-16 23:56:14 +02:00
AdrianLxM	8287fe22cf	AcceptTempButton visible	2017-08-16 23:22:14 +02:00
Milos Kozak	6ca44fce84	Merge pull request #367 from MilosKozak/profile-switch-buttons ... show notification on toast alarm	2017-08-16 22:58:34 +02:00
AdrianLxM	e61d7a4442	show notification on toast alarm	2017-08-16 21:37:33 +02:00
Milos Kozak	b93a153b23	parse 12h format properly	2017-08-16 19:33:41 +02:00
Milos Kozak	7884c98f2f	fix index	2017-08-16 18:26:47 +02:00
Milos Kozak	35db28f013	Merge pull request #365 from MilosKozak/dia-expecteddelta-fix ... Restrict DIA for expectedDelta	2017-08-16 18:11:37 +02:00
Milos Kozak	69a378bb75	Merge pull request #366 from MilosKozak/profile-switch-buttons ... Show profile switch button in profiles	2017-08-16 18:11:26 +02:00
AdrianLxM	63793ed358	Show profile switch button in profiles ... Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written. Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE". This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.	2017-08-16 17:56:57 +02:00
Milos Kozak	e005a6172b	set pump time only if needed	2017-08-16 17:26:58 +02:00
AdrianLxM	5fc63d8f16	restrict DIA for expectedDelta	2017-08-16 14:23:22 +02:00
Milos Kozak	e1d2c557af	Merge pull request #364 from MilosKozak/overlappin-intervals-fix ... Overlappinginterfals - find first element	2017-08-16 08:11:04 +02:00
AdrianLxM	2e382267d4	Overlappinginterfals - find first element	2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt	759afcec7a	Extract method Profile.toTargetRangeString.	2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt	754a0097b9	Simplify.	2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt	6dcdeb2bbc	Overview: format target using unit specific format.	2017-08-15 14:51:09 +02:00
Johannes Mockenhaupt	f0d9f0e86a	Don't rebind ruffy and retry command in case of failure. ... RuffyService is now immeditately rebound when connection was lost, therefore retrying a command after blindly rebinding the service doesn't make sense anymore,more so given that ruffy is less prone to crashing now.	2017-08-15 14:03:01 +02:00
Johannes Mockenhaupt	ec508b55c4	SetTbrCommand: fix check in main menu after cancelling TBR. ... The percentage attribute is displayed with a value of 100, though it's not visible on the display. This change just checks the no duration is displayed to verify no TBR is currently running.	2017-08-15 13:18:42 +02:00
Milos Kozak	4c490c32f7	Merge pull request #361 from MilosKozak/oref-insulincurves ... Oref Insulincurves	2017-08-15 10:13:50 +02:00
Milos Kozak	151165809e	Dutch language	2017-08-14 21:57:49 +02:00
AdrianLxM	ee7b3cca22	insulincurves - notification on short DIA	2017-08-14 20:41:24 +02:00
AdrianLxM	f23c3e7ae1	insulincurves - forgotten string updated	2017-08-14 16:44:39 +02:00
AdrianLxM	707d5a480c	insulincurves - rename peak to peak time	2017-08-14 16:02:07 +02:00
AdrianLxM	94fbd620f4	insulincurves - remove unused base fragment	2017-08-14 15:53:47 +02:00
AdrianLxM	ced1da09cf	insulincurves - i18n	2017-08-14 15:25:37 +02:00
AdrianLxM	13cd7dbda1	insulincurves - ActivityGraph fix double plotting	2017-08-14 15:25:21 +02:00
AdrianLxM	085caddeee	insulincurves - freepeak	2017-08-14 15:24:55 +02:00
AdrianLxM	63d46aed56	insulincurves - minimum 5	2017-08-14 15:24:41 +02:00
AdrianLxM	a538160e76	insulincurves - rapid and ultra both with adjustable dia	2017-08-14 15:24:30 +02:00
AdrianLxM	b8496e3208	insulincurves - working with default params	2017-08-14 15:22:27 +02:00
Milos Kozak	2d2ccde6e4	log Bundle	2017-08-14 12:11:53 +02:00
Timm Korte	e9672ff4aa	adjust setTempBasalAbsolute interface to include the new upstream 'force' parameter	2017-08-14 00:05:40 +02:00
Timm Korte	882f9d7869	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-13 23:57:07 +02:00
Johannes Mockenhaupt	d49356a922	Logging: Print filename and line instead of logger name.	2017-08-13 21:31:21 +02:00
Milos Kozak	377b711896	Merge pull request #352 from diabetesdt1/patch-1 ... Update strings.xml	2017-08-13 20:31:54 +02:00
Milos Kozak	a49a496651	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force	2017-08-13 20:31:45 +02:00
Milos Kozak	d4642b3958	do not enforce stop for v2 driver	2017-08-13 20:31:15 +02:00
Milos Kozak	2a2b5dbb31	Merge pull request #357 from savek-cc/logfile-name ... change logfile name pattern	2017-08-13 15:55:53 +02:00
Timm Korte	bbb03d0ac1	change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename	2017-08-13 14:34:19 +02:00
Timm Korte	8caaeeff2a	change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename	2017-08-13 14:32:37 +02:00
Johannes Mockenhaupt	bb0bea98c3	Don't ignore exceptions when binding the ruffy service.	2017-08-12 16:01:05 +02:00
Johannes Mockenhaupt	ead8508760	Format code.	2017-08-12 16:00:05 +02:00
Johannes Mockenhaupt	d75a04c985	After setting/cancelling TBR also check main menu state after cancel.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	49aa63bd31	More verbose logging, some notes added.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	5a1d2d495d	Rename RuffyScripter.waitScreen -> waitForScreenUpdate.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	fc5b4cd93b	Some logging.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	f763eb246b	Use 1.5g-combo-dev as version.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	d3058f6063	Let an unexpected warning/error escalate rather than hide it.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	2f3d362240	Use SystemClock.sleep() instead of Thread.sleep() throughout.	2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt	306a2787d0	Throw CommandException instead of Exception.	2017-08-12 15:22:55 +02:00
Sandra Keßler	bdbf151efe	add full Menu Output to debug	2017-08-12 15:10:14 +02:00
Sandra Keßler	389eae93c5	renamed goToMainMenuScreen to gotToMainTypeMenu to make it clevrer that Menu.isMaintype is meant, deactivates getBasal for now	2017-08-12 14:15:04 +02:00
Timm Korte	6bbb785574	rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute	2017-08-12 13:36:35 +02:00
Sandra Keßler	d89b914bc2	removed Log from SetTbrCommand	2017-08-12 13:31:47 +02:00
AdrianLxM	f861546e12	Quickfix to avoid crashes after staleData merge	2017-08-12 11:20:56 +02:00
Sandra Keßler	59ee67a353	add Logger logs	2017-08-12 09:29:07 +02:00
Sandra Keßler	92ca9aaede	some Small improvements	2017-08-12 00:27:30 +02:00
Sandra Keßler	3fd6884d03	just rewrote SetTbrCommand to be a scripted command, maybe fixed some errors along the way, Runs very smooth on my shitty pump	2017-08-12 00:12:11 +02:00
Sandra Keßler	abe4c1ff3a	return immidiatly if we are in correct menu	2017-08-11 23:59:05 +02:00
Sandra Keßler	1c1ea14b3c	remove old handler if it was set	2017-08-11 23:58:45 +02:00
Timm Korte	8db9cb8887	add cancelTempBasal to setTempBasal if forced	2017-08-11 23:06:35 +02:00
Milos Kozak	73b6235188	APSRequest Answers event	2017-08-11 22:46:08 +02:00
Timm Korte	7839299530	add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50	2017-08-11 22:08:33 +02:00
Milos Kozak	2770e93ed4	Merge pull request #337 from RoumenGeorgiev/dev ... Alarm for StaleData	2017-08-11 18:45:52 +02:00
Sandra Keßler	e2b09f9e42	recovered merge/unmerge damage	2017-08-11 17:35:58 +02:00
Sandra Keßler	92b342b89a	add an additional wait	2017-08-11 17:35:58 +02:00
Sandra Keßler	6a8b39ca4f	forgot in last commit	2017-08-11 17:35:58 +02:00
Sandra Keßler	6acc25978b	Small fix for slow Set error	2017-08-11 17:35:58 +02:00
Sandra Keßler	bd0a298168	fix maybe long duration before setting tbr	2017-08-11 17:35:58 +02:00
Sandra Keßler	e20084c97f	change step calculation and fix time setting (got the actual vs requested time wrong)	2017-08-11 17:35:58 +02:00
Sandra Keßler	29b5ad9696	modify Waits/timeouts to better Set tar with short Menu timeouts	2017-08-11 17:35:58 +02:00
Sandra Keßler	b1a7083371	add Logs to setTbrCommand	2017-08-11 17:35:58 +02:00
Johannes Mockenhaupt	089295188f	Revert merge which was committed due to a misunderstanding.	2017-08-11 17:35:58 +02:00
Sandra Keßler	6dba4e4956	fix >500% basal setting	2017-08-11 17:35:58 +02:00
diabetesdt1	8cd24fd919	Update strings.xml ... Replaced "Empfindlichkeit" with "Sensitivität"	2017-08-11 13:28:39 +02:00
diabetesdt1	a69a94a384	Update strings.xml	2017-08-11 12:48:15 +02:00
diabetesdt1	15fc53530d	Update strings.xml ... Changed Nightscout to NS back (but not on the short Text). Add more Translations. Overview-Notification used and not "Popup-Notification". Removed on short Names the ". I think "treatment" = "Behandlung" sounds wrong :-|	2017-08-11 12:43:46 +02:00
diabetesdt1	0b62669079	Update strings.xml ... typo fixed	2017-08-11 07:30:53 +02:00
Milos Kozak	26fbd450b0	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv	2017-08-10 22:39:25 +02:00
Milos Kozak	3ca058ce60	SV language cleanup	2017-08-10 22:33:38 +02:00
diabetesdt1	d78928a264	Update strings.xml ... typo fixed and empty strings removed	2017-08-10 21:40:03 +02:00
diabetesdt1	c5b5d65efc	Update strings.xml	2017-08-10 21:29:41 +02:00
diabetesdt1	8df0ccdbb1	Update strings.xml ... rollback language-names	2017-08-10 21:28:09 +02:00
diabetesdt1	33f5e97ac6	Update strings.xml ... add more german translation and typos fixed	2017-08-10 21:12:56 +02:00
Milos Kozak	3a574c3803	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-10 17:28:57 +02:00
Milos Kozak	f703c82ca7	microbolus calculation	2017-08-10 17:28:41 +02:00
Milos Kozak	dae82d49fb	Merge remote-tracking branch 'patrik/dev' into sv	2017-08-10 16:29:42 +02:00
ellabellakaramella	0766ac812c	SV translation	2017-08-10 15:15:40 +02:00
Timm Korte	e7249bf72e	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-10 11:13:21 +02:00
Winfried Kuiper	5b43f11a3f	Update strings.xml ... Confirmation=Bestätigung statt Konfiguration (configuration)	2017-08-09 22:12:09 +02:00
Winfried Kuiper	99a0edfa06	Update strings.xml ... Missing units in german translation	2017-08-09 22:03:59 +02:00
Milos Kozak	57f5e5a92d	add bolus metadata when reading pump history	2017-08-08 23:14:56 +02:00
Milos Kozak	bbc68b2266	synchronized getAutosensData	2017-08-08 15:55:31 +02:00
Milos Kozak	2f8ca8bb04	fix setting zero temp	2017-08-08 15:06:31 +02:00
Timm Korte	8182f99bd2	add userRequested parameter to cancelTBR as needed in current AAPS dev	2017-08-07 22:25:57 +02:00
Savek-CC	f3044a7cbb	Merge branch 'feature_90-110-percent_savek-cc' into 'develop' ... change cancel to 90 or 110 percent basal depending on previous running temp See merge request !14	2017-08-07 20:18:44 +00:00
Timm Korte	07822811ac	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-07 22:16:37 +02:00
RoumenGeorgiev	122efb1b8e	Fix for getting double of alarmTimeagoWarnMins	2017-08-07 20:06:15 +03:00
RoumenGeorgiev	1dd9086924	added snoozing if bgReadingAgo is smaller than threshold	2017-08-07 18:53:56 +03:00
Milos Kozak	3bfecd6da8	check for existing	2017-08-07 16:13:09 +02:00
Milos Kozak	2ae0028495	Swedish	2017-08-07 14:06:11 +02:00
RoumenGeorgiev	4f054907cb	Merge pull request #1 from MilosKozak/dev ... Dev	2017-08-07 09:17:07 +03:00
Savek-CC	d520643d45	Merge branch 'develop' into 'mainline' ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java	2017-08-06 22:35:07 +00:00
Timm Korte	59e9502f22	change cancel to 90 or 110 percent basal depending on previous running temp	2017-08-07 00:27:23 +02:00
Johannes Mockenhaupt	c524e2a685	Revert merge which was committed due to a misunderstanding.	2017-08-06 21:47:17 +02:00
Milos Kozak	a40afd0948	1.5g	2017-08-06 14:28:01 +02:00
Milos Kozak	848863aca5	calculateFromTreatmentsAndTempsSynchronized	2017-08-06 14:25:25 +02:00
Milos Kozak	f1f7a6ca6c	check for null	2017-08-06 14:14:03 +02:00
Milos Kozak	066283a4b0	add SMB flag to treatments	2017-08-06 12:19:25 +02:00
Milos Kozak	6ab6f82b10	more debug on setting temp basal	2017-08-06 11:42:20 +02:00
Milos Kozak	4e4088f164	remove unneeded strings	2017-08-05 18:47:01 +02:00
Milos Kozak	4fda4fd547	convert target values to mdgl before passing to openaps	2017-08-05 18:14:10 +02:00
Milos Kozak	e295c8a2dc	target range change confirm dialog	2017-08-05 18:09:19 +02:00
Milos Kozak	f834b3b7e0	remove unneeded texts	2017-08-05 17:43:31 +02:00
Milos Kozak	1604b85d34	Merge branch 'dev' into move-to-range-in-profile	2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt	dbad306766	Resolve merge issue.	2017-08-05 13:23:15 +02:00
Johannes Mockenhaupt	0ef8fd9994	Some polish.	2017-08-05 13:11:07 +02:00
Johannes Mockenhaupt	8aabc346c0	Update ComboPlugin.cancelTempBasal to user newly added userRequested param.	2017-08-05 13:06:10 +02:00
Johannes Mockenhaupt	8369893428	Fix if-statement.	2017-08-05 12:35:05 +02:00
Johannes Mockenhaupt	134bc32dac	Merge remote-tracking branch 'fork/tbrDurationFix-90-110-cancel' into stable ... * fork/tbrDurationFix-90-110-cancel: change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr missing stuf :/ add unused (but tested) command to get basal rate from Profile 1 update setTBRCommand to way faster methods in scripter add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated) add back key make keypress wait up to 2000ms for key response add type of menu to MenuType (main or sub menu) - fix Multi connect - add key sent with 2500ms wait on keypress - fix Timing and npes in setTBR - make ruffyScripter not reinit every time - fix menu npe change Version info exceptions maybe better error recovery? alternate setTBR based on StateMachine more time increase Button Timing to 200ms wait till we get something currentDuration % 15 == 0 slow pump fix if umbind fails while service is dead, bind would never be called # Conflicts: # app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java	2017-08-05 11:42:14 +02:00
Johannes Mockenhaupt	fc97bb7666	Add TODO/notes.	2017-08-05 11:33:02 +02:00
Johannes Mockenhaupt	a5692d1076	Don't attempt to start idleDisconnectMonitor again if RS is restarted.	2017-08-05 11:28:53 +02:00
Johannes Mockenhaupt	4a1684eb92	Merge remote-tracking branch 'origin/dev' into stable ... * origin/dev: remove canceltemp button from all layouts and click handling from overview fragment correct logging fix cancel real temp basals from actions color for active temp remove translated string not in default strings and add flag to cancel method Some more German Some more German Some German translations, remove unused strings, App name for all Update strings.xml CS translations hide all overview buttons by default move cancel temp to actions new temp basal dialog refactor fix virtual pump crash Disconnect pump: cancel temp before setting new to make sure it will last as expected remove notes strings as well remove notes from temp basal upload cancel current temp before activating superbolus	2017-08-05 11:02:13 +02:00
RoumenGeorgiev	222c357456	Added check for enabled openAPS stale data alarm in NS	2017-08-05 11:58:49 +03:00
RoumenGeorgiev	ad122153a9	added openAPSEnabledAlerts() ... check for OpenAPS alerts enabled	2017-08-05 11:26:12 +03:00
RoumenGeorgiev	3d9df4e18e	Using equals() instead of == on line 1811	2017-08-05 11:20:09 +03:00
Timm Korte	f22f96c138	change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr	2017-08-04 22:39:15 +02:00
Sandra Keßler	37a3270a16	missing stuf :/	2017-08-04 17:58:28 +02:00
Sandra Keßler	f790ce6f20	add unused (but tested) command to get basal rate from Profile 1	2017-08-04 17:57:34 +02:00
Sandra Keßler	ac3859dcae	update setTBRCommand to way faster methods in scripter	2017-08-04 16:39:03 +02:00
Sandra Keßler	d35283ad74	add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated)	2017-08-04 16:38:25 +02:00
Sandra Keßler	d8ca2771fb	add back key	2017-08-04 16:36:25 +02:00
Sandra Keßler	efb73ba4f2	make keypress wait up to 2000ms for key response	2017-08-04 16:36:12 +02:00
Sandra Keßler	763cc23939	add type of menu to MenuType (main or sub menu)	2017-08-04 16:34:25 +02:00
RoumenGeorgiev	cdee9bf703	Get staleData setting from NS first	2017-08-04 17:04:57 +03:00
RoumenGeorgiev	aff62d86b1	Changed name of button to snooze if it's staleDataAlarm	2017-08-04 16:43:46 +03:00
RoumenGeorgiev	714a292d78	fixed wrong pasting	2017-08-04 15:05:09 +03:00
RoumenGeorgiev	837dcdb23b	If alarm is staledata dismis snoozes it	2017-08-04 14:51:25 +03:00
RoumenGeorgiev	82541a50e4	Added functions for snoozing and unsnoozing	2017-08-04 14:49:46 +03:00
RoumenGeorgiev	a8b17a1f22	adding staleDataThreshold as snooze time	2017-08-04 14:48:44 +03:00
Sandra Keßler	6981276cab	- fix Multi connect ... - add key sent with 2500ms wait on keypress - fix Timing and npes in setTBR - make ruffyScripter not reinit every time - fix menu npe	2017-08-04 11:53:51 +02:00
RoumenGeorgiev	529d267b9d	Added check for staleData and notification ... with every loop	2017-08-04 12:29:48 +03:00
RoumenGeorgiev	232590e707	Added staleData	2017-08-03 18:48:45 +03:00
RoumenGeorgiev	74bb05a654	added staledataalarm	2017-08-03 17:14:14 +03:00
AdrianLxM	36e6cb8497	remove canceltemp button from all layouts and click handling from overview fragment	2017-08-03 08:22:59 +02:00
AdrianLxM	053004bbbd	correct logging	2017-08-03 08:20:11 +02:00
AdrianLxM	7a7f75db01	fix cancel real temp basals from actions	2017-08-03 03:22:30 +02:00
AdrianLxM	0ac7357ee9	color for active temp	2017-08-03 03:12:47 +02:00
AdrianLxM	1ac1b77fd4	remove translated string not in default strings and add flag to cancel method	2017-08-03 02:01:52 +02:00
AdrianLxM	23abc0e4e5	Some more German	2017-08-02 00:08:56 +02:00
AdrianLxM	5d51b8f0f9	Some more German	2017-08-01 23:56:16 +02:00
AdrianLxM	e30e62e9ab	Some German translations, remove unused strings, App name for all	2017-08-01 23:46:58 +02:00
Radoslav Radev	39891bbad9	Update strings.xml	2017-08-01 23:29:23 +03:00
Milos Kozak	e933650330	CS translations	2017-08-01 22:17:39 +02:00
Milos Kozak	9cf5c6b6c3	hide all overview buttons by default	2017-08-01 20:52:23 +02:00
Milos Kozak	34d4bec556	move cancel temp to actions	2017-08-01 20:45:57 +02:00
Milos Kozak	9596987b35	new temp basal dialog refactor	2017-08-01 20:02:17 +02:00
Milos Kozak	d2a5939ce3	fix virtual pump crash	2017-08-01 17:53:28 +02:00
Milos Kozak	a24cbfda50	Disconnect pump: cancel temp before setting new to make sure it will last as expected	2017-08-01 17:37:32 +02:00
Milos Kozak	6828e11dd9	remove notes strings as well	2017-08-01 17:25:43 +02:00
Milos Kozak	6f9f72d849	remove notes from temp basal upload	2017-08-01 17:21:32 +02:00
Sandra Keßler	4147e7f6a1	change Version info	2017-07-31 21:45:03 +02:00
Milos Kozak	668008e1c1	cancel current temp before activating superbolus	2017-07-31 19:53:09 +02:00
Sandra Keßler	791d905b14	exceptions	2017-07-31 13:08:10 +02:00
Sandra Keßler	14fdc14807	maybe better error recovery?	2017-07-31 12:59:03 +02:00
Sandra Keßler	58e6791441	alternate setTBR based on StateMachine	2017-07-31 11:52:31 +02:00
Sandra Keßler	3497296b6c	more time	2017-07-31 09:08:12 +02:00
Sandra Keßler	a7165497ea	increase Button Timing to 200ms	2017-07-30 22:49:52 +02:00
Sandra Keßler	7c001e97bf	wait till we get something currentDuration % 15 == 0	2017-07-30 22:25:49 +02:00
Sandra Keßler	bfb6039c16	slow pump fix	2017-07-30 22:25:49 +02:00
Sandra Keßler	1d3fee54e9	if umbind fails while service is dead, bind would never be called	2017-07-30 22:23:01 +02:00
Sandra Keßler	afda4f9254	Merge remote-tracking branch 'refs/remotes/origin/trim-to-max-tbr' into HEAD	2017-07-30 16:21:10 +02:00
Johannes Mockenhaupt	16dc21c7f1	Merge branch 'changeRuffyService' into 'stable' ... change to support changed IRuffyService See merge request !7	2017-07-30 11:27:27 +00:00
Johannes Mockenhaupt	27f788424a	Trim requested TBR rate to maximum the pump supports, properly round.	2017-07-30 13:06:52 +02:00
Johannes Mockenhaupt	d672f3c653	Remove hander on ruffy unbind.	2017-07-30 13:03:43 +02:00
AdrianLxM	bfd96b0635	Merge branch 'stable' into '1_5f' ... # Conflicts: # app/src/main/res/values/strings.xml	2017-07-29 16:55:55 +00:00
Sandra Keßler	5e845e37f7	change to support changed IRuffyService	2017-07-28 13:41:10 +02:00
AdrianLxM	785e1b323c	refresh-data - make guard condition better readable	2017-07-28 05:48:34 +02:00
AdrianLxM	f680d70548	refresh data greater smaller fix	2017-07-27 23:35:44 +02:00
AdrianLxM	9572c8d9fc	Merge remote-tracking branch 'origin/develop' into read-maxtbr-clean	2017-07-27 20:27:48 +02:00
AdrianLxM	e79dc4fb66	only set icons when initialized	2017-07-27 16:31:09 +02:00
Johannes Mockenhaupt	17b0e7d71a	Fix some typos.	2017-07-27 14:35:56 +02:00
AdrianLxM	c41b12492f	tbr capability retry change	2017-07-27 13:43:50 +02:00
Johannes Mockenhaupt	bd353a7043	BolusCommand: confirm via My Data history the correct amount was delivered.	2017-07-27 13:39:23 +02:00
AdrianLxM	2697ac9420	battery and insulinstate	2017-07-27 12:20:59 +02:00
AdrianLxM	e34009271f	preserve max tbr through app restarts	2017-07-27 09:53:33 +02:00
AdrianLxM	8937fbe574	use pumpdescription.maxTempPercent to cutoff temps	2017-07-26 22:35:13 +02:00
AdrianLxM	13173e48c1	tbr capability in ComboFragment	2017-07-26 22:16:35 +02:00
Johannes Mockenhaupt	b96edc048e	Merge remote-tracking branch 'fork/develop' into stable ... * fork/develop: setTBR - check for TBR and RUNTIME	2017-07-26 18:18:10 +02:00
AdrianLxM	76c0b999ff	determine max possible tbr firstshot	2017-07-26 18:11:45 +02:00
Johannes Mockenhaupt	78d2322c14	Typos.	2017-07-26 18:02:21 +02:00
Johannes Mockenhaupt	02c80a924c	SetTbrCommand: remove retry logic, add extra checks for final bolus.	2017-07-26 18:00:18 +02:00
Johannes Mockenhaupt	da69e69570	BolusCommand: remove retry logic, add extra checks for final bolus.	2017-07-26 16:06:58 +02:00
Johannes Mockenhaupt	e1b63a4a74	Command doc.	2017-07-26 15:50:07 +02:00
Johannes Mockenhaupt	f6b1887fd2	Logging: Print filename and line instead of logger name.	2017-07-26 15:26:44 +02:00
Johannes Mockenhaupt	d79b221940	CommandException: provide message for printing.	2017-07-26 14:44:28 +02:00
Johannes Mockenhaupt	0516eacfe5	ConfigBuilder.applyAPSResult: log request rate.	2017-07-26 14:44:21 +02:00
AdrianLxM	21b81a5084	setTBR - check for TBR and RUNTIME	2017-07-26 12:19:28 +00:00
AdrianLxM	5569b42ac3	wear wizard percentage	2017-07-26 09:58:51 +02:00
Milos Kozak	7a572d2341	1.5f	2017-07-25 22:53:55 +02:00
Milos Kozak	4bb3b7c11d	Merge pull request #323 from MilosKozak/nsclient-local-second ... Nsclient local broadcasts	2017-07-25 19:51:57 +02:00
Milos Kozak	0914e67c11	typo	2017-07-25 19:25:58 +02:00
Milos Kozak	f1e21053b5	use key instead of string	2017-07-25 19:24:51 +02:00
Milos Kozak	d6cb8ef6bc	check for existing value	2017-07-25 19:18:51 +02:00
Milos Kozak	252b24cefe	Merge pull request #313 from MilosKozak/synchronize-nsclientlog ... synchronize NSClient log	2017-07-25 12:50:48 +02:00
Johannes Mockenhaupt	58505922f2	Merge branch 'fixTBR' into 'combo' ... fix >500% basal setting See merge request !3	2017-07-25 09:35:59 +00:00
Sandra Keßler	f68042af66	fix >500% basal setting	2017-07-24 18:39:43 +02:00
Johannes Mockenhaupt	314a551c96	Mark log entries comming from ruffy.	2017-07-24 15:18:16 +02:00
Johannes Mockenhaupt	c8c4cf2813	Add log statement.	2017-07-24 13:30:08 +02:00
Johannes Mockenhaupt	ebd9c0d876	Add wait time between reconnects. ... Might improve GL#34.	2017-07-24 13:16:35 +02:00
Johannes Mockenhaupt	674fb398b8	Safeguard against communication issues with ruffy. ... In most cases we can't do much, but we can handle exceptions and show a notification and message what's wrong, so the user can try to fix the issue. Fixes jotomo/AndroidAPS#35.	2017-07-24 12:59:56 +02:00
Johannes Mockenhaupt	81f3aea42a	Provide basic pump data for upload.	2017-07-24 12:59:56 +02:00
AdrianLxM	3500e92a41	nsclient ackAlarm local	2017-07-24 02:33:29 +02:00
AdrianLxM	d60321b4d1	nsclient alarms local	2017-07-24 02:27:16 +02:00
Johannes Mockenhaupt	e6eee42081	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: recategorize cp icons removed unnecessary text colour and fixed indentation layout indentation Moving some buttons to the right categories removed empty ghost files remove duplicate IDs and indentation fix Picture renaming (#311)	2017-07-24 02:25:28 +02:00
Johannes Mockenhaupt	6a0273046d	Comment on English being the only supported pump language so far.	2017-07-24 02:24:48 +02:00
AdrianLxM	a4864c3d06	nsclient cal local	2017-07-24 02:09:26 +02:00
AdrianLxM	194a817332	nsclient devicestatus local	2017-07-24 02:06:05 +02:00
AdrianLxM	fe57d4a61d	nsclient mbg local	2017-07-24 02:02:54 +02:00
AdrianLxM	82b99e1708	nsclient status local	2017-07-24 02:00:46 +02:00
AdrianLxM	759154e578	nsclient profile local	2017-07-24 01:58:23 +02:00
AdrianLxM	7a171bd949	nsclient sgv local	2017-07-24 01:55:01 +02:00
AdrianLxM	38100e758e	nsclient treatments local	2017-07-24 01:50:27 +02:00
AdrianLxM	796b7ecdf2	rename package lowercase	2017-07-24 00:12:53 +02:00
Johannes Mockenhaupt	5e5c837949	Clean up comment.	2017-07-23 23:42:44 +02:00
Johannes Mockenhaupt	cc715cf76f	Notes, typo.	2017-07-23 17:51:08 +02:00
Johannes Mockenhaupt	9826c1d953	Bugfix: NPE when refreshing pump status without a profile set. ... The base basal rate is a different thing than a TBR rate, when a TBR is running the PumpStatus has a tbrRate, when no TBR is running there's no TBR rate, so don't display the base basal rate.	2017-07-23 14:07:46 +02:00
AdrianLxM	5e1e48be0a	Allow prime/fill	2017-07-23 00:24:27 +00:00
AdrianLxM	1c0e97c175	recategorize cp icons	2017-07-22 20:57:30 +02:00
Johannes Mockenhaupt	27187b5e75	Bugfix: More reliable way to determine if the connection is ready to execute comands.	2017-07-22 20:02:35 +02:00
Johannes Mockenhaupt	9cdd988bff	Bugfix: sleep *inside* the loop. ... Whops, maxing out a core, draining the battery.	2017-07-22 17:53:55 +02:00
AdrianLxM	2e32d12bc0	removed unnecessary text colour and fixed indentation	2017-07-22 14:34:59 +02:00
AdrianLxM	c187bf1575	layout indentation	2017-07-22 14:30:55 +02:00
Roumen Georgiev	54697df358	Moving some buttons to the right categories	2017-07-22 14:27:51 +02:00
Johannes Mockenhaupt	fcd6f4ea0e	jotomo/AndroidAPS#29 Don't raise alarm on 'double cancellation'.	2017-07-22 11:36:52 +02:00
Johannes Mockenhaupt	a153b59d5d	Increase timeouts. ... 90s until timeout due to no menu updates 60s timeout for operations (waitForMenuToBeLeft, verifyMenuIsDisplayed).	2017-07-22 11:34:28 +02:00
Johannes Mockenhaupt	b3a7585a52	Note an pump sluggishness.	2017-07-22 11:07:35 +02:00
AdrianLxM	3d4fa0cebf	remove duplicate IDs and indentation fix	2017-07-22 02:15:55 +02:00
Johannes Mockenhaupt	e45acab420	Return original exception in case retry fails as well.	2017-07-22 02:13:34 +02:00
AdrianLxM	0b6c9845fa	synchronize NSClient log	2017-07-22 01:43:33 +02:00
Johannes Mockenhaupt	d0d3e46e03	Log exception when automatically retrying command.	2017-07-22 00:44:53 +02:00
Johannes Mockenhaupt	7f185557f4	DEBUG: log temp basals that are active when pump receives command to issue a tbr when non is active on the pump.	2017-07-21 22:46:00 +02:00
Johannes Mockenhaupt	0029fdad01	Combo-specifici hack: Consider a TBR with less than 60 seconds left as completed ... when determining whether to set a new TBR. Setting a new TBR overrides an running TBR if any, so this won't fail on the Combo. Without this, a TBR mostly runs out 20 seconds after a loop iteration (when receiving a SGV), so for that almost 5 minutes to TBR is set. Note that this is Combo-specific and needs to be revised when integrating this with mainline.	2017-07-21 22:45:47 +02:00
AdrianLxM	10d27f0b6a	Picture renaming (#311) ... * adding icons	2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt	3bd865a870	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: 1.5e Let CircadianPercentageProfileFragment inherit from SubscriberFragment. Fix after merge-conflict cleanup Files renamed Added icons for home, actions and care portal screens update bg translation synchronize interval access from other classes remove unnecessary semicolons spanish emptiy string remove extra strings self asignment -> comment string comparison Add color of chart to corresponding lables/scale Update InsulinFastactingProlongedFragment.java Update InsulinFastactingFragment.java Extract SubscriberFragment base class. Have most fragments update their content in onResume.	2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt	9af2e0af01	Add v2 TODO	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	893a604ef9	Fix combo_fragment blunder.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	d7eee17112	Fix creating treatment record when bolusing (carb only treatment).	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	46b1dff334	Make accessing pump/cmd state in Fragment safer.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	cb8a22582a	Wait up to 90s before timing out on connection attempt. ... Might take longer if we need to wait for the pump display to time out due to recent user activity.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	a28efb4be0	Add "pump error (message)" as a field in Combo fragement.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	63131f73d0	Cleanups.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	29cb1def50	Fix up "Rebind ruffy if there is an exception.". ... Some removals, but more importantly to note that the commit set pump/command state variables volatile again.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	5c36094b8b	Remove some debug code.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	821e31c1c3	Add debug logging.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	a2fad3293d	Fix adding pump state to CommandResult when there are violations.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	d85425e68b	NPE guard.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	d5bf5812b7	Rebind ruffy if there is an exception.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	e526de68ea	Some improvements around connection state.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	bf179cd751	Fail on attempts to cancel non-running TBR. ... Until we know this would be benign. We still return 'enacted=true', so AAPS can mark the TBR as finished to recover from this error state.	2017-07-21 17:28:30 +02:00
AdrianLxM	e381d197cb	1.5e	2017-07-21 16:49:43 +02:00
AdrianLxM	3d82bdb347	Merge pull request #295 from jotomo/on-resume-update-gui ... On resume update gui	2017-07-21 16:47:28 +02:00
AdrianLxM	06497a862d	Merge pull request #303 from AdrianLxM/synchronize-intervals ... synchronize interval access from other classes	2017-07-21 16:47:00 +02:00
AdrianLxM	6d1c0feeab	Merge pull request #302 from AdrianLxM/cleanups ... Cleanups	2017-07-21 16:46:48 +02:00
AdrianLxM	0297f2b75d	Merge pull request #301 from MilosKozak/insulin-colourlables ... Add color of chart to corresponding lables/scale	2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt	fdc0aea24b	Let CircadianPercentageProfileFragment inherit from SubscriberFragment.	2017-07-21 14:56:14 +02:00
AdrianLxM	31fcf34a2d	Fix after merge-conflict cleanup	2017-07-21 11:59:36 +02:00
PoweRGbg	059e58c640	Files renamed	2017-07-21 11:55:12 +02:00
Milos Kozak	c68eccc328	Merge pull request #306 from boikonur/dev	2017-07-20 20:49:35 +02:00
Boyko Kazakov	3b1407b8dd	Added icons for home, actions and care portal screens	2017-07-20 20:57:45 +03:00
Radoslav Radev	3098f0bdfa	update bg translation	2017-07-20 09:24:35 +03:00
AdrianLxM	42263e979e	synchronize interval access from other classes	2017-07-20 02:43:01 +02:00
AdrianLxM	b72482601e	remove unnecessary semicolons	2017-07-20 01:06:41 +02:00
AdrianLxM	1ba11ed006	spanish emptiy string	2017-07-20 01:06:21 +02:00
AdrianLxM	b5cb68be73	remove extra strings	2017-07-20 01:06:00 +02:00
AdrianLxM	6daff6fae9	self asignment -> comment	2017-07-20 01:05:25 +02:00
AdrianLxM	c35b7bb9d6	string comparison	2017-07-20 01:05:05 +02:00
AdrianLxM	03ad898562	Merge branch 'dev' into on-resume-update-gui	2017-07-20 00:17:32 +02:00
AdrianLxM	98bb792264	Add color of chart to corresponding lables/scale	2017-07-19 23:46:32 +02:00
Johannes Mockenhaupt	a1564d5bb7	RuffyScripter: only set connected variable in rtConnected, rtDisconnected. ... Hopefully fixes intermittent failures to close the connection, as idleDisconnectMonitorThread sometimes fails to disconnect because connected == false.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	e322b15e1c	debug: setTbrPercent: 5 minute head start	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	a55756367f	ComboPlugin: use CommandResult.completionTime for treatment entries.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	a8ecc85429	ConfigBuilderPlugin.applyApsResult: more verbose logging ... Log whether the pump was asked to set a TBR if if that is skipped since the pump still runs the requested TBR and for how long.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	1cf6448b0e	Add CommandResult.completionTime field and set it in RuffyScripter when the command has finished executing.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	97733848e7	SetTbrCommand: replace static wait with dynamic wait to have completionDate more accurate.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	467cf1e6ed	Pass pre-cmd pump state to command, log it.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	a7c77bc177	Add "pump error (message)" as a field in Combo fragement.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	8cdd604b84	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: bulgarian removed non-translatable synchronize interval access nsclient remove debug data that puts stress on the broadcast system 3 nsclient remove debug data that puts stress on the broadcast system 2 nsclient remove debug data that puts stress on the broadcast system Align OpenAS(A)MA fragments with layout of other fragments. local broadcasts better setting title setting to disable local broadcasts in NSClient removed some "unneeded" translations wear tdd weighted wear TDD status wear menu simplification Translated latest additions strings.xml ns client quickfix now catch all NS client quickfix - catch even more catch TransactionTooLargeException TT new "old" logic for temp targets TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals # Conflicts: # app/src/main/res/values/strings.xml	2017-07-19 19:54:50 +02:00
AdrianLxM	732e225c7d	bulgarian removed non-translatable	2017-07-19 19:50:40 +02:00
AdrianLxM	f220bb034e	Merge pull request #286 from AdrianLxM/temp-target-logic ... Temp target logic	2017-07-19 19:33:17 +02:00
AdrianLxM	e51954cec3	Merge pull request #292 from AdrianLxM/wear-tdd ... Wear tdd	2017-07-19 19:05:41 +02:00
Milos Kozak	3475b64e1b	Merge pull request #299 from MilosKozak/dev-nsclient-quickfix ... NSClient quickfix	2017-07-19 18:53:38 +02:00
AdrianLxM	76990b7983	synchronize interval access	2017-07-19 17:39:55 +02:00
Milos Kozak	62ff62a31f	Merge pull request #290 from PoweRGbg/patch-1	2017-07-19 17:21:15 +02:00
AdrianLxM	e6ce35485a	nsclient remove debug data that puts stress on the broadcast system 3	2017-07-19 16:09:34 +02:00
AdrianLxM	621c32d832	nsclient remove debug data that puts stress on the broadcast system 2	2017-07-19 16:06:36 +02:00
AdrianLxM	c1e030d789	nsclient remove debug data that puts stress on the broadcast system	2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt	c95879e6ad	Align OpenAS(A)MA fragments with layout of other fragments. ... Removes a margin that makes the top elements jump up and down when flipping through tabs.	2017-07-19 12:32:18 +02:00
Johannes Mockenhaupt	7b16716b65	Clean up statusSumary, command result and pump status.	2017-07-19 01:53:37 +02:00
Johannes Mockenhaupt	485b99e260	Show last command and pump state better in the Combo tab. ... Gets rid of unhelpful "Unknown error" messaegs.	2017-07-19 01:33:19 +02:00
Johannes Mockenhaupt	5aacf8410d	Fix CancelTbrCommand to return command resutlt not in PumpState but as part of the CommandResult object.	2017-07-19 01:30:26 +02:00
Johannes Mockenhaupt	825a87f474	Use OpenAPS-requested duration for TBRs.	2017-07-18 23:57:48 +02:00
AdrianLxM	cfe8e0a23a	local broadcasts better setting title	2017-07-18 22:18:10 +02:00
AdrianLxM	c753873769	setting to disable local broadcasts in NSClient	2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt	9927ab4989	Raise an error upon attempting to cancel a TBR when none is active.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	14d7043600	Skip fetching initial pump state if ruffy service isn't ready yet.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	f3b508ba2d	Combo tab: refresh on resume ... Since we're not getting events when the fragement is not displayed, since we're unregistering from event in onPause.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	3b287df77d	Check active menu again when retrying inputs.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	abf9566476	Log exception	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	ebe14fb0cf	BolusCommand: deal with blinking values. ... How did this not trigger with all the boluses I've issued so far?	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	7fe9ad7910	Add retries for inputing values. ... Rarely there seem to be timing issues and e.g. 10 button down presses to go from 100% to 0% only goes down to 20%. Retry two more times in that case, restarting the input process on the active screen (bolus input, tbr percent/duration input).	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	e52c2a857c	RuffyScripter: log command execution time.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	7dda253b88	RuffyScripter: when pump is suspended fail all commands but ReadPumpState. ... Safest way for v1 (which I'm trying to stabilize, not rework ;-) ).	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	bd14b399d5	Comment.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	b4950b3037	Provide suspended state information to AAPS. ... AAPS seems to still try to issue commands (like cancel TBR, though none is running?)), despite showing "Pump suspended" on the home screen. With the DanaR, AAPS also tries to run commands when the pump is suspended, but there, the treatment is logged as being administered despite the pump not having done that. Here, the pump response with success=false, enacted=false, which causes the ComboPlugin class to NOT create any treatments. No errors are raised, as this is considered a regular state: no treatments are enacted, overview screen shows "pump suspended" and the combo beeping away. That AAPS still tries to issue TBR commands ... that's AAPS' problem for now. Buttons to issue boluses are hiden though.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	55e7006967	Remove superfluous code (state is always set later in controlling thread).	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	599f3ce23c	Order methods in the order they're called, start Alerter service earlier to make sure it can catch early errors.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	487e9deb88	Set an error state when the ruffy service can't be bound. ... See code comment.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	02a9ed6eda	Set an active command before establishing a connection. ... Otherwise the disconnect thread will close the connection due to inactivity. We could add a variable 'isConnecting', but I'm not sure if adding another (ruffy-) global state variable will make things simpler to grasp.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	c37310685a	Don't count the time establishing a connection towards a command timeout. ... Note: connection timeouts are also dealt with. They're now (cleanly) separated: connect- and command-timeouts. If the pump's display is one due to the user interacting with the pump directly, the pump needs a display timeout before being ready for an incoming connection. What I'm trying to say is, it might take some time, maybe up to 30s to establish a connection in that cause and can thus easily create a false timeout error.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	36966c8907	Handle the pump being stopped: don't treat it like an error, but don't execute commands either.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	222ad0a527	Improve display of error state in Combo tab.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	7fa59c6c16	Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	e9fa9b1788	Silly me, of course fragments (and everything else) are recreated by Android all the time.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	29e7ea1966	Don't ignore user requests to update pump data, tweak alerter.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	338d29630c	Notes from manual timing test (yeah, new timeout code seems to work).	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	af4ec4d072	BolusCommand: fix contstraint check (doh!)	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	5f43f0f147	* Fix stale data in Combo tab after error ... * Add info about last command ran to the Combo tab * Don't refresh data more than once a minute. * Specify not only error, but also command that raised the error in alert notification	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	4dc38e447a	Add first ruffyscripter test (needs ruffy to be available during test somehow).	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	ac10bdc01c	First stab at dynamic timeout.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	44ae79bd50	Move command argument checking out of ctor into a dedicated method and check prior to execution.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	6faa1614ac	ComboFragment: rename Update Button to Refresh.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	5fad9b3a85	Cleanups.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	20a8350c67	Robustness for RuffyScripter.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	aa98864d65	... this should have gone into earlier commit, the UI one?	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	ecf3866b43	Improve alerter.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	c131280e91	RuffyScripter.verifyMenuIsDisplayed: don't call waitForMenuUpdate, menu should already be displayed. If not, wait up to 1 second.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	ccffa3bfca	Add alerter thread to ComboPlugin that raises an alarm every 6 minutes (Android will by default silence alarms that go off within less than 5 minutes) when the pump state shows an error condition.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	362c3681d5	Clean up commands package.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	c63c86f98a	RuffyScripter improvements: ... * Keep track of connection status rather than relying in IRuffyService.isConnected * Abort running command if pump stops sending menu updates * Fail if ruffy goes away (binding becomes invalid), currently only if this happens during disconnect attempts	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	52b9621e29	Paranoia: check we're in the expected menu before each and every button press.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	d619796019	Improving pump status in the UI (combo tab)	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	f7586268c7	Dead code be gone.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	93c0147b23	RuffyScripter: take over connection management. Disconnect after 5s of inactivity. Plus some fixes.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	b954ddaa84	Clean up ComoPlugin a bit.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	ccd81c67fd	UI for pump state.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	2ddccd3c31	RuffyScripter.runCommand: Next shot at understanding threading better.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	83e9ec743e	Properly accessing volatile field pumpState.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	69e560baee	Cleanup.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	4c0944b9f8	Optimize cancelling TBR.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	3aecf0f58b	Be more cautious handling command failures.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	8dd714b390	UI crimes	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	8ecf6922f7	Misc improvements: ... * Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading). * Return all possible states in PumpState * Add absolute TBR to PumpState * Add NoOpCommand to fetch state data from pump * Display returned pump state in Combo fragment/tab.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	f251427d1b	Remove ReadStateCommand, all state will be return through the PumpState field on CommandResult, so it's passed back after every command.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	ec6491fcb7	Return absolute TBR rate in PumpState.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	69b98c54c6	Polish.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	9653af5501	RuffyScripter.navigateToMenu: detect if we're wrapping around not finding a menu (likely because it's hidden)	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	7e538cbcf6	Update PumpState s/errorCode/errorMsg/g	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	99830b05b6	Fix detecting error state on connection and fix cancelling TBR. ... When there's an error, timing is crucial. Waiting for the blinking error code to be readable hangs the thread running the command.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	f6c8f3638b	Reflect reject TBR change in comment.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	4ff81e885c	Simplify reading alerts (message doesn't blink)	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	e01e85c54f	On connect, check if pump is in an error state.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	364123c261	Fix carb only treatment.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	d0dabf34da	Fix handling TBR CANCELLED alert, remove ill-advised attempts to fake a command queue and have all commands return a state object.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	952aa0e8a2	RuffyScripter.waitForMenuToBeLeft: add timeout.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	77711b2174	ComboPlugin.runCommand: wait if pump is busy with a command.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	d8011aeaa4	Make cancelling TBR more robust to dismiss TBR cancelled alert specifially and only if it is raised. ... Cancelling a TBR with a runtime < 60s (0:01 in the display) does NOT raise a TBR cancelled alert.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	2c706e7c22	Remove status logging in Ruffy, now done by command.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	8bc4cd255a	Don't close connection when other cmds are about to be run.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	f5ef666061	Add timestamp to State and rename to PumpState.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	f28a27a93f	Read pump state.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	9d8d12fcb9	Cleanups.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	eab9d8dcd7	Fix reducing duration of OpenAPS TBRs	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	e76524a539	Include state in CommandResult.toString.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	375eb46695	ReadStateCommand: properly read TBR %.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	fa039e6961	Note on cancelling TBRs that don't trigger a pump alert.	2017-07-18 21:20:18 +02:00
Johannes Mockenhaupt	0345a01fc1	Make CancelTbrCommand more robust.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	30fc385970	Apply pump specific modifications to OpenAPS suggestion in ComboPlugin.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	5631488cc8	Add ReadStateCommand.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	8b21bb1203	Skip TBR changes smaller than 20%. ... ~50 TBR changes in a 6 hour night seem excessive, even if pump was handicapped by not being connected and thus not having any effect to work with.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	a2b3c26b33	Log pump status on connect.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	347890496b	SetTbrCommand: wain for menu update when switching to TBR_DURATION to make it safer, hopefully.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	8c107cb48a	RuffyScripter: Log button presses.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	df58b6d1c2	CancelTbrCommand: log running TBR to be cancelled.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	8e2cd844a5	Round requested absolute TBR to percent TBR.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	a21da8aba7	Remove pointless events about connection status.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	848a32eade	Logging cleanup.	2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt	9674db8d85	CancelTbrCommand: set enacted=true, even when there was no TBR to cancel. ... This helps recover when there was an issue. AAPS thinks there's a TBR running and by reporting back 'enacted', the plugin will create a "Cancel temp" treatment.	2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt	264e252300	Set last command date. ... Though this is only relevant when starting to fetch data from the pump.	2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt	336315823e	ComboPlugin.getBaseBasalRate: return profile value.	2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt	0729d7a114	RuffyScripter: Abort a running command after 90s timeout	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	f34fed1f05	Semi-fix bolusing not logging a treatment when there was an error.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	e29ef5ffce	Update treatment history when setting/cancelling a TBR.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	a27bb28e87	ComboPlugin.deliverTreatment: return command message as comment in PumpEnactResult. ... Important when there's an error.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	d35d93ed44	RuffyScripter.verifyMenuIsDisplayed: wait a bit longer if needed. ... Sometimes the pump seems to take a bit longer.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	76578872d1	ComoPlugin.deliverTreatment: take more time. ... Even if not interacting with the pump, AAPS calculator doesn't dismiss the dialog if we return within the first 5s.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	d39d58913d	Implement #8, add treatment to history.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	e07d62bf79	Fix setting TBR when existing TBR has runtime < 15m.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	97f9e99437	toString methods for Commands.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	1c1a28f0a8	Ignore requests to issue BolusCommands for zero units.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	5f1ab4e45c	Set duration in PumpEnactResult when issuing SetTbrCommand.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	6842abd157	Provide fake current basal rate.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	3b50a5ae70	Update Combo PumpDescription w.r.t extended bolus.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	1f5c03b64e	Cleanups.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	7cb0268afc	Disconnect after issuing comand to Combo.	2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt	3280092566	Source ruffy scripter for the time being (already some fixes and tweaks in).	2017-07-18 20:55:44 +02:00
Johannes Mockenhaupt	481c63fa57	Initial work on the ComboPlugin.	2017-07-18 20:54:59 +02:00
Johannes Mockenhaupt	ab9908438e	Add Combo short name.	2017-07-18 20:54:57 +02:00
Milos Kozak	30b7697002	adjust combo driver for latest changes	2017-07-18 20:54:14 +02:00
Milos Kozak	e9f5241821	add missing interface functions to combo	2017-07-18 20:54:14 +02:00
Milos Kozak	253c2a34e5	combo plugin skeleton	2017-07-18 20:54:13 +02:00
PoweRGbg	c3f85faede	removed some "unneeded" translations	2017-07-18 18:10:24 +03:00
AdrianLxM	c79a5725fd	Update InsulinFastactingProlongedFragment.java ... ... in case DIA has changed.	2017-07-18 13:19:43 +02:00
AdrianLxM	741f6bd866	Update InsulinFastactingFragment.java ... ... in case DIA has changed	2017-07-18 13:18:41 +02:00
Johannes Mockenhaupt	7eacd5021c	Use target ranges from profile, rather than fixed values from prefs.	2017-07-18 13:04:15 +02:00
Johannes Mockenhaupt	435ec55580	Extract SubscriberFragment base class.	2017-07-18 12:59:25 +02:00
Johannes Mockenhaupt	7c6bdc0b31	Have most fragments update their content in onResume.	2017-07-18 12:38:42 +02:00
AdrianLxM	e0c1f65b8b	wear tdd weighted	2017-07-17 22:40:05 +02:00
AdrianLxM	50c26f28fd	wear TDD status	2017-07-17 22:39:48 +02:00
AdrianLxM	387cfcccaf	wear menu simplification	2017-07-17 22:39:00 +02:00
PoweRGbg	7216418f44	Translated latest additions strings.xml	2017-07-17 11:37:00 +03:00
AdrianLxM	0d1ff3d721	ns client quickfix now catch all	2017-07-16 16:49:26 +02:00
AdrianLxM	c64c5f5401	NS client quickfix - catch even more	2017-07-16 16:38:01 +02:00
AdrianLxM	d5599f1f00	catch TransactionTooLargeException	2017-07-16 16:00:04 +02:00
Milos Kozak	26ebceb4d9	Merge pull request #288 from AdrianLxM/wear-overviewnotification	2017-07-15 16:31:45 +02:00
Boyko Kazakov	7a2db43347	Added Images for different resolutions	2017-07-15 17:03:38 +03:00
AdrianLxM	b79beda971	wear pass through overview notifications	2017-07-15 16:03:04 +02:00
AdrianLxM	cb08d1d76b	TT new "old" logic for temp targets	2017-07-15 13:37:48 +02:00
AdrianLxM	9eaba98dfa	TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals	2017-07-15 13:37:48 +02:00
Johannes Mockenhaupt	80124e6d7b	Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump.	2017-07-14 23:52:16 +02:00
Milos Kozak	0e6a93df90	Merge pull request #279 from AdrianLxM/cpp-wear2 ... Cpp wear	2017-07-12 08:18:57 +02:00
Milos Kozak	3e9734188b	check for array size	2017-07-11 11:27:14 +02:00
Milos Kozak	e33d757975	Merge pull request #277 from AdrianLxM/refactor-profileswitch ... extract method for new ProfileSwitch	2017-07-10 08:13:07 +02:00
AdrianLxM	b53c40c4ad	cpp-watch update while in backtround	2017-07-10 05:26:24 +02:00
AdrianLxM	7fa8ea7224	cpp-watch working2	2017-07-10 04:46:29 +02:00
AdrianLxM	7f0e611783	cpp watch working1	2017-07-10 04:46:13 +02:00
AdrianLxM	0bff8e2778	extract method for new ProfileSwitch	2017-07-10 04:45:43 +02:00
AdrianLxM	26f3362ffc	cpp-watch first roundtrip	2017-07-10 04:45:22 +02:00
AdrianLxM	85d028abff	cpp watch openactivity	2017-07-10 04:45:08 +02:00
AdrianLxM	39ee68e62a	cpp-watch external-function	2017-07-10 04:44:46 +02:00
AdrianLxM	5ea8cff751	extract method for new ProfileSwitch	2017-07-10 01:25:48 +02:00
Milos Kozak	059ac4040e	fix 640g plugin	2017-07-09 23:12:57 +02:00
Milos Kozak	551ff70bc8	forgotten file	2017-07-07 19:35:45 +02:00
Milos Kozak	2724e10c2f	1.5d	2017-07-07 18:39:31 +02:00
Milos Kozak	d61d35fa82	move class to correct place	2017-07-07 18:37:15 +02:00
Milos Kozak	0b5abae44f	fix conflict	2017-07-07 15:10:29 +02:00
Milos Kozak	8de7e05dd5	weightedaverage sensitivity	2017-07-07 15:08:21 +02:00
drnoname82	e12e4ec55e	Update strings.xml	2017-07-07 01:03:20 +02:00
Milos Kozak	31e9f3f55c	Merge pull request #274 from AdrianLxM/wear-oaps-reason-result ... wear show oaps result/reason	2017-07-04 12:01:47 +02:00
Milos Kozak	24259470ad	Merge pull request #275 from AdrianLxM/fakeextended-fix ... Fake extended fix	2017-07-04 12:01:12 +02:00
AdrianLxM	a45fd1619e	fake extended fix 3	2017-07-04 01:43:56 +02:00
AdrianLxM	1922a1b121	fake extended fix 2	2017-07-04 00:17:26 +02:00
Milos Kozak	7b9e5fec1e	autosens warning	2017-07-04 00:16:35 +02:00
AdrianLxM	1574d94aa6	fake extended fix	2017-07-04 00:03:50 +02:00
Milos Kozak	c75bb0e453	fix sensitivy	2017-07-03 21:21:20 +02:00
Milos Kozak	ebf56d0032	double check units are in profile	2017-07-03 11:14:30 +02:00
AdrianLxM	e81b217c94	wear show oaps result/reason	2017-07-03 01:47:58 +02:00
Milos Kozak	5a27f9afa1	allow lock screen in nsclient mode	2017-07-03 00:02:54 +02:00
Milos Kozak	e0e0a75519	allow ISO format with miliseconds	2017-07-02 12:49:25 +02:00
Milos Kozak	771ff0d781	1.5c	2017-07-02 11:47:16 +02:00
Milos Kozak	e9dba7136d	nsclient layout for phones	2017-07-02 11:28:03 +02:00
Milos Kozak	d4537a001f	check for null profile in watchupdaterservice	2017-06-30 23:59:12 +02:00
Milos Kozak	b4ab1d4109	fix types in configbuilder	2017-06-30 21:35:07 +02:00
Milos Kozak	4d16b04acd	buttons on overview GONE before profile is loaded	2017-06-30 17:50:30 +02:00
Milos Kozak	37055cd917	allow decimal number in NumberPicker	2017-06-30 17:43:10 +02:00
Milos Kozak	09e5fdc61b	sensitivity prefs cleanup	2017-06-30 11:56:36 +02:00
Milos Kozak	96e4a25f9e	typo	2017-06-30 11:40:12 +02:00
Milos Kozak	448cf7ea85	use default dia when no profile available	2017-06-30 11:18:51 +02:00
Milos Kozak	51b01a0993	split device statuses too before broadcast	2017-06-30 10:57:29 +02:00
Milos Kozak	f0c9ce5a00	fix crash when no profile loaded from pump yet	2017-06-30 10:47:30 +02:00
Milos Kozak	38002be73d	check for units null	2017-06-30 10:35:05 +02:00
Milos Kozak	a8a4ffcab1	ver 1.5b	2017-06-30 10:24:45 +02:00
Milos Kozak	63ad0704fa	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-06-30 10:23:31 +02:00
Milos Kozak	1e5f96f841	split treatments to smaller chunks before broadcast	2017-06-30 10:23:24 +02:00
Milos Kozak	9e8c91319e	move ns version to about dialog	2017-06-30 09:55:47 +02:00
Milos Kozak	514d6d4dd5	fix crash in instantiating fragment	2017-06-30 09:46:56 +02:00
Milos Kozak	39c6ae5eae	fix merge conflict	2017-06-30 09:35:20 +02:00
Milos Kozak	fec4e60359	Merge pull request #269 from AdrianLxM/percentagevisualization ... visualize absolute rate emulation as percentage	2017-06-30 00:00:47 +02:00
AdrianLxM	6bbec3411a	absolute as percentage update	2017-06-29 23:36:45 +02:00
Milos Kozak	68f90f0da8	Merge pull request #270 from AdrianLxM/danarstats-historyadaption ... DanaRStats adapt to history and work around gaps	2017-06-29 22:15:06 +02:00
Milos Kozak	b4ea205103	Merge pull request #271 from AdrianLxM/diadivisor ... adapt diadivisor	2017-06-29 22:14:28 +02:00
AdrianLxM	72fbb73c65	bolusprogress without context	2017-06-29 20:24:19 +02:00
AdrianLxM	fcab1a267b	adapt diadivisor	2017-06-29 19:39:58 +02:00
Milos Kozak	d81bb9bf23	fix bolusprogress dialog size	2017-06-29 19:21:34 +02:00
AdrianLxM	1f9ed574b7	DanaRStats adapt to history and work around gaps	2017-06-29 16:24:17 +02:00
AdrianLxM	16e360f200	visualize absolute rate emulation as percentage	2017-06-29 14:14:40 +02:00
Milos Kozak	a8338b2dd1	careportal dialog number picker	2017-06-29 01:37:58 +02:00
Milos Kozak	f58f70bdca	wizard tweaking	2017-06-28 23:11:17 +02:00
Milos Kozak	39e83f0cfe	clean context after fragment is destroyed	2017-06-28 10:24:42 +02:00
Milos Kozak	e4d55473a1	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-06-28 09:09:29 +02:00
Milos Kozak	5c5c4243bc	check for missing bg direction	2017-06-28 09:09:19 +02:00
Milos Kozak	ea06a90453	1.5a	2017-06-27 23:24:30 +02:00
Milos Kozak	491f0837c8	allow manual input in NumberPicker	2017-06-27 23:23:44 +02:00
Milos Kozak	c3876c730b	numberpicker in wizard dialog	2017-06-27 23:16:23 +02:00
Milos Kozak	4fc935f0bd	bolus dialog numberpickers	2017-06-27 19:14:32 +02:00
Milos Kozak	ef4a1feda2	numberpicker in calibration dialog	2017-06-27 17:06:23 +02:00
Milos Kozak	341b0660a8	calibration dialog cancel button	2017-06-27 15:25:11 +02:00
Milos Kozak	311a14e457	typo	2017-06-27 13:59:37 +02:00
Milos Kozak	9fb428c128	fix conflict	2017-06-27 13:52:47 +02:00
Milos Kozak	103836717a	fix conflict	2017-06-27 13:51:45 +02:00
Milos Kozak	70374ee341	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-06-27 13:42:45 +02:00
Milos Kozak	50ba9720e1	use container for inflate	2017-06-27 13:42:39 +02:00
Milos Kozak	42b42a90eb	another check for null	2017-06-27 11:01:38 +02:00
Milos Kozak	ab63c2fb48	better check for app initialization	2017-06-27 10:00:22 +02:00
Milos Kozak	7b1b9c9881	dialog widths	2017-06-27 00:11:23 +02:00
Milos Kozak	dbd721319e	ns uploader status	2017-06-26 22:39:01 +02:00
Milos Kozak	87fb969d9f	ns openaps status	2017-06-26 17:21:39 +02:00
Milos Kozak	36b83e4c8a	typo	2017-06-26 13:08:45 +02:00
Milos Kozak	47a9d4b9c8	ns pump status	2017-06-26 12:44:03 +02:00
Milos Kozak	3f641f9c30	carbs absorption settings	2017-06-25 11:16:19 +02:00
Milos Kozak	ac98852f79	cut off carbs after 4h	2017-06-24 19:55:49 +02:00
Milos Kozak	129f813de2	reset cache on ConfigBuilderChange event	2017-06-24 15:11:30 +02:00
Milos Kozak	70aaafa616	copy old oref0 sensitivity code	2017-06-24 15:04:22 +02:00
Milos Kozak	b39f59f59e	remove unneeded fragments	2017-06-24 13:22:50 +02:00
Milos Kozak	5360129e5f	sensitivity plugins	2017-06-24 11:04:09 +02:00
Milos Kozak	240f9618f5	Merge branch 'dev' into newautosens	2017-06-21 09:04:38 +02:00
Milos Kozak	3e7c4b1350	NS high & low alarms with sound	2017-06-21 07:28:04 +02:00
Milos Kozak	7f92f42923	cob on overview	2017-06-20 20:30:50 +02:00
Milos Kozak	33de4e8f2a	schedule overview update 500ms	2017-06-20 20:13:01 +02:00
Milos Kozak	e9898a58c7	show target range as number if equal	2017-06-20 20:10:14 +02:00
Milos Kozak	134efb04bf	fix merge conflict	2017-06-20 20:01:09 +02:00
Milos Kozak	befdbefa49	fix zero parsing error	2017-06-20 19:58:43 +02:00
Milos Kozak	a3757877a3	fix landscape mode	2017-06-20 19:56:25 +02:00
Milos Kozak	80962e33d7	allow to ignore profileswitch events	2017-06-20 19:52:46 +02:00
Milos Kozak	c728174858	Merge branch 'dev' into newautosens	2017-06-19 23:13:29 +02:00
Milos Kozak	745f9270ee	one more null check	2017-06-19 23:08:56 +02:00
Milos Kozak	b185733859	more checks for null	2017-06-19 22:55:56 +02:00
Milos Kozak	df3dff1940	revert magic constant	2017-06-19 22:32:54 +02:00
Milos Kozak	4b1263e2e0	small simplify	2017-06-19 16:28:36 +02:00
Milos Kozak	150ef1a8bc	Merge branch 'dev' into newautosens	2017-06-19 15:03:35 +02:00
Milos Kozak	6eed701310	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-06-19 14:52:54 +02:00
Milos Kozak	7e1c435374	fix loading danar history	2017-06-19 14:52:46 +02:00
PoweRGbg	dcc7112fd8	Update Profile.java	2017-06-19 14:39:49 +03:00
PoweRGbg	6293e89be2	fixed getICList() returning bg units/U to g/hr	2017-06-19 13:10:32 +03:00
Milos Kozak	e90812634b	work from old autosens branch	2017-06-16 14:37:43 +02:00
Milos Kozak	b67d8be1ef	dia as primitive	2017-06-16 09:14:57 +02:00
Milos Kozak	c78399ded0	cache created objects in profilestore	2017-06-16 09:06:35 +02:00
Milos Kozak	49ef46936b	optimize refreshing gui	2017-06-16 08:37:07 +02:00
Milos Kozak	43231cc362	use System.currentTimeMillis()	2017-06-15 23:12:12 +02:00
Milos Kozak	26daffa692	use primitives in inner loops	2017-06-15 22:55:07 +02:00
Milos Kozak	fb7af2f317	ns alarm setting in xml	2017-06-15 21:33:45 +02:00
Milos Kozak	5408562d84	use phone name in devicestatus	2017-06-15 09:45:10 +02:00
Milos Kozak	a2aa8d8bc6	bucketed data for non 5min interval	2017-06-15 00:34:42 +02:00
Milos Kozak	2642a12829	schedule correct scheduleExtendedBolusChange	2017-06-14 22:18:01 +02:00
Milos Kozak	9ce78881fb	log initiator in loop	2017-06-14 22:12:36 +02:00
Milos Kozak	b14cf480cf	add duration to profile switch dialogs	2017-06-14 20:41:55 +02:00
Milos Kozak	ae2bbf76e5	fix duplicating carb entries	2017-06-14 19:49:01 +02:00
Milos Kozak	0b322e53fc	nsclient plugin tweaking	2017-06-13 21:25:50 +02:00
Milos Kozak	43b70f9efc	loop, MA, AMA new design	2017-06-13 20:48:53 +02:00
Milos Kozak	745a3cf874	reuse profile object	2017-06-13 19:37:31 +02:00
Milos Kozak	2c2b6c21a1	cancel temp basal in the same connection	2017-06-13 18:47:54 +02:00
Milos Kozak	3a95325039	fix sms reply text	2017-06-13 16:51:59 +02:00
Milos Kozak	d3de51cc88	optimize dia	2017-06-13 15:06:41 +02:00
Milos Kozak	2a1fe205ee	optimize nsclient logging	2017-06-13 12:17:54 +02:00
Milos Kozak	afca896f23	optimize getUnits() & detecting faked extended	2017-06-13 12:08:30 +02:00
Milos Kozak	1de64f06c2	simplify danar activities, fix profiles	2017-06-12 23:31:50 +02:00
Milos Kozak	6fca923275	fix profileswitch reloads	2017-06-12 13:11:16 +02:00
Milos Kozak	0f40670c24	create singleton from NSstatus	2017-06-12 11:15:03 +02:00
Milos Kozak	b41a942d11	update supported NS & NSclient versions	2017-06-12 09:30:04 +02:00
Milos Kozak	148f4d43f9	detect faking by extended boluses in nsclient mode	2017-06-12 09:15:51 +02:00
Milos Kozak	77659e20e7	ns alarms & getBasal fix	2017-06-11 17:22:54 +02:00
Milos Kozak	bf953f1240	fix maxdailybasal calculation	2017-06-11 14:29:02 +02:00
Milos Kozak	39224f421a	fix extended bolus step	2017-06-11 13:37:38 +02:00
Milos Kozak	b603fce8c7	do not add empty iob series	2017-06-11 12:44:42 +02:00
Milos Kozak	f6650e33e4	remove test buttons	2017-06-10 22:04:59 +02:00
Milos Kozak	723c90c32d	optimize rendering	2017-06-10 21:51:58 +02:00
Milos Kozak	e6f173f305	fix merge conflict	2017-06-10 13:43:02 +02:00
Milos Kozak	6ce35bc36a	Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history	2017-06-10 13:41:36 +02:00
Milos Kozak	f65d75e553	specify source at detailedbolusinfo	2017-06-10 13:39:51 +02:00
Milos Kozak	dfaf3a07c2	typo	2017-06-08 23:22:43 +02:00
Milos Kozak	4231557c9f	fix axis	2017-06-08 23:18:38 +02:00
Milos Kozak	96d760ba62	fix adding basals to database in danar driver	2017-06-08 22:26:32 +02:00
Milos Kozak	74268675af	optimize overview graph drawing	2017-06-08 22:14:55 +02:00
Milos Kozak	a39f61284a	profileswitch sync & v2 bolus fix	2017-06-08 20:52:33 +02:00
Milos Kozak	e09fba93cb	update graph properly	2017-06-08 20:08:02 +02:00
Milos Kozak	e8be720138	temptarget sync	2017-06-08 19:34:46 +02:00
Milos Kozak	1153c33200	tempbasal & extendedbolus 3way sync	2017-06-08 18:15:17 +02:00
Milos Kozak	4d30ba9cdb	treatments PumpHistory and NS mark	2017-06-07 19:43:19 +02:00
Johannes Mockenhaupt	d00e7f8b00	Clear notification when accepting temp basal. ... This clears the notification about a new suggested basal when the temp basal is accepted from within AndroidAPS.	2017-06-07 18:10:08 +02:00
Milos Kozak	e5a326c377	nsclient always use virtual pump, more sync fixes	2017-06-07 18:10:07 +02:00
Milos Kozak	fec56e7c23	fix bug in sync	2017-06-07 08:09:15 +02:00
Milos Kozak	8fab76ee9b	treatments synchronization improvement	2017-06-07 00:11:33 +02:00
Milos Kozak	5931abc860	BgReading optimization	2017-06-06 17:14:17 +02:00
Milos Kozak	a180e182eb	optimize rendering graph	2017-06-06 15:49:41 +02:00
Milos Kozak	8b8a8fcb45	remote time update extra task	2017-06-06 15:06:00 +02:00
Milos Kozak	b8b00dbc81	revert asynctask	2017-06-06 14:49:17 +02:00
Milos Kozak	f93090b012	allow only 1 updategui running	2017-06-06 10:56:26 +02:00
Milos Kozak	17f59df597	gui tweaking, pump battery event	2017-06-06 08:21:11 +02:00
Milos Kozak	7c7638a7a1	extract color resources	2017-06-05 15:34:22 +02:00
Milos Kozak	e0a6db22a2	run rendering calculations on background	2017-06-05 15:16:07 +02:00
Milos Kozak	88b9caa357	absolute basal line	2017-06-05 01:12:36 +02:00
Milos Kozak	dd7e777a24	simplify graph series	2017-06-05 00:50:31 +02:00
Milos Kozak	8934d2d6b9	Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history	2017-06-04 22:38:42 +02:00
Milos Kozak	a3db05ec39	v 1.50 & fix conflict	2017-06-04 22:37:58 +02:00
Milos Kozak	ac038a9252	bigger bg dots on tablet	2017-06-04 22:27:36 +02:00
Milos Kozak	013025b750	fix crashing at start	2017-06-04 01:15:11 +02:00
Milos Kozak	1702ce7702	adjusting nsclient mode	2017-06-04 00:46:44 +02:00
Milos Kozak	b40cf99201	gui tweaking	2017-06-03 22:43:35 +02:00
Milos Kozak	1a4e60d3a8	process duration correctly	2017-06-02 23:59:34 +02:00
Milos Kozak	d365fcd6a4	fix bugs & design tweaking	2017-06-02 23:25:11 +02:00
Milos Kozak	6ca4811e8e	profiles visualisation	2017-06-02 12:27:21 +02:00
Milos Kozak	f267c85377	it compiles now with profiles	2017-06-02 10:25:49 +02:00
Milos Kozak	a19a5a442b	some v2 driver tweaking	2017-06-01 20:52:38 +02:00
Milos Kozak	622097aabc	fix wrong merge	2017-06-01 19:33:56 +02:00
Milos Kozak	32084094fd	v 1.46	2017-06-01 18:59:39 +02:00
Milos Kozak	0a2cdff5e5	fix conflict	2017-05-31 09:29:39 +02:00
Milos Kozak	fb4ea156d6	disable loop as a fist action on superbolus	2017-05-31 09:26:08 +02:00
Milos Kozak	496872a58e	resend after 10sec allowed	2017-05-31 09:14:31 +02:00
Milos Kozak	15f44e6085	basic sync for v2	2017-05-30 22:44:26 +02:00
Milos Kozak	b3d18b2537	disable bolus when pump is suspended	2017-05-30 18:23:07 +02:00
Milos Kozak	f5f7d28cc1	temp basal dialog design	2017-05-30 18:10:05 +02:00
Milos Kozak	3861bece54	extended bolus dialog	2017-05-30 15:07:44 +02:00
Milos Kozak	5f6a77983b	Merge branch 'dev' into history	2017-05-29 22:42:17 +02:00
Milos Kozak	9e3edbb530	typo in checkbox handling	2017-05-29 22:36:04 +02:00
Milos Kozak	358de54322	redesign uploading treatments to NS	2017-05-29 21:45:59 +02:00
Milos Kozak	ec76908eca	redesign uploading tb&eb to NS	2017-05-29 19:43:19 +02:00
Milos Kozak	dec627946d	0xE004 DanaRv2 message	2017-05-29 16:45:09 +02:00
Milos Kozak	9032deaaf3	better cache invalidate handling	2017-05-29 15:26:25 +02:00
Milos Kozak	c90de88ec1	better logging & double treatment plugin fix	2017-05-29 13:07:58 +02:00
Milos Kozak	442ff12aa1	initialize treatment data first by another message	2017-05-29 11:39:12 +02:00
Milos Kozak	fa695b9399	Merge branch 'dev' into history	2017-05-29 10:04:09 +02:00
Milos Kozak	e91acf3fed	eliminate multiple resends in nsclient	2017-05-29 10:03:55 +02:00
Milos Kozak	4dff0e3a56	rename treatment interfaace functions to be more clear	2017-05-26 15:33:42 +02:00
Milos Kozak	0371e97391	Merge branch 'dev' into history	2017-05-26 15:06:04 +02:00
Milos Kozak	60a41b7dce	switch order of commands when setting superbolus	2017-05-26 15:02:59 +02:00
Milos Kozak	0973ef97ac	synchronize danar and danarv2 plugins	2017-05-26 14:41:05 +02:00
Milos Kozak	b8b9827b61	synchronize danar and danarkorean plugins	2017-05-26 13:28:27 +02:00
Milos Kozak	4b39578d9c	fix adding contribution from faked extended	2017-05-26 12:07:56 +02:00
Milos Kozak	a9b251ce12	Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history	2017-05-26 10:31:46 +02:00
Milos Kozak	559e07904c	remove unneeded call	2017-05-26 10:31:05 +02:00
Milos Kozak	bb4302c02f	Merge branch 'dev' into history	2017-05-26 10:24:48 +02:00
Milos Kozak	0b8499cb7f	Merge pull request #251 from AdrianLxM/historytest1 ... lint disable 'ExtraTranslation'	2017-05-26 10:23:51 +02:00
AdrianLxM	7bf8a31e02	check for unused translations again	2017-05-26 10:11:38 +02:00
AdrianLxM	8b81960ceb	remove unused strings from russion translation	2017-05-26 10:10:57 +02:00
Milos Kozak	650b792099	mark selected tab in treatments	2017-05-26 10:05:42 +02:00
AdrianLxM	cc4419f57a	lint ExtraTranslation	2017-05-26 10:00:41 +02:00
AdrianLxM	99b8e48031	lint ExtraTranslation	2017-05-26 09:58:38 +02:00
Milos Kozak	a066580896	handle faked tempbasals synchronization	2017-05-26 08:54:48 +02:00
Milos Kozak	5fb72181ee	careportal cage, sage, iage	2017-05-25 20:18:29 +02:00
Milos Kozak	87993c6163	return functionality of faking by extended boluses	2017-05-25 17:26:05 +02:00
fedor apanasenko	4406bb3f06	Update strings.xml	2017-05-25 09:51:08 +03:00
Milos Kozak	86af9eab3d	stop extended bolus in actions	2017-05-24 20:37:58 +02:00
Milos Kozak	2ae30fe9b4	temptarget design	2017-05-24 19:42:23 +02:00
Milos Kozak	bb9c68fd4d	Merge remote-tracking branch 'origin/dev' into history	2017-05-24 19:18:30 +02:00
Milos Kozak	45df7ddd26	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-05-24 18:50:10 +02:00
Milos Kozak	f936580734	Russsian language	2017-05-24 18:46:19 +02:00
Milos Kozak	5208f23661	Temptargets under treatments	2017-05-23 23:56:53 +02:00
Milos Kozak	771fbdc303	sync of treatments, tempbasals, extended tested and working	2017-05-23 22:59:06 +02:00
Milos Kozak	8db1bd5ae5	tempbasal ns sync	2017-05-23 20:15:14 +02:00
Milos Kozak	7bed883368	Merge branch 'dev' into history	2017-05-22 22:13:42 +02:00
Milos Kozak	6394421017	boluses working	2017-05-22 22:10:56 +02:00
Milos Kozak	6cd046459a	original treatmens plugin removed, temp basals working	2017-05-22 20:58:05 +02:00
AdrianLxM	6d90f79521	also cancel temp on disable loop plugin	2017-05-22 19:14:57 +02:00
AdrianLxM	448a420fad	cancel temp on suspend loop	2017-05-22 17:39:25 +02:00
Milos Kozak	85e6375026	make all getDao private	2017-05-22 12:52:19 +02:00
Milos Kozak	6004a17594	change database structures	2017-05-21 22:05:03 +02:00
Milos Kozak	3330c6a3fd	Merge branch 'dev' into history	2017-05-21 16:46:13 +02:00
Milos Kozak	462849af12	russian language entry	2017-05-21 10:06:34 +02:00
Milos Kozak	012b6a2c26	v 1.45	2017-05-20 20:42:10 +02:00
Milos Kozak	56d54a6988	italian language	2017-05-20 20:41:23 +02:00
Milos Kozak	6ee6eff759	fix objective 1	2017-05-19 14:15:21 +02:00
Milos Kozak	0a182fb022	v 1.44	2017-05-17 18:54:48 +02:00
Milos Kozak	3ec08ab10f	fix app crash	2017-05-16 20:02:09 +02:00
Milos Kozak	91fa355d8c	remove unneeded code	2017-05-16 18:51:31 +02:00
Milos Kozak	d0ae965054	fix basal rounding for v2	2017-05-16 18:02:58 +02:00
Milos Kozak	8452c42746	fix merge	2017-05-16 18:02:01 +02:00
Milos Kozak	8d2e7a34ae	same workaround for korean danar	2017-05-16 17:58:18 +02:00
Milos Kozak	a362c77afe	fix temp basal netRatio display	2017-05-16 17:57:18 +02:00
Milos Kozak	8c5ce7290d	more work on treatments fragment	2017-05-16 17:48:58 +02:00
AdrianLxM	44c3303e0e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline	2017-05-16 16:30:26 +02:00
AdrianLxM	3869b143c4	Workaround for DanaR truncation	2017-05-16 16:29:30 +02:00
Milos Kozak	3ee9bf5ff7	Merge branch 'dev' into history	2017-05-16 15:15:32 +02:00
Milos Kozak	1ad424a178	use Activity instead of FramgmentActivity	2017-05-16 15:15:28 +02:00
Milos Kozak	86c975e9d6	Add Italian language	2017-05-16 13:39:24 +02:00
Milos Kozak	45477f96ee	Merge pull request #243 from AdrianLxM/xdripstatusline ... basal and bolus step in DanaR Fragment	2017-05-16 13:28:39 +02:00
AdrianLxM	572e726678	basal and bolus step in DanaR Fragment	2017-05-16 13:10:02 +02:00
Milos Kozak	6fff6f63a4	bolus dialog redesign	2017-05-16 12:09:32 +02:00
Milos Kozak	4201709e2a	finish careportal dialog redesign	2017-05-16 11:47:33 +02:00
Milos Kozak	54758d08d8	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-05-16 09:47:23 +02:00
Milos Kozak	894923664e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history	2017-05-16 09:46:59 +02:00
Milos Kozak	fd62c572af	more treatments plugin tweaking	2017-05-16 09:46:09 +02:00
Milos Kozak	704ad383e9	careportal layout part1	2017-05-15 21:10:43 +02:00
Milos Kozak	25110cfea4	move database actions from pump to treatments plugin	2017-05-15 18:44:40 +02:00
Milos Kozak	85744548d8	typo in log	2017-05-14 11:48:59 +02:00
Milos Kozak	b1d9e647c6	Merge branch 'dev' into history	2017-05-12 23:14:07 +02:00
Milos Kozak	b19bf628b8	Merge pull request #241 from AdrianLxM/xdripstatusline ... Get correct calibration value if entered with (onboard) keyboard	2017-05-12 23:12:49 +02:00
Milos Kozak	6a6a02f212	Merge branch 'dev' into history	2017-05-12 23:04:39 +02:00
Milos Kozak	3f4cf57bbc	make all Spiners centered	2017-05-12 23:04:14 +02:00
Milos Kozak	7bbd2cff2d	consolidate DanaR code	2017-05-12 22:40:22 +02:00
Milos Kozak	d641b0edd9	move rest of PumpInterface to TreatmentInterface	2017-05-12 21:21:31 +02:00
Milos Kozak	52177cead1	move part of PumpInterface to TreatmentInterface	2017-05-12 21:07:29 +02:00
AdrianLxM	bb35f58eab	Get correct calibration value if entered with (onboard) keyboard	2017-05-12 18:31:52 +02:00
Milos Kozak	22bb49aa60	hide DanaRv2 constraints	2017-05-12 18:05:22 +02:00
Milos Kozak	863e6454eb	calculate iob based on insulin stored with treatment	2017-05-12 17:57:57 +02:00
Milos Kozak	9fc1d59bd0	allow to enforce Treatment plugin	2017-05-12 17:30:52 +02:00
Milos Kozak	c6830baf8f	Merge branch 'dev' into history	2017-05-12 16:35:07 +02:00
Milos Kozak	abdc1022bf	merge bolus & basal into one plugin	2017-05-12 16:27:33 +02:00
AdrianLxM	a60afbceb9	typo	2017-05-12 16:08:48 +02:00
AdrianLxM	a9e093ad0d	some German translations	2017-05-12 16:06:14 +02:00
AdrianLxM	c88b8eaa9a	make buttons scrollable for small heights	2017-05-12 15:26:16 +02:00
Milos Kozak	eddd8ac56d	Merge branch 'DanaRv2' into history	2017-05-12 13:06:05 +02:00
Milos Kozak	e005d6bd69	Merge branch 'dev' into history	2017-05-12 13:05:57 +02:00
Milos Kozak	831b45fac5	DanaRv2 mod7	2017-05-12 13:05:29 +02:00
Milos Kozak	df424ea5ff	overview buttons	2017-05-12 11:06:33 +02:00
Milos Kozak	19c23a3c02	Merge pull request #238 from AdrianLxM/xdripstatusline ... No permission to read statusline	2017-05-12 09:22:09 +02:00
AdrianLxM	7517ee4930	No permission to read statusline	2017-05-12 03:54:24 +02:00
Milos Kozak	b782a5b8dc	Merge branch 'dev' into history	2017-05-12 00:39:20 +02:00
Milos Kozak	be4aa1131e	Merge branch 'DanaRv2' into history	2017-05-12 00:39:08 +02:00
Milos Kozak	2610edae55	DanaRv2 Modify 6	2017-05-12 00:38:26 +02:00
Milos Kozak	a0d31b2118	rename identical functions	2017-05-11 18:54:50 +02:00
Radoslav Radev	d58ddf48c6	Update strings.xml	2017-05-11 17:01:49 +03:00
Milos Kozak	7e99ce416a	move buttons back to bottom	2017-05-11 10:59:05 +02:00
Milos Kozak	6b9048cd61	Merge pull request #234 from warstar2187/korean ... Korean translation update	2017-05-11 09:27:58 +02:00