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

643 commits

Author SHA1 Message Date
Johannes Mockenhaupt 447bd9b6a3
Alignments. 
(cherry picked from commit a63c388)
 2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt 9b80221752
Set inputType for notes fields. 
(cherry picked from commit af0807d)
 2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt f420491611
NewCarbsDialog: cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt 719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt efcc02775b
FillDialog: add missed validation, notes field, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt bf02edd871
Make visibility of notes field a preference. 2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt 05e07cf943
Align style of labels, i18n. 2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt 4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Adding notes to carbs and to wizard on overview
 2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt a075d87da1
Remove help dialog. 
(cherry picked from commit b1ef8e1)
 2018-04-12 20:59:24 +02:00
Johannes Mockenhaupt d2491ca429
NewCarbsDialog: add duration, help. 2018-04-11 13:05:54 +02:00
Markus M. May 99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
AdrianLxM 5c6e598cd6
Merge branch 'dev' into lp-edit 2018-04-08 16:14:43 +02:00
Johannes Mockenhaupt 344d9c1f49
Combo: remove 'read history' button. 
History and basal rate profile are permanently checked and updated. This
functionality would only be needed if driver was fundamentally broken.
 2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt db4439f1cc
Combo: remove half-backed alerts dialog. 2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt e937a777ba
Combo: remove superseeded TDD button and dialog. 2018-04-06 11:35:34 +02:00
AdrianLxM 009f5dfa38 reset -> strings.xml 2018-04-03 18:37:34 +02:00
AdrianLxM 933b1acd7e lp save button 2018-04-03 18:33:13 +02:00
AdrianLxM 75a91997b7 lp reset 2018-04-03 14:34:15 +02:00
Milos Kozak e9c7bdc7f4 add necessity of profile switch to objectives 2018-03-31 22:30:42 +02:00
Milos Kozak a91aeec144 fix nsclient layout 2018-03-31 20:32:47 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Milos Kozak 259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged 
Tdds again merged
 2018-03-28 17:35:23 +02:00
Milos Kozak 8e6953cc92 activate button on NSProfile fragment 2018-03-26 09:25:57 +02:00
AdrianLxM a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Johannes Mockenhaupt 8a7776fd74
Code dedup. 2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt 9838e2fabb
Rework prime/fill button. 2018-03-23 23:06:57 +01:00
Milos Kozak 22f50198fc rename nsclientinternal -> nsclient 2018-03-23 22:44:37 +01:00
Milos Kozak 30f09dc416 show constraints on LoopFragment 2018-03-23 18:23:19 +01:00
Milos Kozak 661595792f rename InsightPump -> Insight 2018-03-23 17:51:05 +01:00
Milos Kozak 3f5808eca3 show max basal limit on smb fragment 2018-03-23 09:59:07 +01:00
AdrianLxM 954f73eabd TDD 05 2018-03-19 19:10:54 +01:00
Johannes Mockenhaupt f918a5f303
More loop results cleanup and i18n. 2018-03-19 14:14:07 +01:00
AdrianLxM 3ade9be7a2 cleanup 2018-03-19 13:32:05 +01:00
Milos Kozak 1c413cc49f
Merge pull request #771 from jotomo/remove-pre-bolus 
Next round of button updates
 2018-03-19 09:29:27 +01:00
Milos Kozak 0266a79201 show invalid profiles in treatments tab 2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt da014daec8
Merge branch 'dev' into remove-pre-bolus 2018-03-18 20:48:19 +01:00
Johannes Mockenhaupt 643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Johannes Mockenhaupt 89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge 
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
 2018-03-18 19:47:23 +01:00
Milos Kozak 4f43feb12e allow profile to be null 2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt b54a010614
CarbsButton: replace suspend option with 'hypo tt'. 2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt 17219c08d1
Combo: fragment spacing fix. 2018-03-17 22:12:19 +01:00
Milos Kozak 3f29ca3b96 more checks for null profile 2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt 612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-03-17 16:45:08 +01:00
Milos Kozak 6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement 
Button refinement
 2018-03-17 15:28:41 +01:00
Johannes Mockenhaupt 8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
 2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt de72fba92e
Combo: update button spacing to match overview. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt 6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
AdrianLxM a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt 194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt 32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM 90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM 067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM 32894a092e chart menu 1 2018-03-16 17:23:02 +01:00
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Milos Kozak db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM 212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak 38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Milos Kozak 39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak 8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
AdrianLxM 118cdb3dce
buttons gone by default in smallheight 
... same as on default layout
 2018-03-04 20:12:33 +01:00
AdrianLxM cdb58ed143
newinsulin dialog wrap content 2018-03-04 19:57:21 +01:00
AdrianLxM 5a4967e544
newcarb dialog wrap content 2018-03-04 19:56:34 +01:00
Roumen Georgiev 9456a24655
Adding Eating soon mode to options 2018-03-01 16:22:05 +02:00
Milos Kozak e544d44799 overview layout cleanup 2018-02-25 16:20:20 +01:00
Milos Kozak 6eed00fae7 add xdrip icon to cgm button 2018-02-25 15:45:43 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Milos Kozak da777d9660 HistoryBrowser fill space by bggraph 2018-02-12 19:39:45 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Johannes Mockenhaupt 1985ed379d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
 2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt 43755f071d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt 6b4b044cd6
Remove nested layout for better performance. 2018-02-04 00:36:08 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
Johannes Mockenhaupt 6981c0fec6
Pump needs rest. 
(cherry picked from commit 2e88fb9)
 2018-01-31 00:59:23 +01:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Johannes Mockenhaupt e3abe04545
Bring back last bolus to combo fragment. 
(cherry picked from commit 108349e)
 2018-01-28 15:30:36 +01:00
Jamorham 3150e7d00f
Add double rounding helper 2018-01-26 22:26:29 +00:00
Jamorham 2f7dc11b9f
Update Insight fragment layouts 2018-01-26 16:46:09 +00:00
Johannes Mockenhaupt 947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt 0f98c49876
Fix namespace errors. 2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt 2a4f1950b3
Add missing ids to other overview layouts. 2018-01-24 16:53:40 +01:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt 3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt 0eba153d8a
Combo: add 'base basal rate' to fragment. 
(cherry picked from commit 2873da5)
 2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Careportal DB browser
  fix rendering treatments with duration
  more autosens logging
  cancel extending bolus on pump disconnection
  set maxiob=0 only for objective 4
  fix stopping bolus connection error
 2018-01-23 02:04:02 +01:00
Milos Kozak 52e4496add Careportal DB browser 2018-01-22 21:49:01 +01:00
Johannes Mockenhaupt 8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  better handling of wrong profiles
 2018-01-21 14:13:46 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt 20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Overview: move checkboxes before label.
  fix pump unreachable for virtual pump
  getLastAutosensData improvement and logging
  remove readstatus prior every command
  bump 1.57-dev
  better log build verison to Fabric

# Conflicts:
#	app/build.gradle
 2018-01-19 21:05:37 +01:00
Johannes Mockenhaupt 8109900e9b
Overview: move checkboxes before label. 
(cherry picked from commit 4825e16)
 2018-01-19 20:13:53 +01:00
Johannes Mockenhaupt 723bcc4ee3
Remove 'queued activities' from ComboFragment. 
(cherry picked from commit 57a4449)
 2018-01-15 11:11:58 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames. 
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
 2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt 0e61032dec
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  wear update
  RS create bond
  add scrollview
  QuickWizard detailed settings

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-12-27 18:19:51 +01:00
Milos Kozak 72d6c4494b add scrollview 2017-12-26 01:22:35 +01:00
Milos Kozak 8fdd16c305 QuickWizard detailed settings 2017-12-26 00:27:34 +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 3ce260dfe9 fix of fix 2017-12-23 11:18:17 +01:00
Milos Kozak 6e09bfbbe4 fix wrong button type 2017-12-23 11:07:29 +01:00
Milos Kozak 600e2ade1c SingleClickButton 2017-12-22 19:50:16 +01:00
Johannes Mockenhaupt 6a3184bc39
ComboFragment: use history icon for history, not bolus icon. 2017-12-21 11:36:25 +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 8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Johannes Mockenhaupt b6bc957813
Minor tewaks and cleanups. 2017-12-13 21:37:44 +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 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 86b63cb27d
Combo tab: show command queue if non-empty. 2017-12-06 17:14:30 +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 0c7b2e1953
Remove last bolus, units display of reservoir level from Combo fragment. 
(cherry picked from commit 42847cb)
 2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt afdcf0b1c5
Remove combo pairing stubs. 2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt 1e19f19cd2
Hide buttons on Combo tab until plugin is initialized. 2017-12-03 22:25:43 +01:00
Johannes Mockenhaupt 1a8c0fcf52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cancel ongoing notification when plugin is disabled.
  Fix typo in fragment name.
  Nitpicky symmetry.
  PersistentNotification unregister workaround.
  Make PumpEnactResult fluent.
  Minor code cleanup.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
 2017-11-22 22:17:57 +01:00
Milos Kozak dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Johannes Mockenhaupt 1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt c6ad1b59f3
Clean up string resources. 2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt 813f857306
Rename fragment 'error history' -> 'alert history'. 2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt 63607d169d
Polish dialogs. 2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt 1b50b43fbb
Add headers to dialogs. 2017-11-21 00:22:16 +01:00
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Johannes Mockenhaupt e27730229e
Update TODO-Combo, nicer icon in fragment. 2017-11-14 10:43:36 +01:00
Johannes Mockenhaupt c22d18eabc
ComboFragment: alert button for pump alerts (instead of alarms). 2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt c11086d9ea
Stuff: 
* Read all history
* Simple viewer for TDDs, errors
* Clean up cancelling TBR (incomplete)
* Initializing pump robustness
 2017-11-12 00:01:01 +01:00
Milos Kozak 25aa5094a4 alarm for failed bolus 2017-11-11 22:32:00 +01:00
Johannes Mockenhaupt 3072a42cd7
Initial dialog to display pump alerts. 2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt fb65aca081
ComboFragment: hack to make battery display look pretty before init. 2017-11-11 16:13:06 +01:00
Milos Kozak 86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt e6a29e5214
Reorder items in fragments. 2017-11-10 02:23:21 +01:00
Johannes Mockenhaupt cc6db3a059
Some ComboFragment cleanups. 2017-11-08 23:31:40 +01:00
Johannes Mockenhaupt f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2 
* origin/dev2: (26 commits)
  add getPreferenceId to food plugin
  preferences update
  use DateUtil#agoString
  use DateUtil#untilString
  timeframe strings
  Show remaining time of TT
  NSTreatments NPE fix
  Cleanup.
  Revert "Debug: wider thread column in log to improve readability."
  Disable event logging by default.
  Log summary after 10s, then every 60s.
  Log receivers of event.
  Log source of event.
  Debug: wider thread column in log to improve readability.
  Better log messages for events.
  Group events in type hierarchy related to the LoopPlugin.
  Remove dead NSPingAck class.
  Let event classes extend Event(UpdageGui) classes.
  Add base event class.
  Log posted events.
  ...
 2017-11-01 21:39:45 +01:00
Milos Kozak f67bd291cd Merge branch 'dev' into dev2 2017-11-01 20:44:24 +01:00
Milos Kozak 60699eddbb preferences update 2017-11-01 20:43:59 +01:00
Johannes Mockenhaupt 6b6d252173
Day 1 
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
  ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
  rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
 2017-10-29 11:36:35 +01:00
Johannes Mockenhaupt eed3773b49
Combo i18n. 2017-10-27 17:19:10 +02:00
Johannes Mockenhaupt b47559647f
wip 2017-10-27 00:03:01 +02:00
Johannes Mockenhaupt cb438934b6
WIP: Pairing 2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt 6cb1d5c0bd
ComboFragment, set "Initializing" as initial status. 2017-10-21 11:22:40 +02:00
Johannes Mockenhaupt 8b8a135804
Add (back) last bolus to ComboFragment. 2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt 4517736122
Add back TBR to ComboFragment. 2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt 4e978656f5
Trim down ComboFragment. 
Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview
and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.
 2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt 3d6c8ee2a5
Combo Fragment misc. 2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt c29b4d13a3
Support pump suspend status (and misc other ...). 2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt e1c1f4b996
Revert string danar_stats. 2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt 4de010b1a2
Strings reuse for pumps. 2017-10-19 16:11:36 +02:00
Johannes Mockenhaupt dca219d900
Fix initializing ruffy service, read reservoir level on init. 2017-10-18 20:53:44 +02:00
Johannes Mockenhaupt ab4f46471b
Add RuffyCommands.readPumpState, cleanup, fix. 2017-10-18 18:29:29 +02:00
Milos Kozak 13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt 41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2 
* origin/dev: (126 commits)
  ConfigBuilder: hide disabled plugins by default.
  sum on name for LP
  log to debug not error
  logger reformat
  logging
  rhinoAMA first full run
  rhinoAMA first crashfree call
  rhino some more cleanups
  rhino logging and cleanups
  rhino MA looping
  rhino first real detemine-basal call
  rhino small refactor
  NDK filters to work around j2v8 vs. libBleCommandUtil issue.
  NewTreatmentDialog: sanitize inputs, fixes #417.
  rhino complex parameter passing
  rhino first parameter passing
  rhino function passing
  first rhino
  location permission for BLE scanning
  use customized name only for LocalProfile
  ...
 2017-10-17 12:16:43 +02:00
Milos Kozak 3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
AdrianLxM 39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
Milos Kozak d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak 9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak 230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned 
Overview: align checkboxes and labels vertically.
 2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt 62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt 70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak 60086dac8d Merge remote-tracking branch 'origin/dev' into profile 2017-10-07 18:30:55 +02:00
Milos Kozak a54b9e52d8 Merge pull request #446 from AdrianLxM/numberpicker-update 
overview checkboxes cutoff fix
 2017-10-07 18:29:56 +02:00
Milos Kozak ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
AdrianLxM 046c28856c treatments in config builder 2017-10-07 01:18:28 +02:00
AdrianLxM 10d273dac8 checkboxes for NS-Client layouts 2017-10-06 15:48:32 +02:00
AdrianLxM 333b131c1e overview checkboxes cutoff fix 2017-10-06 13:53:55 +02:00
Milos Kozak f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak 3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak 96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
Milos Kozak 6d08a608a2 dana layout 2017-10-03 22:37:53 +02:00
Milos Kozak 58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak 8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Roumen Georgiev ef803d6a41 In one line 2017-09-29 15:06:23 +03:00
Roumen Georgiev e004b95a60 Update danar_fragment.xml 2017-09-29 09:50:07 +03:00
Roumen Georgiev 7444bc11fa text identation 2017-09-29 09:47:29 +03:00
Roumen Georgiev 92e2008692 Adding button Icons 2017-09-29 09:40:11 +03:00
Milos Kozak 91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Milos Kozak 1823cd3f24 extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
Milos Kozak 082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak 349b27e31a NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
Johannes Mockenhaupt 1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
 2017-09-18 22:54:35 +02:00
Milos Kozak fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak 04994924c5 GUI tweaking, small fixes 2017-09-18 18:41:45 +02:00
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt 627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false. 
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
 2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog 
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
 2017-09-09 16:30:17 +02:00
Milos Kozak db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak 7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak 7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak 981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Johannes Mockenhaupt c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt 1d3411ba56
Show connection, execution time in combo fragment. 
(cherry picked from commit 4078c23)
 2017-08-27 12:36:28 +02:00
Milos Kozak ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Johannes Mockenhaupt bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
 2017-08-19 22:38:58 +02:00
Milos Kozak ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak 73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00