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

2223 commits

Author SHA1 Message Date
Johannes Mockenhaupt
8b8a135804
Add (back) last bolus to ComboFragment. 2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt
4517736122
Add back TBR to ComboFragment. 2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt
c04d746cfc
Remove duplicated code. 2017-10-19 23:30:44 +02:00
Johannes Mockenhaupt
4e978656f5
Trim down ComboFragment. 
Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview
and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.
 2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt
3d6c8ee2a5
Combo Fragment misc. 2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt
71eff7ec79
Add space between number and minute for 'x min ago' template. 2017-10-19 22:59:03 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...). 2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
e1c1f4b996
Revert string danar_stats. 2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
4de010b1a2
Strings reuse for pumps. 2017-10-19 16:11:36 +02:00
Johannes Mockenhaupt
8fe72e1474
WIP notes, combo fragement expansion 2017-10-19 13:24:18 +02:00
Johannes Mockenhaupt
5fc9da885a
Pairing stub. 2017-10-19 12:16:07 +02:00
Johannes Mockenhaupt
07253b59a0
Refactoring. 2017-10-19 02:56:29 +02:00
Johannes Mockenhaupt
413464f1f1
Overview: add space between insulin and unit letter. 2017-10-19 02:46:06 +02:00
Johannes Mockenhaupt
7797cbd69e
Remove accidential debug wait. 2017-10-19 02:45:39 +02:00
Johannes Mockenhaupt
64c3d452a8
Some ui polish. 2017-10-19 02:45:29 +02:00
Johannes Mockenhaupt
0a67bb73a4
Fix displaying reservoir level on startup. 2017-10-19 00:04:01 +02:00
Johannes Mockenhaupt
52d3803275
Source ruffy@eb659b3aa47a1ed699789df7e50e0d80c4640cc3, with pumpdata hackery. 2017-10-18 21:37:11 +02:00
Johannes Mockenhaupt
dca219d900
Fix initializing ruffy service, read reservoir level on init. 2017-10-18 20:53:44 +02:00
Johannes Mockenhaupt
ab4f46471b
Add RuffyCommands.readPumpState, cleanup, fix. 2017-10-18 18:29:29 +02:00
Johannes Mockenhaupt
e4901f292f
Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt
e5eba342ba
SPI first draft. 2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt
4a91b68ed7
Package refactoring. 2017-10-17 19:45:37 +02:00
Johannes Mockenhaupt
f33d55b092
Trim combo prefs. 2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt
64ecf84174
Cleaning up. 2017-10-17 19:08:56 +02:00
Johannes Mockenhaupt
5ab7e4dbd6
Connect to IRuffyService in RuffyScripter, rather than ComboPlugin. 2017-10-17 19:05:55 +02:00
Johannes Mockenhaupt
142f9cf6a3
Extract SPI. 2017-10-17 18:59:41 +02:00
Johannes Mockenhaupt
5131b8b62f
Remove combo hacks outside of combo plugin. 2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt
357c84e2e2
ComboPlugin singletion. 2017-10-17 12:20:12 +02:00
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
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