Commit graph

1764 commits

Author SHA1 Message Date
Johannes Mockenhaupt 1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt 5690772946
Nitpicky symmetry. 2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt d202976251
PersistentNotification unregister workaround. 2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt 9442c56eb8
Make PumpEnactResult fluent. 2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt 60324ac6c6
Minor code cleanup. 2017-11-22 11:30:38 +01:00
Milos Kozak 62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak 63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt b49a4c57ba
BolusProgressDialog: hide stop button once pressed. 2017-11-22 00:20:50 +01:00
Milos Kozak 252c0b3db9 DanaR queue driver 2017-11-21 23:00:53 +01:00
Milos Kozak f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00
Milos Kozak a6bf18244a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-11-21 22:31:22 +01:00
Milos Kozak 4007049118 use MIN_DIA instead of DEFAULT_DIA 2017-11-21 22:29:50 +01:00
Milos Kozak d2cba61354 allign dana plugin code 2017-11-21 19:27:43 +01:00
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak 21ae42d37b Merge branch 'dev' into queue 2017-11-20 17:50:49 +01:00
Milos Kozak 1335887957 Merge branch 'dev' into dev2 2017-11-20 17:40:45 +01:00
Milos Kozak 2f0599fbc7 missing return 2017-11-20 17:38:06 +01:00
Milos Kozak d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Milos Kozak 973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak 0f0f39dfb4 log profiles if different 2017-11-20 17:26:03 +01:00
Milos Kozak 777aedd5db fix setting of TRB when low basal rate is running 2017-11-20 15:25:44 +01:00
Milos Kozak 297617467e fix format and add test for fromISODateString 2017-11-20 13:34:13 +01:00
Milos Kozak d8798e0bcf use mills from status if available 2017-11-20 13:23:25 +01:00
Andrew Warrington bc485a4783 Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Johannes Mockenhaupt e0df4646f9
Remove dead code. 2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt 5839ad6a93
Ctors Android-style. 2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt 9a4acbe052
Fix NPE initialising MyPreferencesFragment. 2017-11-13 01:12:05 +01:00
Andrew Warrington 45a26da8b3 Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Milos Kozak 7374545046 refactor all deliverTreatment 2017-11-12 00:08:25 +01:00
Milos Kozak 620a54a31b bolus from wizard to queue 2017-11-11 23:44:30 +01:00
Milos Kozak c7faf2a5e7 bolus progress dialog during connection 2017-11-11 23:03:31 +01:00
Milos Kozak 25aa5094a4 alarm for failed bolus 2017-11-11 22:32:00 +01:00
Milos Kozak a5227fc773 add bolus sound 2017-11-11 16:20:34 +01:00
Milos Kozak 86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Milos Kozak a186ce6468 more command queue code 2017-11-10 00:27:18 +01:00
Milos Kozak d40e0c97c4 simplify active pump access where possible 2017-11-08 23:40:54 +01:00
Milos Kozak 8bae1a18e4 CommandQueue 2017-11-08 22:22:51 +01:00
Milos Kozak 3a773feeeb RS fix last bolus time 2017-11-08 19:23:48 +01:00
Milos Kozak 676dfcc5d1 RS remove duplicated message 2017-11-08 19:18:17 +01:00
Milos Kozak 30f16c7d3e RS fix extended bolus result 2017-11-08 19:13:44 +01:00
Milos Kozak 0af51bb6ea show timeshift if not zero 2017-11-07 13:24:08 +01:00
Andrew Warrington d70860bd97 Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-05 21:41:50 +01:00
Milos Kozak e063f3a2cb removed unneeded code 2017-11-02 18:03:40 +01:00
Milos Kozak a7077a8a6a long click on name to open settings 2017-11-02 17:47:41 +01:00
Milos Kozak 20c66e3b6f add link to advanced settings 2017-11-02 17:39:25 +01:00
Milos Kozak a162343cd4 add getPreferenceId to food plugin 2017-11-01 20:47:16 +01:00
Milos Kozak f67bd291cd Merge branch 'dev' into dev2 2017-11-01 20:44:24 +01:00
Milos Kozak 60699eddbb preferences update 2017-11-01 20:43:59 +01:00
Milos Kozak 00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak 440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
AdrianLxM f9ed104fe3
use DateUtil#agoString 2017-10-29 02:08:43 +02:00
AdrianLxM 3121fa3e84
use DateUtil#untilString 2017-10-29 02:07:17 +02:00
AdrianLxM 9e8752b096
timeframe strings 2017-10-29 02:06:06 +02:00
AdrianLxM 7d82870203
Show remaining time of TT 2017-10-28 02:16:30 +02:00
AdrianLxM 88e22c5f17 NSTreatments NPE fix
When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE

I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.
2017-10-27 16:56:17 +02:00
Milos Kozak 8a6e811c95 Merge branch 'dev' into dev2 2017-10-26 21:13:10 +02:00
Milos Kozak ae47183459 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-26 21:12:37 +02:00
Milos Kozak 26b216a8ee fix RS response code 2017-10-26 20:40:24 +02:00
Johannes Mockenhaupt e5cb5386e3
Disable event logging by default. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 785a8f21de
Log receivers of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 9a1d7fd512
Log source of event. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt d830096482
Better log messages for events. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 9d10563bd9
Group events in type hierarchy related to the LoopPlugin. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 3e24a6069d
Remove dead NSPingAck class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 302ed69564
Let event classes extend Event(UpdageGui) classes. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 8ad223e5e1
Add base event class. 2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt 5a446c9ab5
Log posted events. 2017-10-26 16:54:46 +02:00
AdrianLxM 707d2df345 No explicit service start 2017-10-25 20:10:59 +02:00
Johannes Mockenhaupt 4767809931 Start KeepAliveService after pump init. 2017-10-25 20:10:24 +02:00
AdrianLxM 41dcf8d6f4 Merge remote-tracking branch 'milosremote/dev' into servicestart 2017-10-25 19:57:00 +02:00
AdrianLxM f3872cd934 Merge pull request #465 from jotomo/j2v8-removal
J2v8 removal
2017-10-25 19:56:29 +02:00
Milos Kozak 4f0bbda847 Merge branch 'dev' into dev2 2017-10-25 11:38:12 +02:00
Milos Kozak 7c99157d89 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-25 11:37:19 +02:00
Milos Kozak 606973d4ad use max absorption time for AAPS and weighted average sensitivity detection 2017-10-25 11:37:05 +02:00
Milos Kozak f673d3a721 Merge branch 'dev' into dev2 2017-10-24 21:08:54 +02:00
Milos Kozak 8b020d72cd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-24 21:08:13 +02:00
Milos Kozak 2fb707b9ed log.debug -> log.error on RS comm 2017-10-24 21:08:03 +02:00
Milos Kozak 441c2beffc read status after bolus 2017-10-24 09:19:03 +02:00
Milos Kozak 1ad409754f move preparing graph series to extra class #2 2017-10-23 22:41:12 +02:00
Milos Kozak d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
Milos Kozak 3cdca93b30 RS connectivity & bolus improvement 2017-10-21 20:09:21 +02:00
Milos Kozak 7dd678c917 Better bolusing with different speeds (R & Rv2) 2017-10-21 18:55:56 +02:00
Milos Kozak 8e82e341fd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-21 18:07:30 +02:00
Milos Kozak a8751bf35a Detailed onscreen history logging 2017-10-21 18:05:19 +02:00
McHoffi 986eab041d Merge pull request #1 from MilosKozak/dev
Dev
2017-10-21 17:43:33 +02:00
McHoffi 9c7c583aed Split to smaller pieces 2017-10-21 17:41:01 +02:00
Milos Kozak dbf5a5e577 Sensitivity logging optional 2017-10-21 13:14:06 +02:00
Milos Kozak 881a745e32 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-20 21:36:56 +02:00
Milos Kozak 01d6f1594a RS synchronized change 2017-10-20 17:37:06 +02:00
Milos Kozak e545f75d69 fix displaying XX:30 time intervals 2017-10-20 11:34:33 +02:00
Milos Kozak c258b41f11 allow to use actual profile in wizard 2017-10-19 19:35:35 +02:00
Milos Kozak 0b7832ec60 getUnits from active profile not interface 2017-10-19 19:23:19 +02:00
Milos Kozak 19f107fe53 move preparing graph series to extra class #2 2017-10-18 23:56:13 +02:00
Milos Kozak d65a2d8f8c move preparing graph series to extra class 2017-10-18 19:01:39 +02:00
Milos Kozak 6ff3d00f3c Merge remote-tracking branch 'origin/dev' into food 2017-10-17 20:55:55 +02:00
Milos Kozak 13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt fee19db501
ConfigBuilder: hide disabled plugins by default. 2017-10-16 22:14:49 +02:00
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
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
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
Milos Kozak 1eeb1c6f7a RS history OK 2017-09-22 14:57:23 +02:00
SMUSTAF1 81fe9ebdcc Clear the SMS text field if the user removes the old number. 2017-09-20 13:54:05 +02:00
Milos Kozak e1903840dd handle received foods in nsclient 2017-09-20 10:20:50 +02:00
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
Milos Kozak 08fca41b5f partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
Milos Kozak 01002f11e7 Merge pull request #416 from jotomo/vpump-enact
VirtualPump: set PumpEnactResult.enacted.
2017-09-14 10:06:01 +02:00
Milos Kozak 13fd6136c3 refactor connectivity notifications 2017-09-14 00:29:34 +02:00
Johannes Mockenhaupt cb3b472488
VirtualPump: set PumpEnactResult.enacted.
(cherry picked from commit ec49bc3)
2017-09-13 13:16:48 +02:00
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt 07b04b8abf
Use correct units for low/high from TT. 2017-09-12 01:23:38 +02:00
Milos Kozak 69b04fdf26 Merge pull request #413 from samihusseingit/dev
Dev
2017-09-11 20:12:51 +02:00
Johannes Mockenhaupt 936ce42cc0
Remove duplicate logging. 2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt 612efa6a13
Revert "Make the BolusProgress dialog a bit more self-contained."
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).

This reverts commit c11455dff1.
2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt c11455dff1
Make the BolusProgress dialog a bit more self-contained.
(cherry picked from commit 75db72a)
2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt c227e0e5fa
Dead code be gone.
(cherry picked from commit bb626ce)
2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt 5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt c50fad81bb
Log exceptions in catch blocks rather than printing to console.
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt 627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false.
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00