AdrianLxM
9e2968f21a
Do not misinterpret a fake-extended as 0% temp.
2017-10-04 16:00:48 +02:00
Milos Kozak
8bf5933c88
refactor TimeListEdit
2017-10-04 15:46:23 +02:00
Milos Kozak
6d08a608a2
dana layout
2017-10-03 22:37:53 +02:00
Milos Kozak
58ed0416d1
fix conflict
2017-10-03 22:33:35 +02:00
Milos Kozak
96c1a18a66
Merge pull request #435 from PoweRGbg/dev
...
alesinka's icons added to the DanaR tab
2017-10-03 22:28:04 +02:00
Milos Kozak
067494fae1
RS hightempbasal
2017-10-03 22:27:06 +02:00
Milos Kozak
2a98a7e9ba
RS bolus code
2017-10-03 21:47:36 +02:00
Milos Kozak
f5dfff7491
RS APS messages
2017-10-03 20:58:09 +02:00
Milos Kozak
3a014949e9
remove firmware check
2017-10-03 18:45:54 +02:00
Milos Kozak
a5730cb982
initialize only with proper protocol
2017-10-02 22:44:10 +02:00
Milos Kozak
97f69c50fd
store pairing key per pump
2017-10-02 22:21:11 +02:00
Milos Kozak
8cecac0a7f
more LocalProfile work
2017-10-02 19:57:41 +02:00
Milos Kozak
1a5b72f745
Fix time parsing
2017-10-02 17:38:45 +02:00
Roumen Georgiev
ef803d6a41
In one line
2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60
Update danar_fragment.xml
2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa
text identation
2017-09-29 09:47:29 +03:00
Roumen Georgiev
2e61bc136f
Add files via upload
2017-09-29 09:44:25 +03:00
Roumen Georgiev
3c0a509541
Add files via upload
2017-09-29 09:43:42 +03:00
Roumen Georgiev
a152f94f53
Add files via upload
2017-09-29 09:42:42 +03:00
Roumen Georgiev
cb982477cd
Add files via upload
2017-09-29 09:41:32 +03:00
Roumen Georgiev
271534a64b
Add files via upload
2017-09-29 09:40:58 +03:00
Roumen Georgiev
92e2008692
Adding button Icons
2017-09-29 09:40:11 +03:00
Milos Kozak
ba54dacffb
1.54-dev
2017-09-25 19:51:05 +02:00
Milos Kozak
8bbee37b70
fix TB & EB is not set
2017-09-25 19:38:27 +02:00
Milos Kozak
73687442c8
Merge branch 'dev' into rs
2017-09-25 19:36:01 +02:00
Milos Kozak
dc6cbadbdf
fix TB & EB is not set
2017-09-25 19:34:49 +02:00
Milos Kozak
d9f59840b6
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food
2017-09-24 22:47:50 +02:00
Milos Kozak
4fbe7d1000
food database support
2017-09-24 22:47:18 +02:00
Milos Kozak
91b02d4d39
fill dialog refactor & code clean
2017-09-24 14:51:16 +02:00
Milos Kozak
3c7abff88d
remove unused imports
2017-09-24 14:28:26 +02:00
Milos Kozak
1823cd3f24
extended bolus dialog refactor
2017-09-24 13:00:59 +02:00
Milos Kozak
547f09ffbd
allow to view profile from overview
2017-09-24 11:45:32 +02:00
Milos Kozak
c79b750a9c
reactor OptionsToShow
2017-09-24 11:08:04 +02:00
Milos Kozak
082414f0d3
CPP support to profile switch
2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a
NS profile fragment shows all profiles
2017-09-23 23:54:43 +02:00
Milos Kozak
6393ee5e10
CPP functionality to Profile.class
2017-09-23 23:12:08 +02:00
Milos Kozak
b3bcb778e0
check for NPE in posted dialogs
2017-09-23 20:12:53 +02:00
Milos Kozak
c3a0f5ddad
split BLE to separate class
2017-09-23 15:03:07 +02:00
Milos Kozak
144a227d14
more progress logging on R
2017-09-23 12:53:41 +02:00
Milos Kozak
8cd8c6b5d9
more progress logging on RS
2017-09-23 12:28:11 +02:00
Milos Kozak
4ed2896f76
remove duplicated code
2017-09-23 10:56:00 +02:00
Milos Kozak
2972b48d5a
Merge pull request #424 from samihusseingit/clear_SMS_number_field
...
Clear sms number field
2017-09-22 15:40:50 +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
samihusseingit
0113092023
Merge pull request #4 from MilosKozak/dev
...
Dev
2017-09-20 13:11:41 +02:00
Milos Kozak
e1903840dd
handle received foods in nsclient
2017-09-20 10:20:50 +02:00
Johannes Mockenhaupt
99c2f797ea
Fix imports.
2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt
1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (53 commits)
bump 1.53
BG & IOB contribution on by default in wizard
check for NaN
Revert "Rounding issues visible in nightscout insulin field"
Clarified boolean logic with parentheses :)
loadEvents after bolus in separate thread
use notification for bolus delivery failed message when window has been destroyed
fix null pointer exception
Added cases to accept both a.m./p.m. and AM/PM
split JSON arrays to 50 elements
Update strings.xml
Changed rounding to use BigDecimals to avoid noisy long doubles in output
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
Removed unused imports
Rounding fix
VirtualPump: set PumpEnactResult.enacted.
Use correct units for low/high from TT.
Remove duplicate logging.
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/MainApp.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +02:00
Milos Kozak
fdc3c49a2a
fix merge conflits
2017-09-18 22:03:26 +02:00
Milos Kozak
cd7c7733ea
bump 1.53
2017-09-18 21:59:01 +02:00
