caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
6353 commits 1 branch 20 tags 140 MiB
Commit graph

744 commits

Author SHA1 Message Date
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Markus M. May 2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode 2018-03-15 23:00:08 +01:00
Markus M. May e38f10dba0 Merge jamoto/engineering-mode 2018-03-15 21:10:18 +01:00
Milos Kozak db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
Milos Kozak e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
Johannes Mockenhaupt a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt 637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled. 2018-03-12 23:01:58 +01:00
Milos Kozak eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak 38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Milos Kozak 39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak 8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
AdrianLxM 5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2 
Watchface overhaul
 2018-03-08 15:10:53 +01:00
AdrianLxM d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
Milos Kozak ed11bb1d70 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-02 00:00:09 +01:00
Milos Kozak c61fcdbe3f allow 15 & 30 pump disconnection 2018-03-01 23:59:44 +01:00
Milos Kozak 75a6366115 translations cleanup 2018-03-01 15:08:55 +01:00
Milos Kozak 7b91f0d490 allow to open G5 app from CGM button 2018-02-25 17:33:46 +01:00
Milos Kozak 32f2f4d6fa Merge branch 'g5cal' into buttons 2018-02-25 15:31:43 +01:00
Milos Kozak cb8fc905bb catch if G5 app is missing 2018-02-25 15:23:25 +01:00
Milos Kozak a7da0bb67a
Merge pull request #719 from jotomo/buttons 
Moar buttons.
 2018-02-25 11:05:21 +01:00
Jamorham 9d985ec3b7
Add FabricPrivacy 2018-02-22 12:30:36 +00:00
AdrianLxM c22c22f1d7 wear settings for predictions 2018-02-21 15:56:13 +01:00
JamOrHam bc2f749ef3
Merge branch 'dev' into dev 2018-02-21 13:43:18 +00:00
Jamorham 67b397b417
Insight: preemptive connection preference option 2018-02-21 12:23:19 +00:00
Milos Kozak 1cb92861b5 Chinese to menu 2018-02-20 17:04:15 +01:00
Milos Kozak dc35c9f6b3 fix typos 2018-02-18 22:56:46 +01:00
Jamorham 9a76cdb3a1
Insight: add preemptive connection, keep-alive, statistics 2018-02-18 14:57:28 +00:00
Milos Kozak 0fe287bb79
Merge pull request #689 from AdrianLxM/smb-wear2 
no wear vibrations on SMB (optional)
 2018-02-18 12:39:36 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
AdrianLxM 7b3d370564 Notification on missing profile switch 2018-02-18 01:10:27 +01:00
Johannes Mockenhaupt 2bccf13213
Add shortname for G5. 2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt 52aa27de05
Sanity check bolus timestamp on start, after bolusing. 2018-02-16 17:33:59 +01:00
AdrianLxM a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
Johannes Mockenhaupt df4ad822fc
Make new behaviour configurable, default on. 
(cherry picked from commit f807592)
 2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt aae9f7d153
Show notification to check pump date if last bolus is older than 24h. 2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak 943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Milos Kozak 359b8401b2
Merge pull request #678 from jamorham/dev 
Updates to Insight plugin
 2018-02-10 15:13:35 +01:00
AdrianLxM 4587a47840 add links to about 2018-02-10 14:53:43 +01:00
Jamorham 046de51496
Insight few small changes 2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt 1985ed379d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
 2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt 43755f071d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2 
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
 2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt f49f3c7e4b
Clean up string resources. 
(cherry picked from commit 4adcffc)
 2018-02-03 16:33:40 +01:00
Milos Kozak 6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
Jamorham 73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Johannes Mockenhaupt d336c176fb
Update some descriptions. 2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt c62ca89931
Fix adding a partial bolus to treatments. 2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt e790c87940
Cleanups and strings. 2018-01-31 00:59:23 +01:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Johannes Mockenhaupt 1e22599979
Fix format specifier. 2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt 216359312a
Minor non-code tweaks. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 2468f23e97
ComboFragment: i18n last bolus. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt 3adda9bf6e
Clean up bolus delivery code. 2018-01-29 13:18:49 +01:00
Johannes Mockenhaupt 449dbd79f7
Rename TBR to 'temp basal' 2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt 0655e4e676
SMB: clean up APSResult.toSpanned a bit. 
(cherry picked from commit 10d7c79)
 2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt bd87a893c2
Best effort to handle multiple boluses within the same minute. 
(cherry picked from commit cc9094f)
 2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt 3a95c3c4d9
More work for bolusing with pump history records. 
(cherry picked from commit 4bc3e42)
 2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt 8c27b32d07
Let "Initializing" be a pump state, not an action. 2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt b3a60eb5ab
Initial work on basing boluses on pump history. 2018-01-28 15:22:41 +01:00
Milos Kozak 296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Milos Kozak 4af8e14417 Merge branch 'dev' into smb060 2018-01-27 13:47:41 +01:00
Milos Kozak ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Milos Kozak b2d9ad8986 Merge branch 'dev' into smb060 2018-01-26 22:49:25 +01:00
Milos Kozak d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Milos Kozak 98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Johannes Mockenhaupt 5dcf214d08
Fix German translation. 2018-01-25 20:10:21 +01:00
Jamorham 54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt 0eba153d8a
Combo: add 'base basal rate' to fragment. 
(cherry picked from commit 2873da5)
 2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Careportal DB browser
  fix rendering treatments with duration
  more autosens logging
  cancel extending bolus on pump disconnection
  set maxiob=0 only for objective 4
  fix stopping bolus connection error
 2018-01-23 02:04:02 +01:00
Milos Kozak f5a2c5bcd2 cancel extending bolus on pump disconnection 2018-01-21 23:38:24 +01:00
Johannes Mockenhaupt 17d7eaa883
Fix missing/extra string resources. 2018-01-21 20:28:43 +01:00
Milos Kozak fa48720f0e Merge branch 'dev' into smb060 2018-01-21 15:58:54 +01:00
Milos Kozak eedc38fbcf synchronized access to basal_v 2018-01-21 15:56:07 +01:00
Milos Kozak e5ede788ba Merge branch 'dev' into smb060 2018-01-21 13:38:21 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Milos Kozak 91a6c7a96c Merge branch 'dev' into smb060 2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames. 
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
 2018-01-11 21:47:30 +01:00
Milos Kozak fbb120673f Merge branch 'dev' into smb060 2018-01-07 15:32:14 +01:00
Milos Kozak 1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Milos Kozak 144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
AdrianLxM 95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
Milos Kozak d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak ff5d42522c Merge branch 'dev' into smb060 2018-01-03 20:31:36 +01:00
Milos Kozak d27d1b1821 Objectives update 2017-12-31 12:24:51 +01:00
Milos Kozak 162e73e64d Merge branch 'dev' into smb060 2017-12-26 00:35:16 +01:00
Milos Kozak 8fdd16c305 QuickWizard detailed settings 2017-12-26 00:27:34 +01:00
Milos Kozak 7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +01:00
Milos Kozak 93b954fffe when using profile percentage limit basal rate to minimal value supported by pump 2017-12-22 20:17:31 +01:00
Milos Kozak 5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +01:00
Milos Kozak beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline 
Nsoffline
 2017-12-20 20:17:30 +01:00
Johannes Mockenhaupt 57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060 
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
 2017-12-20 17:28:08 +01:00
Milos Kozak 0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump 
Remove sync to pump pref, always sync
 2017-12-20 10:49:47 +01:00
Milos Kozak 8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak 5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
Milos Kozak b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Milos Kozak 696dd4c592 Merge branch 'dev' into smb 2017-12-07 23:54:37 +01:00
Milos Kozak 9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt 23874ebbd6
Remove 'sync to profile' pref. 
(cherry picked from commit 01c52e7)
 2017-12-05 10:00:31 +01:00
Milos Kozak d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
AdrianLxM 98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak 622ac15c50 Merge branch 'dev' into smb, fix compile, add queue features 2017-12-01 18:13:05 +01:00
Milos Kozak 04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +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 8bae1a18e4 CommandQueue 2017-11-08 22:22:51 +01:00
Milos Kozak 5ad564e0e3 CS translation 2017-11-03 10:13:23 +01:00
Milos Kozak fe0376206e fix merge conflict 2017-10-24 11:46:27 +02:00
Milos Kozak d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
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 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
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 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 17f59df597 gui tweaking, pump battery event 2017-06-06 08:21:11 +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 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 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 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 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 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 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 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 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 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 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
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 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