4098 commits

Author	SHA1	Message	Date
Johannes Mockenhaupt	cb3b472488	VirtualPump: set PumpEnactResult.enacted. ... (cherry picked from commit ec49bc3)	2017-09-13 13:16:48 +02:00
Milos Kozak	e795a8cd99	Revert "Temp fix for not adding SMB boluses to treatments and IOB calculations" ... This reverts commit 87c993cde1	2017-09-13 07:05:47 +00:00
Roumen Georgiev	87c993cde1	Temp fix for not adding SMB boluses to treatments and IOB calculations	2017-09-13 06:49:48 +00: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
Roumen Georgiev	1a8edc8372	Update ConfigBuilderPlugin.java - Typo fix on line 598	2017-09-11 13:09:57 +00: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
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
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
Milos Kozak	addd6c8232	fix conflict	2017-08-28 19:15:33 +02:00
Johannes Mockenhaupt	381a26119b	Crap, don't enable experimental bolus by default.	2017-08-28 00:33:33 +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	95fda165a3	Merge fixes without changes to behaviour.	2017-08-27 18:49: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	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	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	9349662f8e	Rename ReadPumpStateCommand -> GetPumpStateCommand.	2017-08-27 18:05:04 +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	ba967df2e3	disable careportal buttons until profile is set	2017-08-27 11:44:39 +02:00
Milos Kozak	b02b1829ad	put back sensitivity plugins	2017-08-26 21:26:40 +02:00
Milos Kozak	3369ce1759	temporary remove untested plugin for release	2017-08-26 20:42:25 +02:00
Milos Kozak	adceef3641	fix merge conflict	2017-08-23 23:42:51 +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	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	01a93a35b9	Merge branch 'dev' into smb	2017-08-22 20:34:38 +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	e74c2b564a	fix conflicts	2017-08-22 20:25:10 +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
Milos Kozak	aad168c50f	visualize SMB	2017-08-21 17:42:26 +02:00
Milos Kozak	204c39880f	mark SMB boluses in treatments tab	2017-08-21 17:22:25 +02:00
Milos Kozak	4f16700dc0	provide lastBolusTime	2017-08-21 15:47:37 +02:00
Milos Kozak	ebfc4e3075	colored predictions	2017-08-21 15:36:52 +02:00
Milos Kozak	f5143b2ec4	display UAM prediction	2017-08-21 09:24:17 +02:00
Milos Kozak	ec114c3b38	execute SMB	2017-08-21 08:41:34 +02:00
Milos Kozak	466ba2907b	Merge branch 'dev' into smb	2017-08-20 21:53:19 +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	a18e2b4641	fix of fix :(	2017-08-20 19:42:41 +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
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
Milos Kozak	838deed1e8	Merge branch 'dev' into smb	2017-08-18 12:30:09 +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
Milos Kozak	a097bf51aa	minDeviationSlope 1st try	2017-08-17 23:37:59 +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
Milos Kozak	c36587430c	fix merge conflict	2017-08-17 21:24:50 +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
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
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	e5cc34b975	fix merge conflict	2017-08-16 18:38:14 +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
Milos Kozak	898e162300	initial work on SMB	2017-08-15 23:13:37 +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
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	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
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
Johannes Mockenhaupt	2f3d362240	Use SystemClock.sleep() instead of Thread.sleep() throughout.	2017-08-12 15:22:55 +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
AdrianLxM	f861546e12	Quickfix to avoid crashes after staleData merge	2017-08-12 11:20:56 +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
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
Milos Kozak	f703c82ca7	microbolus calculation	2017-08-10 17:28:41 +02:00
Timm Korte	e7249bf72e	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-10 11:13:21 +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
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	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	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	1604b85d34	Merge branch 'dev' into move-to-range-in-profile	2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt	8aabc346c0	Update ComboPlugin.cancelTempBasal to user newly added userRequested param.	2017-08-05 13:06:10 +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	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
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	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	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
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
Milos Kozak	668008e1c1	cancel current temp before activating superbolus	2017-07-31 19:53:09 +02:00
Sandra Keßler	14fdc14807	maybe better error recovery?	2017-07-31 12:59:03 +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
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
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
AdrianLxM	76c0b999ff	determine max possible tbr firstshot	2017-07-26 18:11:45 +02:00
Johannes Mockenhaupt	0516eacfe5	ConfigBuilder.applyAPSResult: log request rate.	2017-07-26 14:44:21 +02:00
AdrianLxM	5569b42ac3	wear wizard percentage	2017-07-26 09:58:51 +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	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	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
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	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
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	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	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	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	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
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
Johannes Mockenhaupt	fdc0aea24b	Let CircadianPercentageProfileFragment inherit from SubscriberFragment.	2017-07-21 14:56:14 +02: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	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	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	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	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
AdrianLxM	76990b7983	synchronize interval access	2017-07-19 17:39:55 +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	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	825a87f474	Use OpenAPS-requested duration for TBRs.	2017-07-18 23:57:48 +02:00
AdrianLxM	c753873769	setting to disable local broadcasts in NSClient	2017-07-18 22:15:17 +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	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	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	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	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	6faa1614ac	ComboFragment: rename Update Button to Refresh.	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	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	d619796019	Improving pump status in the UI (combo tab)	2017-07-18 21:20:40 +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	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	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	69b98c54c6	Polish.	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	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	77711b2174	ComboPlugin.runCommand: wait if pump is busy with a 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	30fc385970	Apply pump specific modifications to OpenAPS suggestion in ComboPlugin.	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	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	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	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	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	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	7cb0268afc	Disconnect after issuing comand to Combo.	2017-07-18 20:55:47 +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
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
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
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	d61d35fa82	move class to correct place	2017-07-07 18:37:15 +02:00
Milos Kozak	8de7e05dd5	weightedaverage sensitivity	2017-07-07 15:08:21 +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	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	09e5fdc61b	sensitivity prefs cleanup	2017-06-30 11:56:36 +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	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	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	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	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	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	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	559e07904c	remove unneeded call	2017-05-26 10:31:05 +02:00
Milos Kozak	650b792099	mark selected tab in treatments	2017-05-26 10:05:42 +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
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	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	6ee6eff759	fix objective 1	2017-05-19 14:15:21 +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	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	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	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
Milos Kozak	72f3efc39a	disable danarv2 temporary	2017-05-10 21:58:46 +02:00
Milos Kozak	51d52f6b3d	Merge branch 'DanaRv2' into history	2017-05-10 21:53:31 +02:00
Milos Kozak	15127dc4c6	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-05-10 21:37:42 +02:00
Milos Kozak	878e3e0921	use SP	2017-05-10 21:37:34 +02:00
AdrianLxM	201d2df16b	cleanup imports	2017-05-10 16:37:11 +02:00
AdrianLxM	b247b81428	use helper class to query settings	2017-05-10 16:33:41 +02:00
Milos Kozak	5b25d28f42	Merge branch 'dev' into DanaRv2	2017-05-10 14:05:43 +02:00
Milos Kozak	23fd6a6c44	overlappingintervals	2017-05-10 14:00:46 +02:00
AdrianLxM	fc85deb62d	move evaluation of always_use_shortavg setting to the OAPS plugins ... For the overview and the watch we still may use the standard delta, even if this setting is enabled. (Also good to check that it is the same as in xDrip e.g.)	2017-05-10 01:18:27 +02:00
AdrianLxM	298d7a7d9c	Merge branch 'dev' into xdripstatusline	2017-05-09 23:26:31 +02:00
AdrianLxM	1fa3a2a697	bgi on watch status (optional)	2017-05-09 23:23:37 +02:00
Milos Kozak	77181f6f7f	Handle exceptions in StatusLinePlugin	2017-05-09 21:32:24 +02:00
Milos Kozak	cd16b71759	upload OpenAPS Offline	2017-05-09 21:29:08 +02:00
Milos Kozak	d313df0d19	removing treatments	2017-05-09 20:47:02 +02:00
Milos Kozak	d781c69b94	invalidate autosens on new profile	2017-05-09 16:51:08 +02:00
Milos Kozak	09fea02ed2	Allow to disable NS upload while client is connected	2017-05-09 16:24:53 +02:00
Milos Kozak	ee16fabdfc	DanaRv2 modify 3	2017-05-09 15:53:11 +02:00
Milos Kozak	b30d79c4cb	fix conflicts	2017-05-09 10:46:04 +02:00
Milos Kozak	0048366dcf	fix conflict	2017-05-09 10:14:21 +02:00
Milos Kozak	6e5d3635c8	using bolus amount from history if comm is interrupted	2017-05-08 23:13:43 +02:00
AdrianLxM	63b9a06431	Send empty status to xDrip when disabled. Send status immediately when enabling plugin.	2017-05-08 16:34:45 +02:00
AdrianLxM	da0334eb19	xdrip statusline reformat	2017-05-08 16:23:59 +02:00
AdrianLxM	67f21537ea	send status to xDrip	2017-05-06 15:18:19 +02:00
Milos Kozak	14a56842ee	allow to change x axis scale	2017-05-04 23:51:04 +02:00
Milos Kozak	05d9f16031	hide label too	2017-05-04 23:22:16 +02:00
Milos Kozak	bd0ff991dd	remember graph settings fix	2017-05-04 21:33:26 +02:00
Milos Kozak	645bcdbb8a	deviations < 2 as equal	2017-05-04 21:09:17 +02:00
Milos Kozak	db5dcc0064	different color for carbs deviations	2017-05-04 20:40:43 +02:00
Milos Kozak	aabcee8ea7	fix conflicts	2017-05-04 19:53:45 +02:00
Milos Kozak	352a2a7475	deviations graph	2017-05-04 19:51:58 +02:00
Milos Kozak	070867af28	menu on top	2017-05-04 19:13:56 +02:00
Milos Kozak	a83ff12ca8	remove unneeded code	2017-05-04 16:30:01 +02:00
Milos Kozak	d145ef907f	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-05-04 15:25:48 +02:00
Milos Kozak	194fd7f0a6	check for null	2017-05-04 15:25:41 +02:00
Milos Kozak	10d5b914f3	check for finished activity	2017-05-03 18:37:00 +02:00
Milos Kozak	573256d7d4	catch missing sms permission	2017-05-03 18:30:18 +02:00
Milos Kozak	37edc19509	check for null	2017-05-03 18:23:33 +02:00
Milos Kozak	037bb09d23	check for null	2017-05-03 18:15:10 +02:00
Milos Kozak	b80c382512	fix exception in sms comm	2017-05-02 22:49:17 +02:00
Milos Kozak	602310b70a	DanaRv2 1st rev	2017-05-02 17:02:30 +02:00
Milos Kozak	34f83e6b09	fix null pointer exception	2017-05-01 09:18:10 +02:00
Milos Kozak	2fabee85b4	Merge pull request #229 from AdrianLxM/adridev3 ... adaptions to small screen	2017-04-30 22:20:21 +02:00
AdrianLxM	0069f320f8	config builder smallscreen	2017-04-30 21:57:55 +02:00
AdrianLxM	5dc07012d2	overview smallscreen	2017-04-30 21:34:30 +02:00
Milos Kozak	9ff714ea2d	try to fix cob graph	2017-04-30 21:27:40 +02:00
Milos Kozak	0f1c2bb193	DanaRv2 1st rev	2017-04-30 21:08:00 +02:00
Milos Kozak	2cb6e275c0	allign design of status pills	2017-04-30 13:17:59 +02:00
Milos Kozak	76993e17e5	handle calculation properly when historical data changed	2017-04-30 10:23:26 +02:00
Milos Kozak	4dd9281276	remove actionbar	2017-04-29 20:16:50 +02:00
Milos Kozak	66d011665d	configbuilder UI improvement	2017-04-29 16:59:44 +02:00
Milos Kozak	686d6635d3	remove unused code	2017-04-29 15:27:24 +02:00
Milos Kozak	3add216584	more work on autosens	2017-04-29 09:04:25 +02:00
Milos Kozak	5fe3c50171	copy paste bug	2017-04-28 08:27:05 +02:00
Milos Kozak	3552d6aa40	bg value colored	2017-04-27 21:26:53 +02:00
Milos Kozak	0aad00808c	fix temp basal iob calculation	2017-04-27 20:22:04 +02:00
Milos Kozak	5ef034b4fc	cob display	2017-04-26 23:45:40 +02:00
Milos Kozak	638f6bc291	IobCobCalculationPlugin	2017-04-25 16:37:27 +02:00
Milos Kozak	0232229020	fix history iob calculation	2017-04-25 10:48:30 +02:00
Milos Kozak	5a3eb0cc25	refresh on context menu	2017-04-24 22:17:45 +02:00
Milos Kozak	7d328f0676	do not trigger refresh too many times	2017-04-24 21:15:27 +02:00
Milos Kozak	7534f54f19	trend in wizard off by default	2017-04-24 19:24:53 +02:00
Milos Kozak	935a9366d9	fix cob in wizard	2017-04-24 17:46:20 +02:00
Milos Kozak	a20e49669a	fix graph library bug	2017-04-24 16:04:31 +02:00
Milos Kozak	0942ffe0fa	fix iob rendering 2	2017-04-24 14:18:54 +02:00
Milos Kozak	80305aae3a	fix iob rendering	2017-04-24 13:24:16 +02:00
Milos Kozak	a07a8755b1	IOB graph	2017-04-24 13:17:14 +02:00
Milos Kozak	1a474f7983	grid gray	2017-04-23 21:14:42 +02:00
Milos Kozak	b8a8bed6c5	remove butterknife at all, remove unused code, overview graph optimalization	2017-04-23 13:45:49 +02:00
Milos Kozak	66c05d8a08	remove butterknife from overview	2017-04-23 10:55:07 +02:00
Milos Kozak	2ce08260bf	do not calculate autosens when no bg data available	2017-04-23 09:47:27 +02:00
Milos Kozak	1a76809f33	more checking for null	2017-04-22 11:27:56 +02:00
Milos Kozak	1f2967e866	superbolus must be explicitly enabled	2017-04-22 11:08:57 +02:00
Milos Kozak	20f99dffe2	basals rendering redesign	2017-04-22 10:09:54 +02:00
Milos Kozak	a8146da8a8	target range with background color	2017-04-21 23:06:54 +02:00
Milos Kozak	2077b5e081	android support library bug workaround	2017-04-21 18:56:48 +02:00
Milos Kozak	55a2df470e	insulin activity graph	2017-04-21 18:34:40 +02:00
Milos Kozak	7f122f7497	show dia in insulin plugin	2017-04-21 16:13:53 +02:00
Milos Kozak	90a55966b1	Fast Acting Insulin Prolonged	2017-04-21 15:36:49 +02:00
Milos Kozak	17771434aa	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00
Milos Kozak	25491fbac6	Insulin interface	2017-04-21 11:45:25 +02:00
Milos Kozak	04ae55ac63	exit app after import settings	2017-04-16 13:27:01 +02:00
Milos Kozak	781aa6e657	check for null	2017-04-14 16:10:20 +02:00
Milos Kozak	7aa2aa4d24	give some time to service to start in UploadQueue	2017-04-14 16:00:21 +02:00
Milos Kozak	a5d10708e6	check for null in calibration dialog	2017-04-14 15:54:07 +02:00
Milos Kozak	402768cb87	1.33 app start logging optional	2017-04-14 15:33:39 +02:00
Milos Kozak	2413fae0a9	1.32 superbolus & trend contribution in wizard	2017-04-14 14:50:18 +02:00
Milos Kozak	d41d5f9e6b	loop context menu fix	2017-04-08 20:13:30 +02:00
Milos Kozak	c5245ae5fd	SMS suspend/resume loop	2017-04-06 21:22:27 +02:00
Milos Kozak	a02da220c9	CS translations	2017-04-05 22:04:55 +02:00
Milos Kozak	f596050239	loop suspend menu	2017-04-05 21:39:39 +02:00
Milos Kozak	42883a81a0	allow return GlucoseStatus with only 1 actual value	2017-04-04 10:29:46 +02:00
Milos Kozak	e5012d8633	Answers for SMS commands	2017-04-04 10:03:15 +02:00
Milos Kozak	d6f31820d9	request battery optimalization whitelisting	2017-03-31 09:21:40 +02:00
Milos Kozak	fe6ff686b1	fix pump suspended message	2017-03-27 18:37:43 +02:00
Milos Kozak	dc45d01120	changle loading initial status	2017-03-24 23:03:55 +01:00
Milos Kozak	b6016dc084	objective 0 zero days duration	2017-03-24 12:31:28 +01:00
Milos Kozak	c78adb6256	suspended status for korean pump	2017-03-24 12:22:36 +01:00
Milos Kozak	a4f302ee4a	show if pump is suspended	2017-03-24 12:05:12 +01:00
Milos Kozak	32fda0f0df	fix upload virtual pump status	2017-03-23 10:48:49 +01:00
Milos Kozak	8b357ac49e	fix null pointer exception	2017-03-23 10:12:36 +01:00
Milos Kozak	a5b59d5092	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-03-23 10:09:55 +01:00
Milos Kozak	e8edf9eb54	Glimp support	2017-03-21 19:11:39 +01:00
Milos Kozak	f528f1cd83	fix reading glimp bg data	2017-03-18 23:35:43 +01:00
Milos Kozak	7f4db28c41	add sound	2017-03-10 10:42:12 +01:00
Milos Kozak	48d30f2da3	toast out of memory	2017-03-09 22:24:57 +01:00
Milos Kozak	86a7699d8f	copy/paste mistake	2017-03-09 16:34:08 +01:00
Milos Kozak	aa46479cdb	unneeded else	2017-03-09 11:00:29 +01:00
Milos Kozak	96427cf3dc	use onAttach for context in CalibrationDialog	2017-03-09 10:59:11 +01:00
Milos Kozak	7c6d708d06	use onAttach for context in WizardDialog	2017-03-09 10:57:20 +01:00
Milos Kozak	2c2d837079	fix null pointer exception	2017-03-09 10:20:38 +01:00
Milos Kozak	52aa7c1bf8	fix null pointer exception	2017-03-09 09:57:24 +01:00
Milos Kozak	151baa2fb5	enable nsclient internal by default	2017-03-07 11:07:56 +01:00
Milos Kozak	be26db356d	another fix	2017-03-06 18:53:43 +01:00
Milos Kozak	af8e485250	log SafeParse	2017-03-05 20:12:30 +01:00
Milos Kozak	9843f139ad	fixed bugs in autosens	2017-03-05 15:22:35 +01:00
Milos Kozak	9e05c86284	Log hours in sensitivity	2017-03-05 12:12:28 +01:00
Milos Kozak	2af1ab6ac4	more Answers to user actions	2017-03-03 21:12:59 +01:00
Milos Kozak	ebf4697150	log app start	2017-03-02 23:25:55 +01:00
Milos Kozak	79d282d215	add answers	2017-03-02 23:08:40 +01:00
Milos Kozak	5a45bd3751	remove sample data	2017-03-02 21:17:24 +01:00
Milos Kozak	3d521eb75c	nsclient: try to send data immediately	2017-03-02 20:59:18 +01:00
Milos Kozak	d841ff5098	prevent null pointer exception	2017-03-02 20:40:09 +01:00
Milos Kozak	73fbac1bae	fix crash	2017-03-02 20:33:46 +01:00
Milos Kozak	6ecaad7d69	make sure service is running	2017-03-02 20:19:35 +01:00
Milos Kozak	d4070cf99a	check for null	2017-03-01 19:14:42 +01:00
Milos Kozak	9e03087a77	nsclient tweaking	2017-02-28 14:36:44 +01:00
Milos Kozak	a9d8f3f806	queue in db	2017-02-24 13:02:44 +01:00
Milos Kozak	e25fb9845d	hide unneeded labels in nsclient mode	2017-02-23 23:32:26 +01:00
Milos Kozak	ade45d5b4c	hide unlock button if not needed	2017-02-23 23:13:38 +01:00
Milos Kozak	b0c828c93e	nsclient build variant	2017-02-23 20:00:33 +01:00
Milos Kozak	15d6de4701	age from product flavor to prefs	2017-02-22 20:29:41 +01:00
Milos Kozak	d9225ccc8a	fix null object reference	2017-02-22 15:23:16 +01:00
Milos Kozak	87ad140eb5	SMS logging and resource refactor	2017-02-22 14:11:05 +01:00
Milos Kozak	666874c6c4	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-02-22 13:54:50 +01:00
Milos Kozak	efc1988374	uploader battery fix	2017-02-21 14:12:28 +01:00
Milos Kozak	4b6276c0b1	uploader battery always in json	2017-02-21 13:45:33 +01:00
Milos Kozak	2e0f6e8914	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-02-21 13:33:59 +01:00
Milos Kozak	a508b0bbc5	do not postpone status upload	2017-02-21 13:33:52 +01:00
Milos Kozak	615af399f8	remove ping me	2017-02-21 11:17:46 +01:00
Milos Kozak	99b66ab393	connect counter	2017-02-21 10:36:29 +01:00
Milos Kozak	3f84a63213	add delta sign	2017-02-21 10:00:44 +01:00
Milos Kozak	34ed92f8aa	fix displaying delta when not available	2017-02-21 10:00:08 +01:00
AdrianLxM	98edfc57e0	dismiss bolus progress via events	2017-02-20 14:49:38 +01:00
Milos Kozak	6200584268	hours to fetch fixed	2017-02-20 09:46:55 +01:00
Milos Kozak	352902438c	Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient	2017-02-20 08:32:25 +01:00
Milos Kozak	d84632a8a4	uploader battery in device status	2017-02-20 08:32:10 +01:00
Milos Kozak	9ea19fff9b	detect last received date	2017-02-19 23:41:42 +01:00
Milos Kozak	3b1b732d8f	nclient log collection	2017-02-19 20:56:12 +01:00
Milos Kozak	c9a6a44e4b	adjust upload timing	2017-02-19 20:48:10 +01:00
Milos Kozak	d030427b0f	adjust devicestatus upload	2017-02-19 20:41:20 +01:00
Milos Kozak	5f4eb1e4c4	pump status tweaking	2017-02-19 19:15:14 +01:00
Milos Kozak	de124b8e3e	Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient	2017-02-19 09:42:28 +01:00
Milos Kozak	9303bd61fd	Merge branch 'dev' into nsclient	2017-02-19 09:41:16 +01:00
Milos Kozak	a2eb76a8b8	handle if bolus progress is not sent	2017-02-19 00:06:29 +01:00
Milos Kozak	e0a9a7ae81	fix carbs logging in driver	2017-02-18 23:12:45 +01:00
AdrianLxM	abaafb87eb	wear show on status when loop is disabled	2017-02-18 18:52:09 +01:00
AdrianLxM	d113d39916	wear setting to show detailed IOB	2017-02-18 18:13:13 +01:00
Milos Kozak	5d795fbe33	Merge branch 'dev' into nsclient	2017-02-17 22:26:02 +01:00
Milos Kozak	29b4f0063b	better handling readonly permission	2017-02-17 22:12:35 +01:00
Milos Kozak	f33ccf278b	dbupdate/remove, saving queue	2017-02-17 21:24:30 +01:00
Milos Kozak	14e37246c2	nsclient gui and pausing tweaking	2017-02-17 18:14:33 +01:00
Milos Kozak	31364ff07b	ignore dbaccess if nsclient not enabled	2017-02-17 16:41:28 +01:00
Milos Kozak	8a374f1b35	Shared preferences cleanup	2017-02-17 16:16:20 +01:00
Milos Kozak	3216ff636a	preference keys to strings	2017-02-17 13:43:17 +01:00
Milos Kozak	71112a90e2	internal nsclient	2017-02-17 13:18:36 +01:00
LadyViktoria	92cd31a0b6	fix key for openapsama_current_basal_safety_multiplier	2017-02-15 14:42:59 +01:00
LadyViktoria	16555347e8	fix key for openapsama_current_basal_safety_multiplier	2017-02-15 13:21:38 +01:00
Milos Kozak	dda95dc275	allow to remove treatments from GUI	2017-02-14 21:13:13 +01:00
Milos Kozak	a75c62be35	show notification when aproaching daily limit	2017-02-14 19:47:45 +01:00
Milos Kozak	2e4aec9916	settings password protected	2017-02-14 19:16:34 +01:00
Milos Kozak	5992413cf9	disable quickwizard with if bg is old	2017-02-14 15:50:24 +01:00
Milos Kozak	8001796f4b	virtual pump status upload optional	2017-02-14 15:41:30 +01:00
Milos Kozak	e00045155e	prefill bg value in careportal dialog	2017-02-14 15:09:22 +01:00
Milos Kozak	f9ee3c547a	translations	2017-02-13 21:05:57 +01:00
Milos Kozak	e3edf5cce5	calculate cob 1.5 * DIA to the past	2017-02-13 19:35:01 +01:00
Milos Kozak	c6b3fe9883	Merge pull request #178 from AdrianLxM/wear-bolus5 ... Wear Bolus	2017-02-13 18:13:36 +01:00
Milos Kozak	c31795d2e6	adjust devicestatus upload timings	2017-02-13 17:47:58 +01:00
AdrianLxM	05d40e4af0	wear better toasts	2017-02-13 14:18:23 +01:00
AdrianLxM	665f662f3a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2	2017-02-13 02:18:32 +01:00
AdrianLxM	5ce9d257e8	pump shortStatus String in interface	2017-02-13 02:18:25 +01:00
AdrianLxM	e85e651c56	wear full status support and product flavour with/without controls on wear	2017-02-13 01:55:35 +01:00
AdrianLxM	6fcee9ea3f	pump shortStatus String in interface	2017-02-13 00:15:02 +01:00
Milos Kozak	e003ef8368	Merge pull request #175 from LadyViktoria/dev ... use validation lib in cpp - layout fixes & longer snackbar duration	2017-02-12 22:29:20 +01:00
Milos Kozak	1f3aee091e	manual invoke of loop in separate thread	2017-02-12 22:02:42 +01:00
viktoria	ba254f8829	Merged branch dev into dev	2017-02-12 20:01:25 +01:00
viktoria	0d02f42714	use validation lib in cpp - layout fixes & longer snackbar duration	2017-02-12 19:51:56 +01:00
Milos Kozak	4e3cc65d5d	handling pump suspend, show pump actions on overview	2017-02-12 19:51:13 +01:00
AdrianLxM	c0b287ba00	wear target statusO	2017-02-12 17:32:53 +01:00
AdrianLxM	1f5dd4750a	CPP dismiss info when focus is lost	2017-02-11 22:20:29 +01:00
AdrianLxM	6c5028b4be	CPP dismiss info when focus is lost	2017-02-11 22:18:28 +01:00
AdrianLxM	104c146b2f	Merge pull request #63 from AdrianLxM/patch-16 ... LadyViktoria validation lib plus safety	2017-02-11 21:12:22 +01:00
AdrianLxM	e4c529fa1f	reenable safety function	2017-02-11 19:59:20 +01:00
AdrianLxM	d9103b6823	wear wizard confirm reformat, connection stability, prime not in menu per default	2017-02-11 19:51:33 +01:00
AdrianLxM	6cb192b876	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5	2017-02-11 18:09:22 +01:00
AdrianLxM	b57253af5e	wear add carbs to bolus-wizard confirmation	2017-02-11 17:54:47 +01:00
viktoria	06ee59b42c	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev' ... Conflicts: app/build.gradle	2017-02-11 16:06:37 +01:00
Milos Kozak	e1341e79bf	Merge pull request #161 from warstar2187/master ... Fix ExtendedBolusStep	2017-02-11 16:03:31 +01:00
viktoria	56f15a3cf7	Deprecation DataBaseHelper - use Long for .limit	2017-02-11 14:33:22 +01:00
Milos Kozak	c5081c378b	Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats ... Deprecation DanaR Stats	2017-02-11 14:23:45 +01:00
viktoria	0ffddcdefa	Deprecation TimeListEdit - add design support libraries	2017-02-11 14:01:37 +01:00
viktoria	a4591af392	Deprecation colors	2017-02-11 14:00:44 +01:00
viktoria	1217c22b43	Deprecation DanaR Stats	2017-02-11 13:44:43 +01:00
AdrianLxM	5ea7913a41	wear actionstringhandler use correct actualBG()	2017-02-11 02:58:22 +01:00
AdrianLxM	638b9c263c	Merge pull request #61 from MilosKozak/dev ... Dev	2017-02-11 02:55:14 +01:00
viktoria	580a296177	use validation lib in cpp - small changes	2017-02-11 00:47:14 +01:00
AdrianLxM	9dae8b4e56	wear don't enact 0carbs/0bolus on wizard result	2017-02-11 00:32:45 +01:00
viktoria	7877235972	Merged branch dev into dev	2017-02-11 00:16:55 +01:00
viktoria	279c67bb70	use validation lib in cpp - add snackbar	2017-02-11 00:16:25 +01:00
Milos Kozak	1e4fa1b93e	fix not enacting extended	2017-02-10 21:45:46 +01:00
Milos Kozak	2e40c7b605	sms calibrations	2017-02-10 21:20:55 +01:00
LadyViktoria	49e08f3357	use validation lib in cpp - add counter	2017-02-10 18:00:10 +01:00
LadyViktoria	e0627bd815	use validation lib in cpp - add a timer	2017-02-10 17:39:09 +01:00
LadyViktoria	48a158b036	use validation lib in cpp - better event handling	2017-02-10 17:29:59 +01:00
Milos Kozak	83667be8cc	extract sending intent to a function	2017-02-10 17:25:32 +01:00
Milos Kozak	8db3f258cd	xdrip calibration	2017-02-10 16:53:39 +01:00
LadyViktoria	11d0f1aebf	better keyboard handling in fragments	2017-02-10 14:24:56 +01:00
warstar2187	9458e0effa	Update DanaRKoreanPlugin.java	2017-02-10 20:59:44 +09:00
warstar2187	61f1acdcb0	Update DanaRPlugin.java	2017-02-10 20:59:06 +09:00
AdrianLxM	384e36a1f3	wear remove bolus enaction for testing	2017-02-10 12:52:54 +01:00
LadyViktoria	80de9c0cd8	use validation lib in cpp	2017-02-10 11:34:05 +01:00
AdrianLxM	4220d7712a	wear wizard working	2017-02-10 06:07:31 +01:00
AdrianLxM	9785d507a8	wear temp targets working	2017-02-10 02:36:38 +01:00
AdrianLxM	8ece312b6a	Merge pull request #60 from MilosKozak/dev ... Dev	2017-02-09 23:47:12 +01:00
AdrianLxM	aff82642af	wear multiple watch situation and disable fillbolus for wider testing	2017-02-09 23:39:23 +01:00
Milos Kozak	90061c6f25	Show log	2017-02-09 22:29:21 +01:00
AdrianLxM	3ff41af939	wear bolus activity and refactoring	2017-02-09 20:54:41 +01:00
Milos Kozak	ed7dd48612	remove TODOs	2017-02-09 20:18:22 +01:00
AdrianLxM	dc476a6600	wear menu restructuring and status	2017-02-09 17:40:26 +01:00
Milos Kozak	8a2846c516	Merge branch 'dev' into dev	2017-02-09 17:01:05 +01:00
Milos Kozak	9e9637d70b	accept temp button visible only if loop selected	2017-02-09 16:51:14 +01:00
Milos Kozak	3aff89acdc	fix not attached to activity in bolus progress dialog	2017-02-09 16:45:54 +01:00
Milos Kozak	806cc4a3a7	fix nullpointerexception in reading temp basal status	2017-02-09 16:43:27 +01:00
Milos Kozak	a39416d876	fix nullpointerexception in reading temp basal status	2017-02-09 16:39:07 +01:00
Milos Kozak	caa109dbfd	use SafeParse in DanaRStartsActivity	2017-02-09 16:32:44 +01:00
Milos Kozak	b9b08c1528	fix crash when pump status not loaded yet	2017-02-09 16:29:02 +01:00
Milos Kozak	3d3e849d8a	fix null pointer exception in persistentnotification	2017-02-09 16:23:28 +01:00
AdrianLxM	b8c3fe2933	wear wizard including bg and iob toggles	2017-02-09 16:16:31 +01:00
Milos Kozak	7f123e4208	warn on wrong entered sms phone number	2017-02-09 16:14:09 +01:00
Milos Kozak	c015862239	fix crash: not attached to Activity	2017-02-09 16:04:57 +01:00
LadyViktoria	7fc6de17c1	Add prefernces.json changes 2	2017-02-09 10:41:02 +01:00
LadyViktoria	886c1ea359	Add prefernces.json changes	2017-02-09 09:36:51 +01:00
AdrianLxM	bf7a96b3e7	bolus progress dialog without activity context	2017-02-09 03:15:13 +01:00
AdrianLxM	74107f58fe	wear first fill bolus working	2017-02-09 01:53:28 +01:00
viktoria	0bf51710d1	Merged branch dev into dev	2017-02-08 21:23:47 +01:00
Milos Kozak	698ab31d71	show temp targets only if APS enabled in config	2017-02-08 21:04:26 +01:00
Milos Kozak	a43677e4b0	fix pumpcontrol build crash	2017-02-08 20:36:30 +01:00
AdrianLxM	d2d0d4b51a	wear confirm roundtrip working	2017-02-08 15:15:22 +01:00
AdrianLxM	8e9d73e3a3	wear sending confirmation requests	2017-02-08 11:53:26 +01:00
AdrianLxM	20d32d042f	wear bolusprogress cleanup	2017-02-07 12:08:13 +01:00
AdrianLxM	e261fa3ec8	wear re-disable fill bolus for virtual pump	2017-02-07 12:02:02 +01:00
AdrianLxM	650111d1b7	wear event for bolus requests to show card early on	2017-02-07 11:09:16 +01:00
AdrianLxM	f4b553fe52	Wear added bolusprogress and dismiss when finished	2017-02-07 09:17:19 +01:00
AdrianLxM	8c37809751	Wear cancel bolus via content intent to progress card	2017-02-06 19:35:27 +01:00
AdrianLxM	7ec3ff2a17	Wear bolus progress as card	2017-02-06 16:52:39 +01:00
AdrianLxM	379e3f8ab1	rounding minutesago instead of truncating it	2017-02-05 02:18:13 +01:00
viktoria	b0a9d74b49	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev' ... Conflicts: app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java app/src/main/res/values/strings.xml	2017-02-02 19:00:17 +01:00
AdrianLxM	bd75015a58	Correct error for tempbasals	2017-02-01 14:38:55 +01:00
Milos Kozak	78fb6f934e	measure execution time of every part	2017-01-31 09:52:33 +01:00
Milos Kozak	1b2500dc6c	calculate only needed data in AMA	2017-01-31 09:40:05 +01:00
Milos Kozak	9722130299	move all treatments db actions to DatabaseHelper	2017-01-30 20:00:46 +01:00
Milos Kozak	8d0c1dcacf	do not calculate autosens for MA	2017-01-30 15:19:50 +01:00
Milos Kozak	d98c6b125e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-01-30 14:31:15 +01:00
Milos Kozak	607ac8b897	AMA execution time	2017-01-30 14:30:46 +01:00
AdrianLxM	dce0c378b9	round durations	2017-01-30 05:02:49 +01:00
AdrianLxM	9f74b0083b	Add minutesrunning in determine-basal Adapter	2017-01-30 04:25:03 +01:00
Milos Kozak	179511a833	fix conflicts	2017-01-29 22:41:01 +01:00
Milos Kozak	907de4da7b	execution profiler	2017-01-29 22:37:25 +01:00
Milos Kozak	762b561abb	CS translations	2017-01-29 21:15:05 +01:00
Milos Kozak	d6a22be184	remove absorption rate from everywhere	2017-01-29 20:19:02 +01:00
Milos Kozak	4e14865054	remove unneeded carbs_hr from AMA	2017-01-29 19:29:26 +01:00
Milos Kozak	331598b7fa	display danar profile preferences only if selected	2017-01-29 19:22:49 +01:00
Milos Kozak	e608bf4095	fix profile test in keep alive & korean driver switching	2017-01-29 19:17:28 +01:00
Milos Kozak	3a17ed19c4	prevent null pointer exception	2017-01-29 18:48:42 +01:00
Milos Kozak	ed29302547	status outdated first	2017-01-29 11:24:11 +01:00
Milos Kozak	c48e147a68	remove forgotten code	2017-01-29 11:21:15 +01:00
Milos Kozak	55f99ee28e	connect when outdated basal	2017-01-29 11:11:07 +01:00
Milos Kozak	3f90ad6a5c	sync profile to pump	2017-01-28 23:45:14 +01:00
viktoria	c64d45b758	Merged MilosKozak/dev into dev ... Conflicts: app/src/main/res/values/strings.xml	2017-01-28 22:35:54 +01:00
Milos Kozak	b9b9e21dcb	fix merge conflicts	2017-01-28 21:37:51 +01:00
Milos Kozak	926a26a724	the same for korean danar	2017-01-28 21:17:27 +01:00
Milos Kozak	538e8fd2fa	better detect & display old pump firmware	2017-01-28 20:48:32 +01:00
AdrianLxM	4ced11819c	fix autosens ... bgi's most of the time where 0 or got truncated to full integers. Example from tonight: autosens result factor from 1.0 before and 1.09 after this.	2017-01-28 01:20:36 +01:00
LadyViktoria	24e6f42ac2	Merged branch dev into dev	2017-01-27 09:11:45 +01:00
Milos Kozak	1e8defb884	Merge pull request #144 from AdrianLxM/deltasx ... remove round-basal.js	2017-01-26 22:43:57 +01:00
viktoria	3fcf52aa02	Merged MilosKozak/dev into dev	2017-01-26 18:39:30 +01:00
Milos Kozak	08880b8032	Merge branch 'master' into dev	2017-01-26 18:31:31 +01:00
Milos Kozak	e78de8b622	fix static func	2017-01-26 18:27:09 +01:00
Milos Kozak	0c289bfb6e	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2017-01-26 18:23:47 +01:00
Milos Kozak	87ba28136a	log new firmware pump	2017-01-26 18:23:30 +01:00
Milos Kozak	72fc4ec096	Merge branch 'master' into dev	2017-01-26 17:00:10 +01:00
Milos Kozak	750cea7bcf	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2017-01-26 16:57:11 +01:00
Milos Kozak	5c5468b55b	use minimal basal rate from description	2017-01-26 16:56:29 +01:00
LadyViktoria	1d2f98abf4	Add prefernces.json remove openapsama_skip_neutral_temps	2017-01-26 15:32:44 +01:00
LadyViktoria	0ddc26ce89	Add prefernces.json small import fixes	2017-01-26 12:10:50 +01:00
LadyViktoria	4702a87d8e	Add prefernces.json add safety limits	2017-01-26 12:07:25 +01:00
viktoria	c01488e7a9	Add prefernces.json switch to SafeParse	2017-01-25 20:19:00 +01:00
LadyViktoria	2a0968eba9	Add prefences.Json show summary	2017-01-25 20:17:16 +01:00
AdrianLxM	b588211658	prevent nullpointer exception when BG <39	2017-01-25 15:37:05 +01:00
LadyViktoria	b898fc044e	Add prefernces.json to advanced settings	2017-01-25 15:18:01 +01:00
AdrianLxM	1328c32bb8	remove duplicate setTempBasal function declaration	2017-01-25 13:18:54 +01:00
AdrianLxM	805f23fe59	directly pass round-basal to V8	2017-01-25 10:02:35 +01:00
AdrianLxM	950b638e50	Advanced Settings	2017-01-24 10:28:42 +01:00
AdrianLxM	3a43858948	Settings for deltas	2017-01-24 02:21:25 +01:00
Milos Kozak	df0af4da94	fix uploading profile	2017-01-23 15:56:32 +01:00
Milos Kozak	750ac19b41	upload data for temp target only if needed	2017-01-23 14:47:14 +01:00
Milos Kozak	22f9817f8e	upload cpp setting to NS	2017-01-23 09:31:14 +01:00
Milos Kozak	ceaf4f7f78	Merge branch 'dev' into adjusttargetsse	2017-01-22 11:30:59 +01:00
AdrianLxM	f418152059	sorten tab titles active	2017-01-21 23:48:05 +01:00
AdrianLxM	ea78dd5bc1	Shorten tabs first	2017-01-21 19:44:58 +01:00
Milos Kozak	404a4de916	Merge pull request #136 from AdrianLxM/adjusttargetsse ... Preference Switches for Autosens	2017-01-21 11:22:34 +01:00
Milos Kozak	53f9b30b3e	temp target display update	2017-01-21 11:22:03 +01:00
AdrianLxM	50b7e619fc	Preference switches for Autosens	2017-01-21 01:35:15 +01:00
Milos Kozak	ea37d9eaa8	Merge pull request #131 from AdrianLxM/tempt-pill ... Tempt pill	2017-01-21 00:11:07 +01:00
viktoria	5a09c3df70	DanaR Stats Korean react on touch elsewwhere	2017-01-20 22:43:02 +01:00
AdrianLxM	377a55c69f	DanaR Stats react on touch elsewhere	2017-01-20 20:47:31 +01:00
viktoria	33bb7d80a6	DanaR Stats small fixes and move Listeners	2017-01-20 16:45:01 +01:00
viktoria	722976f6b0	DanaR Stats beautify layout and add some listeners	2017-01-20 14:51:16 +01:00
viktoria	d2acad1942	Korean DanaR Stats some improvements	2017-01-20 03:19:17 +01:00
viktoria	2d966c9feb	DanaR Stats some improvements	2017-01-20 03:13:41 +01:00
viktoria	62853326ed	Merged branch dev into danarstats	2017-01-20 00:10:56 +01:00
AdrianLxM	3f3d519c84	Merge branch 'dev' into tempt-pill	2017-01-19 21:57:42 +01:00
AdrianLxM	992d95744d	remove duplicate code	2017-01-19 21:53:08 +01:00
AdrianLxM	0c11f78ed3	cleanup after merge	2017-01-19 21:15:08 +01:00
LadyViktoria	1597f74bd0	Merge branch 'dev' into danarstats	2017-01-19 20:52:01 +01:00
AdrianLxM	6c3a07cc62	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev	2017-01-19 20:47:53 +01:00
viktoria	6120add315	Add very Hard Limits to constants	2017-01-19 20:36:19 +01:00
Milos Kozak	c701b5d125	waiting for pump message	2017-01-19 19:21:25 +01:00
Milos Kozak	f8feaf565b	show how is value hard limited	2017-01-19 18:40:08 +01:00
Milos Kozak	649cab63fc	allow some diff on profile check	2017-01-19 18:07:16 +01:00
Milos Kozak	e808bcedee	remove logging	2017-01-19 15:17:43 +01:00
Milos Kozak	75b53cfc0d	iob calc fix	2017-01-19 14:35:16 +01:00
Milos Kozak	07c9a21ff9	autosens log	2017-01-19 13:54:56 +01:00
Milos Kozak	e8dcf73c83	remove carbsAbsorbed from debug	2017-01-18 21:45:27 +01:00
Milos Kozak	8586ed5adb	show autosens result	2017-01-18 21:40:43 +01:00
AdrianLxM	480b832efe	temptarget zero-duration cleanup	2017-01-18 16:49:48 +01:00
AdrianLxM	b79743588d	temptarget sort and allow for zero-duration to cancel predated ones	2017-01-18 15:52:20 +01:00
viktoria	b70e895b95	DanaR Stats fixes	2017-01-18 04:31:47 +01:00
viktoria	9ba24b4ffd	DanaR Stats Beautify	2017-01-18 03:08:19 +01:00
viktoria	678fbedcbf	Merge branch 'dev' ... Conflicts: app/src/main/res/values/strings.xml	2017-01-18 03:03:58 +01:00
Milos Kozak	9f4cc28c0f	allow removing temp target records with null _id	2017-01-17 23:43:50 +01:00
AdrianLxM	d36a515d45	temp target overview	2017-01-17 21:32:30 +01:00
Milos Kozak	f9ed2ed4b4	temp targets to AMA	2017-01-17 18:56:08 +01:00
Milos Kozak	0e21b67a42	fix merge conflicts	2017-01-17 18:00:44 +01:00
Milos Kozak	432c937a46	Merge branch 'dev' into AMA	2017-01-17 17:49:21 +01:00
Milos Kozak	b0392b997e	fix crash	2017-01-17 17:02:57 +01:00
Milos Kozak	1b385c10e3	fix iob calculation in the past	2017-01-17 16:19:34 +01:00
Milos Kozak	12eec7108a	detect oldest data available	2017-01-17 15:19:02 +01:00
Milos Kozak	7c90dfe03c	confirm dialog on removing temptarget	2017-01-16 23:54:46 +01:00
Milos Kozak	b6714ae254	use notification instead of toast	2017-01-16 23:37:58 +01:00
Milos Kozak	87c84da3d9	minimal NSClient version 1.21	2017-01-16 23:25:31 +01:00
Milos Kozak	218190e92f	support for removing temp targets from GUI	2017-01-16 23:23:20 +01:00
Milos Kozak	8c38090031	apply temp targets to MA	2017-01-16 21:03:31 +01:00
Milos Kozak	eaa16402a7	show running temp target on overview	2017-01-16 20:47:57 +01:00
Milos Kozak	61b1ee781f	temp target treatment dialog & sync fix	2017-01-16 16:59:12 +01:00
viktoria	61a1e5bc04	Korean DanaR Stats Activity	2017-01-16 13:23:41 +01:00
viktoria	e851d15aff	DanaR Stats Activity	2017-01-16 13:23:41 +01:00
Milos Kozak	61a8cad4e8	allow refrest temp targets from NS & fix bugs	2017-01-14 16:36:42 +01:00
Milos Kozak	a96bc52e01	handle temp targets data from NS	2017-01-14 00:37:35 +01:00
Milos Kozak	458bee4538	display temptargets	2017-01-13 23:43:17 +01:00
Milos Kozak	339e62c120	temptarget db support	2017-01-13 22:36:47 +01:00
Milos Kozak	1b53cde2bf	plain temptarget plugin	2017-01-13 21:14:04 +01:00
Milos Kozak	dcc6acdf31	Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA	2017-01-13 20:31:20 +01:00
Milos Kozak	d9fffc5625	refactor IOB calculation & fix iob_array.time	2017-01-13 20:30:48 +01:00
Milos Kozak	6015930b41	Merge pull request #126 from AdrianLxM/patch-12 ... Extended restricted by MAXBOLUS DanaR-plugin	2017-01-13 19:41:49 +01:00
AdrianLxM	916ab35be1	Extended restricted by MAXBOLUS Dana	2017-01-13 19:33:37 +01:00
Milos Kozak	9d8d925f75	better check for null	2017-01-12 21:55:17 +01:00
viktoria	f5f60bcd30	fix autosens adjust BG targets ... regarding to that: https://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html the autosens_adjust_targets setting is only for allow autosens to adjust the BG target not for enabling or disabling the wohle autosens feature	2017-01-10 01:01:11 +01:00
Milos Kozak	97431e5b94	show base basal line	2017-01-09 23:19:25 +01:00
Milos Kozak	8a4678bb8f	make now-line more visible	2017-01-09 22:13:45 +01:00
Milos Kozak	bb76fa9d20	need of 14 days run to enable AMA	2017-01-09 19:54:23 +01:00
Milos Kozak	18a1927204	better optimize space of prediction in overview	2017-01-09 17:34:37 +01:00
Milos Kozak	e03de6cb63	use mgdl in autosens	2017-01-09 11:29:54 +01:00
Milos Kozak	c62e498aac	ensure we are loading 24h + dia data	2017-01-09 10:57:15 +01:00
Milos Kozak	5f146f90de	fix merge conflict	2017-01-09 10:17:27 +01:00
viktoria	4fe06e4ee1	refactor cpp ... add safety values to constans class	2017-01-09 02:28:27 +01:00
Milos Kozak	e9b900d74a	show predictions in graph	2017-01-08 23:10:27 +01:00
Milos Kozak	93b80746c6	optimize determine basal	2017-01-08 17:02:33 +01:00
Milos Kozak	aa24a592fa	better detect meal bolus	2017-01-08 16:57:05 +01:00
Milos Kozak	68a127d804	make autosens configurable in settings, determinebasaladapter refactoring	2017-01-08 14:21:29 +01:00
Milos Kozak	e71b478941	show both deltas on overview	2017-01-08 12:04:42 +01:00
Milos Kozak	4303cd2982	Merge branch 'master' into AMA	2017-01-08 00:46:11 +01:00
Milos Kozak	7b5a289fc1	run aps only on interested treatments	2017-01-08 00:45:43 +01:00
Milos Kozak	66bd06076e	log invoke() source	2017-01-08 00:38:53 +01:00
Milos Kozak	6621c2f610	log script debug in fragment	2017-01-08 00:27:13 +01:00
Milos Kozak	28c329dc01	log script params separately	2017-01-08 00:19:48 +01:00
Milos Kozak	9c93d3ad7d	log autosens input data in fragment	2017-01-08 00:07:18 +01:00
Milos Kozak	f707029560	fix conflict	2017-01-07 23:45:41 +01:00
Milos Kozak	75192f0372	prevent logging exception	2017-01-07 23:38:59 +01:00
Milos Kozak	89db232375	Merge pull request #110 from MilosKozak/dateformat ... use android.text.format.DateUtils	2017-01-07 23:27:47 +01:00
Milos Kozak	38f397cd59	revert formating date	2017-01-07 23:26:28 +01:00
Milos Kozak	e5fc19a785	better arrange code lines	2017-01-07 23:04:12 +01:00
Milos Kozak	8456f87de1	Merge remote-tracking branch 'origin/master' into AMA	2017-01-07 00:04:26 +01:00
Milos Kozak	25a3b678e9	most new AMA code added	2017-01-06 22:42:37 +01:00
Milos Kozak	6dc3d38a2f	fix passing carb ratio	2017-01-06 09:52:17 +01:00
Milos Kozak	26102848f5	refactor MealData	2017-01-04 23:03:13 +01:00
Milos Kozak	ebb3e90587	extract MealData	2017-01-04 22:47:21 +01:00
Milos Kozak	e585ab4030	Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA	2017-01-04 22:37:10 +01:00
Milos Kozak	3eee917979	add sample data	2017-01-04 22:37:03 +01:00
Milos Kozak	724a041341	refactor classes	2017-01-04 22:33:17 +01:00
Milos Kozak	8aad003311	copy basic files oref0 dev 2017/01/04, make it running without crash	2017-01-04 22:21:46 +01:00
Milos Kozak	9d5c2e5dac	fix visibility of aps plugin at start	2017-01-03 22:13:25 +01:00
Milos Kozak	50f75e3404	upload AMA result to NS too	2017-01-03 21:42:32 +01:00
Milos Kozak	05911be4e0	remove parcelable code from determinebasaladapter	2017-01-03 21:37:23 +01:00
Milos Kozak	3dfac49b82	duplicate MA -> AMA	2017-01-03 21:15:40 +01:00
Milos Kozak	faf8e07248	renaming before adding AMA	2017-01-03 21:01:01 +01:00
Milos Kozak	f3f6a911ae	use android.text.format.DateUtils	2017-01-03 19:06:35 +01:00
Milos Kozak	fe75298263	safer display values in openapsma fragment	2017-01-03 10:24:08 +01:00
Milos Kozak	952a2342a8	Merge pull request #104 from MilosKozak/mm640g ... MM640g bg source	2017-01-02 13:58:56 +01:00
Milos Kozak	8637e99afe	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2017-01-02 00:05:57 +01:00
AdrianLxM	9c40e4af34	Dismiss editing when fragment is paused	2017-01-01 21:46:25 +01:00
Milos Kozak	fded515ac1	fix TimeListEdit when fragment is restored	2017-01-01 20:22:23 +01:00
Milos Kozak	4408146f23	disable entering basals in profiles only if pump is not tempbasal capable	2017-01-01 14:34:57 +01:00
Milos Kozak	ef2e7b1a62	show basal line only if pump is tempbasal capable	2017-01-01 14:19:35 +01:00
Milos Kozak	9edb5c9a66	draw basals only if pump is tempbasal capable	2017-01-01 14:00:59 +01:00
Milos Kozak	86f5aec0bb	disable visible control when plugin is not enabled	2017-01-01 13:45:03 +01:00
Milos Kozak	38a9c94258	Local Profile	2016-12-31 20:10:36 +01:00
Milos Kozak	6b18336fa2	LocalProfile plugin	2016-12-31 15:06:45 +01:00
Milos Kozak	0458ad65ce	handle arrays separately	2016-12-31 14:52:23 +01:00
Milos Kozak	2e6c168adc	TimeListEdit most work done	2016-12-31 13:11:32 +01:00
Milos Kozak	e1c2e4c492	TimeListEdit initial work	2016-12-30 16:43:43 +01:00
Milos Kozak	2f52091b67	show upload profile button only when pump is capable to this	2016-12-29 23:10:39 +01:00
Milos Kozak	1e99c00626	allow sms string to be translated separately	2016-12-29 16:22:40 +01:00
Milos Kozak	8e46a55e48	allow better translation of min ago	2016-12-29 16:06:00 +01:00
Milos Kozak	24c5bb9303	Merge branch 'master' into mm640g	2016-12-29 14:01:24 +01:00
Milos Kozak	6b86818464	Merge pull request #102 from AdrianLxM/avgdelta ... Avgdelta	2016-12-28 23:15:23 +01:00
Milos Kozak	c8a58808e0	more logging on setting extended bolus	2016-12-28 23:13:11 +01:00
AdrianLxM	d70c9673d5	average delta	2016-12-28 22:39:40 +01:00
Milos Kozak	9a47e521d2	show result in loop plugin when correct basal settoo	2016-12-28 22:30:38 +01:00
Milos Kozak	d2d3e024a2	Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS	2016-12-28 15:15:24 +01:00
Milos Kozak	e2c2f49f6f	MM640g bg source	2016-12-28 14:57:11 +01:00
AdrianLxM	6ac889cecd	ongoing notification integration	2016-12-28 00:03:08 +01:00
Milos Kozak	26b260a85a	use bolus step from pump description	2016-12-27 23:46:39 +01:00
AdrianLxM	4afd2295f8	Ongoing Notification 2	2016-12-27 23:39:47 +01:00
AdrianLxM	d597be71de	ongoing notification	2016-12-27 23:39:16 +01:00
Milos Kozak	29327aef01	MDI pump driver	2016-12-27 23:35:50 +01:00
Milos Kozak	fdb252b62d	show direction next to BG	2016-12-27 20:41:28 +01:00
Milos Kozak	ecd787bdb3	detect broken communication during bolusing	2016-12-27 16:06:49 +01:00
Milos Kozak	42b581ec29	log bolus start	2016-12-27 15:13:27 +01:00
Milos Kozak	cd41bff2bb	SMS command BG	2016-12-27 12:17:26 +01:00
Milos Kozak	a109bb9853	handle switching profiles in correct order	2016-12-25 23:18:46 +01:00
Milos Kozak	463a913cd1	add debug to profile comparation	2016-12-25 15:08:40 +01:00
Milos Kozak	46be73d187	send sms notification when profile received from NS	2016-12-25 14:26:41 +01:00
Milos Kozak	61720a74ec	do not return error if not initialized	2016-12-25 13:34:48 +01:00
Milos Kozak	94cb506d20	Merge branch 'koreandanar' into smsnotify	2016-12-25 11:51:52 +01:00
Milos Kozak	381de0a5f5	function to send notification	2016-12-25 11:51:46 +01:00
Milos Kozak	02b3da97e0	send important confirmations to all phone numbers	2016-12-25 11:29:13 +01:00
Milos Kozak	273993f995	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into smsnotify	2016-12-25 09:53:43 +01:00
Milos Kozak	052ac47595	Better profile handling	2016-12-24 23:53:17 +01:00
Milos Kozak	edcfebfd41	fix displaying missing carbs in wizard	2016-12-24 15:05:44 +01:00
Milos Kozak	5c506faa65	proper reaction to pump error	2016-12-24 14:53:37 +01:00
Milos Kozak	79aee157e3	redundant code cleanup	2016-12-24 14:13:35 +01:00
Milos Kozak	7719e2ac63	use notifications for profile update	2016-12-22 12:17:38 +01:00
Milos Kozak	132f82b484	fix showing objectives	2016-12-22 12:04:17 +01:00
Milos Kozak	d72a3cbf36	Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar	2016-12-21 14:50:22 +01:00
Milos Kozak	d8696412b1	temporary disable korean danar	2016-12-21 14:48:36 +01:00
AdrianLxM	5e2302ed68	start KeepAlive at app start 2	2016-12-16 02:00:53 +01:00
AdrianLxM	4f3c9baf0b	start KeepAlive at app start 1	2016-12-16 01:57:18 +01:00
Milos Kozak	37d539ce3e	remove duplicated function	2016-12-15 19:10:07 +01:00
Milos Kozak	368652670c	Merge branch 'master' into koreandanar	2016-12-15 18:58:16 +01:00
Milos Kozak	d34e4579fc	clear aps result before new calculation	2016-12-15 18:55:23 +01:00
Milos Kozak	889c75f3ee	Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar	2016-12-14 11:17:15 +01:00
Milos Kozak	5626c621ff	fix loop	2016-12-14 11:16:28 +01:00
AdrianLxM	d461a4b2c4	Set fragmentVisible instead of fragmentEnabled	2016-12-14 08:23:22 +01:00
Milos Kozak	49453e10df	fix x axis on overview when no data displayed	2016-12-13 23:18:02 +01:00
Milos Kozak	738d4c1c2a	hide pump control buttons when pump is not initialized	2016-12-13 22:50:51 +01:00
Milos Kozak	cb4330ddcd	notify when pump settings is wrong	2016-12-13 22:10:13 +01:00
Milos Kozak	407ea423cb	detect if extended bolus is enabled, detect easy ui mode	2016-12-13 21:35:49 +01:00
Milos Kozak	4a2a15d394	smarter plugin selection and handling	2016-12-11 22:55:45 +01:00
Milos Kozak	8f6f6e326d	Disable profile control for pump profiles if pump is not enabled	2016-12-11 13:46:27 +01:00
Milos Kozak	0d6787a744	force enabled if only 1 plugin exists	2016-12-11 13:36:32 +01:00
Milos Kozak	be1ec7f3e3	fix processing plugins in configbuilder	2016-12-11 13:08:20 +01:00
Milos Kozak	7aaa15dd3b	Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar	2016-12-11 11:15:34 +01:00
Milos Kozak	80a463a56d	parse allowed phone numbers	2016-12-11 10:52:50 +01:00
AdrianLxM	c8ac855219	also switch profiles	2016-12-10 23:51:57 +01:00
AdrianLxM	e1dc624a47	fully remove mm640g	2016-12-10 22:58:31 +01:00
Milos Kozak	5b6e85f5c9	Merge branch 'master' into koreandanar	2016-12-10 18:14:39 +01:00
Milos Kozak	82f4c8ffac	better handling of non existing profiles	2016-12-10 18:14:12 +01:00
Milos Kozak	617192dc3a	hide buttons based on pump description	2016-12-10 00:18:20 +01:00
Milos Kozak	cf4851250d	enable loop only when pump is temp basals capable	2016-12-09 21:47:58 +01:00
Milos Kozak	2a10d4789e	virtual pump description	2016-12-09 21:30:34 +01:00
Milos Kozak	b824cc28c9	korean danar description	2016-12-09 20:37:56 +01:00
Milos Kozak	bd6ee0f213	add duration to description	2016-12-09 20:20:21 +01:00
Milos Kozak	199c6b5e2c	fix curentBasal rouding	2016-12-09 19:32:59 +01:00
Milos Kozak	3acabd792c	basic danar description	2016-12-09 19:28:48 +01:00
Milos Kozak	6ba532d178	notify about setting basal profile	2016-12-09 16:04:07 +01:00
Milos Kozak	4103e4bf4a	allow set profile to pump from simpleprofile plugin	2016-12-09 12:40:15 +01:00
Milos Kozak	e9d639c979	fix read basal profile on korean pump	2016-12-09 12:00:44 +01:00
Milos Kozak	a01c15f8f7	miminum basal rate in description	2016-12-09 11:46:46 +01:00
Milos Kozak	56eb347b84	Merge remote-tracking branch 'origin/master' into koreandanar	2016-12-09 11:33:33 +01:00
Milos Kozak	8c00e08574	Merge pull request #87 from AdrianLxM/dbfix ... lazy initialization of optional plugins	2016-12-09 11:32:22 +01:00
Milos Kozak	f75c2f8f91	check if plugin is enabled before accepting message	2016-12-09 11:31:45 +01:00
AdrianLxM	f4e82ec022	lazy loading on optional plugins	2016-12-09 09:56:16 +01:00
Milos Kozak	064de0f64e	synchronize pump time	2016-12-09 09:31:51 +01:00
Milos Kozak	ccda992161	remove unused MM640g plugin	2016-12-08 15:23:37 +01:00
Milos Kozak	073cc84368	added PumpDescription	2016-12-08 15:21:16 +01:00
Milos Kozak	0044b8b41a	Merge remote-tracking branch 'origin/master' into koreandanar	2016-12-08 14:29:38 +01:00
Milos Kozak	e0f0ee0cbb	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-12-08 14:28:53 +01:00
Milos Kozak	fdd594358c	fix removeExpired in notifications	2016-12-08 14:28:21 +01:00
Milos Kozak	8f98ad1b15	do not process remote profile if not selected	2016-12-07 22:12:48 +01:00
AdrianLxM	fa4cf31cf4	Correct db query	2016-12-07 01:48:53 +01:00
Milos Kozak	1db9ce287c	fix basal rates decoding	2016-12-07 00:15:42 +01:00
Milos Kozak	2dea4615c0	basal rates set	2016-12-06 23:46:36 +01:00
Milos Kozak	f2928c3d39	fix IC and ISF in DanaR Korean profile	2016-12-06 23:19:48 +01:00
Milos Kozak	be8003da4b	Merge branch 'master' into koreandanar	2016-12-06 23:18:02 +01:00
Milos Kozak	64de2fd736	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-12-06 23:15:23 +01:00
Milos Kozak	10d30571a9	fix IC and ISF in DanaR profile	2016-12-06 23:14:25 +01:00
Milos Kozak	d897b778a0	Merge pull request #84 from MilosKozak/notifications ... basic notification functionality	2016-12-06 23:05:23 +01:00
Milos Kozak	3a3fc5d508	one more ICF with 1 decimal	2016-12-06 23:03:45 +01:00
Milos Kozak	86755599df	show IC and ICF with 1 decimal	2016-12-06 23:00:57 +01:00
Milos Kozak	b61108eb2b	remove test data	2016-12-06 22:55:49 +01:00
AdrianLxM	1a20b637b6	limit readings to values above 38	2016-12-05 17:47:03 +01:00
Milos Kozak	abfb832a10	basic notification functionality	2016-12-05 15:20:44 +01:00
Milos Kozak	4b389c2cad	dana drivers switching working	2016-12-03 17:42:08 +01:00
AdrianLxM	1af28d007f	wear make sendData() private	2016-12-01 12:10:58 +01:00
AdrianLxM	7eb8702a9c	wear profile-null fix Toasts from strings.xml the second	2016-12-01 10:54:19 +01:00
AdrianLxM	68f4a2db50	wear profile-fix toast from strings.xml	2016-12-01 10:47:39 +01:00
AdrianLxM	0d8fd9df5c	wear profile may be null	2016-12-01 09:30:39 +01:00
Milos Kozak	db2fd55f7c	copy files for Korean DanaR	2016-11-29 20:52:40 +01:00
Milos Kozak	36d5f1dc29	proper danar errors detection	2016-11-29 18:28:36 +01:00
AdrianLxM	896503918c	wear extract strings	2016-11-29 15:01:00 +01:00
AdrianLxM	1eacf35e47	Merge pull request #25 from AdrianLxM/wear-prepare-final ... wear merge current master	2016-11-29 13:17:21 +01:00
Milos Kozak	ee408ada79	Merge pull request #80 from warstar2187/master ... Fix Insulin Activity and Korean update	2016-11-29 07:44:58 +01:00
warstar2187	7f97b232da	Update Treatment.java	2016-11-29 12:08:45 +09:00
Milos Kozak	2912d1cce1	Merge pull request #79 from AdrianLxM/viktoria-permissions ... Viktoria permissions	2016-11-28 19:02:28 +01:00
AdrianLxM	70338ac158	wear PoweRGbg fixes	2016-11-28 18:42:19 +01:00
AdrianLxM	87d49c03c8	wear product flavors	2016-11-26 07:10:22 +01:00
AdrianLxM	b2d2f462f6	first check if element exist, then access it	2016-11-25 13:35:53 +01:00
LadyViktoria	39be1bb4c7	Android 6+ Permissions #6	2016-11-25 13:35:34 +01:00
AdrianLxM	ff29a795db	SMS permission crashfix	2016-11-25 13:32:27 +01:00
LadyViktoria	33d783e9b0	Android 6+ Permissions #4	2016-11-25 13:32:17 +01:00
LadyViktoria	1967602c70	Android 6+ Permissions #3	2016-11-25 13:32:07 +01:00
viktoria	dd02fcaa85	Android 6+ Permissions #2	2016-11-25 13:31:52 +01:00
LadyViktoria	f25715d87c	Android 6+ Permissions	2016-11-25 13:31:43 +01:00
AdrianLxM	12e78656b7	wear settings	2016-11-24 16:23:31 +01:00
AdrianLxM	c633904e8c	wear fragment and reset button	2016-11-24 16:23:31 +01:00
AdrianLxM	b306de49dc	wear Emma	2016-11-24 16:23:31 +01:00
AdrianLxM	ef0e30b2b3	wear big chart avgDelta working	2016-11-24 16:23:31 +01:00
AdrianLxM	5e3fddcc05	wear arrows working	2016-11-24 16:23:31 +01:00
AdrianLxM	95432e35e0	wear yet again current situation tweaks	2016-11-24 16:23:31 +01:00
AdrianLxM	663a865595	wear intent to express current situation better	2016-11-24 16:23:31 +01:00
AdrianLxM	8af4ac0daf	wear bigchart fully functional	2016-11-24 16:23:31 +01:00
AdrianLxM	afa5faf834	wear basal live	2016-11-24 16:23:31 +01:00
AdrianLxM	2b17fc5155	wear painting temps	2016-11-24 16:23:31 +01:00
AdrianLxM	70c3969f85	wear something is painting	2016-11-24 16:23:31 +01:00
AdrianLxM	b93273d706	wear status working	2016-11-24 16:23:31 +01:00
AdrianLxM	e2c3069374	resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled	2016-11-24 16:23:31 +01:00
AdrianLxM	2e0ac569eb	wear first bg and delta on watch	2016-11-24 16:23:31 +01:00
AdrianLxM	761077e8ae	wear fix overeager refactoring and plugin pluggable	2016-11-24 16:23:31 +01:00
AdrianLxM	2fd93a8e31	wear installing on watch	2016-11-24 16:23:31 +01:00
ecorman	da861a7108	Note basal start / end to see note in Xdrip+ with data	2016-11-23 23:59:11 +01:00
AdrianLxM	ef847a7cc2	Make bolus progress dialog not cancalable	2016-11-21 19:50:27 +01:00
AdrianLxM	b97920b3ef	Integer: comparison by value not by reference ... Why is there no compiler warning for this?	2016-11-18 15:21:07 +01:00
AdrianLxM	505a135ac8	CPP add sum to basal rate representation	2016-11-17 13:35:38 +01:00
AdrianLxM	ade27a9460	CPP proper dialog handling	2016-11-15 18:59:38 +01:00
AdrianLxM	3da9a8c45c	CPP limits 50 to 200 percent	2016-11-15 17:25:23 +01:00
AdrianLxM	b01fb6ee6e	CPP hard limits for percentage	2016-11-15 07:52:59 +01:00
AdrianLxM	513b2966c9	CPP cleanup and i18n	2016-11-14 18:19:17 +01:00
AdrianLxM	74ea6c4011	CPP working	2016-11-14 18:19:17 +01:00
AdrianLxM	85b052efda	CPP copyprev buttons working	2016-11-14 18:19:17 +01:00
AdrianLxM	c2d1fdb39e	CPP edit base basal gui - without function yet	2016-11-14 18:19:17 +01:00
AdrianLxM	dba81ede2a	calculation for isf and ic. Tooltips.	2016-11-14 18:19:17 +01:00
AdrianLxM	0e5d18ec86	keep basal in order as required when writing to dana	2016-11-14 18:19:17 +01:00
AdrianLxM	3fe7c7a0fa	CPP shiftfix and base profile view	2016-11-14 18:19:17 +01:00
AdrianLxM	2c5b20a721	CPP html-ify and send to pump button	2016-11-14 18:19:17 +01:00
AdrianLxM	4dbb20b8c5	CPP small redesign	2016-11-14 18:19:17 +01:00
AdrianLxM	f815f7fce6	CPP ic and isf data	2016-11-14 18:19:17 +01:00
AdrianLxM	8c93925865	CPP simple representation string	2016-11-14 18:19:17 +01:00
AdrianLxM	364b3d6710	CPP percentage and shift working on hard coded basal rate	2016-11-14 18:19:17 +01:00
AdrianLxM	be556cf388	CPP copy simple profile	2016-11-14 18:19:17 +01:00
AdrianLxM	12fc454fe1	divisions with doubles to not do whole minute jumps	2016-11-12 13:16:11 +01:00
AdrianLxM	68acc3aca3	deltas per 5 minutes	2016-11-12 13:05:18 +01:00
Milos Kozak	0b56b7554c	Merge pull request #64 from AdrianLxM/fill-presets2 ... Fill presets	2016-11-12 10:41:54 +01:00
Milos Kozak	b5bd6749ae	fix app crash when no profile set	2016-11-11 16:40:31 +01:00
AdrianLxM	401be6dd5b	add U to buttons	2016-11-11 16:29:28 +01:00
AdrianLxM	1568f77229	fill preset buttons	2016-11-11 16:24:00 +01:00
Milos Kozak	a341fa4343	fix merge conflict	2016-11-11 13:09:11 +01:00
Milos Kozak	ad475ace90	Merge pull request #63 from AdrianLxM/profileLongpress ... profile switch dialog on long press on profile pill	2016-11-11 12:57:00 +01:00
Milos Kozak	753fb4664d	Merge pull request #61 from AdrianLxM/fill-action ... Fill action	2016-11-11 12:56:21 +01:00
AdrianLxM	4a23d4ce0d	profile switch dialog on long press on profile pill	2016-11-11 12:29:13 +01:00
AdrianLxM	41e68a03a2	SimpleProfile as profile name	2016-11-11 01:45:41 +01:00
AdrianLxM	4b27c9212a	DanaR as part of profile name	2016-11-11 01:45:28 +01:00
AdrianLxM	a6d5d68938	fill action	2016-11-11 00:56:15 +01:00
Milos Kozak	e8d169f078	allow automated actions only whem pump is initialized	2016-11-10 23:33:12 +01:00
Milos Kozak	86a3df1996	lower allowed diff to perform action from 0.1 to 0.05	2016-11-10 23:33:12 +01:00
AdrianLxM	7b4b4f7cfc	Overview profile redesign	2016-11-10 23:20:23 +01:00
AdrianLxM	4ee87d1cca	basal profile on overview	2016-11-10 21:03:26 +01:00
AdrianLxM	a6ae92bb2f	Receive profile updates on uploadOnly when NS-Profiles are used	2016-11-10 18:53:01 +01:00
AdrianLxM	c900d6611c	Warn on "refresh treatments from NS" button in upload only mode.	2016-11-10 18:52:42 +01:00
AdrianLxM	f85f04d33f	NS upload only	2016-11-10 18:33:50 +01:00
Milos Kozak	21f732b378	report app start/restart to NS	2016-11-10 16:42:59 +01:00
Milos Kozak	a5778b4916	Merge pull request #58 from AdrianLxM/loadmorehightemps ... Load more "extended bolus" high temps	2016-11-10 13:54:11 +01:00
AdrianLxM	5088b84417	Receive profile updates on uploadOnly when NS-Profiles are used	2016-11-10 13:50:13 +01:00
Milos Kozak	156f42da5f	always report active profile	2016-11-10 13:15:23 +01:00
Milos Kozak	770f44118b	Merge pull request #56 from AdrianLxM/hapticFeedback ... Haptic feedback	2016-11-10 10:02:26 +01:00
Milos Kozak	8d360f837d	Merge pull request #57 from warstar2187/master ... kr translation update	2016-11-10 10:02:01 +01:00
AdrianLxM	3ee1cf5023	haptic feedback for loop pill on overview	2016-11-10 00:02:51 +01:00
AdrianLxM	aaba503cd0	Fix crash due to not found theme	2016-11-08 22:57:56 +01:00
AdrianLxM	218ccc803b	Ask before resetting DB	2016-11-08 22:35:57 +01:00
Milos Kozak	a2d4f22bd7	added git HEAD and version to pump status and logs	2016-11-08 19:10:25 +01:00
Milos Kozak	94a7033e0c	always upload current basal rate	2016-11-08 17:55:39 +01:00
Milos Kozak	a4a9efd812	TAB_VIEW_PADDING_DIPS = 9	2016-11-08 14:24:02 +01:00
warstar2187	9ae3d88f9c	Update DanaRPlugin.java	2016-11-08 19:59:54 +09:00
Milos Kozak	4a4dc04865	fix iob reporting to NS	2016-11-08 10:29:24 +01:00
AdrianLxM	ff66edf064	Add TDD to DanaR daily view ... ... also don't show the time for the day. It is always 00:00 anyways.	2016-11-08 06:11:50 +01:00
AdrianLxM	93accc0d9f	Add in basalIOB.activity	2016-11-07 15:18:48 +01:00
AdrianLxM	8bdc86f359	Calculate activityContrib for TempBasal	2016-11-07 15:17:16 +01:00
AdrianLxM	2e6a37dcbd	Add base basal rate to Overview when temp is running ... Now that there is more space with less buttons, it should fit ;)	2016-11-07 10:18:16 +01:00
Milos Kozak	925b5612fc	Merge pull request #49 from AdrianLxM/disableLoopLongpress ... Disable loop on Longpress on Loop-Status in Overview	2016-11-07 10:14:14 +01:00
AdrianLxM	e948a6f955	fix for net IOB	2016-11-07 07:55:41 +01:00
AdrianLxM	686593986c	Update PreferencesActivity.java	2016-11-07 01:02:08 +01:00
AdrianLxM	c851aefc8e	Update MainActivity.java	2016-11-07 01:01:33 +01:00
AdrianLxM	68be6179f8	Update EventRefreshGui.java	2016-11-07 01:00:50 +01:00
AdrianLxM	be39a35d68	Update ConfigBuilderFragment.java	2016-11-07 00:59:47 +01:00
AdrianLxM	c93322f2da	Overview Loopdisable on longclick 1	2016-11-07 00:58:44 +01:00
Milos Kozak	f84777bf00	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-11-06 12:10:55 +01:00
Milos Kozak	95ffb03a26	fix resources crash	2016-11-06 12:10:24 +01:00
AdrianLxM	3f02c8fc8c	Show decimal place ... The time since last bolus has one decimal place but it was shown as zero.	2016-11-06 02:01:22 +01:00
Milos Kozak	65b8ca00db	looper to profile switch	2016-11-05 20:32:47 +01:00
Milos Kozak	45ffc18d25	move set temp and set extended buttons to actions	2016-11-05 20:12:58 +01:00
Milos Kozak	3ac9811d9a	Actions page & offline profile switch	2016-11-05 15:46:11 +01:00
Milos Kozak	15ca64e218	Merge pull request #43 from ecorman/master ... Basal % rate	2016-11-02 23:37:17 +01:00
AdrianLxM	b7f4dd3366	borders again on loopmode label	2016-11-02 18:27:46 +01:00
AdrianLxM	b1f3bb17bb	Show in Overview when loop is disabled	2016-11-02 18:04:14 +01:00
AdrianLxM	2294093aab	Show current total ... The total of the calculation in the wizard was showing the value from the previous calculation when you enable/disable to include Bolus-IOB or Basal-IOB into the calculation. The button to send to the pump showed the current amount of units.	2016-10-31 13:01:50 +01:00
ecorman	f2baa32e40	Basal % rate	2016-10-31 13:01:38 +01:00
ecorman	cf3bb52c7b	Add percent to result to allow manual adjust	2016-10-31 02:29:19 +01:00
warstar2187	5443bb4fba	Update SmsCommunicatorPlugin.java	2016-10-27 02:23:47 +09:00
warstar2187	79a6b65bb9	Update SmsCommunicatorPlugin.java	2016-10-26 19:38:36 +09:00
Milos Kozak	861c24fc45	distinguish between meal and correction bulus	2016-10-25 23:33:02 +02:00
Milos Kozak	8614469a35	test activity for null	2016-10-23 23:34:14 +02:00
Milos Kozak	1597ee77b5	typo	2016-10-22 18:04:26 +02:00
Milos Kozak	05f8c2d1ba	default constructor only in WizardDialog	2016-10-21 22:00:14 +02:00
Milos Kozak	8d05845c4f	default constructor only in BolusProgressDialog	2016-10-21 21:50:21 +02:00
Milos Kozak	38cf01eb62	more build types with maxbolus: full fullteenage fullchild	2016-10-21 00:03:52 +02:00
Milos Kozak	6f8d828ec2	QuickWizard	2016-10-20 23:50:31 +02:00
Milos Kozak	6bfaec375f	use sResources	2016-10-17 21:23:37 +02:00
Milos Kozak	7a3f7098b0	DanaR hardcoded bolus limit 10 -> 17	2016-10-17 09:31:06 +02:00
Milos Kozak	a829a506f2	check for null on getDialog()	2016-10-17 08:57:21 +02:00
Milos Kozak	2354e60f31	allow high temps in open loop mode	2016-10-17 08:44:01 +02:00
Milos Kozak	744a4143f4	retrieve device status with xdrip too	2016-10-16 21:11:16 +02:00
Milos Kozak	af31ca804f	correct width on more dialogs on Andriod 6	2016-10-15 11:31:15 +02:00
Milos Kozak	8ff675e8a4	Constant instead of string in profile	2016-10-11 23:55:53 +02:00
Milos Kozak	5ec339e987	fix BolusProgessDialog size on Android 6	2016-10-11 23:49:26 +02:00
Milos Kozak	9cd8602f83	normalize mg/dl mg/dL	2016-10-11 23:30:13 +02:00
Milos Kozak	9f1bbd35bd	wizard calculation to extra file	2016-10-11 22:47:48 +02:00
Milos Kozak	777b6cdb0d	catch errors on load profile	2016-10-10 12:11:12 +02:00
Milos Kozak	2e02521eae	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-10-09 11:17:56 +02:00
Milos Kozak	174d6019ff	fix carbs limit in wizard	2016-10-09 11:17:41 +02:00
Milos Kozak	cbb316b599	check for null in NS treatment dialog	2016-10-07 22:35:17 +02:00
Milos Kozak	34c6329b6f	fix context in newextendedbolusdialog	2016-10-06 20:57:12 +02:00
Milos Kozak	4f07fea8b2	SafeParse in SimpleProfile	2016-10-02 16:12:44 +02:00
Milos Kozak	b5ecbc11e8	check if pump info is loaded before invoking loop	2016-10-01 19:47:18 +02:00
Milos Kozak	163ccf2d0a	hard limits on base basal rate	2016-09-19 15:09:35 +02:00
Milos Kozak	a3721f8932	do set bg on init in careportal dialog	2016-09-18 03:09:53 +02:00
Milos Kozak	4378c9af14	more SMS commands	2016-09-16 14:08:26 +02:00
Milos Kozak	514fb569e9	show base basal rate and profile in ns pump plugin	2016-09-14 22:02:49 +02:00
Milos Kozak	5ac2cd5cca	try to fix random crash	2016-09-13 22:34:40 +02:00
Milos Kozak	ecb685f7f6	hard limits on openaps params	2016-09-13 22:15:17 +02:00
Milos Kozak	e23be121a5	workaround for missing unit in nsprofile	2016-09-11 15:17:33 +02:00
Milos Kozak	841141cd20	recheck pump status if older than 30 min before aplly basal	2016-09-11 13:32:21 +02:00
Milos Kozak	81e82143fc	fix treatment dialog in careportal	2016-09-10 21:20:01 +02:00
Milos Kozak	f1564519d3	show icon in toolbar	2016-09-10 16:08:29 +02:00
Milos Kozak	23e8220b12	initialize current profile in careportal	2016-09-10 15:51:07 +02:00
Milos Kozak	87055bef0b	show danar prefs only if pump is enabled	2016-09-10 15:37:37 +02:00
Milos Kozak	05831c75a6	SMS LOOP commands	2016-09-10 15:33:00 +02:00
Milos Kozak	b15fe7541e	objectives fix	2016-09-10 12:20:32 +02:00
Milos Kozak	a3ea0b5316	Merge branch 'master' of https://github.com/ecorman/AndroidAPS into ecorman-master	2016-09-09 11:08:04 +02:00
Milos Kozak	f48faccdd8	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-09-09 11:05:07 +02:00
Milos Kozak	77916ec4ae	fix double carbs when carbtime != 0	2016-09-09 11:04:50 +02:00
ecorman	5878cbbb75	Change plugins order to have fast access to careportal	2016-09-08 23:37:44 +02:00
ecorman	b7402aa9ea	Correction Input negative improvement	2016-09-08 23:29:14 +02:00
Milos Kozak	e8467ec75f	check for null	2016-09-08 16:53:48 +02:00
Milos Kozak	2c10ade944	try catch on load settings	2016-09-08 13:15:07 +02:00
Milos Kozak	ae9b03f1ae	fix newtempbasaldialogcontext	2016-09-08 12:53:06 +02:00
Milos Kozak	933e081fc5	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-09-08 10:08:24 +02:00
Milos Kozak	7fd59246af	use locale string in extended status of DanaR pump	2016-09-08 10:07:55 +02:00
ecorman	96a0d25183	Merge pull request #1 from MilosKozak/master ... Update from original repo	2016-09-08 00:04:02 +02:00
ecorman	b4f9fca50d	Modificaciones en gradle	2016-09-07 23:47:33 +02:00
ecorman	581f053e53	Allow negative correction in bolus	2016-09-07 23:38:29 +02:00
Milos Kozak	47bff5ad5e	limit requests on openloop mode	2016-09-05 15:27:53 +02:00
Milos Kozak	34d2178878	fix newextendedbolusdialog context	2016-09-05 09:14:39 +02:00
Milos Kozak	b56d3223ab	fix passing date in careportal	2016-09-02 14:12:05 +02:00
Milos Kozak	3d238e3adb	reset flag when pump is changed	2016-09-02 13:35:10 +02:00
Milos Kozak	ff32764375	remove accents in SMS	2016-09-02 09:43:38 +02:00
Milos Kozak	9f9d348c11	check for null context in wizarddialog	2016-08-27 12:32:18 +02:00
Milos Kozak	7b82b60324	vars optimalization	2016-08-21 22:14:33 +02:00
Milos Kozak	e46aab8948	updateguiifvisible on resume	2016-08-21 22:06:36 +02:00
Milos Kozak	08d940b2fb	temp fix of bolus progress crash	2016-08-18 09:10:32 +02:00
Milos Kozak	38ee1402a4	simple profile fix	2016-08-16 08:32:31 +02:00
Milos Kozak	ced974e96d	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-08-15 10:05:00 +02:00
Milos Kozak	d78d0be270	danar history context fix	2016-08-15 10:04:52 +02:00
Milos Kozak	451a455d3d	longer wait in comm after bolus	2016-08-14 20:35:00 +02:00
Milos Kozak	8864886702	more dialogs tweaking	2016-08-14 20:33:29 +02:00
Milos Kozak	bb041b1c06	more progress dialog tweaking	2016-08-14 20:19:47 +02:00
Milos Kozak	e95650d54d	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-08-14 10:14:16 +02:00
Milos Kozak	be8c1c2a83	change to screen lock, better context handling	2016-08-14 10:13:26 +02:00
Milos Kozak	6a6ed7b87a	Merge pull request #24 from jotomo/case-sensitive-filesystem ... Align class name with file name to fix error on case-sensitive filesy…	2016-08-14 09:44:21 +02:00
Milos Kozak	9c3b8dc2b9	typo	2016-08-13 23:00:10 +02:00
Milos Kozak	b77bbd5bc6	static options in careportal dialog	2016-08-13 22:16:36 +02:00
Milos Kozak	d11f0b1ea1	wakelock on bolusing	2016-08-13 22:16:04 +02:00
Johannes Mockenhaupt	4793561f7c	Align class name with file name to fix error on case-sensitive filesystems/OSs.	2016-08-13 21:01:47 +02:00
Milos Kozak	129c88478f	empty constructor in progressdialog	2016-08-13 15:07:57 +02:00
Milos Kozak	d85bb7db4d	fix double treatment upload from wizard	2016-08-13 12:47:15 +02:00
Milos Kozak	6c9c0d8223	hide danar profile option when pump disabled	2016-08-13 12:36:33 +02:00
Milos Kozak	609f99dc1c	fix danar show in prefs	2016-08-13 12:33:20 +02:00
Milos Kozak	a55a4ba6eb	upload only fresh pump status	2016-08-13 12:30:10 +02:00
Milos Kozak	3fb84636db	fix objectives import/export	2016-08-13 11:30:43 +02:00
Milos Kozak	40aada0eb4	ajdust some danar pump comm params	2016-08-12 20:22:44 +02:00
Milos Kozak	b1d5b12f55	fix npe	2016-08-11 22:52:26 +02:00
Milos Kozak	6228f01bdf	initialize treatment inzulin and carbs value	2016-08-11 15:26:23 +02:00
Milos Kozak	4da0f345cf	fix wizard gui	2016-08-11 09:54:03 +02:00
Milos Kozak	565e2a831b	more static members	2016-08-11 00:15:50 +02:00
Milos Kozak	0e6185064a	fix casting after refactor	2016-08-10 23:48:44 +02:00
Milos Kozak	39894cdc40	dataservice optimalization	2016-08-10 23:43:08 +02:00
Milos Kozak	a3e656dc6f	make completed objectives static	2016-08-10 23:32:11 +02:00
Milos Kozak	d023e4ae32	move targets from fragment to plugin	2016-08-10 23:27:26 +02:00
Milos Kozak	acbd028465	bolus progress in virtual pump	2016-08-10 14:50:53 +02:00
Milos Kozak	0ad856bed1	detect socket closed error	2016-08-09 15:46:08 +02:00
Milos Kozak	49d6690450	OpenAPS MA target value	2016-08-09 15:40:12 +02:00
Milos Kozak	a284f2fc38	accept single devicestatus, dynamic basal scale	2016-08-09 15:09:51 +02:00
Milos Kozak	77222a6c0a	switch basal colors	2016-08-09 08:39:45 +02:00
Milos Kozak	9591aed93c	fix wizard not showing progress	2016-08-08 16:54:46 +02:00
Milos Kozak	1ced97ced6	progressive plusminus element	2016-08-08 16:03:03 +02:00
Milos Kozak	2e72e18c62	send carbs and insulin in one connect	2016-08-08 15:49:13 +02:00
Milos Kozak	267e0220c0	overview scroll, determinebasal fix	2016-08-08 14:47:24 +02:00
Milos Kozak	88698576a2	plusminis edit shows toast when hit limit	2016-08-08 10:08:30 +02:00
Milos Kozak	294f9d6c99	fixing bugs after refactoring	2016-08-07 23:21:08 +02:00
Milos Kozak	6f1bb28600	fix bus register	2016-08-07 15:10:08 +02:00
Milos Kozak	ff2e9a82bc	fix some crashes	2016-08-07 13:07:13 +02:00
Milos Kozak	b711648bee	plugins refactoring	2016-08-05 23:54:03 +02:00
Milos Kozak	7cc0fb593d	IOB display & upload fix	2016-08-05 00:32:48 +02:00
Milos Kozak	b42644de39	objectives finalization, some todos	2016-08-04 23:38:43 +02:00
Milos Kozak	4df4a22997	profileviewer cleanup	2016-08-04 19:33:09 +02:00
Milos Kozak	7d4260b36f	danar connection improvement	2016-08-04 18:01:17 +02:00
Milos Kozak	a7d3dca752	Bolusing dialog	2016-08-04 09:17:26 +02:00
Milos Kozak	3e5eb85b88	synchronize on final object	2016-08-03 18:34:24 +02:00
Milos Kozak	c20026c15a	lowsuspend cleanup	2016-08-03 14:40:47 +02:00
Milos Kozak	be71ef15db	add hardcoded limits to danar driver	2016-08-02 19:35:28 +02:00
Milos Kozak	2f47f2a048	loop fragment cleanup	2016-08-02 19:03:02 +02:00
Milos Kozak	dbb0a6a659	danar fragment update, danar pump password, toast with sound	2016-08-02 18:39:14 +02:00
Milos Kozak	62bb4d640f	config builder code cleanup	2016-08-02 15:55:23 +02:00
Milos Kozak	6bee16919e	optimize keepalive pump connection	2016-08-02 15:43:21 +02:00
Milos Kozak	da26ea5995	optimize overview fragment	2016-08-02 15:28:34 +02:00
Milos Kozak	e94fe1f647	danar history translation support	2016-07-28 13:40:32 +02:00
Milos Kozak	61e8ffeebd	DanaR history loader	2016-07-27 17:49:56 +02:00
Milos Kozak	73ef2d7684	danar history db support	2016-07-21 15:10:42 +02:00
Milos Kozak	1c0edb151e	DanaR NS history sync class	2016-07-21 00:18:45 +02:00
Milos Kozak	1a90746bed	added danar history messages	2016-07-20 23:12:25 +02:00
Milos Kozak	789521c9db	allow rounding on setting extended bolus	2016-07-20 21:43:29 +02:00
Milos Kozak	5e6b77ec02	broadcast danar timeout too	2016-07-20 12:09:03 +02:00
Milos Kozak	e00c01ebee	remove alert service	2016-07-19 11:31:58 +02:00
viktoria	11d26b9815	typo	2016-07-18 23:32:12 +02:00
Milos Kozak	b361d99f03	refresh treatments over SMS	2016-07-18 22:17:40 +02:00
Milos Kozak	6147a71dd7	adjust timing on bolus and carbs	2016-07-18 21:55:01 +02:00
Milos Kozak	1aa1af3d0c	adjust timing on setting profile	2016-07-18 21:48:43 +02:00
Milos Kozak	4aad8c1310	use class name of fragment for saving preferences	2016-07-18 21:44:14 +02:00
Milos Kozak	87dd8712b4	bind service to application context, adjust messages timing	2016-07-18 21:20:53 +02:00
Milos Kozak	3e3ad1d515	move plugins to MainApp, improve dataservice	2016-07-18 20:19:55 +02:00
Milos Kozak	fe72300790	typo	2016-07-18 14:17:24 +02:00
Milos Kozak	fdbfa16e40	remove TODOs and comments	2016-07-18 13:18:45 +02:00
Milos Kozak	a1a64873fd	DanaR driver as a service	2016-07-18 12:02:33 +02:00
Milos Kozak	d82a696bfb	show treatments in overview graph	2016-07-17 15:04:33 +02:00
Milos Kozak	c5736b6bf3	remove todos	2016-07-16 23:05:31 +02:00
Milos Kozak	82a16efcc2	bolus wizard full functionality	2016-07-16 22:37:10 +02:00
Milos Kozak	489037df1a	fix dialog crash	2016-07-15 23:58:09 +02:00
Milos Kozak	9bd807ea0d	productFlavors	2016-07-15 23:53:14 +02:00
Milos Kozak	ce7cddc1da	fix null object reference	2016-07-15 23:27:42 +02:00
Milos Kozak	b69dc35716	upload pump status without loop too	2016-07-15 23:18:31 +02:00
Milos Kozak	cd86476d6a	design of virtual pump	2016-07-15 21:06:39 +02:00
Milos Kozak	7f661b7fa6	danar profile dia&car configurable in preferences	2016-07-15 20:56:07 +02:00
Milos Kozak	f01b03979d	todos clean	2016-07-15 20:36:45 +02:00
Milos Kozak	1f696691d0	configbuilder logging	2016-07-15 19:59:24 +02:00
Milos Kozak	c5d40b3a6c	careportal eventtypes translations	2016-07-15 19:45:03 +02:00
Milos Kozak	0fd07362e5	danar scheduled disconnection 3->5 sec	2016-07-14 23:36:12 +02:00
Milos Kozak	90fee59e8a	sms communicator: remote bolus, status	2016-07-14 23:29:21 +02:00
Milos Kozak	2ca75b52e5	null exception fix in danaconnection	2016-07-13 20:39:32 +02:00
Milos Kozak	f2bdf4bcff	better format of html aps result	2016-07-13 19:21:31 +02:00
Milos Kozak	24eee0475f	filter extended boluses in danar status	2016-07-13 19:11:01 +02:00
Milos Kozak	4a8ecb3a79	better display pump results	2016-07-13 18:57:23 +02:00
Milos Kozak	7fc939f179	setDanaConnection if not exists	2016-07-13 16:19:26 +02:00
Milos Kozak	b81cf8341b	MM640g base interface code	2016-07-13 15:56:27 +02:00
Milos Kozak	b818027b02	synchronized connectifnotconnected	2016-07-13 14:46:08 +02:00
Milos Kozak	a10a819a9d	allow bgsource not to be primary type	2016-07-13 14:28:16 +02:00
Milos Kozak	272262b115	SMSCommunicator plugin	2016-07-13 13:54:40 +02:00
Milos Kozak	76d42ef3fb	displaying basal fix	2016-07-12 17:56:01 +02:00
Milos Kozak	3bceeb368a	fix requesting cancel temp	2016-07-12 00:30:43 +02:00
Milos Kozak	4c312366c2	fix displaying temps from extended on overview page	2016-07-12 00:08:45 +02:00
Milos Kozak	9e7b018589	fix iob.combine	2016-07-11 23:54:56 +02:00
Milos Kozak	ae1a4b38dd	use absolute in upload based on preference	2016-07-11 23:21:20 +02:00
Milos Kozak	efa2944c4c	translations & fixes	2016-07-11 22:52:23 +02:00
Milos Kozak	4c21fe8383	formating fix	2016-07-11 18:42:14 +02:00
Milos Kozak	4dff8bc6af	consolidate DecimalFormatters	2016-07-11 18:07:54 +02:00
Milos Kozak	f7715a3409	xml reformating, some code cleaning	2016-07-11 17:49:09 +02:00
Milos Kozak	3127870770	DanaR as profile source	2016-07-11 14:04:57 +02:00
Milos Kozak	143d347841	most danar code there	2016-07-10 15:05:13 +02:00
Milos Kozak	f8ac10cddc	fix max deily total units	2016-07-08 14:06:37 +02:00
Milos Kozak	aa87cb7dea	alert only when danar is selected	2016-07-08 13:41:53 +02:00
Milos Kozak	e37917dae4	test alert fix	2016-07-08 13:39:27 +02:00
Milos Kozak	dc3eb80d52	basic danar comm	2016-07-08 00:17:02 +02:00
Milos Kozak	3895c1c4df	typo	2016-07-07 18:17:43 +02:00
Milos Kozak	690fd06c01	Agreement	2016-07-07 18:04:36 +02:00
Milos Kozak	c844a2ad9a	DanaR preferences & preferences cleanup	2016-07-07 17:17:54 +02:00
Milos Kozak	ba015f1140	DanaR service	2016-07-07 10:34:20 +02:00
Milos Kozak	47e130d246	KeepAliveReceiver	2016-07-07 00:56:31 +02:00
Milos Kozak	725db13776	rename Alarm -> Alert	2016-07-07 00:20:47 +02:00
Milos Kozak	85f4a93c11	move languages to preferences	2016-07-06 22:50:25 +02:00
Milos Kozak	26c70f6932	LocaleHelper.onCreate	2016-07-06 22:08:00 +02:00
Milos Kozak	7c46407f81	AlarmService	2016-07-06 22:05:28 +02:00
Milos Kozak	c16ad7e37d	move applyAPSResult out of pump interface	2016-07-06 11:25:27 +02:00
Milos Kozak	6ca5517aef	switch + and - in dialogs	2016-07-06 11:11:12 +02:00
Milos Kozak	ce7439bc00	add bg language	2016-07-05 20:28:23 +02:00
Milos Kozak	9bd7363dbf	fix accessing storage on android 6	2016-07-04 10:05:21 +02:00
Milos Kozak	b9798fe9f2	cover more situations when profile does not exist	2016-07-04 09:46:15 +02:00
viktoria	08e7a254de	typo	2016-07-04 01:04:35 +02:00
Milos Kozak	bb447d733d	put back deleted code	2016-07-03 23:20:27 +02:00
Milos Kozak	48dba18721	fix doubled path in confirm message	2016-07-03 23:10:27 +02:00
Milos Kozak	5e5fc203cc	remove todo	2016-07-03 22:47:51 +02:00
Milos Kozak	5c2a9f85d4	create ISO date accepted by apple products	2016-07-03 22:40:41 +02:00
Milos Kozak	9aa1a451e5	fix sql error on add treatment	2016-07-03 21:10:03 +02:00
Milos Kozak	59aba8d9be	german language to menu	2016-07-03 20:54:00 +02:00
Milos Kozak	afa4332d28	import/export preferences	2016-07-03 20:37:42 +02:00
Milos Kozak	f8301360dc	show ver in toolbar	2016-07-03 19:21:41 +02:00
Milos Kozak	15d64ce4eb	remove debugging code	2016-07-03 18:46:14 +02:00
Milos Kozak	9766b4eccb	fix bug when app is running without loop	2016-07-03 18:44:02 +02:00
Milos Kozak	08d677b806	ns upload entered by fix	2016-07-03 17:42:17 +02:00
Milos Kozak	9f8d7d3dca	configbuilder fragment translations	2016-07-03 13:56:57 +02:00
Milos Kozak	2b01b2a10b	combobolus dialog plus/minus buttons	2016-07-03 13:46:49 +02:00
Milos Kozak	07b01cd8d0	some missing translations	2016-07-03 13:35:02 +02:00
Milos Kozak	5cad7f1cb4	temp basal dialog plus/minus buttons	2016-07-03 13:25:23 +02:00
Milos Kozak	ea4eef88ed	1st round of CZ translation	2016-07-03 01:02:35 +02:00
Milos Kozak	92f4c37fac	careportal	2016-07-02 23:58:57 +02:00
Milos Kozak	a9748cc721	move some support classes	2016-06-28 11:30:42 +02:00
Milos Kozak	f3c15aca75	plus minus controls	2016-06-28 11:19:27 +02:00
Milos Kozak	caa4f3402e	split iob in wizard dialog, fixies for no data in app	2016-06-27 23:34:33 +02:00
Milos Kozak	f324e43e2d	remove fake glucose	2016-06-27 20:42:53 +02:00
Milos Kozak	0397c98eb7	locales in date: keep default	2016-06-27 20:38:38 +02:00
Milos Kozak	b6970fb5e7	force refresh after lang change	2016-06-27 20:23:07 +02:00
Milos Kozak	aa6c5764c4	language selector in menu	2016-06-27 20:14:31 +02:00
Milos Kozak	877b760aef	use bg targets in overview from nightscout	2016-06-27 19:34:59 +02:00
Milos Kozak	a3d32fcb44	objectives fragment complete	2016-06-27 18:48:48 +02:00
Milos Kozak	a4bdebdedf	detect ns versions	2016-06-26 14:56:43 +02:00
Milos Kozak	2f16c9b998	open loop mode & notification	2016-06-26 11:43:26 +02:00
Milos Kozak	ff5043e99b	put back removed code	2016-06-25 15:37:12 +02:00
Milos Kozak	5dfddfdfee	fix counting and displaying iob	2016-06-25 15:00:42 +02:00
Milos Kozak	582ffc3c9a	proper iob update on treatmnets&temps tab	2016-06-24 23:27:52 +02:00
Milos Kozak	35ff53dbb4	iob & basal on overview tab	2016-06-24 23:17:46 +02:00
Milos Kozak	3d16e874ad	fix upload without enact	2016-06-24 22:27:25 +02:00
Milos Kozak	88ac01f58d	typo fix	2016-06-24 18:33:34 +02:00
Milos Kozak	7322078c0a	Crashlytics added	2016-06-24 17:48:11 +02:00
Milos Kozak	275c5f5664	db index change and ver=2	2016-06-24 17:30:25 +02:00
Milos Kozak	120341b706	devicestatus, lot of gui and internal improvements, temp&extended in db only	2016-06-24 17:16:17 +02:00
Milos Kozak	22e4e33d94	stop faking bg	2016-06-23 17:09:29 +02:00
Milos Kozak	a57409c388	temp basal rendering	2016-06-23 17:07:38 +02:00
Milos Kozak	91b36a8528	work on tempbasals	2016-06-22 18:08:21 +02:00
Milos Kozak	58388c4a87	move getConfigBuilder() to MainApp	2016-06-22 12:20:27 +02:00
Milos Kozak	2a2589f5eb	some db and incomming data optimalisation	2016-06-21 23:24:54 +02:00
Milos Kozak	edddfed004	add source selection xdrip/nsclient	2016-06-21 00:34:36 +02:00
Milos Kozak	ea43a033d7	upload extended bolus to NS	2016-06-20 23:44:00 +02:00
Milos Kozak	fdf09b9daf	extended bolus dialog	2016-06-20 22:55:49 +02:00
Milos Kozak	4645c2bc4d	apply constraints on new treatment dialog	2016-06-20 21:43:29 +02:00
Milos Kozak	7cb0e0e588	manual tempbasal dialog	2016-06-20 20:45:55 +02:00
Milos Kozak	cc45f74c25	fix remaining duration	2016-06-20 13:36:55 +02:00
Milos Kozak	aea505e543	some rouding to make nicer on screen	2016-06-20 12:03:05 +02:00
Milos Kozak	5ac31bd0ca	menu, preferences, treatment&wizard buttons, ns upload	2016-06-19 20:06:00 +02:00
Milos Kozak	aa97722283	loop & safety fragment	2016-06-19 13:17:16 +02:00
Milos Kozak	fbb4f1973c	refreshing overview plugin	2016-06-17 16:14:04 +02:00
Milos Kozak	d74d54931b	save state on openapsma	2016-06-17 14:42:02 +02:00
Milos Kozak	0a4df246d0	save state on lowsuspend	2016-06-16 21:09:59 +02:00
Milos Kozak	d69701a092	SimpleProfile plugin, ConfigBuilder GUI improvements	2016-06-16 19:22:58 +02:00
Milos Kozak	ddb1868018	Constrains interface	2016-06-15 21:47:26 +02:00
Milos Kozak	26724ecbda	ConfigBuilder most work done	2016-06-14 23:45:55 +02:00
Milos Kozak	b8eca8a802	rename profileviewer -> nsprofileviewer	2016-06-14 13:01:37 +02:00
Milos Kozak	32bfea8d18	base ConfigBuilder plugin	2016-06-13 22:53:41 +02:00
Milos Kozak	7e3d1e6ad4	add @Nullable where possible	2016-06-12 14:18:21 +02:00
Milos Kozak	f15fdf613f	fix delta and minago	2016-06-12 13:59:09 +02:00
Milos Kozak	b310310511	GUI improvements	2016-06-12 13:30:34 +02:00
Milos Kozak	a66ece9af5	Lowsuspend finished	2016-06-12 10:53:19 +02:00
Milos Kozak	743350f4b3	another glucose status fix	2016-06-11 23:34:18 +02:00
Milos Kozak	74dcbb1864	glucoseReading fix	2016-06-11 22:46:47 +02:00
Milos Kozak	a8ab671d78	OpenApsMA invoke	2016-06-11 22:21:44 +02:00
Milos Kozak	73ebf3ffeb	typo in VIRTUAL	2016-06-11 20:47:00 +02:00
Milos Kozak	68b5570d35	VirtualPump	2016-06-11 20:45:40 +02:00
Milos Kozak	a5088584a2	OpenAPS MA initial work	2016-06-10 18:50:46 +02:00
Milos Kozak	9f0ea19b44	low and high line on graph	2016-06-09 17:06:21 +02:00
Milos Kozak	22aab61b02	plugins type, SimpleDateFromat thread safe	2016-06-09 16:33:44 +02:00
Milos Kozak	891c5dd4d7	show units in profile	2016-06-09 09:21:33 +02:00
Milos Kozak	b1cf867410	some graph adjustments	2016-06-09 09:17:55 +02:00
Milos Kozak	45cceddfcc	basic graph on everview fragment	2016-06-09 00:01:28 +02:00
Milos Kozak	3b883dee31	basic overview fragment + some gui fixes	2016-06-07 23:36:22 +02:00
Milos Kozak	701e6a2055	receive BGs from xDrip and NSClient	2016-06-07 21:48:17 +02:00
Milos Kozak	04f1b37c51	refresh treatments confirm dialog	2016-06-06 12:30:20 +02:00
Milos Kozak	bd47fb8624	button refresh treatments from nightscout	2016-06-06 12:17:37 +02:00
Milos Kozak	21a3434463	fix activity contrib	2016-06-06 11:24:17 +02:00
Milos Kozak	627ce66852	TempBasals & some IOB adjustments	2016-06-06 10:42:46 +02:00
Milos Kozak	d6608bbcbc	Update IOB on tab selection	2016-06-05 15:58:08 +02:00
Milos Kozak	f7779bd9f1	Treatments fragment	2016-06-05 14:53:03 +02:00
Milos Kozak	629ed62e03	Profile fragment	2016-06-05 01:40:35 +02:00
Milos Kozak	9b749202fd	Objectives design	2016-06-04 17:28:05 +02:00