Commit graph

2018 commits

Author SHA1 Message Date
Johannes Mockenhaupt
4a1684eb92
Merge remote-tracking branch 'origin/dev' into stable
* origin/dev:
  remove canceltemp button from all layouts and click handling from overview fragment
  correct logging
  fix cancel real temp basals from actions
  color for active temp
  remove translated string not in default strings and add flag to cancel method
  Some more German
  Some more German
  Some German translations, remove unused strings, App name for all
  Update strings.xml
  CS translations
  hide all overview buttons by default
  move cancel temp to actions
  new temp basal dialog refactor
  fix virtual pump crash
  Disconnect pump: cancel temp before setting new to make sure it will last as expected
  remove notes strings as well
  remove notes from temp basal upload
  cancel current temp before activating superbolus
2017-08-05 11:02:13 +02:00
Timm Korte
f22f96c138 change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr 2017-08-04 22:39:15 +02:00
Sandra Keßler
37a3270a16 missing stuf :/ 2017-08-04 17:58:28 +02:00
Sandra Keßler
f790ce6f20 add unused (but tested) command to get basal rate from Profile 1 2017-08-04 17:57:34 +02:00
Sandra Keßler
ac3859dcae update setTBRCommand to way faster methods in scripter 2017-08-04 16:39:03 +02:00
Sandra Keßler
d35283ad74 add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated) 2017-08-04 16:38:25 +02:00
Sandra Keßler
d8ca2771fb add back key 2017-08-04 16:36:25 +02:00
Sandra Keßler
efb73ba4f2 make keypress wait up to 2000ms for key response 2017-08-04 16:36:12 +02:00
Sandra Keßler
763cc23939 add type of menu to MenuType (main or sub menu) 2017-08-04 16:34:25 +02:00
Sandra Keßler
6981276cab - fix Multi connect
- add key sent with 2500ms wait on keypress
- fix Timing and npes in setTBR
- make ruffyScripter not reinit every time
- fix menu npe
2017-08-04 11:53:51 +02:00
Milos Kozak
541a261dda Merge pull request #334 from AdrianLxM/colored-activetemp
Colored activetemp
2017-08-03 09:11:30 +02:00
AdrianLxM
36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd correct logging 2017-08-03 08:20:11 +02:00
Milos Kozak
b5cfe1c727 Merge pull request #332 from AdrianLxM/cancel-userRequesed-flag
remove translated string not in default strings and add flag to cance…
2017-08-03 08:08:45 +02:00
AdrianLxM
7a7f75db01 fix cancel real temp basals from actions 2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9 color for active temp 2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4 remove translated string not in default strings and add flag to cancel method 2017-08-03 02:01:52 +02:00
Milos Kozak
9b87d34cc7 Merge pull request #330 from AdrianLxM/1.5-german
Some German translations, remove unused strings, App name for all
2017-08-02 11:22:24 +02:00
AdrianLxM
23abc0e4e5 Some more German 2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9 Some more German 2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab Some German translations, remove unused strings, App name for all 2017-08-01 23:46:58 +02:00
Milos Kozak
43757951e0 Merge pull request #329 from slavidex/patch-40
Update strings.xml
2017-08-01 22:51:01 +02:00
Radoslav Radev
39891bbad9 Update strings.xml 2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330 CS translations 2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3 hide all overview buttons by default 2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556 move cancel temp to actions 2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35 new temp basal dialog refactor 2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3 fix virtual pump crash 2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50 Disconnect pump: cancel temp before setting new to make sure it will last as expected 2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849 remove notes from temp basal upload 2017-08-01 17:21:32 +02:00
Sandra Keßler
4147e7f6a1 change Version info 2017-07-31 21:45:03 +02:00
Milos Kozak
668008e1c1 cancel current temp before activating superbolus 2017-07-31 19:53:09 +02:00
Sandra Keßler
791d905b14 exceptions 2017-07-31 13:08:10 +02:00
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
AdrianLxM
785e1b323c refresh-data - make guard condition better readable 2017-07-28 05:48:34 +02:00
AdrianLxM
f680d70548 refresh data greater smaller fix 2017-07-27 23:35:44 +02:00