1
0
Fork 0
Commit graph

1283 commits

Author SHA1 Message Date
Milos Kozak
7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +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
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
99e5a39b33 Merge branch 'dev' into smb060 2017-12-22 10:34:45 +01:00
Johannes Mockenhaupt
6a3184bc39
ComboFragment: use history icon for history, not bolus icon. 2017-12-21 11:36:25 +01:00
AdrianLxM
2d2bd6d77a
remove string with no default translation 2017-12-21 08:26:55 +01:00
Milos Kozak
5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +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 from MilosKozak/nsoffline
Nsoffline
2017-12-20 20:17:30 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Milos Kozak
0d7e950b73
Merge pull request from jotomo/sync-to-pump
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Johannes Mockenhaupt
8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +01:00
Johannes Mockenhaupt
a6a87d0790
Minor fixes and polish around bolus cancellation. 2017-12-15 10:41:07 +01:00
Milos Kozak
8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak
5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
Johannes Mockenhaupt
b6bc957813
Minor tewaks and cleanups. 2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt
67eb6b20ed
Handle errors when reading the history for verification fails. 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
a169245dc3
On bolusing failure, attempt verify by reading last bolus from history. 2017-12-13 20:39:08 +01:00
Johannes Mockenhaupt
f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups. 2017-12-12 00:57:04 +01:00
Milos Kozak
b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Johannes Mockenhaupt
ca9fe3e755
Fixes around bolus cancellation. 2017-12-10 01:39:58 +01:00
Johannes Mockenhaupt
26fa63d571
ComboFragment: always show refresh button.
To allow force starting a conecting attempt if the pump is still
in disconnected state.
2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt
471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  remove unused imports
  adapt wear actions to command queue
  RS report unsupported firmware
  removing the whole if() statement
  fix NPE when profile not loaded
  fix of extended bolus size
  Added profile's target BG in NSClient mode
2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt
c386d0ba03
Fix TDDS dialog title. 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
27e9cfda6f
Overhaul Combo tab buttons and dialogs. 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
063a5ba6b9
Only read Tdd and Alerts through buttons on Combo tab, not treatment history. 2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt
cf142a4538
Merge pull request from jotomo/verify-record-date-after-bolus-cancel
Verify and return delivered bolus amount in BolusCommand
2017-12-09 19:41:16 +01:00
Johannes Mockenhaupt
b409b737e5
On connect, take over TBR CANCELLED warning and raise message. Fixes . 2017-12-09 17:33:11 +01:00
Johannes Mockenhaupt
f09464e5d6
Move detection of partial bolus delivery to BolusCommand.
Have BolusCommand verify delivered bolus if needed and return the
actually delivered bolus amount. This makes more sense now,
given history is only read if unavoidable.
2017-12-08 12:56:15 +01:00
Milos Kozak
696dd4c592 Merge branch 'dev' into smb 2017-12-07 23:54:37 +01:00
AdrianLxM
795292d891 bend translations 2017-12-07 20:51:17 +01:00
Milos Kozak
dc3c853aca Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt
86b63cb27d
Combo tab: show command queue if non-empty. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
32b7df39f9
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Update strings.xml
  Update strings.xml
2017-12-06 11:34:32 +01:00
AdrianLxM
525adddc5e
Merge pull request from osodebailar/dev
Dev
2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt
0f034dd662
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  check for duration in json
  untranslatable strings
  greek language
  check for null
  queue logging
2017-12-05 23:19:05 +01:00
AdrianLxM
50cbff6fa4 untranslatable strings 2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt
f9867c69fb
Remove warning if pump time is off. 2017-12-05 21:46:12 +01:00
Milos Kozak
a293f86978 Merge branch 'dev' into smb 2017-12-05 17:36:44 +01:00
Milos Kozak
188762519c greek language 2017-12-05 17:03:40 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Johannes Mockenhaupt
01c52e753c
Remove 'sync to profile' pref. 2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt
ada5301361
Cleanups. 2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt
e7d49f2300
Merge branch 'no-history-for-you' into combo-scripter-v2
* no-history-for-you:
  When bolusing, only read history in case of error or cancellation.
  Cleanups.
  Remove lastBolus, reservoirLevel.
  Use timestamp for TBR, not pump minutes.
  Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
  ComboFragment: move forced history read to long-pressing the TDD button.
  More steps towards reducing comms amount.
  Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
  Remove last bolus, units display of reservoir level from Combo fragment.

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt
bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev: (68 commits)
  max connection time to 120 sec
  make chart zoomable again
  fix NPE
  lowest priority for background calculations
  wear timestamps long
  remove unneeded code
  fix landscape overview
  synchronized wait
  fix build tools for travis
  try to fix travis
  upgrade build tools
  R: resolve thread deadlock during bolus stop
  remove unsupported code from korean pump
  handle bolus stop prior to delivery correctly
  fix translations
  better logging
  Revert unnecessary change.
  Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
  gradle update
  parse more iso formats
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/info/nightscout/androidaps/Config.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
#	app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_others.xml
#	app/src/main/res/xml/pref_wear.xml
#	gradle/wrapper/gradle-wrapper.properties
#	wear/build.gradle
2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt
98ba0fbf87
When bolusing, only read history in case of error or cancellation. 2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt
141c116db6
ComboFragment: move forced history read to long-pressing the TDD button.
To avoid accidentally doing this when a short press on Refresh was
intended.
2017-12-05 00:08:42 +01:00
Milos Kozak
d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00