2698 commits

Author	SHA1	Message	Date
Johannes Mockenhaupt	f7a46d386e	Remove j2v8.	2017-10-16 21:52:06 +02:00
Milos Kozak	d1a9398451	Merge pull request #463 from AdrianLxM/mr-profileRhino ... sum on name for LP	2017-10-16 14:58:41 +02:00
AdrianLxM	414cb5fd8d	sum on name for LP	2017-10-16 12:54:17 +02:00
Milos Kozak	5172a91ca1	Merge pull request #458 from jotomo/gh-417-new-treatment-validation ... NewTreatmentDialog: sanitize inputs, fixes #417.	2017-10-16 08:38:30 +02:00
AdrianLxM	3e7b7ced06	logger reformat	2017-10-15 22:34:03 +02:00
AdrianLxM	c499e5977c	logging	2017-10-15 22:27:08 +02:00
AdrianLxM	1c49362415	rhinoAMA first full run	2017-10-15 20:42:36 +02:00
AdrianLxM	1494b7f5b3	rhinoAMA first crashfree call	2017-10-15 19:36:31 +02:00
AdrianLxM	564c882754	rhino some more cleanups	2017-10-15 16:19:29 +02:00
AdrianLxM	d32a874baa	rhino logging and cleanups	2017-10-15 16:10:58 +02:00
AdrianLxM	e65b4bf858	rhino MA looping	2017-10-15 14:06:13 +02:00
AdrianLxM	190305c6df	rhino first real detemine-basal call	2017-10-15 13:00:10 +02:00
AdrianLxM	124ec6e992	rhino small refactor	2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt	a9adcee974	NewTreatmentDialog: sanitize inputs, fixes #417. ... Inputs are now check as they're being made and cleared if they exceed constraints. This is the same behaviour the Calculator dialog shows.	2017-10-15 10:45:12 +02:00
AdrianLxM	9008ef6f6f	rhino complex parameter passing	2017-10-15 03:55:03 +02:00
AdrianLxM	303d35118e	rhino first parameter passing	2017-10-15 03:50:18 +02:00
AdrianLxM	81b611ad92	rhino function passing	2017-10-15 03:21:32 +02:00
AdrianLxM	7f2451934c	first rhino	2017-10-15 02:52:57 +02:00
Milos Kozak	1db158670a	location permission for BLE scanning	2017-10-14 13:36:38 +02:00
Milos Kozak	1994cd707c	use customized name only for LocalProfile	2017-10-14 10:39:32 +02:00
Milos Kozak	3b90d02e05	show status on Dana fragment too	2017-10-13 13:31:32 +02:00
Milos Kozak	02c57fb9a3	RS connection improvement	2017-10-13 13:17:17 +02:00
Milos Kozak	c99830968a	adjust enforcing new temp basal on user request	2017-10-13 12:39:34 +02:00
Milos Kozak	f235b5fb02	use basalStep instead of fixed value	2017-10-13 12:07:33 +02:00
Milos Kozak	9a4e457d2b	fix RS events parsing	2017-10-13 11:54:50 +02:00
Milos Kozak	1f3c54eb73	split sgvs before broadcast	2017-10-13 08:35:29 +02:00
Milos Kozak	6124ef25a4	report wrong alarm data #2	2017-10-13 08:21:37 +02:00
Milos Kozak	91e286b2ae	report wrong alarm data	2017-10-13 08:11:30 +02:00
Milos Kozak	45a2eba0c2	fix NPE	2017-10-13 08:06:27 +02:00
AdrianLxM	71d95bea92	fix ic isf	2017-10-13 02:56:49 +02:00
AdrianLxM	869b3eff5f	Spinner set selection delayed	2017-10-12 23:56:58 +02:00
AdrianLxM	746d71bcff	remove wear flavours	2017-10-12 18:24:48 +02:00
AdrianLxM	f751638a7f	enabling wearcontrols from preferences	2017-10-12 18:01:10 +02:00
AdrianLxM	944e334231	migrate CPP->LP working	2017-10-12 12:44:17 +02:00
AdrianLxM	6f97e52a07	migrate CPP->LP partial	2017-10-12 12:36:06 +02:00
AdrianLxM	45c07d4106	U/h -> U	2017-10-11 23:38:08 +02:00
AdrianLxM	4667a047ea	add sum to basal in lp	2017-10-11 20:57:43 +02:00
AdrianLxM	39b18915d0	Align LP GUI	2017-10-11 20:19:42 +02:00
AdrianLxM	339c33bd75	Spinner - selection events only after first touch	2017-10-11 19:25:09 +02:00
AdrianLxM	374983e1ae	only inflate elements when needed	2017-10-11 07:59:41 +02:00
AdrianLxM	c181aaaf34	Basal sum in label	2017-10-11 02:32:17 +02:00
AdrianLxM	e6565c1911	reuse button on profile switch	2017-10-11 00:25:44 +02:00
AdrianLxM	02369b952b	a little safer<	2017-10-10 22:54:24 +02:00
AdrianLxM	398e950f8e	fix percentage concatenation on profile names	2017-10-10 22:11:06 +02:00
AdrianLxM	549b72b032	fix percentage/shift from watch	2017-10-10 21:51:58 +02:00
AdrianLxM	b60ff8ceef	max timeshift to 23	2017-10-10 20:47:38 +02:00
AdrianLxM	36784b983e	remove cpp import	2017-10-10 20:42:29 +02:00
AdrianLxM	1410b2e706	wear cpp -> general profile	2017-10-10 20:32:43 +02:00
Milos Kozak	982e46d958	prepare profileswitch function for watch	2017-10-10 19:25:21 +02:00
Milos Kozak	77ec52ff23	fix sending profile switch to pump	2017-10-10 19:19:39 +02:00
Milos Kozak	da71cdfca0	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-10 19:15:07 +02:00
Milos Kozak	24099222f3	Dana R & v2 speed selection	2017-10-10 19:14:43 +02:00
Milos Kozak	50de4a5979	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-10 18:03:50 +02:00
Milos Kozak	d142d2e4f9	resolve RS merge conflict	2017-10-10 16:47:03 +02:00
Milos Kozak	9ec3efbaab	fix conflict	2017-10-09 23:14:46 +02:00
Milos Kozak	4687b001e0	more cpp functionality to Profile	2017-10-08 14:41:51 +02:00
Johannes Mockenhaupt	c6c5624b85	Singleton OpenAPSSMBPlugin.	2017-10-07 23:05:37 +02:00
Milos Kozak	a617d591b0	fix NPE	2017-10-07 22:29:55 +02:00
Milos Kozak	8f259042d6	fix NPE	2017-10-07 22:24:42 +02:00
Johannes Mockenhaupt	fa1c282699	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (28 commits) Singleton & Crashlytics logging part 2 treatments in config builder Singleton & Crashlytics logging part 1 checkboxes for NS-Client layouts overview checkboxes cutoff fix update NP value after manual entry restore preferences temp target presets Rv2 percent fix korean percent fix serialize reload of treatments getTempBasalFromHistory -> getRealTempBasalFromHistory Do not misinterpret a fake-extended as 0% temp. In one line Update danar_fragment.xml text identation Add files via upload Add files via upload Add files via upload Add files via upload ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java	2017-10-07 21:33:22 +02:00
Milos Kozak	6618d2fef2	fix negative timeshift	2017-10-07 20:42:56 +02:00
Milos Kozak	60086dac8d	Merge remote-tracking branch 'origin/dev' into profile	2017-10-07 18:30:55 +02:00
Milos Kozak	c56ecfced6	Merge pull request #447 from AdrianLxM/treatments-configbuilder2 ... treatments in config builder	2017-10-07 18:29:44 +02:00
Milos Kozak	9e7c81613c	Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile	2017-10-07 18:28:59 +02:00
Milos Kozak	ef645ca600	fix merge conflict	2017-10-07 18:27:20 +02:00
Milos Kozak	d6fb912ff9	Singleton & Crashlytics logging part 2	2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt	da3f02648c	Use SpinnerHelper in TimeListEdit. ... Resolves the spinner's onItemSelected handler to back invoked repeatedly on faster devices.	2017-10-07 16:37:24 +02:00
AdrianLxM	046c28856c	treatments in config builder	2017-10-07 01:18:28 +02:00
Milos Kozak	0e763724f6	Singleton & Crashlytics logging part 1	2017-10-06 16:39:59 +02:00
Milos Kozak	a1ca4677c0	log exception	2017-10-06 16:07:41 +02:00
Milos Kozak	4db82fd275	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-10-06 13:15:57 +02:00
Milos Kozak	32d6e06b07	Merge pull request #444 from AdrianLxM/temptarget-presets ... Temptarget presets	2017-10-06 13:15:06 +02:00
Milos Kozak	a670a43346	Merge pull request #445 from AdrianLxM/numberpicker-update ... update NP value after manual entry	2017-10-06 12:41:34 +02:00
AdrianLxM	1b5ef50eb2	update NP value after manual entry	2017-10-06 03:24:35 +02:00
AdrianLxM	bd93fc1adb	temp target presets	2017-10-06 02:53:23 +02:00
Milos Kozak	e0794a6e7f	fix time shifting	2017-10-05 00:54:35 +02:00
Milos Kozak	f08809ff9e	rename button to activate profile	2017-10-04 23:33:02 +02:00
Milos Kozak	3d58fe6bb5	cleanup	2017-10-04 23:24:56 +02:00
Milos Kozak	96edac5ddf	LocalProfile fix	2017-10-04 23:17:19 +02:00
AdrianLxM	d6089bef73	Rv2 percent fix	2017-10-04 19:39:41 +02:00
AdrianLxM	7ce282dc4e	korean percent fix	2017-10-04 19:38:42 +02:00
Milos Kozak	9f6962cee5	serialize reload of treatments	2017-10-04 18:04:34 +02:00
AdrianLxM	3d2647321b	getTempBasalFromHistory -> getRealTempBasalFromHistory	2017-10-04 16:51:54 +02:00
AdrianLxM	9e2968f21a	Do not misinterpret a fake-extended as 0% temp.	2017-10-04 16:00:48 +02:00
Milos Kozak	8bf5933c88	refactor TimeListEdit	2017-10-04 15:46:23 +02:00
Milos Kozak	067494fae1	RS hightempbasal	2017-10-03 22:27:06 +02:00
Milos Kozak	2a98a7e9ba	RS bolus code	2017-10-03 21:47:36 +02:00
Milos Kozak	f5dfff7491	RS APS messages	2017-10-03 20:58:09 +02:00
Milos Kozak	3a014949e9	remove firmware check	2017-10-03 18:45:54 +02:00
Milos Kozak	a5730cb982	initialize only with proper protocol	2017-10-02 22:44:10 +02:00
Milos Kozak	97f69c50fd	store pairing key per pump	2017-10-02 22:21:11 +02:00
Milos Kozak	8cecac0a7f	more LocalProfile work	2017-10-02 19:57:41 +02:00
Milos Kozak	1a5b72f745	Fix time parsing	2017-10-02 17:38:45 +02:00
Milos Kozak	8bbee37b70	fix TB & EB is not set	2017-09-25 19:38:27 +02:00
Milos Kozak	73687442c8	Merge branch 'dev' into rs	2017-09-25 19:36:01 +02:00
Milos Kozak	dc6cbadbdf	fix TB & EB is not set	2017-09-25 19:34:49 +02:00
Milos Kozak	d9f59840b6	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food	2017-09-24 22:47:50 +02:00
Milos Kozak	4fbe7d1000	food database support	2017-09-24 22:47:18 +02:00
Milos Kozak	91b02d4d39	fill dialog refactor & code clean	2017-09-24 14:51:16 +02:00
Milos Kozak	3c7abff88d	remove unused imports	2017-09-24 14:28:26 +02:00
Milos Kozak	1823cd3f24	extended bolus dialog refactor	2017-09-24 13:00:59 +02:00
Milos Kozak	547f09ffbd	allow to view profile from overview	2017-09-24 11:45:32 +02:00
Milos Kozak	c79b750a9c	reactor OptionsToShow	2017-09-24 11:08:04 +02:00
Milos Kozak	082414f0d3	CPP support to profile switch	2017-09-24 10:39:54 +02:00
Milos Kozak	349b27e31a	NS profile fragment shows all profiles	2017-09-23 23:54:43 +02:00
Milos Kozak	6393ee5e10	CPP functionality to Profile.class	2017-09-23 23:12:08 +02:00
Milos Kozak	b3bcb778e0	check for NPE in posted dialogs	2017-09-23 20:12:53 +02:00
Milos Kozak	c3a0f5ddad	split BLE to separate class	2017-09-23 15:03:07 +02:00
Milos Kozak	144a227d14	more progress logging on R	2017-09-23 12:53:41 +02:00
Milos Kozak	8cd8c6b5d9	more progress logging on RS	2017-09-23 12:28:11 +02:00
Milos Kozak	4ed2896f76	remove duplicated code	2017-09-23 10:56:00 +02:00
Johannes Mockenhaupt	7e8e7f0dae	Fix APSResult.toString as well. ... (cherry picked from commit d485e5b)	2017-09-22 16:00:19 +02:00
Milos Kozak	1eeb1c6f7a	RS history OK	2017-09-22 14:57:23 +02:00
Johannes Mockenhaupt	2750ccbf26	Fix APSResult.toSpanned for SMBs. ... Adds a missing newline after "SMB: xxx" (cherry picked from commit d4de9ce)	2017-09-22 09:54:51 +02:00
SMUSTAF1	81fe9ebdcc	Clear the SMS text field if the user removes the old number.	2017-09-20 13:54:05 +02:00
Johannes Mockenhaupt	ce2b1e4d10	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (40 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java # app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java	2017-09-20 13:02:31 +02:00
Milos Kozak	e1903840dd	handle received foods in nsclient	2017-09-20 10:20:50 +02:00
Milos Kozak	60990e500e	Revert "Only do SMB if invoke is from EventNewBG" ... This reverts commit 6ef4b0c2a9	2017-09-18 21:28:43 +00:00
Johannes Mockenhaupt	99c2f797ea	Fix imports.	2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt	1bd5dc3719	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (53 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/res/values/strings.xml	2017-09-18 22:54:35 +02:00
Milos Kozak	fdc3c49a2a	fix merge conflits	2017-09-18 22:03:26 +02:00
Milos Kozak	b797530c9d	BG & IOB contribution on by default in wizard	2017-09-18 21:57:35 +02:00
Milos Kozak	d2815e4045	check for NaN	2017-09-18 21:52:06 +02:00
Milos Kozak	d7f8d75d06	Revert "Rounding issues visible in nightscout insulin field"	2017-09-18 21:24:22 +02:00
Milos Kozak	a98d2e846f	Merge pull request #419 from dylanleonard/feature_time_spinner_fix ... Time Spinner Local Profile Fix	2017-09-18 21:06:34 +02:00
Dylan Leonard	d8590fe8f1	Clarified boolean logic with parentheses :)	2017-09-18 15:04:46 -04:00
Milos Kozak	bf748f3d4b	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:56:42 +02:00
Milos Kozak	8785bc63d5	loadEvents after bolus in separate thread	2017-09-18 20:54:53 +02:00
Milos Kozak	c2afa328e3	Merge branch 'dev' into tt-in-wizard	2017-09-18 20:44:54 +02:00
Milos Kozak	42ee7c668e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-09-18 20:43:24 +02:00
Milos Kozak	8daf9e5c2c	use notification for bolus delivery failed message when window has been destroyed	2017-09-18 20:40:03 +02:00
Milos Kozak	17fa2617f7	fix null pointer exception	2017-09-18 20:23:05 +02:00
Dylan Leonard	4f5987b72a	Added cases to accept both a.m./p.m. and AM/PM	2017-09-18 14:20:28 -04:00
Milos Kozak	3f7819937b	split JSON arrays to 50 elements	2017-09-18 20:10:53 +02:00
Milos Kozak	04994924c5	GUI tweaking, small fixes	2017-09-18 18:41:45 +02:00
Milos Kozak	7f4888978e	warn if basal step is not 0.01	2017-09-18 13:28:00 +02:00
Milos Kozak	6cee6c0f51	RS extended disabled warning	2017-09-18 12:59:56 +02:00
Milos Kozak	e3ad396f65	more work on service	2017-09-18 12:57:07 +02:00
Milos Kozak	ee4d8b7748	some work on history	2017-09-18 09:10:27 +02:00
Wouter Lagerweij	02c2213545	Changed rounding to use BigDecimals to avoid noisy long doubles in output	2017-09-17 14:27:49 +02:00
Dylan Leonard	91f0c21306	Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called	2017-09-16 19:30:07 -04:00
Wouter Lagerweij	aaa3f648d0	Removed unused imports	2017-09-17 00:56:00 +02:00
Wouter Lagerweij	e350c8c3c3	Rounding fix	2017-09-17 00:53:16 +02:00
Milos Kozak	6662c9dd6c	bolus ok	2017-09-15 13:52:28 +02:00
Roumen Georgiev	6ef4b0c2a9	Only do SMB if invoke is from EventNewBG	2017-09-15 09:33:07 +00:00
Milos Kozak	08fca41b5f	partial bolus code, messages blocked by sleep :(	2017-09-14 22:53:11 +02:00
Milos Kozak	01002f11e7	Merge pull request #416 from jotomo/vpump-enact ... VirtualPump: set PumpEnactResult.enacted.	2017-09-14 10:06:01 +02:00
Milos Kozak	13fd6136c3	refactor connectivity notifications	2017-09-14 00:29:34 +02:00
Milos Kozak	1bd938c8d5	Merge branch 'smb-source' into 'smb' ... Set Source.USER for SMB to deliver. See merge request !363	2017-09-13 11:21:27 +00:00
Johannes Mockenhaupt	a4ebd15dbf	Set Source.USER for SMB to deliver.	2017-09-13 13:19:20 +02:00
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