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
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
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
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
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
Milos Kozak
d6a27c1af0
1.5h
2017-08-23 13:28:07 +02:00
Milos Kozak
c98cd3c834
Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
...
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
0551f7f16d
Merge pull request #387 from MilosKozak/invalid-overview
...
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586
Merge pull request #389 from jotomo/cleanups
...
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema.
2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment.
2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08
correct supercall
2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97
Use bolusstep granularity in fill dialog
2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4
bugfix: fill as invalid treatments if triggered from phone
2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197
add invalid treatments to charts in "invalid" colour
2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c
Use bolusstep as step for insulin correction in wizard
2017-08-22 00:41:23 +02:00
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
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
6b8dd5868d
fix displaying target in mmol
2017-08-18 11:46:04 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline.
2017-08-17 22:01:59 +02:00
