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

1890 commits

Author SHA1 Message Date
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
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
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
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
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
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
Milos Kozak
6ca4811e8e profiles visualisation 2017-06-02 12:27:21 +02:00
Milos Kozak
f267c85377 it compiles now with profiles 2017-06-02 10:25:49 +02:00
Milos Kozak
a19a5a442b some v2 driver tweaking 2017-06-01 20:52:38 +02:00
Milos Kozak
622097aabc fix wrong merge 2017-06-01 19:33:56 +02:00
Milos Kozak
0a2cdff5e5 fix conflict 2017-05-31 09:29:39 +02:00
Milos Kozak
fb4ea156d6 disable loop as a fist action on superbolus 2017-05-31 09:26:08 +02:00
Milos Kozak
496872a58e resend after 10sec allowed 2017-05-31 09:14:31 +02:00
Milos Kozak
15f44e6085 basic sync for v2 2017-05-30 22:44:26 +02:00
Milos Kozak
b3d18b2537 disable bolus when pump is suspended 2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak
5f6a77983b Merge branch 'dev' into history 2017-05-29 22:42:17 +02:00
Milos Kozak
9e3edbb530 typo in checkbox handling 2017-05-29 22:36:04 +02:00
Milos Kozak
358de54322 redesign uploading treatments to NS 2017-05-29 21:45:59 +02:00
Milos Kozak
ec76908eca redesign uploading tb&eb to NS 2017-05-29 19:43:19 +02:00
Milos Kozak
dec627946d 0xE004 DanaRv2 message 2017-05-29 16:45:09 +02:00
Milos Kozak
9032deaaf3 better cache invalidate handling 2017-05-29 15:26:25 +02:00
Milos Kozak
c90de88ec1 better logging & double treatment plugin fix 2017-05-29 13:07:58 +02:00
Milos Kozak
442ff12aa1 initialize treatment data first by another message 2017-05-29 11:39:12 +02:00
Milos Kozak
fa695b9399 Merge branch 'dev' into history 2017-05-29 10:04:09 +02:00
Milos Kozak
e91acf3fed eliminate multiple resends in nsclient 2017-05-29 10:03:55 +02:00
Milos Kozak
4dff0e3a56 rename treatment interfaace functions to be more clear 2017-05-26 15:33:42 +02:00
Milos Kozak
0371e97391 Merge branch 'dev' into history 2017-05-26 15:06:04 +02:00
Milos Kozak
60a41b7dce switch order of commands when setting superbolus 2017-05-26 15:02:59 +02:00
Milos Kozak
0973ef97ac synchronize danar and danarv2 plugins 2017-05-26 14:41:05 +02:00
Milos Kozak
b8b9827b61 synchronize danar and danarkorean plugins 2017-05-26 13:28:27 +02:00
Milos Kozak
4b39578d9c fix adding contribution from faked extended 2017-05-26 12:07:56 +02:00
Milos Kozak
a9b251ce12 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-26 10:31:46 +02:00
Milos Kozak
559e07904c remove unneeded call 2017-05-26 10:31:05 +02:00
Milos Kozak
bb4302c02f Merge branch 'dev' into history 2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f Merge pull request #251 from AdrianLxM/historytest1 
lint disable 'ExtraTranslation'
 2017-05-26 10:23:51 +02:00
AdrianLxM
8b81960ceb remove unused strings from russion translation 2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a lint ExtraTranslation 2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031 lint ExtraTranslation 2017-05-26 09:58:38 +02:00
Milos Kozak
a066580896 handle faked tempbasals synchronization 2017-05-26 08:54:48 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
fedor apanasenko
4406bb3f06 Update strings.xml 2017-05-25 09:51:08 +03: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
45df7ddd26 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-24 18:50:10 +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
7bed883368 Merge branch 'dev' into history 2017-05-22 22:13:42 +02:00
Milos Kozak
6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
AdrianLxM
6d90f79521 also cancel temp on disable loop plugin 2017-05-22 19:14:57 +02:00
AdrianLxM
448a420fad cancel temp on suspend loop 2017-05-22 17:39:25 +02:00
Milos Kozak
85e6375026 make all getDao private 2017-05-22 12:52:19 +02:00
Milos Kozak
6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak
3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak
56d54a6988 italian language 2017-05-20 20:41:23 +02:00
Milos Kozak
6ee6eff759 fix objective 1 2017-05-19 14:15:21 +02:00
Milos Kozak
3ec08ab10f fix app crash 2017-05-16 20:02:09 +02:00
Milos Kozak
91fa355d8c remove unneeded code 2017-05-16 18:51:31 +02:00
Milos Kozak
d0ae965054 fix basal rounding for v2 2017-05-16 18:02:58 +02:00
Milos Kozak
8452c42746 fix merge 2017-05-16 18:02:01 +02:00
Milos Kozak
8d2e7a34ae same workaround for korean danar 2017-05-16 17:58:18 +02:00
Milos Kozak
a362c77afe fix temp basal netRatio display 2017-05-16 17:57:18 +02:00
Milos Kozak
8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
AdrianLxM
44c3303e0e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline 2017-05-16 16:30:26 +02:00
AdrianLxM
3869b143c4 Workaround for DanaR truncation 2017-05-16 16:29:30 +02:00
Milos Kozak
3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak
1ad424a178 use Activity instead of FramgmentActivity 2017-05-16 15:15:28 +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
6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
54758d08d8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-16 09:47:23 +02:00
Milos Kozak
894923664e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-16 09:46:59 +02:00
Milos Kozak
fd62c572af more treatments plugin tweaking 2017-05-16 09:46:09 +02:00
Milos Kozak
704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak
85744548d8 typo in log 2017-05-14 11:48:59 +02:00
Milos Kozak
b1d9e647c6 Merge branch 'dev' into history 2017-05-12 23:14:07 +02:00
Milos Kozak
b19bf628b8 Merge pull request #241 from AdrianLxM/xdripstatusline 
Get correct calibration value if entered with (onboard) keyboard
 2017-05-12 23:12:49 +02:00
Milos Kozak
6a6a02f212 Merge branch 'dev' into history 2017-05-12 23:04:39 +02:00
Milos Kozak
3f4cf57bbc make all Spiners centered 2017-05-12 23:04:14 +02:00
Milos Kozak
7bbd2cff2d consolidate DanaR code 2017-05-12 22:40:22 +02:00
Milos Kozak
d641b0edd9 move rest of PumpInterface to TreatmentInterface 2017-05-12 21:21:31 +02:00
Milos Kozak
52177cead1 move part of PumpInterface to TreatmentInterface 2017-05-12 21:07:29 +02:00
AdrianLxM
bb35f58eab Get correct calibration value if entered with (onboard) keyboard 2017-05-12 18:31:52 +02:00
Milos Kozak
22bb49aa60 hide DanaRv2 constraints 2017-05-12 18:05:22 +02:00
Milos Kozak
863e6454eb calculate iob based on insulin stored with treatment 2017-05-12 17:57:57 +02:00
Milos Kozak
9fc1d59bd0 allow to enforce Treatment plugin 2017-05-12 17:30:52 +02:00
Milos Kozak
c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM
a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
AdrianLxM
c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak
eddd8ac56d Merge branch 'DanaRv2' into history 2017-05-12 13:06:05 +02:00
Milos Kozak
e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak
831b45fac5 DanaRv2 mod7 2017-05-12 13:05:29 +02:00
Milos Kozak
df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak
19c23a3c02 Merge pull request #238 from AdrianLxM/xdripstatusline 
No permission to read statusline
 2017-05-12 09:22:09 +02:00
AdrianLxM
7517ee4930 No permission to read statusline 2017-05-12 03:54:24 +02:00
Milos Kozak
b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak
be4aa1131e Merge branch 'DanaRv2' into history 2017-05-12 00:39:08 +02:00
Milos Kozak
2610edae55 DanaRv2 Modify 6 2017-05-12 00:38:26 +02:00
Milos Kozak
a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Radoslav Radev
d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61 Merge pull request #234 from warstar2187/korean 
Korean translation update
 2017-05-11 09:27:58 +02:00
Milos Kozak
72f3efc39a disable danarv2 temporary 2017-05-10 21:58:46 +02:00
Milos Kozak
51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak
15127dc4c6 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-10 21:37:42 +02:00
Milos Kozak
878e3e0921 use SP 2017-05-10 21:37:34 +02:00
AdrianLxM
201d2df16b cleanup imports 2017-05-10 16:37:11 +02:00
AdrianLxM
b247b81428 use helper class to query settings 2017-05-10 16:33:41 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
Milos Kozak
23fd6a6c44 overlappingintervals 2017-05-10 14:00:46 +02:00
AdrianLxM
fc85deb62d move evaluation of always_use_shortavg setting to the OAPS plugins 
For the overview and the watch we still may use the standard delta, even if this setting is enabled. (Also good to check that it is the same as in xDrip e.g.)
 2017-05-10 01:18:27 +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
77181f6f7f Handle exceptions in StatusLinePlugin 2017-05-09 21:32:24 +02:00
Milos Kozak
cd16b71759 upload OpenAPS Offline 2017-05-09 21:29:08 +02:00
Milos Kozak
d313df0d19 removing treatments 2017-05-09 20:47:02 +02:00
Milos Kozak
554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +02:00
Milos Kozak
d781c69b94 invalidate autosens on new profile 2017-05-09 16:51:08 +02:00
Milos Kozak
09fea02ed2 Allow to disable NS upload while client is connected 2017-05-09 16:24:53 +02:00
Milos Kozak
ee16fabdfc DanaRv2 modify 3 2017-05-09 15:53:11 +02:00
Milos Kozak
b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak
0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
Milos Kozak
8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +02:00
Milos Kozak
6e5d3635c8 using bolus amount from history if comm is interrupted 2017-05-08 23:13:43 +02:00
AdrianLxM
63b9a06431 Send empty status to xDrip when disabled. Send status immediately when enabling plugin. 2017-05-08 16:34:45 +02:00
AdrianLxM
da0334eb19 xdrip statusline reformat 2017-05-08 16:23:59 +02:00
AdrianLxM
67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak
14a56842ee allow to change x axis scale 2017-05-04 23:51:04 +02:00
Milos Kozak
05d9f16031 hide label too 2017-05-04 23:22:16 +02:00
Milos Kozak
bd0ff991dd remember graph settings fix 2017-05-04 21:33:26 +02:00
Milos Kozak
344144d88a pump status equal size 2017-05-04 21:11:51 +02:00
Milos Kozak
645bcdbb8a deviations < 2 as equal 2017-05-04 21:09:17 +02:00
Milos Kozak
db5dcc0064 different color for carbs deviations 2017-05-04 20:40:43 +02:00
Milos Kozak
aabcee8ea7 fix conflicts 2017-05-04 19:53:45 +02:00
Milos Kozak
352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak
070867af28 menu on top 2017-05-04 19:13:56 +02:00
Milos Kozak
a83ff12ca8 remove unneeded code 2017-05-04 16:30:01 +02:00
Milos Kozak
d145ef907f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-04 15:25:48 +02:00
Milos Kozak
194fd7f0a6 check for null 2017-05-04 15:25:41 +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
6d5f2514d0 remove duplicated string 2017-05-03 18:45:29 +02:00
Milos Kozak
10d5b914f3 check for finished activity 2017-05-03 18:37:00 +02:00
Milos Kozak
573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
Milos Kozak
37edc19509 check for null 2017-05-03 18:23:33 +02:00
Milos Kozak
037bb09d23 check for null 2017-05-03 18:15:10 +02:00
Milos Kozak
c30977bfd8 Merge pull request #230 from AdrianLxM/adridev3 
typo insuin->insulin
 2017-05-03 08:31:04 +02:00
Milos Kozak
b80c382512 fix exception in sms comm 2017-05-02 22:49:17 +02:00
Milos Kozak
602310b70a DanaRv2 1st rev 2017-05-02 17:02:30 +02:00
AdrianLxM
9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +02:00