Commit graph

8862 commits

Author SHA1 Message Date
Johannes Mockenhaupt 41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (126 commits)
  ConfigBuilder: hide disabled plugins by default.
  sum on name for LP
  log to debug not error
  logger reformat
  logging
  rhinoAMA first full run
  rhinoAMA first crashfree call
  rhino some more cleanups
  rhino logging and cleanups
  rhino MA looping
  rhino first real detemine-basal call
  rhino small refactor
  NDK filters to work around j2v8 vs. libBleCommandUtil issue.
  NewTreatmentDialog: sanitize inputs, fixes #417.
  rhino complex parameter passing
  rhino first parameter passing
  rhino function passing
  first rhino
  location permission for BLE scanning
  use customized name only for LocalProfile
  ...
2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt d123e7b7c0
Remove duplicate values in strings.xml. 2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt f0db2f0822
Merge branch 'experimental' into combo-v2
* experimental: (28 commits)
  Refactor, clean out stuff, add RuffyCommands interface.
  ExperimentalBolusCommand: update progress when starting to programm the pump.
  Remove GetReservoirLevelCommand, will be a method in the future.
  Add TODO.
  Make access to RuffyScripter.currentMenu safer.
  Update pref descriptions.
  Disable incomplete parts in ExperimentalBolusCommand.
  Declare RuffyScripter.currentMenu nullable.
  Wait for currentMenu to be != null
  Option to ignore TBR failures: also ignore errors when reading pump state.
  Refactorings and notes.
  A little less broken CancellableBolusCommand.
  Update pref descriptions
  Add pref to disable all pump comm alerts.
  Move RuffyScripter to PumpCombo package.
  Add option to skip small TBR changes, add summaries to prefs.
  Refactor.
  Move confirmAlert method to scripter.
  SetTbrCommand: extract confirrmAlert method.
  Experimental options: for specifc prefs, always check experimental options are turned on.
  ...
2017-10-17 11:39:01 +02:00
Johannes Mockenhaupt 60c9a984b5
Refactor, clean out stuff, add RuffyCommands interface. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 960586b79d
ExperimentalBolusCommand: update progress when starting to programm the pump. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt cb24d13cae
Remove GetReservoirLevelCommand, will be a method in the future. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt f4f91c0b85
Add TODO. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 09f834d990
Make access to RuffyScripter.currentMenu safer. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt dc7dd15571
Update pref descriptions. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 882f400d1e
Disable incomplete parts in ExperimentalBolusCommand. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 5d10956900
Declare RuffyScripter.currentMenu nullable.
(cherry picked from commit fb0c829)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 15bac4d386
Wait for currentMenu to be != null
(cherry picked from commit 13b96ec)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt fd7f4ae145
Option to ignore TBR failures: also ignore errors when reading pump state.
(cherry picked from commit 82052e8)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt a33d7db471
Refactorings and notes.
(cherry picked from commit 8c77f0e)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 0fda86dffa
A little less broken CancellableBolusCommand.
(cherry picked from commit 9d56f23)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt add3011e4b
Update pref descriptions
(cherry picked from commit 13e358a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt a76fbefee8
Add pref to disable all pump comm alerts.
(cherry picked from commit f074a5b)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 516a8c044b
Move RuffyScripter to PumpCombo package.
(cherry picked from commit 7875ac0)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt c8c445c608
Add option to skip small TBR changes, add summaries to prefs.
(cherry picked from commit a76b03a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 58757735f8
Refactor.
(cherry picked from commit 06a454d)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt c96122cbed
Move confirmAlert method to scripter.
(cherry picked from commit f018d42)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt b1d000eae3
SetTbrCommand: extract confirrmAlert method.
(cherry picked from commit 329ff14)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 9b6cd23cdd
Experimental options: for specifc prefs, always check experimental options are turned on.
While the specific prefs are disabled when disabling experimental options, they can still be turned on.

(cherry picked from commit 6270239)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt 81b97b5278
Add option to ignore setting a TBR as long as it does't occur twice in a row.
(cherry picked from commit 238e85c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 6019323740
Work around curentMenu being null, maybe.
(cherry picked from commit da49be0)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 4aac46f2bc
Cleanup.
(cherry picked from commit e7fe202)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 17dd6df527
Move config options to preferences.
(cherry picked from commit 24657ed)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 21a37c9247
Add experimental option to avoid one vibration after bolusing.
(cherry picked from commit 104777c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 9649682ae3
Don't raise alerts if loop is disabled.
(cherry picked from commit dc7fd2b)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt 9d6ff73b34
SetTbrCommand: extract method refactoring and minor cleanup. 2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt bf9369babc
Move readDuration method to SetTbrCommand. 2017-10-17 11:27:20 +02:00
Milos Kozak 9622453d3a Merge pull request #467 from jotomo/config-bulder-defaults
ConfigBuilder: hide disabled plugins by default.
2017-10-17 10:39:03 +02:00
Johannes Mockenhaupt fee19db501
ConfigBuilder: hide disabled plugins by default. 2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt f7a46d386e
Remove j2v8. 2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
This reverts commit 7c04787004.
2017-10-16 21:48:08 +02:00
Milos Kozak 8bfcd79aff Merge pull request #464 from MilosKozak/profile
Profile
2017-10-16 15:46:53 +02:00
Milos Kozak d1a9398451 Merge pull request #463 from AdrianLxM/mr-profileRhino
sum on name for LP
2017-10-16 14:58:41 +02:00
AdrianLxM 414cb5fd8d sum on name for LP 2017-10-16 12:54:17 +02:00
Milos Kozak 5172a91ca1 Merge pull request #458 from jotomo/gh-417-new-treatment-validation
NewTreatmentDialog: sanitize inputs, fixes #417.
2017-10-16 08:38:30 +02:00
Milos Kozak f343d88ca7 Merge pull request #462 from MilosKozak/profileRhino
Profile rhino
2017-10-16 08:29:47 +02:00
AdrianLxM dbc5657003 log to debug not error 2017-10-15 23:21:55 +02:00
AdrianLxM 2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA
Rhino ama
2017-10-15 22:39:54 +02:00
AdrianLxM 3e7b7ced06 logger reformat 2017-10-15 22:34:03 +02:00
AdrianLxM c499e5977c logging 2017-10-15 22:27:08 +02:00
AdrianLxM 1c49362415 rhinoAMA first full run 2017-10-15 20:42:36 +02:00
AdrianLxM 1494b7f5b3 rhinoAMA first crashfree call 2017-10-15 19:36:31 +02:00
AdrianLxM 564c882754 rhino some more cleanups 2017-10-15 16:19:29 +02:00
AdrianLxM d32a874baa rhino logging and cleanups 2017-10-15 16:10:58 +02:00
AdrianLxM e65b4bf858 rhino MA looping 2017-10-15 14:06:13 +02:00
AdrianLxM 190305c6df rhino first real detemine-basal call 2017-10-15 13:00:10 +02:00