Commit graph

245 commits

Author SHA1 Message Date
Andy Rozman bd3529e650 Merge branch 'dev' into medtronic_andy 2019-03-31 20:03:49 +01:00
AdrianLxM d4d499587b Merge remote-tracking branch 'andyremote/wear_upgrade' into dev-wear 2019-03-18 23:51:20 +01:00
AdrianLxM 859267fe34
build with lint complaining 2019-03-14 10:47:29 +01:00
Andy Rozman f7c4db35b5 Merge branch 'dev' into wear_upgrade 2019-03-12 22:46:38 +00:00
Andy Rozman 6fcb1ce230 Medtronic 0.8.1-SNAPSHOT
- wear changes
- refactoring of decoder
- started work on bolus, tbr, resumes
2019-03-10 19:08:54 +00:00
Andy Rozman b91ab26863 Wear android manifest 2019-03-06 23:48:45 +00:00
Andy Rozman 6e500c1e75 On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out.
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent

On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
2019-03-06 23:38:18 +00:00
Milos Kozak 5cf9516012 fix gradle files 2019-03-05 20:44:51 +01:00
Andy Rozman 056ad650cd - changed wear versions
- added some code to listener
- added some log entries
2019-03-05 01:05:16 +00:00
Andy Rozman fda43c423d - Change wear versions to highest 2019-03-04 23:23:51 +00:00
Milos Kozak b6809c9d45 fix compiler warning 2018-10-22 21:27:15 +02:00
Milos Kozak 4f107cf3ee wear flavors 2018-08-29 17:56:34 +02:00
AdrianLxM 8716f57978
timeshift can be negative on watch 2018-08-02 21:40:44 +02:00
Sebastian Lenz 971e258265 cancel TBR request notification on wearable if accepted or no longer valid 2018-07-25 23:48:54 +02:00
Sebastian Lenz 8c49119b15 processing the acceptance of the TBR request from the wearable 2018-07-25 23:47:59 +02:00
Sebastian Lenz e2ef8f2d74 send notification about TBR request to the wearable 2018-07-25 23:46:06 +02:00
AdrianLxM 6e9e9702e0 icons & wear 2018-07-21 21:21:29 +02:00
Milos Kozak 375025f7f0 remove unused string 2018-07-02 15:55:52 +02:00
AdrianLxM d8603f07be remove debug clause and smaller fonts 2018-06-27 20:22:19 +02:00
AdrianLxM 15d373f273 vibrate again 2018-06-27 19:03:29 +02:00
AdrianLxM f160a49ef6 only start one confirm activity 2018-06-27 18:48:09 +02:00
AdrianLxM 815c3c17a9 cleanup. 2018-06-27 18:06:27 +02:00
AdrianLxM a283586a3c autodismissing confirm activity. 2018-06-27 18:06:16 +02:00
AdrianLxM 0fe26fda27 confirm activity working 2018-06-27 18:06:07 +02:00
AdrianLxM aad2b94c8e first confirm activity 2018-06-27 18:05:55 +02:00
AdrianLxM b05b300faf ecarb duration format 2018-05-03 22:08:35 +02:00
AdrianLxM f2168ff36b ecarb hang in activity again 2018-05-03 22:08:19 +02:00
AdrianLxM 76277d11ad ecarb hang in activity 2018-05-03 22:08:11 +02:00
AdrianLxM 71db7b60c9 ecarb first activity 2018-05-03 22:08:02 +02:00
AdrianLxM 917fcb5953 wearwizard reorder menu 2018-05-03 17:49:27 +02:00
AdrianLxM c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
Johannes Mockenhaupt c51635dba4
Watch: colored preds. 2018-05-02 16:01:40 +02:00
AdrianLxM 9839ad0497
revert wear targetSdkVersion
... as we use old communication protocol.
2018-04-18 20:59:40 +02:00
AdrianLxM 2414be85f2
dummy-edit to re-trigger travis 2018-04-10 22:53:27 +02:00
swissalpine 2972138d2a Fix for black number and labels on black background (aaps wear) 2018-04-10 22:14:52 +02:00
Milos Kozak 132400bb9e
Merge pull request #859 from MilosKozak/watchsmb
Watchsmb
2018-04-09 15:19:24 +02:00
Markus M. May 79094a92f9 Provide newer support libraries, compile with 27 and target 25 2018-04-04 22:46:44 +02:00
Markus M. May c3bec7e7a6 Revert targetSdkVersion 2018-04-04 21:38:47 +02:00
Markus M. May 9006721873 Version bump butterknife plugin 2018-04-02 22:43:20 +02:00
Markus M. May 6024f0f5ee Remove unnecessary gitignores 2018-04-01 20:49:02 +02:00
Markus M. May 5ef062c22f inital gradle update 2018-04-01 20:49:02 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02: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
AdrianLxM 1738aea4de
Don't overlap time ticks with current time 2018-03-16 23:57:58 +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
Andrew Warrington d8d87e1ffd BaseWatchFace.java: Update chart with bolus and prediction data. (Affects AAPSv2 and Steampunk watch faces.) 2018-03-11 21:18:03 +01:00
Johannes Mockenhaupt 7bd85c5972 Use meal color parameter. 2018-03-08 14:26:50 +01:00
AdrianLxM 0818f3b419 Merge remote-tracking branch 'swissalpineremote/patch-4' into watchsmb2 2018-03-04 20:18:43 +01:00
AdrianLxM d7deaa15eb wear COB string better default 2018-03-04 20:14:58 +01:00