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

2692 commits

Author SHA1 Message Date
AdrianLxM c83f966d92 wear timestamps long 2017-12-04 18:40:13 +01:00
Milos Kozak 23e37a8be7 remove unneeded code 2017-12-04 18:13:20 +01:00
AdrianLxM aefb0d62df
Merge pull request #522 from MilosKozak/dev 
Dev
 2017-12-04 17:53:36 +01:00
Milos Kozak 34fe8d8b60 Merge branch 'staledata' into dev 2017-12-04 13:02:23 +01:00
Milos Kozak 812583059a
Merge pull request #512 from PoweRGbg/patch-3 
ProfileSwitch on graph depending on ScreenSize
 2017-12-04 12:49:01 +01:00
AdrianLxM 53723411c4
fix landscape overview 2017-12-04 10:42:34 +01:00
Johannes Mockenhaupt fe40ebd4a5
More steps towards reducing comms amount. 
(cherry picked from commit 3ba6079)
 2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt 471c813bb4
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. 
(cherry picked from commit bcd1ac3)
 2017-12-03 22:48:06 +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 1b91684c65
Enforce low-suspend loop mode rather than disabling loop on usage violation. Because. 2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt 1e19f19cd2
Hide buttons on Combo tab until plugin is initialized. 2017-12-03 22:25:43 +01:00
AdrianLxM 42c61f4e6f synchronized wait 2017-12-03 21:58:35 +01:00
Milos Kozak 5a12d15c8c upgrade build tools 2017-12-03 21:15:12 +01:00
Milos Kozak 4c3e26d19c R: resolve thread deadlock during bolus stop 2017-12-03 20:10:54 +01:00
Milos Kozak 2b2d729f42 remove unsupported code from korean pump 2017-12-03 19:55:23 +01:00
Milos Kozak 4185bb347d handle bolus stop prior to delivery correctly 2017-12-03 19:34:01 +01:00
Milos Kozak 9e0241aebc fix translations 2017-12-03 19:12:07 +01:00
Milos Kozak 5d217cf1b3 better logging 2017-12-03 19:02:11 +01:00
Andrew Warrington eea5082278 Revert unnecessary change. 2017-12-03 19:01:56 +01:00
Andrew Warrington 9dca53f968 Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face. 2017-12-03 18:53:52 +01:00
Andrew Warrington cefe93d0a0 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-03 17:48:36 +01:00
Milos Kozak f25334273a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-03 17:34:58 +01:00
Milos Kozak 0101bc0a81 parse more iso formats 2017-12-03 17:34:29 +01:00
AdrianLxM 7777143b07 scrollable overview on Jelly 2017-12-03 17:30:20 +01:00
AdrianLxM 7958dc9dce jelly overview 2017-12-03 13:55:54 +01:00
AdrianLxM 0a8d89db8a Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview 2017-12-03 11:48:14 +01:00
AdrianLxM 07c1084287
Merge branch 'watchfaces' into dev 2017-12-02 21:45:39 +01:00
Milos Kozak 38ecd88f6c
Merge pull request #513 from AdrianLxM/btwatchdog-pr 2017-12-02 16:19:46 +01:00
AdrianLxM 14bb0e6ac4
Only do pump alarms in APS mode 2017-12-02 10:21:42 +01:00
Milos Kozak 8a7f0f22d9 min NS version 0.10.2 2017-12-01 22:51:25 +01:00
AdrianLxM 98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak faea3a5147 RS proper evaluate extended bolus result 2017-12-01 17:37:49 +01:00
AdrianLxM 090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM 09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
AdrianLxM 4b063a7766 fix SP for long with string-ressource-id 2017-12-01 13:49:50 +01:00
Milos Kozak aa210970ec Merge branch 'g5' into dev 2017-12-01 10:18:53 +01:00
Milos Kozak 77e855ec61 fix NPE 2017-12-01 10:18:27 +01:00
Roumen Georgiev ecbac7ea96
Make ProfileSwitch text 20% larger 2017-12-01 10:30:18 +02:00
Andreas 29d9d20605
Update strings.xml 
Add german text for local alerts
 2017-12-01 08:03:33 +01:00
Andreas e07c5fb50d
Update strings.xml 
Change "Temp basal" to "Temp Basal"
 2017-11-30 15:04:40 +01:00
Roumen Georgiev d683ea2f0c
All labes scaled 
COB is not here
 2017-11-30 11:28:26 +02:00
Roumen Georgiev 24b9326602
Update PointsWithLabelGraphSeries.java 2017-11-30 09:57:16 +02:00
Roumen Georgiev 418a7f7094
ProfileSwitch depending on ScreenSize 
Text size in ProfileSwitch events depends on screen resolution
 2017-11-30 09:45:18 +02:00
Milos Kozak 04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak b73e12b731 G5: accept arrays 2017-11-29 17:22:45 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Roumen Georgiev c56330cae7
Less than, not moreThan15 2017-11-29 09:21:55 +02:00
Milos Kozak b1a214b9e7
Merge branch 'dev' into dev 2017-11-28 21:50:32 +01:00
Milos Kozak d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak 7d5d327c5d fix compile 2017-11-28 21:06:50 +01:00
Milos Kozak 9b135cc4e4 Merge branch 'queue' into dev 2017-11-28 20:52:49 +01:00
Milos Kozak 694e90960e reenable RS driver 2017-11-28 20:52:24 +01:00
Milos Kozak b4187c84ed bump 1.56-dev 2017-11-28 20:51:54 +01:00
Milos Kozak bf4ffaed8f bump 1.55 2017-11-28 20:31:31 +01:00
Milos Kozak 70621837d9 disable RS driver 2017-11-28 20:29:30 +01:00
Milos Kozak b8df1fcec4 Merge branch 'dev' into queue 2017-11-28 20:27:58 +01:00
Roumen Georgiev 542cedff9d
check for sgv older than 15 mins 2017-11-28 16:29:18 +02:00
Roumen Georgiev 723cb33497
Disabling staledata alarm on new sgv values fromNSClient 2017-11-28 16:15:25 +02:00
Roumen Georgiev eb593a4557
Update Notification.java 2017-11-28 16:09:23 +02:00
Andrew Warrington dcf79c710c Update following testing! Bug fixes: 
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
 2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt b03202f3d3
Bug notes. 
(cherry picked from commit c553626)
 2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt dc6c91fd87
Set Source.PUMP when setting/cancelling TBR. 
While technically, the history isn't read, we can be reasonably
sure a TBR was set/cancelled by reading the main menu (and for
TBR starts that's the only way to do so). Reading the history
might cause (more) problems with the pump's minute-precision
and not yield much safety. Besides, command mode is expected
to take over yesterday.

(cherry picked from commit 04fb1c8)
 2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt 383750d5e8
Set Source.PUMP when bolusing (already reading from history). 
(cherry picked from commit d747415)
 2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt 720e64e541
Fix checkTbrMismatch tolerance for TBRs up to 2m off. 
(cherry picked from commit 46c1e00)
 2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt ffb5ee3b22
Show min/avg/max in Combo TDD dialog. 
(cherry picked from commit 348b53a)
 2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt b46165e52a
Abort reading all pump data if history read fails. 
(cherry picked from commit 9f679bc)
 2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt 9ce57e7076
Fix bolus verification. 2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt a0ba857279
Move WarningOrErrorCode class to parent package. 
(cherry picked from commit 38922ba)
 2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt c36eac1ff3
More logging around bolusing. 
(cherry picked from commit df89b7f)
 2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt 0f8442d65c
Issue a history read when bolusing fails. 
(cherry picked from commit cafed14)
 2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt 1d83abc0d2
Fix rejecting multiple TBRs. 
(cherry picked from commit c1e9800)
 2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt 1e9d0d08c3
Reject requents to enact TBRs if one was already started within this minute. 
(cherry picked from commit 3805413)
 2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt e13f29e615
Use correct key in prefs. 2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt b148b334b2
Adhere to 'Sync to profile' setting in ConfigBuilder. 2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt ac935b19de
SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead. 2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt 5e79900411
Small robustness improvements. 2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt 1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records. 2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt 44ccbc06a0
Retry reading/writing basal profile, cleanups, notes. 2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt 28f31414ba
Update pump profile during Combo init. 2017-11-23 20:54:28 +01:00
AdrianLxM 5b9fd6fd78 set basal rate overview notifications 2017-11-23 03:06:10 +01:00
AdrianLxM b3f0951d1f isThisProfileSet - same behaviour on uninitialized pump as DanaR 2017-11-23 02:19:29 +01:00
AdrianLxM 3f10c316a4 combo set basal: account for different granularity > 1 U/h 2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt 61d1028011
Update local basal profile after setting it on pump. 2017-11-22 22:42:47 +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
Johannes Mockenhaupt 83be0a8315
Setting basal rate on pump (combo side). 2017-11-22 22:16:28 +01:00
Milos Kozak a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
AdrianLxM 681add11a9 remove translations without english default 2017-11-22 21:06:31 +01:00
Milos Kozak 8818afe033 KoreanDanaR queue 2017-11-22 20:11:25 +01:00
Milos Kozak dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Milos Kozak a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions 
Combo extractions
 2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt e28e5685f6
Cancel ongoing notification when plugin is disabled. 2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt 9f946229bc
Slightly improve the dialogs. 2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt cf430b84cf
Extract some string resources. 2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt 1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt 5690772946
Nitpicky symmetry. 2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt d202976251
PersistentNotification unregister workaround. 2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt 9442c56eb8
Make PumpEnactResult fluent. 2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt 60324ac6c6
Minor code cleanup. 2017-11-22 11:30:38 +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 2861509d07
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
  BolusProgressDialog: hide stop button once pressed.
  fix RU translation
  use MIN_DIA instead of DEFAULT_DIA
 2017-11-22 10:56:57 +01:00
Milos Kozak 62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr 
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
 2017-11-22 10:52:15 +01:00
Milos Kozak 63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed 
BolusProgressDialog: hide stop button once pressed.
 2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt 4c66199142
Cleanups based on Android Studio analysis. 2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt 8b81925ccb
Only raise notification to check pump time when the latter could be read. 2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts. 2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt b49a4c57ba
BolusProgressDialog: hide stop button once pressed. 2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt b27ee06ebe
Fix issues during history read. 2017-11-22 00:05:59 +01:00
Milos Kozak 252c0b3db9 DanaR queue driver 2017-11-21 23:00:53 +01:00
Milos Kozak f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt 066d138e59
Double comparisons. 2017-11-21 22:31:28 +01:00
Milos Kozak a6bf18244a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-11-21 22:31:22 +01:00
Milos Kozak ca44ae9a0b fix RU translation 2017-11-21 22:31:02 +01:00
Milos Kozak 4007049118 use MIN_DIA instead of DEFAULT_DIA 2017-11-21 22:29:50 +01:00
Milos Kozak d2cba61354 allign dana plugin code 2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt bf52352224
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  missing return
  log profiles if different
  fix setting of TRB when low basal rate is running
  fix format and add test for fromISODateString
  use mills from status if available
 2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt d6938c20e6
Updating README. 2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt 426379c6d3
Remoe SetBasalProfileCommand. 
Too slow, unclear usage (ProfileInterface), likely superseeded soon.
 2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt 4b1a774544
Optimize fetching full history. 2017-11-21 00:43:17 +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
Johannes Mockenhaupt 75855f3f05
Implement reading basal profile. 2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt 971a97a9e3
Some minor tweaks. 2017-11-20 23:53:39 +01:00
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt 3cccf287da
Only update pumpState cache if menu could be read. 2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt dbd442e8ea
ComboPlugin.checkTbrMismatch: allow for deviations 
to compensenate inprecise times used by pump for tbr duration.
 2017-11-20 18:59:59 +01:00
Milos Kozak 21ae42d37b Merge branch 'dev' into queue 2017-11-20 17:50:49 +01:00
Milos Kozak 1335887957 Merge branch 'dev' into dev2 2017-11-20 17:40:45 +01:00
Milos Kozak 2f0599fbc7 missing return 2017-11-20 17:38:06 +01:00
Milos Kozak d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Milos Kozak 973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak 0f0f39dfb4 log profiles if different 2017-11-20 17:26:03 +01:00
Milos Kozak 777aedd5db fix setting of TRB when low basal rate is running 2017-11-20 15:25:44 +01:00
Milos Kozak 297617467e fix format and add test for fromISODateString 2017-11-20 13:34:13 +01:00
Milos Kozak d8798e0bcf use mills from status if available 2017-11-20 13:23:25 +01:00
Johannes Mockenhaupt aadb7c5728
Update TODO, javadoc. 2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt dafb6d225b
Display active alert in Combo tab. 2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt 9d3625e78c
Show bolus/TBR percent and duration with activity. 2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt 46fdd47ac0
Fixes and cleanups. 2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt 2c0975994d
Fixes. 2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt 9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Remove dead code.
  Ctors Android-style.
  Fix NPE initialising MyPreferencesFragment.
  RS fix last bolus time
  RS remove duplicated message
  RS fix extended bolus result
  show timeshift if not zero
  CS translation
  removed unneeded code
  long click on name to open settings
  add link to advanced settings

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
 2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt 99db38a8e0
Fix displaying connection problems in Combo tab. 2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt deb566c1bd
Align ComboPlugin with merged changes. 2017-11-18 16:42:56 +01:00
Johannes Mockenhaupt d92540a17c
Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 
* adrian/localalerts-settings:
  remove already commented out code
  upper case literals
  use correct setting
  Don't alarm while disconnected
  disconnect state
  remove deprecated wear notification settings
  no-urgent notification title
  presnooze missed readings/pump on startup
  system notifications for non-urgent
  Notification bugfixes
  use ID as request code
  guard double clicks
  refactor notifications: subpackage
  initialized only when maxBasal >0
  Dismiss notification service
  local alert thresholds as settings
  Extract local alerts for unreachable pump, missed BG readings.

# Conflicts:
#	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/res/values/strings.xml
 2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt f03b9669d5
Minor improvements. 2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt b85b6f85f4
Major cleanup and some new features. 
* PumpState.timestamp: round to second (format used in DB)
* Raise notification about wrong pump clock time since setting
  clock isn't possible with current ruffy
* Set TempBasal.pumpId when setting/cancelling TBR
* Checking state of pump on connect
* Better checks whether pump is ready to execute command
* Rework dynamic command timeout
* Confirm benign warnings on connect and turn into notifications
* Some groundwork for reading/setting basal profile
* Check pump history every 15m
 2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt 76cc08c1a9
BolusProgressDialog: hide stop button once pressed. 2017-11-16 00:23:37 +01:00
Andrew Warrington bc485a4783 Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces. 
Inclusion of Home2 ("AAPSv2") watch face for round.
 2017-11-15 23:07:44 +01:00