Commit graph

1672 commits

Author SHA1 Message Date
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
707d5a480c insulincurves - rename peak to peak time 2017-08-14 16:02:07 +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
Johannes Mockenhaupt
d49356a922
Logging: Print filename and line instead of logger name. 2017-08-13 21:31:21 +02:00
Milos Kozak
377b711896 Merge pull request #352 from diabetesdt1/patch-1
Update strings.xml
2017-08-13 20:31:54 +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
Milos Kozak
2a2b5dbb31 Merge pull request #357 from savek-cc/logfile-name
change logfile name pattern
2017-08-13 15:55:53 +02:00
Timm Korte
8caaeeff2a change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename 2017-08-13 14:32:37 +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
diabetesdt1
8cd24fd919 Update strings.xml
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1
a69a94a384 Update strings.xml 2017-08-11 12:48:15 +02:00
diabetesdt1
15fc53530d Update strings.xml
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1
0b62669079 Update strings.xml
typo fixed
2017-08-11 07:30:53 +02:00
Milos Kozak
26fbd450b0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv 2017-08-10 22:39:25 +02:00
Milos Kozak
3ca058ce60 SV language cleanup 2017-08-10 22:33:38 +02:00
diabetesdt1
d78928a264 Update strings.xml
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1
c5b5d65efc Update strings.xml 2017-08-10 21:29:41 +02:00
diabetesdt1
8df0ccdbb1 Update strings.xml
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1
33f5e97ac6 Update strings.xml
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Milos Kozak
3a574c3803 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-10 17:28:57 +02:00
Milos Kozak
f703c82ca7 microbolus calculation 2017-08-10 17:28:41 +02:00
Milos Kozak
dae82d49fb Merge remote-tracking branch 'patrik/dev' into sv 2017-08-10 16:29:42 +02:00
ellabellakaramella
0766ac812c SV translation 2017-08-10 15:15:40 +02:00
Winfried Kuiper
5b43f11a3f Update strings.xml
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper
99a0edfa06 Update strings.xml
Missing units in german translation
2017-08-09 22:03:59 +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
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
Milos Kozak
2ae0028495 Swedish 2017-08-07 14:06:11 +02:00
RoumenGeorgiev
4f054907cb Merge pull request #1 from MilosKozak/dev
Dev
2017-08-07 09:17:07 +03:00
Milos Kozak
a40afd0948 1.5g 2017-08-06 14:28:01 +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
4e4088f164 remove unneeded strings 2017-08-05 18:47:01 +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
f834b3b7e0 remove unneeded texts 2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34 Merge branch 'dev' into move-to-range-in-profile 2017-08-05 14:48:41 +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
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
714a292d78 fixed wrong pasting 2017-08-04 15:05:09 +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
RoumenGeorgiev
529d267b9d Added check for staleData and notification
with every loop
2017-08-04 12:29:48 +03: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
AdrianLxM
23abc0e4e5 Some more German 2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9 Some more German 2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab Some German translations, remove unused strings, App name for all 2017-08-01 23:46:58 +02:00
Radoslav Radev
39891bbad9 Update strings.xml 2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330 CS translations 2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3 hide all overview buttons by default 2017-08-01 20:52:23 +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
AdrianLxM
5569b42ac3 wear wizard percentage 2017-07-26 09:58:51 +02:00
Milos Kozak
7a572d2341 1.5f 2017-07-25 22:53:55 +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
0914e67c11 typo 2017-07-25 19:25:58 +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
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
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
AdrianLxM
1c0e97c175 recategorize cp icons 2017-07-22 20:57:30 +02:00
AdrianLxM
2e32d12bc0 removed unnecessary text colour and fixed indentation 2017-07-22 14:34:59 +02:00
AdrianLxM
c187bf1575 layout indentation 2017-07-22 14:30:55 +02:00
Roumen Georgiev
54697df358 Moving some buttons to the right categories 2017-07-22 14:27:51 +02:00
AdrianLxM
3d4fa0cebf remove duplicate IDs and indentation fix 2017-07-22 02:15:55 +02:00
AdrianLxM
0b6c9845fa synchronize NSClient log 2017-07-22 01:43:33 +02:00
AdrianLxM
10d27f0b6a Picture renaming (#311)
* adding icons
2017-07-21 22:24:06 +02:00
AdrianLxM
e381d197cb 1.5e 2017-07-21 16:49:43 +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
AdrianLxM
0297f2b75d Merge pull request #301 from MilosKozak/insulin-colourlables
Add color of chart to corresponding lables/scale
2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt
fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment. 2017-07-21 14:56:14 +02:00
AdrianLxM
31fcf34a2d Fix after merge-conflict cleanup 2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640 Files renamed 2017-07-21 11:55:12 +02:00
Milos Kozak
c68eccc328 Merge pull request #306 from boikonur/dev 2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd Added icons for home, actions and care portal screens 2017-07-20 20:57:45 +03:00
Radoslav Radev
3098f0bdfa update bg translation 2017-07-20 09:24:35 +03: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
1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73 remove extra strings 2017-07-20 01:06:00 +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
AdrianLxM
732e225c7d bulgarian removed non-translatable 2017-07-19 19:50:40 +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
Milos Kozak
3475b64e1b Merge pull request #299 from MilosKozak/dev-nsclient-quickfix
NSClient quickfix
2017-07-19 18:53:38 +02:00
AdrianLxM
76990b7983 synchronize interval access 2017-07-19 17:39:55 +02:00
Milos Kozak
62ff62a31f Merge pull request #290 from PoweRGbg/patch-1 2017-07-19 17:21:15 +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
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments.
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
2017-07-19 12:32:18 +02:00
AdrianLxM
cfe8e0a23a local broadcasts better setting title 2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769 setting to disable local broadcasts in NSClient 2017-07-18 22:15:17 +02:00
PoweRGbg
c3f85faede removed some "unneeded" translations 2017-07-18 18:10:24 +03: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