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

1891 commits

Author SHA1 Message Date
Johannes Mockenhaupt a28efb4be0
Add "pump error (message)" as a field in Combo fragement. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 63131f73d0
Cleanups. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 29cb1def50
Fix up "Rebind ruffy if there is an exception.". 
Some removals, but more importantly to note that
the commit set pump/command state variables
volatile again.
 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 5c36094b8b
Remove some debug code. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 821e31c1c3
Add debug logging. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt a2fad3293d
Fix adding pump state to CommandResult when there are violations. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt d85425e68b
NPE guard. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt d5bf5812b7
Rebind ruffy if there is an exception. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt e526de68ea
Some improvements around connection state. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt bf179cd751
Fail on attempts to cancel non-running TBR. 
Until we know this would be benign.
We still return 'enacted=true', so AAPS can mark the TBR as finished
to recover from this error state.
 2017-07-21 17:28:30 +02:00
AdrianLxM e381d197cb 1.5e 2017-07-21 16:49:43 +02:00
AdrianLxM 3d82bdb347 Merge pull request #295 from jotomo/on-resume-update-gui 
On resume update gui
 2017-07-21 16:47:28 +02:00
AdrianLxM 06497a862d Merge pull request #303 from AdrianLxM/synchronize-intervals 
synchronize interval access from other classes
 2017-07-21 16:47:00 +02:00
AdrianLxM 6d1c0feeab Merge pull request #302 from AdrianLxM/cleanups 
Cleanups
 2017-07-21 16:46:48 +02:00
AdrianLxM 0297f2b75d Merge pull request #301 from MilosKozak/insulin-colourlables 
Add color of chart to corresponding lables/scale
 2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment. 2017-07-21 14:56:14 +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
Milos Kozak c68eccc328 Merge pull request #306 from boikonur/dev 2017-07-20 20:49:35 +02:00
Boyko Kazakov 3b1407b8dd Added icons for home, actions and care portal screens 2017-07-20 20:57:45 +03:00
Radoslav Radev 3098f0bdfa update bg translation 2017-07-20 09:24:35 +03:00
AdrianLxM 42263e979e synchronize interval access from other classes 2017-07-20 02:43:01 +02:00
AdrianLxM b72482601e remove unnecessary semicolons 2017-07-20 01:06:41 +02:00
AdrianLxM 1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +02:00
AdrianLxM b5cb68be73 remove extra strings 2017-07-20 01:06:00 +02:00
AdrianLxM 6daff6fae9 self asignment -> comment 2017-07-20 01:05:25 +02:00
AdrianLxM c35b7bb9d6 string comparison 2017-07-20 01:05:05 +02:00
AdrianLxM 03ad898562 Merge branch 'dev' into on-resume-update-gui 2017-07-20 00:17:32 +02:00
AdrianLxM 98bb792264 Add color of chart to corresponding lables/scale 2017-07-19 23:46:32 +02:00
Johannes Mockenhaupt a1564d5bb7
RuffyScripter: only set connected variable in rtConnected, rtDisconnected. 
Hopefully fixes intermittent failures to close the connection, as
idleDisconnectMonitorThread sometimes fails to disconnect
because connected == false.
 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt e322b15e1c
debug: setTbrPercent: 5 minute head start 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a55756367f
ComboPlugin: use CommandResult.completionTime for treatment entries. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a8ecc85429
ConfigBuilderPlugin.applyApsResult: more verbose logging 
Log whether the pump was asked to set a TBR if if that is skipped
since the pump still runs the requested TBR and for how long.
 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt 1cf6448b0e
Add CommandResult.completionTime field and set it in RuffyScripter when the command has finished executing. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt 97733848e7
SetTbrCommand: replace static wait with dynamic wait to have completionDate more accurate. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt 467cf1e6ed
Pass pre-cmd pump state to command, log it. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a7c77bc177
Add "pump error (message)" as a field in Combo fragement. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt 8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo 
* origin/dev:
  bulgarian removed non-translatable
  synchronize interval access
  nsclient remove debug data that puts stress on the broadcast system 3
  nsclient remove debug data that puts stress on the broadcast system 2
  nsclient remove debug data that puts stress on the broadcast system
  Align OpenAS(A)MA fragments with layout of other fragments.
  local broadcasts better setting title
  setting to disable local broadcasts in NSClient
  removed some "unneeded" translations
  wear tdd weighted
  wear TDD status
  wear menu simplification
  Translated latest additions strings.xml
  ns client quickfix now catch all
  NS client quickfix - catch even more
  catch TransactionTooLargeException
  TT new "old" logic for temp targets
  TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-07-19 19:54:50 +02:00
AdrianLxM 732e225c7d bulgarian removed non-translatable 2017-07-19 19:50:40 +02:00
AdrianLxM f220bb034e Merge pull request #286 from AdrianLxM/temp-target-logic 
Temp target logic
 2017-07-19 19:33:17 +02:00
AdrianLxM e51954cec3 Merge pull request #292 from AdrianLxM/wear-tdd 
Wear tdd
 2017-07-19 19:05:41 +02:00
Milos Kozak 3475b64e1b Merge pull request #299 from MilosKozak/dev-nsclient-quickfix 
NSClient quickfix
 2017-07-19 18:53:38 +02:00
AdrianLxM 76990b7983 synchronize interval access 2017-07-19 17:39:55 +02:00
Milos Kozak 62ff62a31f Merge pull request #290 from PoweRGbg/patch-1 2017-07-19 17:21:15 +02:00
AdrianLxM e6ce35485a nsclient remove debug data that puts stress on the broadcast system 3 2017-07-19 16:09:34 +02:00
AdrianLxM 621c32d832 nsclient remove debug data that puts stress on the broadcast system 2 2017-07-19 16:06:36 +02:00
AdrianLxM c1e030d789 nsclient remove debug data that puts stress on the broadcast system 2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments. 
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
 2017-07-19 12:32:18 +02:00
Johannes Mockenhaupt 7b16716b65
Clean up statusSumary, command result and pump status. 2017-07-19 01:53:37 +02:00
Johannes Mockenhaupt 485b99e260
Show last command and pump state better in the Combo tab. 
Gets rid of unhelpful "Unknown error" messaegs.
 2017-07-19 01:33:19 +02:00
Johannes Mockenhaupt 5aacf8410d
Fix CancelTbrCommand to return command resutlt not in PumpState but as part of the CommandResult object. 2017-07-19 01:30:26 +02:00
Johannes Mockenhaupt 825a87f474
Use OpenAPS-requested duration for TBRs. 2017-07-18 23:57:48 +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
Johannes Mockenhaupt 9927ab4989
Raise an error upon attempting to cancel a TBR when none is active. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 14d7043600
Skip fetching initial pump state if ruffy service isn't ready yet. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt f3b508ba2d
Combo tab: refresh on resume 
Since we're not getting events when the fragement is not displayed,
since we're unregistering from event in onPause.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 3b287df77d
Check active menu again when retrying inputs. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt abf9566476
Log exception 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ebe14fb0cf
BolusCommand: deal with blinking values. 
How did this not trigger with all the  boluses I've issued so far?
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 7fe9ad7910
Add retries for inputing values. 
Rarely there seem to be timing issues and e.g.
10 button down presses to go from 100% to 0% only goes down to 20%.
Retry two more times in that case, restarting the input process on the
active screen (bolus input, tbr percent/duration input).
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt e52c2a857c
RuffyScripter: log command execution time. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 7dda253b88
RuffyScripter: when pump is suspended fail all commands but ReadPumpState. 
Safest way for v1 (which I'm trying to stabilize, not rework ;-) ).
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt bd14b399d5
Comment. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt b4950b3037
Provide suspended state information to AAPS. 
AAPS seems to still try to issue commands (like cancel TBR,
though none is running?)), despite showing "Pump suspended"
on the home screen.
With the DanaR, AAPS also tries to run commands when the
pump is suspended, but there, the treatment is logged
as being administered despite the pump not having done that.

Here, the pump response with success=false, enacted=false,
which causes the ComboPlugin class to NOT create any
treatments. No errors are raised, as this is considered a regular
state: no treatments are enacted, overview screen shows
"pump suspended" and the combo beeping away.
That AAPS still tries to issue TBR commands ... that's AAPS'
problem for now. Buttons to issue boluses are hiden though.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 55e7006967
Remove superfluous code (state is always set later in controlling thread). 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 599f3ce23c
Order methods in the order they're called, start Alerter service earlier to make sure it can catch early errors. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 487e9deb88
Set an error state when the ruffy service can't be bound. 
See code comment.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 02a9ed6eda
Set an active command before establishing a connection. 
Otherwise the disconnect thread will close the connection
due to inactivity. We could add a variable 'isConnecting',
but I'm not sure if adding another (ruffy-) global state
variable will make things simpler to grasp.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt c37310685a
Don't count the time establishing a connection towards a command timeout. 
Note: connection timeouts are also dealt with. They're now (cleanly)
separated: connect- and command-timeouts.

If the pump's display is one due to the user interacting with the pump
directly, the pump needs a display timeout before being ready for an
incoming connection. What I'm trying to say is, it might take some time,
maybe up to 30s to establish a connection in that cause and can thus
easily create a false timeout error.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 36966c8907
Handle the pump being stopped: don't treat it like an error, but don't execute commands either. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 222ad0a527
Improve display of error state in Combo tab. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 7fa59c6c16
Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt e9fa9b1788
Silly me, of course fragments (and everything else) are recreated by Android all the time. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 29e7ea1966
Don't ignore user requests to update pump data, tweak alerter. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 338d29630c
Notes from manual timing test (yeah, new timeout code seems to work). 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt af4ec4d072
BolusCommand: fix contstraint check (doh!) 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 5f43f0f147
* Fix stale data in Combo tab after error 
* Add info about last command ran to the Combo tab
* Don't refresh data more than once a minute.
* Specify not only error, but also command that raised the error in
  alert notification
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 4dc38e447a
Add first ruffyscripter test (needs ruffy to be available during test somehow). 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ac10bdc01c
First stab at dynamic timeout. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 44ae79bd50
Move command argument checking out of ctor into a dedicated method and check prior to execution. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 6faa1614ac
ComboFragment: rename Update Button to Refresh. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 5fad9b3a85
Cleanups. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 20a8350c67
Robustness for RuffyScripter. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt aa98864d65
... this should have gone into earlier commit, the UI one? 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ecf3866b43
Improve alerter. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt c131280e91
RuffyScripter.verifyMenuIsDisplayed: don't call waitForMenuUpdate, menu should already be displayed. If not, wait up to 1 second. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ccffa3bfca
Add alerter thread to ComboPlugin that raises an alarm every 6 minutes (Android will by default silence alarms that go off within less than 5 minutes) when the pump state shows an error condition. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 362c3681d5
Clean up commands package. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt c63c86f98a
RuffyScripter improvements: 
* Keep track of connection status rather than relying in IRuffyService.isConnected
* Abort running command if pump stops sending menu updates
* Fail if ruffy goes away (binding becomes invalid), currently only if this happens during disconnect attempts
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 52b9621e29
Paranoia: check we're in the expected menu before each and every button press. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt d619796019
Improving pump status in the UI (combo tab) 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt f7586268c7
Dead code be gone. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 93c0147b23
RuffyScripter: take over connection management. Disconnect after 5s of inactivity. Plus some fixes. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt b954ddaa84
Clean up ComoPlugin a bit. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt ccd81c67fd
UI for pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 2ddccd3c31
RuffyScripter.runCommand: Next shot at understanding threading better. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 83e9ec743e
Properly accessing volatile field pumpState. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 69e560baee
Cleanup. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 4c0944b9f8
Optimize cancelling TBR. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 3aecf0f58b
Be more cautious handling command failures. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8dd714b390
UI crimes 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8ecf6922f7
Misc improvements: 
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f251427d1b
Remove ReadStateCommand, all state will be return through the PumpState field on CommandResult, so it's passed back after every command. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt ec6491fcb7
Return absolute TBR rate in PumpState. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 69b98c54c6
Polish. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 9653af5501
RuffyScripter.navigateToMenu: detect if we're wrapping around not finding a menu (likely because it's hidden) 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 7e538cbcf6
Update PumpState s/errorCode/errorMsg/g 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 99830b05b6
Fix detecting error state on connection and fix cancelling TBR. 
When there's an error, timing is crucial. Waiting for the blinking error code
to be readable hangs the thread running the command.
 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f6c8f3638b
Reflect reject TBR change in comment. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 4ff81e885c
Simplify reading alerts (message doesn't blink) 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt e01e85c54f
On connect, check if pump is in an error state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 364123c261
Fix carb only treatment. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt d0dabf34da
Fix handling TBR CANCELLED alert, remove ill-advised attempts to fake a command queue and have all commands return a state object. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 952aa0e8a2
RuffyScripter.waitForMenuToBeLeft: add timeout. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 77711b2174
ComboPlugin.runCommand: wait if pump is busy with a command. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt d8011aeaa4
Make cancelling TBR more robust to dismiss TBR cancelled alert specifially and only if it is raised. 
Cancelling a TBR with a runtime < 60s (0:01 in the display) does NOT raise a TBR cancelled alert.
 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 2c706e7c22
Remove status logging in Ruffy, now done by command. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8bc4cd255a
Don't close connection when other cmds are about to be run. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f5ef666061
Add timestamp to State and rename to PumpState. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f28a27a93f
Read pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 9d8d12fcb9
Cleanups. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt eab9d8dcd7
Fix reducing duration of OpenAPS TBRs 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt e76524a539
Include state in CommandResult.toString. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 375eb46695
ReadStateCommand: properly read TBR %. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt fa039e6961
Note on cancelling TBRs that don't trigger a pump alert. 2017-07-18 21:20:18 +02:00
Johannes Mockenhaupt 0345a01fc1
Make CancelTbrCommand more robust. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 30fc385970
Apply pump specific modifications to OpenAPS suggestion in ComboPlugin. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 5631488cc8
Add ReadStateCommand. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 8b21bb1203
Skip TBR changes smaller than 20%. 
~50 TBR changes in a 6 hour night seem excessive, even if pump was
handicapped by not being connected and thus not having any effect
to work with.
 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt a2b3c26b33
Log pump status on connect. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 347890496b
SetTbrCommand: wain for menu update when switching to TBR_DURATION to make it safer, hopefully. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 8c107cb48a
RuffyScripter: Log button presses. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt df58b6d1c2
CancelTbrCommand: log running TBR to be cancelled. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 8e2cd844a5
Round requested absolute TBR to percent TBR. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt a21da8aba7
Remove pointless events about connection status. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 848a32eade
Logging cleanup. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 9674db8d85
CancelTbrCommand: set enacted=true, even when there was no TBR to cancel. 
This helps recover when there was an issue. AAPS thinks there's a TBR
running and by reporting back 'enacted', the plugin will create a
"Cancel temp" treatment.
 2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt 264e252300
Set last command date. 
Though this is only relevant when starting to fetch data from the pump.
 2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt 336315823e
ComboPlugin.getBaseBasalRate: return profile value. 2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt 0729d7a114
RuffyScripter: Abort a running command after 90s timeout 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt f34fed1f05
Semi-fix bolusing not logging a treatment when there was an error. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt e29ef5ffce
Update treatment history when setting/cancelling a TBR. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt a27bb28e87
ComboPlugin.deliverTreatment: return command message as comment in PumpEnactResult. 
Important when there's an error.
 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt d35d93ed44
RuffyScripter.verifyMenuIsDisplayed: wait a bit longer if needed. 
Sometimes the pump seems to take a bit longer.
 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 76578872d1
ComoPlugin.deliverTreatment: take more time. 
Even if not interacting with the pump, AAPS calculator doesn't dismiss the
dialog if we return within the first 5s.
 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt d39d58913d
Implement #8, add treatment to history. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt e07d62bf79
Fix setting TBR when existing TBR has runtime < 15m. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 97f9e99437
toString methods for Commands. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 1c1a28f0a8
Ignore requests to issue BolusCommands for zero units. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 5f1ab4e45c
Set duration in PumpEnactResult when issuing SetTbrCommand. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 6842abd157
Provide fake current basal rate. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 3b50a5ae70
Update Combo PumpDescription w.r.t extended bolus. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 1f5c03b64e
Cleanups. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 7cb0268afc
Disconnect after issuing comand to Combo. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 3280092566
Source ruffy scripter for the time being (already some fixes and tweaks in). 2017-07-18 20:55:44 +02:00
Johannes Mockenhaupt 481c63fa57
Initial work on the ComboPlugin. 2017-07-18 20:54:59 +02:00
Johannes Mockenhaupt ab9908438e
Add Combo short name. 2017-07-18 20:54:57 +02:00
Milos Kozak 30b7697002
adjust combo driver for latest changes 2017-07-18 20:54:14 +02:00
Milos Kozak e9f5241821
add missing interface functions to combo 2017-07-18 20:54:14 +02:00
Milos Kozak 253c2a34e5
combo plugin skeleton 2017-07-18 20:54:13 +02:00
PoweRGbg c3f85faede removed some "unneeded" translations 2017-07-18 18:10:24 +03:00
AdrianLxM c79a5725fd Update InsulinFastactingProlongedFragment.java 
... in case DIA has changed.
 2017-07-18 13:19:43 +02:00
AdrianLxM 741f6bd866 Update InsulinFastactingFragment.java 
... in case DIA has changed
 2017-07-18 13:18:41 +02:00
Johannes Mockenhaupt 7eacd5021c
Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
Johannes Mockenhaupt 435ec55580
Extract SubscriberFragment base class. 2017-07-18 12:59:25 +02:00
Johannes Mockenhaupt 7c6bdc0b31
Have most fragments update their content in onResume. 2017-07-18 12:38:42 +02:00
AdrianLxM e0c1f65b8b wear tdd weighted 2017-07-17 22:40:05 +02:00
AdrianLxM 50c26f28fd wear TDD status 2017-07-17 22:39:48 +02:00
AdrianLxM 387cfcccaf wear menu simplification 2017-07-17 22:39:00 +02:00
PoweRGbg 7216418f44 Translated latest additions strings.xml 2017-07-17 11:37:00 +03:00
AdrianLxM 0d1ff3d721 ns client quickfix now catch all 2017-07-16 16:49:26 +02:00
AdrianLxM c64c5f5401 NS client quickfix - catch even more 2017-07-16 16:38:01 +02:00
AdrianLxM d5599f1f00 catch TransactionTooLargeException 2017-07-16 16:00:04 +02:00
Milos Kozak 26ebceb4d9 Merge pull request #288 from AdrianLxM/wear-overviewnotification 2017-07-15 16:31:45 +02:00
Boyko Kazakov 7a2db43347 Added Images for different resolutions 2017-07-15 17:03:38 +03:00
AdrianLxM b79beda971 wear pass through overview notifications 2017-07-15 16:03:04 +02:00
AdrianLxM cb08d1d76b TT new "old" logic for temp targets 2017-07-15 13:37:48 +02:00
AdrianLxM 9eaba98dfa TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals 2017-07-15 13:37:48 +02:00
Johannes Mockenhaupt 80124e6d7b
Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump. 2017-07-14 23:52:16 +02:00
Milos Kozak 0e6a93df90 Merge pull request #279 from AdrianLxM/cpp-wear2 
Cpp wear
 2017-07-12 08:18:57 +02:00
Milos Kozak 3e9734188b check for array size 2017-07-11 11:27:14 +02:00
Milos Kozak e33d757975 Merge pull request #277 from AdrianLxM/refactor-profileswitch 
extract method for new ProfileSwitch
 2017-07-10 08:13:07 +02:00
AdrianLxM b53c40c4ad cpp-watch update while in backtround 2017-07-10 05:26:24 +02:00
AdrianLxM 7fa8ea7224 cpp-watch working2 2017-07-10 04:46:29 +02:00
AdrianLxM 7f0e611783 cpp watch working1 2017-07-10 04:46:13 +02:00
AdrianLxM 0bff8e2778 extract method for new ProfileSwitch 2017-07-10 04:45:43 +02:00
AdrianLxM 26f3362ffc cpp-watch first roundtrip 2017-07-10 04:45:22 +02:00
AdrianLxM 85d028abff cpp watch openactivity 2017-07-10 04:45:08 +02:00
AdrianLxM 39ee68e62a cpp-watch external-function 2017-07-10 04:44:46 +02:00
AdrianLxM 5ea8cff751 extract method for new ProfileSwitch 2017-07-10 01:25:48 +02:00
Milos Kozak 059ac4040e fix 640g plugin 2017-07-09 23:12:57 +02:00
Milos Kozak 551ff70bc8 forgotten file 2017-07-07 19:35:45 +02:00
Milos Kozak 2724e10c2f 1.5d 2017-07-07 18:39:31 +02:00
Milos Kozak d61d35fa82 move class to correct place 2017-07-07 18:37:15 +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 31e9f3f55c Merge pull request #274 from AdrianLxM/wear-oaps-reason-result 
wear show oaps result/reason
 2017-07-04 12:01:47 +02:00
Milos Kozak 24259470ad Merge pull request #275 from AdrianLxM/fakeextended-fix 
Fake extended fix
 2017-07-04 12:01:12 +02:00
AdrianLxM a45fd1619e fake extended fix 3 2017-07-04 01:43:56 +02:00
AdrianLxM 1922a1b121 fake extended fix 2 2017-07-04 00:17:26 +02:00
Milos Kozak 7b9e5fec1e autosens warning 2017-07-04 00:16:35 +02:00
AdrianLxM 1574d94aa6 fake extended fix 2017-07-04 00:03:50 +02:00
Milos Kozak c75bb0e453 fix sensitivy 2017-07-03 21:21:20 +02:00
Milos Kozak ebf56d0032 double check units are in profile 2017-07-03 11:14:30 +02:00
AdrianLxM e81b217c94 wear show oaps result/reason 2017-07-03 01:47:58 +02:00
Milos Kozak 5a27f9afa1 allow lock screen in nsclient mode 2017-07-03 00:02:54 +02:00
Milos Kozak e0e0a75519 allow ISO format with miliseconds 2017-07-02 12:49:25 +02:00
Milos Kozak 771ff0d781 1.5c 2017-07-02 11:47:16 +02:00
Milos Kozak e9dba7136d nsclient layout for phones 2017-07-02 11:28:03 +02:00
Milos Kozak d4537a001f check for null profile in watchupdaterservice 2017-06-30 23:59:12 +02:00
Milos Kozak b4ab1d4109 fix types in configbuilder 2017-06-30 21:35:07 +02:00
Milos Kozak 4d16b04acd buttons on overview GONE before profile is loaded 2017-06-30 17:50:30 +02:00
Milos Kozak 37055cd917 allow decimal number in NumberPicker 2017-06-30 17:43:10 +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 448cf7ea85 use default dia when no profile available 2017-06-30 11:18:51 +02:00
Milos Kozak 51b01a0993 split device statuses too before broadcast 2017-06-30 10:57:29 +02:00
Milos Kozak f0c9ce5a00 fix crash when no profile loaded from pump yet 2017-06-30 10:47:30 +02:00
Milos Kozak 38002be73d check for units null 2017-06-30 10:35:05 +02:00
Milos Kozak a8a4ffcab1 ver 1.5b 2017-06-30 10:24:45 +02:00
Milos Kozak 63ad0704fa Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-30 10:23:31 +02:00
Milos Kozak 1e5f96f841 split treatments to smaller chunks before broadcast 2017-06-30 10:23:24 +02:00
Milos Kozak 9e8c91319e move ns version to about dialog 2017-06-30 09:55:47 +02:00
Milos Kozak 514d6d4dd5 fix crash in instantiating fragment 2017-06-30 09:46:56 +02:00
Milos Kozak 39c6ae5eae fix merge conflict 2017-06-30 09:35:20 +02:00
Milos Kozak fec4e60359 Merge pull request #269 from AdrianLxM/percentagevisualization 
visualize absolute rate emulation as percentage
 2017-06-30 00:00:47 +02:00
AdrianLxM 6bbec3411a absolute as percentage update 2017-06-29 23:36:45 +02:00
Milos Kozak 68f90f0da8 Merge pull request #270 from AdrianLxM/danarstats-historyadaption 
DanaRStats adapt to history and work around gaps
 2017-06-29 22:15:06 +02:00
Milos Kozak b4ea205103 Merge pull request #271 from AdrianLxM/diadivisor 
adapt diadivisor
 2017-06-29 22:14:28 +02:00
AdrianLxM 72fbb73c65 bolusprogress without context 2017-06-29 20:24:19 +02:00
AdrianLxM fcab1a267b adapt diadivisor 2017-06-29 19:39:58 +02:00
Milos Kozak d81bb9bf23 fix bolusprogress dialog size 2017-06-29 19:21:34 +02:00
AdrianLxM 1f9ed574b7 DanaRStats adapt to history and work around gaps 2017-06-29 16:24:17 +02:00
AdrianLxM 16e360f200 visualize absolute rate emulation as percentage 2017-06-29 14:14:40 +02:00
Milos Kozak a8338b2dd1 careportal dialog number picker 2017-06-29 01:37:58 +02:00
Milos Kozak f58f70bdca wizard tweaking 2017-06-28 23:11:17 +02:00
Milos Kozak 39e83f0cfe clean context after fragment is destroyed 2017-06-28 10:24:42 +02:00
Milos Kozak e4d55473a1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-28 09:09:29 +02:00
Milos Kozak 5c5c4243bc check for missing bg direction 2017-06-28 09:09:19 +02:00
Milos Kozak ea06a90453 1.5a 2017-06-27 23:24:30 +02:00
Milos Kozak 491f0837c8 allow manual input in NumberPicker 2017-06-27 23:23:44 +02:00
Milos Kozak c3876c730b numberpicker in wizard dialog 2017-06-27 23:16:23 +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 341b0660a8 calibration dialog cancel button 2017-06-27 15:25:11 +02:00
Milos Kozak 311a14e457 typo 2017-06-27 13:59:37 +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 70374ee341 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-27 13:42:45 +02:00
Milos Kozak 50ba9720e1 use container for inflate 2017-06-27 13:42:39 +02:00
Milos Kozak 42b42a90eb another check for null 2017-06-27 11:01:38 +02:00
Milos Kozak ab63c2fb48 better check for app initialization 2017-06-27 10:00:22 +02:00
Milos Kozak 7b1b9c9881 dialog widths 2017-06-27 00:11:23 +02:00
Milos Kozak dbd721319e ns uploader status 2017-06-26 22:39:01 +02:00
Milos Kozak 87fb969d9f ns openaps status 2017-06-26 17:21:39 +02:00
Milos Kozak 36b83e4c8a typo 2017-06-26 13:08:45 +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 ac98852f79 cut off carbs after 4h 2017-06-24 19:55:49 +02:00
Milos Kozak 129f813de2 reset cache on ConfigBuilderChange event 2017-06-24 15:11:30 +02:00
Milos Kozak 70aaafa616 copy old oref0 sensitivity code 2017-06-24 15:04:22 +02:00
Milos Kozak b39f59f59e remove unneeded fragments 2017-06-24 13:22:50 +02:00
Milos Kozak 5360129e5f sensitivity plugins 2017-06-24 11:04:09 +02:00
Milos Kozak 240f9618f5 Merge branch 'dev' into newautosens 2017-06-21 09:04:38 +02:00
Milos Kozak 3e7c4b1350 NS high & low alarms with sound 2017-06-21 07:28:04 +02:00
Milos Kozak 7f92f42923 cob on overview 2017-06-20 20:30:50 +02:00
Milos Kozak 33de4e8f2a schedule overview update 500ms 2017-06-20 20:13:01 +02:00
Milos Kozak e9898a58c7 show target range as number if equal 2017-06-20 20:10:14 +02:00
Milos Kozak 134efb04bf fix merge conflict 2017-06-20 20:01:09 +02:00
Milos Kozak befdbefa49 fix zero parsing error 2017-06-20 19:58:43 +02:00
Milos Kozak a3757877a3 fix landscape mode 2017-06-20 19:56:25 +02:00
Milos Kozak 80962e33d7 allow to ignore profileswitch events 2017-06-20 19:52:46 +02:00
Milos Kozak c728174858 Merge branch 'dev' into newautosens 2017-06-19 23:13:29 +02:00
Milos Kozak 745f9270ee one more null check 2017-06-19 23:08:56 +02:00
Milos Kozak b185733859 more checks for null 2017-06-19 22:55:56 +02:00
Milos Kozak df3dff1940 revert magic constant 2017-06-19 22:32:54 +02:00
Milos Kozak 4b1263e2e0 small simplify 2017-06-19 16:28:36 +02:00
Milos Kozak 150ef1a8bc Merge branch 'dev' into newautosens 2017-06-19 15:03:35 +02:00
Milos Kozak 6eed701310 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-19 14:52:54 +02:00
Milos Kozak 7e1c435374 fix loading danar history 2017-06-19 14:52:46 +02:00
PoweRGbg dcc7112fd8 Update Profile.java 2017-06-19 14:39:49 +03:00
PoweRGbg 6293e89be2 fixed getICList() returning bg units/U to g/hr 2017-06-19 13:10:32 +03:00
Milos Kozak e90812634b work from old autosens branch 2017-06-16 14:37:43 +02:00
Milos Kozak b67d8be1ef dia as primitive 2017-06-16 09:14:57 +02:00
Milos Kozak c78399ded0 cache created objects in profilestore 2017-06-16 09:06:35 +02:00
Milos Kozak 49ef46936b optimize refreshing gui 2017-06-16 08:37:07 +02:00
Milos Kozak 43231cc362 use System.currentTimeMillis() 2017-06-15 23:12:12 +02:00
Milos Kozak 26daffa692 use primitives in inner loops 2017-06-15 22:55:07 +02:00
Milos Kozak fb7af2f317 ns alarm setting in xml 2017-06-15 21:33:45 +02:00
Milos Kozak 5408562d84 use phone name in devicestatus 2017-06-15 09:45:10 +02:00
Milos Kozak a2aa8d8bc6 bucketed data for non 5min interval 2017-06-15 00:34:42 +02:00
Milos Kozak 2642a12829 schedule correct scheduleExtendedBolusChange 2017-06-14 22:18:01 +02:00
Milos Kozak 9ce78881fb log initiator in loop 2017-06-14 22:12:36 +02:00
Milos Kozak b14cf480cf add duration to profile switch dialogs 2017-06-14 20:41:55 +02:00
Milos Kozak ae2bbf76e5 fix duplicating carb entries 2017-06-14 19:49:01 +02:00
Milos Kozak 0b322e53fc nsclient plugin tweaking 2017-06-13 21:25:50 +02:00
Milos Kozak 43b70f9efc loop, MA, AMA new design 2017-06-13 20:48:53 +02:00
Milos Kozak 745a3cf874 reuse profile object 2017-06-13 19:37:31 +02:00
Milos Kozak 2c2b6c21a1 cancel temp basal in the same connection 2017-06-13 18:47:54 +02:00
Milos Kozak 3a95325039 fix sms reply text 2017-06-13 16:51:59 +02:00
Milos Kozak d3de51cc88 optimize dia 2017-06-13 15:06:41 +02:00
Milos Kozak 2a1fe205ee optimize nsclient logging 2017-06-13 12:17:54 +02:00
Milos Kozak afca896f23 optimize getUnits() & detecting faked extended 2017-06-13 12:08:30 +02:00
Milos Kozak 1de64f06c2 simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
Milos Kozak 6fca923275 fix profileswitch reloads 2017-06-12 13:11:16 +02:00
Milos Kozak 0f40670c24 create singleton from NSstatus 2017-06-12 11:15:03 +02:00
Milos Kozak b41a942d11 update supported NS & NSclient versions 2017-06-12 09:30:04 +02:00
Milos Kozak 148f4d43f9 detect faking by extended boluses in nsclient mode 2017-06-12 09:15:51 +02:00
Milos Kozak 77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +02:00
Milos Kozak bf953f1240 fix maxdailybasal calculation 2017-06-11 14:29:02 +02:00
Milos Kozak 39224f421a fix extended bolus step 2017-06-11 13:37:38 +02:00
Milos Kozak b603fce8c7 do not add empty iob series 2017-06-11 12:44:42 +02:00
Milos Kozak f6650e33e4 remove test buttons 2017-06-10 22:04:59 +02:00
Milos Kozak 723c90c32d optimize rendering 2017-06-10 21:51:58 +02:00
Milos Kozak e6f173f305 fix merge conflict 2017-06-10 13:43:02 +02:00
Milos Kozak 6ce35bc36a Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-06-10 13:41:36 +02:00
Milos Kozak f65d75e553 specify source at detailedbolusinfo 2017-06-10 13:39:51 +02:00
Milos Kozak dfaf3a07c2 typo 2017-06-08 23:22:43 +02:00
Milos Kozak 4231557c9f fix axis 2017-06-08 23:18:38 +02:00
Milos Kozak 96d760ba62 fix adding basals to database in danar driver 2017-06-08 22:26:32 +02:00
Milos Kozak 74268675af optimize overview graph drawing 2017-06-08 22:14:55 +02:00
Milos Kozak a39f61284a profileswitch sync & v2 bolus fix 2017-06-08 20:52:33 +02:00
Milos Kozak e09fba93cb update graph properly 2017-06-08 20:08:02 +02:00
Milos Kozak e8be720138 temptarget sync 2017-06-08 19:34:46 +02:00
Milos Kozak 1153c33200 tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
Milos Kozak 4d30ba9cdb treatments PumpHistory and NS mark 2017-06-07 19:43:19 +02:00
Johannes Mockenhaupt d00e7f8b00
Clear notification when accepting temp basal. 
This clears the notification about a new suggested basal when the
temp basal is accepted from within AndroidAPS.
 2017-06-07 18:10:08 +02:00
Milos Kozak e5a326c377 nsclient always use virtual pump, more sync fixes 2017-06-07 18:10:07 +02:00
Milos Kozak fec56e7c23 fix bug in sync 2017-06-07 08:09:15 +02:00
Milos Kozak 8fab76ee9b treatments synchronization improvement 2017-06-07 00:11:33 +02:00
Milos Kozak 5931abc860 BgReading optimization 2017-06-06 17:14:17 +02:00
Milos Kozak a180e182eb optimize rendering graph 2017-06-06 15:49:41 +02:00
Milos Kozak 8b8a8fcb45 remote time update extra task 2017-06-06 15:06:00 +02:00
Milos Kozak b8b00dbc81 revert asynctask 2017-06-06 14:49:17 +02:00
Milos Kozak f93090b012 allow only 1 updategui running 2017-06-06 10:56:26 +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 88b9caa357 absolute basal line 2017-06-05 01:12:36 +02:00
Milos Kozak dd7e777a24 simplify graph series 2017-06-05 00:50:31 +02:00
Milos Kozak 8934d2d6b9 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-06-04 22:38:42 +02:00
Milos Kozak a3db05ec39 v 1.50 & fix conflict 2017-06-04 22:37:58 +02:00
Milos Kozak ac038a9252 bigger bg dots on tablet 2017-06-04 22:27:36 +02:00
Milos Kozak 013025b750 fix crashing at start 2017-06-04 01:15:11 +02:00
Milos Kozak 1702ce7702 adjusting nsclient mode 2017-06-04 00:46:44 +02:00
Milos Kozak b40cf99201 gui tweaking 2017-06-03 22:43:35 +02:00
Milos Kozak 1a4e60d3a8 process duration correctly 2017-06-02 23:59:34 +02:00
Milos Kozak d365fcd6a4 fix bugs & design tweaking 2017-06-02 23:25:11 +02:00