Commit graph

12018 commits

Author SHA1 Message Date
Milos Kozak ab035e3949 Merge pull request #371 from diabetesdt1/patch-2
Update strings.xml
2017-08-20 21:44:21 +02:00
Johannes Mockenhaupt b162fcce01
wip 2017-08-20 20:47:58 +02:00
Milos Kozak a18e2b4641 fix of fix :( 2017-08-20 19:42:41 +02:00
Milos Kozak 86d791d93f Merge pull request #378 from jotomo/profile-default-values
Fix initalizing profile with default values.
2017-08-20 19:08:55 +02:00
Milos Kozak 655995e281 Merge pull request #379 from warstar2187/dev
Update Korean Translation
2017-08-20 19:07:39 +02:00
Johannes Mockenhaupt bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt 2210f3b129 Merge branch 'config-options-develop' into 'develop'
Add config options:

See merge request !20
2017-08-19 20:35:08 +00:00
Johannes Mockenhaupt 387ceff525
Add config options:
* alternate SetTbrCommand impl (original impl)
* split bolus (quick hack) to split up boluses to slow delivery
2017-08-19 22:29:48 +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
warstar2187 36c25cbd45 Update strings.xml 2017-08-19 21:35:03 +09: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 838deed1e8 Merge branch 'dev' into smb 2017-08-18 12:30:09 +02:00
Johannes Mockenhaupt d851637d4f
more 2017-08-18 11:55:19 +02:00
Milos Kozak 6b8dd5868d fix displaying target in mmol 2017-08-18 11:46:04 +02:00
Milos Kozak 4f54b7ba81 Merge pull request #374 from jotomo/profile-switch-viewer-polish
Some polish around treatments tab, profile switches
2017-08-18 11:21:04 +02:00
Milos Kozak a097bf51aa minDeviationSlope 1st try 2017-08-17 23:37:59 +02:00
diabetesdt1 efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1 ef42193d95 Update strings.xml
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt 5991f307af
Profile.getValuesList: don't add trailing newline. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt a6351f4455
Fix some warnings. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt 4f2357e9fb
Use OK/Cancel buttons for profile removal dialog. 2017-08-17 22:01:59 +02:00
AdrianLxM 6c8e957a33 Merge pull request #373 from MilosKozak/profile-switch-viewer
Profile switch viewer update
2017-08-17 21:49:06 +02:00
Johannes Mockenhaupt 4bbba51637 Merge branch 'remove-cmd-retry-with-reconnect' into 'develop'
Don't rebind ruffy and retry command in case of failure.

See merge request !18
2017-08-17 19:48:37 +00:00
AdrianLxM 5d6327bfaa static variables -> object variables 2017-08-17 21:34:30 +02:00
AdrianLxM 5769915f8c Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer 2017-08-17 21:29:15 +02:00
Milos Kozak c36587430c fix merge conflict 2017-08-17 21:24:50 +02:00
AdrianLxM 0cc9ee4193 Avoid npe if no string is assigned to the profile switch 2017-08-17 21:24:31 +02:00
Milos Kozak ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak a850e3c31c Merge pull request #372 from MilosKozak/profile-switch-viewer
Show profile on tap in Treatments->ProfileSwitch
2017-08-17 21:20:06 +02:00
Milos Kozak 73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt fabaf7c2ef
more 2017-08-17 19:04:43 +02:00
AdrianLxM 92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
diabetesdt1 64446f07c5 Update strings.xml
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
Johannes Mockenhaupt 738dd72f5b
Remove TODOs for extended bolus. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt 22e3517cd6
wip cancelling 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt a664bdeaaa
Initial take on bolus cancellation. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt c1ecad1ed6
Initial take on bolus progress reporting. 2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt a230501f74
Add alternative SetTbrCommand for pumps with different behaviour. 2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt f41d597c07
Formatting. 2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt b000824b8a
Merge branch 'remove-cmd-retry-with-reconnect' into develop
* remove-cmd-retry-with-reconnect:
  Don't rebind ruffy and retry command in case of failure.
2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (27 commits)
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  Overview: format target using unit specific format.
  Dutch language
  insulincurves - notification on short DIA
  insulincurves - forgotten string updated
  insulincurves - rename peak to peak time
  insulincurves - remove unused base fragment
  insulincurves - i18n
  insulincurves - ActivityGraph fix double plotting
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-17 10:08:15 +02:00
Milos Kozak f2755e0ae7 Merge pull request #370 from MilosKozak/AdrianLxM-patch-2
Check for tempbasal not RealTempbasal
2017-08-17 08:13:53 +02:00
AdrianLxM 47e295b3c1 Check for tempbasal not RealTempbasla 2017-08-17 00:42:26 +02:00
Milos Kozak e53bf6b728 Merge pull request #369 from MilosKozak/AdrianLxM-patch-1
Overlapping interval - regard first element on cut
2017-08-17 00:26:00 +02:00
AdrianLxM 776ae3f424 Overlapping interval - regard first element on cut 2017-08-16 23:56:14 +02:00
Milos Kozak 4ce173c3e9 Merge pull request #368 from MilosKozak/openloop-vertical
AcceptTempButton visible
2017-08-16 23:41:28 +02:00
AdrianLxM 8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
Milos Kozak 6ca44fce84 Merge pull request #367 from MilosKozak/profile-switch-buttons
show notification on toast alarm
2017-08-16 22:58:34 +02:00