Commit graph

13197 commits

Author SHA1 Message Date
Milos Kozak e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
don't show single connection timeouts on the watch
2017-12-25 20:44:39 +01:00
AdrianLxM e50c6fc8ed RS BLE modifications 2017-12-25 20:39:14 +01:00
Johannes Mockenhaupt ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging
* origin/dev:
  fix non smooth ratio graph
  fix of fix
  fix wrong button type
  fix doubled percentage when comming from NS
  proper select last used profile
  when using profile percentage limit basal rate to minimal value supported by pump
  SingleClickButton
  RS fix crash when pairing is not confirmed on pump
  Double -> double
  use joda-time
  Use autosensdata for wizard instead of  APSResult
2017-12-25 20:29:32 +01:00
Milos Kozak dd58952b42
Merge pull request #548 from MilosKozak/COB-Wizard-idea
Use autosensdata for wizard instead of  APSResult
2017-12-25 19:22:02 +01:00
Milos Kozak b0bf9b5c79 Merge branch 'dev' into smb060 2017-12-25 17:01:53 +01:00
Milos Kozak f968ec630c fix non smooth ratio graph 2017-12-25 17:01:31 +01:00
Johannes Mockenhaupt d081345da2
Define lowest non-zero basal rate as minimum basal rate for the Combo. 2017-12-25 11:05:51 +01:00
Milos Kozak ae30046c95 Merge branch 'dev' into smb060 2017-12-23 11:18:37 +01:00
Milos Kozak 3ce260dfe9 fix of fix 2017-12-23 11:18:17 +01:00
Milos Kozak 51de0f16c1 Merge branch 'dev' into smb060 2017-12-23 11:07:48 +01:00
Milos Kozak 6e09bfbbe4 fix wrong button type 2017-12-23 11:07:29 +01:00
Milos Kozak 7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +01:00
Milos Kozak 2bb37a4bfc fix doubled percentage when comming from NS 2017-12-22 21:03:36 +01:00
Milos Kozak 248d3d1697 proper select last used profile 2017-12-22 20:34:53 +01:00
Milos Kozak 93b954fffe when using profile percentage limit basal rate to minimal value supported by pump 2017-12-22 20:17:31 +01:00
Milos Kozak 600e2ade1c SingleClickButton 2017-12-22 19:50:16 +01:00
Johannes Mockenhaupt 4f46fc27ad
README-Combo: clean up 'known issues section'. 2017-12-22 16:12:41 +01:00
Milos Kozak 0851581f7f Merge branch 'dev' into smb060 2017-12-22 12:03:11 +01:00
Milos Kozak 25667bc79e RS fix crash when pairing is not confirmed on pump 2017-12-22 11:57:59 +01:00
Johannes Mockenhaupt 7073688920
Update ComboPlugin to match updated PumpInterface. 2017-12-22 10:46:54 +01:00
Johannes Mockenhaupt bd0ae23e30
Merge branch 'dev' into csv2-staging
* dev:
  fix disconnecting pump
  format output date to be displayed on iDevices correctly
  BolusWizard use 0 for insulin correction if in range
  LocalProfile TimeListEdit min, max
  remove string with no default translation
  Rv2,RS fix loading events
  initialize lastCommandTime too after BT reset
  allow to read status after every command
2017-12-22 10:39:30 +01:00
Milos Kozak e77e7ffbbd Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2017-12-22 10:35:33 +01:00
Milos Kozak 99e5a39b33 Merge branch 'dev' into smb060 2017-12-22 10:34:45 +01:00
Milos Kozak 5bc6ea04c2 Double -> double 2017-12-22 03:27:13 +01:00
Milos Kozak 31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Milos Kozak 74abdc0271 fix disconnecting pump 2017-12-22 01:35:52 +01:00
Milos Kozak 6b23ba10bd format output date to be displayed on iDevices correctly 2017-12-22 00:37:22 +01:00
Milos Kozak a5c4495a5d BolusWizard use 0 for insulin correction if in range 2017-12-22 00:17:46 +01:00
Milos Kozak 771f9eac1a LocalProfile TimeListEdit min, max 2017-12-22 00:12:40 +01:00
Johannes Mockenhaupt 42418d4146
ComboFragment: make warning/error bold for a better readability.
On lower DPI devices they're already bold, but on higher DPI devices
the yellow "Low" is hardly discernible from white.

(cherry picked from commit 693ba73)
2017-12-21 22:45:27 +01:00
Johannes Mockenhaupt 6a3184bc39
ComboFragment: use history icon for history, not bolus icon. 2017-12-21 11:36:25 +01:00
Milos Kozak 5c7ad1e650
Merge pull request #553 from MilosKozak/AdrianLxM-patch-1
remove string with no default translation
2017-12-21 09:51:41 +01:00
Andrew Warrington 176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. 2017-12-21 09:50:16 +01:00
Milos Kozak fb12c0bc96 enable SMB for G5 2017-12-21 09:02:49 +01:00
Milos Kozak cb2368f535 Merge branch 'dev' into smb060 2017-12-21 08:58:33 +01:00
AdrianLxM 2d2bd6d77a
remove string with no default translation 2017-12-21 08:26:55 +01:00
Milos Kozak 2bdda9af43 Rv2,RS fix loading events 2017-12-21 07:45:56 +01:00
Simon Pauwels 5bda1235c3
Merge pull request #11 from jotomo/combo-scripter-v2
20.12.2017
2017-12-20 22:37:43 +01:00
Milos Kozak 5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +01:00
Johannes Mockenhaupt cf9d55747e
Fix NPE. 2017-12-20 21:14:35 +01:00
Milos Kozak adff0329dd initialize lastCommandTime too after BT reset 2017-12-20 20:55:14 +01:00
Milos Kozak 0f43e95644 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 20:45:35 +01:00
Milos Kozak 63b0efede3 allow to read status after every command 2017-12-20 20:45:21 +01:00
Johannes Mockenhaupt 3b43e4d06a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  RS enable BT before scanning
  BG viewer
  NSOffline remove from queue as well
  NS offline

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-20 20:21:12 +01:00
Milos Kozak beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline
Nsoffline
2017-12-20 20:17:30 +01:00
Milos Kozak c33dd1e7d7 RS enable BT before scanning 2017-12-20 19:50:44 +01:00
Johannes Mockenhaupt 4094b0dd61
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  wait a few sec before disconnection for another command
2017-12-20 19:42:13 +01:00
Milos Kozak 70f4b72ff9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 18:26:52 +01:00
Milos Kozak 096b2e93a3 wait a few sec before disconnection for another command 2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt af4816453e
Add note on supported basal rate ranges. 2017-12-20 18:06:59 +01:00