Commit graph

1917 commits

Author SHA1 Message Date
Sandra Keßler
14fdc14807 maybe better error recovery? 2017-07-31 12:59:03 +02:00
Sandra Keßler
58e6791441 alternate setTBR based on StateMachine 2017-07-31 11:52:31 +02:00
Sandra Keßler
3497296b6c more time 2017-07-31 09:08:12 +02:00
Sandra Keßler
a7165497ea increase Button Timing to 200ms 2017-07-30 22:49:52 +02:00
Sandra Keßler
7c001e97bf wait till we get something currentDuration % 15 == 0 2017-07-30 22:25:49 +02:00
Sandra Keßler
bfb6039c16 slow pump fix 2017-07-30 22:25:49 +02:00
Sandra Keßler
1d3fee54e9 if umbind fails while service is dead, bind would never be called 2017-07-30 22:23:01 +02:00
Sandra Keßler
afda4f9254 Merge remote-tracking branch 'refs/remotes/origin/trim-to-max-tbr' into HEAD 2017-07-30 16:21:10 +02:00
Johannes Mockenhaupt
16dc21c7f1 Merge branch 'changeRuffyService' into 'stable'
change to support changed IRuffyService

See merge request !7
2017-07-30 11:27:27 +00:00
Johannes Mockenhaupt
27f788424a
Trim requested TBR rate to maximum the pump supports, properly round. 2017-07-30 13:06:52 +02:00
Johannes Mockenhaupt
d672f3c653
Remove hander on ruffy unbind. 2017-07-30 13:03:43 +02:00
Johannes Mockenhaupt
127fbc993e Merge branch '1_5f' into 'stable'
1 5f - again with target stable

See merge request !10
2017-07-30 10:04:12 +00:00
AdrianLxM
bfd96b0635 Merge branch 'stable' into '1_5f'
# Conflicts:
#   app/src/main/res/values/strings.xml
2017-07-29 16:55:55 +00:00
Sandra Keßler
5e845e37f7 change to support changed IRuffyService 2017-07-28 13:41:10 +02:00
Johannes Mockenhaupt
17b0e7d71a
Fix some typos. 2017-07-27 14:35:56 +02:00
Johannes Mockenhaupt
bd353a7043
BolusCommand: confirm via My Data history the correct amount was delivered. 2017-07-27 13:39:23 +02:00
Milos Kozak
39d41e8e7d Merge pull request #324 from AdrianLxM/wear-wizard-percentage
wear wizard percentage
2017-07-27 00:44:22 +02:00
Johannes Mockenhaupt
b96edc048e
Merge remote-tracking branch 'fork/develop' into stable
* fork/develop:
  setTBR - check for TBR and RUNTIME
2017-07-26 18:18:10 +02:00
Johannes Mockenhaupt
e7dd95bbcc
Merge branch 'jotomo/AndroidAPS#44' into stable
* jotomo/AndroidAPS#44:
  Typos.
  SetTbrCommand: remove retry logic, add extra checks for final bolus.
  BolusCommand: remove retry logic, add extra checks for final bolus.
2017-07-26 18:16:06 +02:00
Johannes Mockenhaupt
54954be17a Merge branch 'setTBR-smallfix' into 'develop'
setTBR - check for TBR and RUNTIME

See merge request !4
2017-07-26 16:04:09 +00:00
Johannes Mockenhaupt
78d2322c14
Typos. 2017-07-26 18:02:21 +02:00
Johannes Mockenhaupt
02c80a924c
SetTbrCommand: remove retry logic, add extra checks for final bolus. 2017-07-26 18:00:18 +02:00
Johannes Mockenhaupt
da69e69570
BolusCommand: remove retry logic, add extra checks for final bolus. 2017-07-26 16:06:58 +02:00
Johannes Mockenhaupt
e1b63a4a74
Command doc. 2017-07-26 15:50:07 +02:00
Johannes Mockenhaupt
f6b1887fd2
Logging: Print filename and line instead of logger name. 2017-07-26 15:26:44 +02:00
Johannes Mockenhaupt
d79b221940
CommandException: provide message for printing. 2017-07-26 14:44:28 +02:00
Johannes Mockenhaupt
0516eacfe5
ConfigBuilder.applyAPSResult: log request rate. 2017-07-26 14:44:21 +02:00
AdrianLxM
21b81a5084 setTBR - check for TBR and RUNTIME 2017-07-26 12:19:28 +00:00
AdrianLxM
5569b42ac3 wear wizard percentage 2017-07-26 09:58:51 +02:00
Milos Kozak
7a572d2341 1.5f 2017-07-25 22:53:55 +02:00
Milos Kozak
31cdafffe1 Merge pull request #319 from AdrianLxM/rename-packages-lowercase
rename package lowercase
2017-07-25 19:52:24 +02:00
Milos Kozak
4bb3b7c11d Merge pull request #323 from MilosKozak/nsclient-local-second
Nsclient local broadcasts
2017-07-25 19:51:57 +02:00
Milos Kozak
0914e67c11 typo 2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5 use key instead of string 2017-07-25 19:24:51 +02:00
Milos Kozak
d6cb8ef6bc check for existing value 2017-07-25 19:18:51 +02:00
Milos Kozak
252b24cefe Merge pull request #313 from MilosKozak/synchronize-nsclientlog
synchronize NSClient log
2017-07-25 12:50:48 +02:00
Johannes Mockenhaupt
314a551c96
Mark log entries comming from ruffy. 2017-07-24 15:18:16 +02:00
Johannes Mockenhaupt
c8c4cf2813
Add log statement. 2017-07-24 13:30:08 +02:00
Johannes Mockenhaupt
ebd9c0d876
Add wait time between reconnects.
Might improve GL#34.
2017-07-24 13:16:35 +02:00
Johannes Mockenhaupt
674fb398b8
Safeguard against communication issues with ruffy.
In most cases we can't do much, but we can handle exceptions
and show a notification and message what's wrong, so the user
can try to fix the issue.

Fixes jotomo/AndroidAPS#35.
2017-07-24 12:59:56 +02:00
Johannes Mockenhaupt
81f3aea42a
Provide basic pump data for upload. 2017-07-24 12:59:56 +02:00
AdrianLxM
3500e92a41 nsclient ackAlarm local 2017-07-24 02:33:29 +02:00
AdrianLxM
d60321b4d1 nsclient alarms local 2017-07-24 02:27:16 +02:00
Johannes Mockenhaupt
e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  recategorize cp icons
  removed unnecessary text colour and fixed indentation
  layout indentation
  Moving some buttons to the right categories
  removed empty ghost files
  remove duplicate IDs and indentation fix
  Picture renaming (#311)
2017-07-24 02:25:28 +02:00
Johannes Mockenhaupt
6a0273046d
Comment on English being the only supported pump language so far. 2017-07-24 02:24:48 +02:00
AdrianLxM
a4864c3d06 nsclient cal local 2017-07-24 02:09:26 +02:00
AdrianLxM
194a817332 nsclient devicestatus local 2017-07-24 02:06:05 +02:00
AdrianLxM
fe57d4a61d nsclient mbg local 2017-07-24 02:02:54 +02:00
AdrianLxM
82b99e1708 nsclient status local 2017-07-24 02:00:46 +02:00
AdrianLxM
759154e578 nsclient profile local 2017-07-24 01:58:23 +02:00