Commit graph

753 commits

Author SHA1 Message Date
Milos Kozak
7dd678c917 Better bolusing with different speeds (R & Rv2) 2017-10-21 18:55:56 +02:00
AdrianLxM
7ed7a2e8c4 Merge remote-tracking branch 'milosremote/dev' into smb-rhino 2017-10-21 17:06:57 +02:00
Milos Kozak
c258b41f11 allow to use actual profile in wizard 2017-10-19 19:35:35 +02:00
Milos Kozak
13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Milos Kozak
02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak
bee60eb0e3 CS translations 2017-10-13 09:16:15 +02:00
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM
e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
Milos Kozak
d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +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
ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
AdrianLxM
bd93fc1adb temp target presets 2017-10-06 02:53:23 +02:00
Milos Kozak
f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak
3a014949e9 remove firmware check 2017-10-03 18:45:54 +02:00
Milos Kozak
97f69c50fd store pairing key per pump 2017-10-02 22:21:11 +02:00
Milos Kozak
082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak
8cd8c6b5d9 more progress logging on RS 2017-09-23 12:28:11 +02:00
Milos Kozak
1eeb1c6f7a RS history OK 2017-09-22 14:57:23 +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
fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak
c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +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
08fca41b5f partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
Milos Kozak
ed6cabe7fa initial RS work 2017-09-13 00:35:03 +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
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
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Milos Kozak
addd6c8232 fix conflict 2017-08-28 19:15:33 +02:00
Milos Kozak
6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
Milos Kozak
ebfc4e3075 colored predictions 2017-08-21 15:36:52 +02:00
Milos Kozak
c36587430c fix merge conflict 2017-08-17 21:24:50 +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
AdrianLxM
92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
Milos Kozak
e5cc34b975 fix merge conflict 2017-08-16 18:38:14 +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
898e162300 initial work on SMB 2017-08-15 23:13:37 +02:00
Milos Kozak
4c490c32f7 Merge pull request #361 from MilosKozak/oref-insulincurves
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak
151165809e Dutch language 2017-08-14 21:57:49 +02:00
AdrianLxM
707d5a480c insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
AdrianLxM
ced1da09cf insulincurves - i18n 2017-08-14 15:25:37 +02:00
AdrianLxM
085caddeee insulincurves - freepeak 2017-08-14 15:24:55 +02:00
Milos Kozak
2ae0028495 Swedish 2017-08-07 14:06:11 +02:00
Milos Kozak
4e4088f164 remove unneeded strings 2017-08-05 18:47:01 +02:00
Milos Kozak
f834b3b7e0 remove unneeded texts 2017-08-05 17:43:31 +02:00
Milos Kozak
e933650330 CS translations 2017-08-01 22:17:39 +02:00
Milos Kozak
9596987b35 new temp basal dialog refactor 2017-08-01 20:02:17 +02:00
Milos Kozak
6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +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
AdrianLxM
10d27f0b6a Picture renaming (#311)
* adding icons
2017-07-21 22:24:06 +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
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
AdrianLxM
b79beda971 wear pass through overview notifications 2017-07-15 16:03:04 +02:00
AdrianLxM
39ee68e62a cpp-watch external-function 2017-07-10 04:44:46 +02:00
Milos Kozak
0b5abae44f fix conflict 2017-07-07 15:10:29 +02:00
Milos Kozak
8de7e05dd5 weightedaverage sensitivity 2017-07-07 15:08:21 +02:00
drnoname82
e12e4ec55e Update strings.xml 2017-07-07 01:03:20 +02:00
Milos Kozak
7b9e5fec1e autosens warning 2017-07-04 00:16:35 +02:00
Milos Kozak
5a27f9afa1 allow lock screen in nsclient mode 2017-07-03 00:02:54 +02:00
Milos Kozak
e9dba7136d nsclient layout for phones 2017-07-02 11:28:03 +02:00
Milos Kozak
09e5fdc61b sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
Milos Kozak
96e4a25f9e typo 2017-06-30 11:40:12 +02:00
Milos Kozak
9e8c91319e move ns version to about dialog 2017-06-30 09:55:47 +02:00
Milos Kozak
39c6ae5eae fix merge conflict 2017-06-30 09:35:20 +02:00
AdrianLxM
16e360f200 visualize absolute rate emulation as percentage 2017-06-29 14:14:40 +02:00
Milos Kozak
f58f70bdca wizard tweaking 2017-06-28 23:11:17 +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
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
dbd721319e ns uploader status 2017-06-26 22:39:01 +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
5360129e5f sensitivity plugins 2017-06-24 11:04:09 +02:00
Milos Kozak
80962e33d7 allow to ignore profileswitch events 2017-06-20 19:52:46 +02:00
Milos Kozak
e90812634b work from old autosens branch 2017-06-16 14:37:43 +02:00
Milos Kozak
fb7af2f317 ns alarm setting in xml 2017-06-15 21:33:45 +02:00
Milos Kozak
b41a942d11 update supported NS & NSclient versions 2017-06-12 09:30:04 +02:00
Milos Kozak
77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +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
b40cf99201 gui tweaking 2017-06-03 22:43:35 +02:00
Milos Kozak
d365fcd6a4 fix bugs & design tweaking 2017-06-02 23:25:11 +02:00
Milos Kozak
f267c85377 it compiles now with profiles 2017-06-02 10:25:49 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +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
bb9c68fd4d Merge remote-tracking branch 'origin/dev' into history 2017-05-24 19:18:30 +02:00
Milos Kozak
f936580734 Russsian language 2017-05-24 18:46:19 +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
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
Milos Kozak
3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak
3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak
86c975e9d6 Add Italian language 2017-05-16 13:39:24 +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
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak
df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak
51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +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
554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +02:00
Milos Kozak
09fea02ed2 Allow to disable NS upload while client is connected 2017-05-09 16:24:53 +02:00
Milos Kozak
0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
AdrianLxM
67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak
352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak
289ad394ce Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-03 22:30:12 +02:00
Milos Kozak
573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
AdrianLxM
9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +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
4dd9281276 remove actionbar 2017-04-29 20:16:50 +02:00
Milos Kozak
974e5e0098 pump fragment redesign 2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722 virtual pump layout 2017-04-29 17:48:45 +02:00
Milos Kozak
3552d6aa40 bg value colored 2017-04-27 21:26:53 +02:00
Milos Kozak
5ef034b4fc cob display 2017-04-26 23:45:40 +02:00
Milos Kozak
a07a8755b1 IOB graph 2017-04-24 13:17:14 +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
90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +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
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
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
d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak
a4f302ee4a show if pump is suspended 2017-03-24 12:05:12 +01:00
Milos Kozak
e8edf9eb54 Glimp support 2017-03-21 19:11:39 +01:00
Milos Kozak
de9dbf9243 CS translations 2017-03-04 20:55:13 +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
87ad140eb5 SMS logging and resource refactor 2017-02-22 14:11:05 +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
5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +01:00
Milos Kozak
9303bd61fd Merge branch 'dev' into nsclient 2017-02-19 09:41:16 +01:00
AdrianLxM
d113d39916 wear setting to show detailed IOB 2017-02-18 18:13:13 +01:00
Milos Kozak
29b4f0063b better handling readonly permission 2017-02-17 22:12:35 +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
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
8001796f4b virtual pump status upload optional 2017-02-14 15:41:30 +01:00
Milos Kozak
f9ee3c547a translations 2017-02-13 21:05:57 +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
1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
Milos Kozak
4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
Milos Kozak
351a624b83 small string change 2017-02-12 13:48:03 +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
638b9c263c Merge pull request #61 from MilosKozak/dev
Dev
2017-02-11 02:55:14 +01:00
Milos Kozak
40d166cb7d CS translations 2017-02-10 21:39:51 +01:00
Milos Kozak
2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
Milos Kozak
8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
AdrianLxM
8ece312b6a Merge pull request #60 from MilosKozak/dev
Dev
2017-02-09 23:47:12 +01:00
Milos Kozak
715d15b51f CS translations 2017-02-09 22:44:42 +01:00
Milos Kozak
90061c6f25 Show log 2017-02-09 22:29:21 +01:00
Milos Kozak
8a2846c516 Merge branch 'dev' into dev 2017-02-09 17:01:05 +01:00
Milos Kozak
7f123e4208 warn on wrong entered sms phone number 2017-02-09 16:14:09 +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
650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +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
LadyViktoria
1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +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
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
538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +01:00
LadyViktoria
4d4630ca1a Add prefernces.json rename some Strings to match OpenAPS docs 2017-01-27 09:56:32 +01:00
LadyViktoria
f510b0a8cc Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +01:00
LadyViktoria
1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
viktoria
74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +01:00
viktoria
88d6178a1b Add prefernces.json small fix 2017-01-25 22:20:56 +01:00
viktoria
9d2b645d8c Add prefernces.json default values 2017-01-25 22:11:17 +01:00
viktoria
fd6432f808 Add prefernces.json put hyperlink and warning there 2017-01-25 20:41:33 +01:00
viktoria
8e095fefaf Add prefernces.json layout changes 2017-01-25 20:20:39 +01:00
viktoria
0838ede6a3 Add prefernces.json change secondary text color to white 2017-01-25 20:19:53 +01:00
LadyViktoria
b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
Milos Kozak
044547b594 Merge pull request #143 from AdrianLxM/deltasx
Settings for deltas
2017-01-24 10:59:10 +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
viktoria
bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +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
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
2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +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
Milos Kozak
2754e23c08 CS translations 2017-01-19 19:52:14 +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
viktoria
9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
Milos Kozak
0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak
7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak
61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
Milos Kozak
61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Milos Kozak
1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak
74afdb6874 Merge branch 'dev' into AMA 2017-01-09 17:34:49 +01:00
Milos Kozak
26a76217bf Greek language 2017-01-09 17:23:56 +01:00
Milos Kozak
68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak
6621c2f610 log script debug in fragment 2017-01-08 00:27:13 +01:00
Milos Kozak
9c93d3ad7d log autosens input data in fragment 2017-01-08 00:07:18 +01:00
Milos Kozak
25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak
3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
Milos Kozak
952a2342a8 Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
2017-01-02 13:58:56 +01:00
Milos Kozak
6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak
1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak
8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
Milos Kozak
24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak
e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
AdrianLxM
6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
Milos Kozak
29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak
cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak
052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak
7719e2ac63 use notifications for profile update 2016-12-22 12:17:38 +01:00
Milos Kozak
cb4330ddcd notify when pump settings is wrong 2016-12-13 22:10:13 +01:00
Milos Kozak
6ba532d178 notify about setting basal profile 2016-12-09 16:04:07 +01:00
Milos Kozak
4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak
be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak
0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak
abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
Milos Kozak
4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
Milos Kozak
db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c wear extract strings 2016-11-29 15:01:00 +01:00
Milos Kozak
2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
LadyViktoria
39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
LadyViktoria
1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
ecorman
da861a7108 Note basal start / end to see note in Xdrip+ with data 2016-11-23 23:59:11 +01:00
AdrianLxM
513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
Milos Kozak
0b56b7554c Merge pull request #64 from AdrianLxM/fill-presets2
Fill presets
2016-11-12 10:41:54 +01:00
AdrianLxM
1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
Milos Kozak
c034f77b71 fix merge conflict 2 2016-11-11 13:09:50 +01:00
Milos Kozak
a341fa4343 fix merge conflict 2016-11-11 13:09:11 +01:00
AdrianLxM
a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
Milos Kozak
e8d169f078 allow automated actions only whem pump is initialized 2016-11-10 23:33:12 +01:00
AdrianLxM
a6ae92bb2f Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 18:53:01 +01:00
AdrianLxM
c900d6611c Warn on "refresh treatments from NS" button in upload only mode. 2016-11-10 18:52:42 +01:00
AdrianLxM
f85f04d33f NS upload only 2016-11-10 18:33:50 +01:00
Milos Kozak
21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
AdrianLxM
341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
Milos Kozak
3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
AdrianLxM
b1f3bb17bb Show in Overview when loop is disabled 2016-11-02 18:04:14 +01:00
Milos Kozak
4c3d67535c Korean language template 2016-10-25 23:38:44 +02:00
Milos Kozak
861c24fc45 distinguish between meal and correction bulus 2016-10-25 23:33:02 +02:00
Milos Kozak
6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak
4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak
ecb685f7f6 hard limits on openaps params 2016-09-13 22:15:17 +02:00
Milos Kozak
05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
ecorman
dd032b19e0 Spanish translation update strings.xml 2016-09-07 23:40:37 +02:00
ecorman
b3857f7794 Spanish translation 2016-09-07 23:39:06 +02:00
Milos Kozak
40aada0eb4 ajdust some danar pump comm params 2016-08-12 20:22:44 +02:00
Milos Kozak
4da0f345cf fix wizard gui 2016-08-11 09:54:03 +02:00
Milos Kozak
d023e4ae32 move targets from fragment to plugin 2016-08-10 23:27:26 +02:00
Milos Kozak
acbd028465 bolus progress in virtual pump 2016-08-10 14:50:53 +02:00
Milos Kozak
49d6690450 OpenAPS MA target value 2016-08-09 15:40:12 +02:00
Milos Kozak
88698576a2 plusminis edit shows toast when hit limit 2016-08-08 10:08:30 +02:00
Milos Kozak
b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak
b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak
a7d3dca752 Bolusing dialog 2016-08-04 09:17:26 +02:00
Milos Kozak
c20026c15a lowsuspend cleanup 2016-08-03 14:40:47 +02:00
Milos Kozak
dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Milos Kozak
e94fe1f647 danar history translation support 2016-07-28 13:40:32 +02:00
Milos Kozak
61e8ffeebd DanaR history loader 2016-07-27 17:49:56 +02:00
Milos Kozak
a1a64873fd DanaR driver as a service 2016-07-18 12:02:33 +02:00
Milos Kozak
7f661b7fa6 danar profile dia&car configurable in preferences 2016-07-15 20:56:07 +02:00
Milos Kozak
c5d40b3a6c careportal eventtypes translations 2016-07-15 19:45:03 +02:00
Milos Kozak
90fee59e8a sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
Milos Kozak
4a8ecb3a79 better display pump results 2016-07-13 18:57:23 +02:00
Milos Kozak
b81cf8341b MM640g base interface code 2016-07-13 15:56:27 +02:00
Milos Kozak
272262b115 SMSCommunicator plugin 2016-07-13 13:54:40 +02:00
Milos Kozak
76d42ef3fb displaying basal fix 2016-07-12 17:56:01 +02:00
Milos Kozak
f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak
3127870770 DanaR as profile source 2016-07-11 14:04:57 +02:00
Milos Kozak
143d347841 most danar code there 2016-07-10 15:05:13 +02:00
Milos Kozak
e37917dae4 test alert fix 2016-07-08 13:39:27 +02:00
Milos Kozak
dc3eb80d52 basic danar comm 2016-07-08 00:17:02 +02:00
Milos Kozak
690fd06c01 Agreement 2016-07-07 18:04:36 +02:00
Milos Kozak
c844a2ad9a DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
Milos Kozak
ba015f1140 DanaR service 2016-07-07 10:34:20 +02:00
Milos Kozak
85f4a93c11 move languages to preferences 2016-07-06 22:50:25 +02:00
Milos Kozak
7c46407f81 AlarmService 2016-07-06 22:05:28 +02:00
Milos Kozak
a99c8aa75b remove 'language' from label in menu 2016-07-06 11:13:42 +02:00
Milos Kozak
ce7439bc00 add bg language 2016-07-05 20:28:23 +02:00
viktoria
da4d73cd52 Array fix 2016-07-03 22:47:08 +02:00
Milos Kozak
02f5806832 preferences translations 2016-07-03 21:05:36 +02:00
Milos Kozak
59aba8d9be german language to menu 2016-07-03 20:54:00 +02:00
Milos Kozak
afa4332d28 import/export preferences 2016-07-03 20:37:42 +02:00
Milos Kozak
9f8d7d3dca configbuilder fragment translations 2016-07-03 13:56:57 +02:00
Milos Kozak
07b01cd8d0 some missing translations 2016-07-03 13:35:02 +02:00
Milos Kozak
5cad7f1cb4 temp basal dialog plus/minus buttons 2016-07-03 13:25:23 +02:00
Milos Kozak
000fafced3 some missing CZ translations 2016-07-03 11:13:50 +02:00
Milos Kozak
7459acfc34 finished CZ translation 2016-07-03 11:04:24 +02:00
Milos Kozak
ea4eef88ed 1st round of CZ translation 2016-07-03 01:02:35 +02:00
Milos Kozak
92f4c37fac careportal 2016-07-02 23:58:57 +02:00
Milos Kozak
caa4f3402e split iob in wizard dialog, fixies for no data in app 2016-06-27 23:34:33 +02:00
Milos Kozak
aa6c5764c4 language selector in menu 2016-06-27 20:14:31 +02:00
Milos Kozak
a3d32fcb44 objectives fragment complete 2016-06-27 18:48:48 +02:00
Milos Kozak
a4bdebdedf detect ns versions 2016-06-26 14:56:43 +02:00
Milos Kozak
2f16c9b998 open loop mode & notification 2016-06-26 11:43:26 +02:00
Milos Kozak
270503fe74 Merge pull request #2 from LadyViktoria/master
Material Design and Buttons
2016-06-24 23:36:01 +02:00
viktoria
4eaa2c6f1d Material Design and Buttons 2016-06-24 23:20:38 +02:00
Milos Kozak
35ff53dbb4 iob & basal on overview tab 2016-06-24 23:17:46 +02:00
Milos Kozak
91b36a8528 work on tempbasals 2016-06-22 18:08:21 +02:00
Milos Kozak
edddfed004 add source selection xdrip/nsclient 2016-06-21 00:34:36 +02:00
Milos Kozak
fdf09b9daf extended bolus dialog 2016-06-20 22:55:49 +02:00
Milos Kozak
4645c2bc4d apply constraints on new treatment dialog 2016-06-20 21:43:29 +02:00
Milos Kozak
7cb0e0e588 manual tempbasal dialog 2016-06-20 20:45:55 +02:00
Milos Kozak
5ac31bd0ca menu, preferences, treatment&wizard buttons, ns upload 2016-06-19 20:06:00 +02:00
Milos Kozak
aa97722283 loop & safety fragment 2016-06-19 13:17:16 +02:00
Milos Kozak
ddb1868018 Constrains interface 2016-06-15 21:47:26 +02:00
Milos Kozak
26724ecbda ConfigBuilder most work done 2016-06-14 23:45:55 +02:00
Milos Kozak
b8eca8a802 rename profileviewer -> nsprofileviewer 2016-06-14 13:01:37 +02:00
Milos Kozak
32bfea8d18 base ConfigBuilder plugin 2016-06-13 22:53:41 +02:00
Milos Kozak
b310310511 GUI improvements 2016-06-12 13:30:34 +02:00
Milos Kozak
a66ece9af5 Lowsuspend finished 2016-06-12 10:53:19 +02:00
Milos Kozak
a8ab671d78 OpenApsMA invoke 2016-06-11 22:21:44 +02:00
Milos Kozak
73ebf3ffeb typo in VIRTUAL 2016-06-11 20:47:00 +02:00
Milos Kozak
68b5570d35 VirtualPump 2016-06-11 20:45:40 +02:00
Milos Kozak
a5088584a2 OpenAPS MA initial work 2016-06-10 18:50:46 +02:00
Milos Kozak
891c5dd4d7 show units in profile 2016-06-09 09:21:33 +02:00
Milos Kozak
701e6a2055 receive BGs from xDrip and NSClient 2016-06-07 21:48:17 +02:00
Milos Kozak
627ce66852 TempBasals & some IOB adjustments 2016-06-06 10:42:46 +02:00
Milos Kozak
f7779bd9f1 Treatments fragment 2016-06-05 14:53:03 +02:00
Milos Kozak
629ed62e03 Profile fragment 2016-06-05 01:40:35 +02:00
Milos Kozak
9b749202fd Objectives design 2016-06-04 17:28:05 +02:00