Commit graph

3174 commits

Author SHA1 Message Date
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
a162343cd4 add getPreferenceId to food plugin 2017-11-01 20:47:16 +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
Milos Kozak
00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak
f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
Event logging
2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt
4da160a951
Disable closed loop under unsafe conditions. 2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt
8d3947dc7f
Initial bolus syncing. 2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt
744d24cbcf
DatabaseHelper: add getTreatmentByDate. 2017-10-31 19:28:32 +01:00
Johannes Mockenhaupt
74bbab9cf1
More bolus work. 2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt
ab900fda6c
Refresh tab after pump init. 2017-10-31 14:46:06 +01:00
Johannes Mockenhaupt
69648ecf30
Make bolusing safe. 2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt
efc298bf90
Make PumpEnactResult fluent. 2017-10-31 12:47:41 +01:00
Johannes Mockenhaupt
9544b49a37
Small cleanups. 2017-10-31 11:10:49 +01:00
Johannes Mockenhaupt
4ffdae4a8c
RuffyScripter.readPumpStateInternal: read time. 2017-10-31 11:06:00 +01:00
Johannes Mockenhaupt
f64e00fc79
Auto-retrying repeatable commands when there's a connection loss. 2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt
88f500417d
Cleanup: ComboFragement. 2017-10-31 11:02:14 +01:00
Johannes Mockenhaupt
9121aa5217
Bolus cancellation for all stages. 2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt
39b89df484
BolusCommand: cancel earlier if requested. 2017-10-31 02:13:30 +01:00
Johannes Mockenhaupt
50cbcaba52
CancelTbrCommand: shortcut requests to cancel TBR when none is active. 2017-10-31 00:49:16 +01:00
Johannes Mockenhaupt
1658ed14c9
Clean up using warning codes instead of message. 2017-10-30 21:47:44 +01:00
Johannes Mockenhaupt
522b5e9e1b
Clean up string resource names. 2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt
2198747feb
NPE fix. 2017-10-30 19:52:26 +01:00
Johannes Mockenhaupt
75bc2cd940
NotificationStore: extract key string. 2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
9bae22f551
Tweaking ComboFragment's Last Connection. 2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
a920946cd1
Extract local alerts for unreachable pump, missed BG readings. 2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt
79d7ec5467
Add prefs for local alerts. 2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt
bffd1239c0
Disable reading history while incomplete. 2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt
550ed57ca5
KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode. 2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt
d423c8ae2a
Add pref to raise urgent alarms as system notifications. 2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt
bdc61765ce
KeepAliveReceiver: sanitize pump disconnected/missed readings alarms.
* Don't raise alarm on application start
* Re-raise alert only every ~30 min, not every 5 min.
2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt
598d7f8de0
Cleanup. 2017-10-30 01:32:57 +01:00
Johannes Mockenhaupt
cccf6f175c
ruffy: catch race-condition sending keep alive during disconnect. 2017-10-30 00:48:11 +01:00
Johannes Mockenhaupt
03443f3358
Dead code be gone. 2017-10-29 21:39:25 +01:00
Johannes Mockenhaupt
a2460180f9
Remove unclear error message field from CommandResult, use codes from pump warnings/errors. 2017-10-29 21:19:03 +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
14307cb77b
ruffy: log a few things on error level instead of info. 2017-10-29 02:14:43 +01:00
AdrianLxM
f9ed104fe3
use DateUtil#agoString 2017-10-29 02:08:43 +02:00
AdrianLxM
3121fa3e84
use DateUtil#untilString 2017-10-29 02:07:17 +02:00
AdrianLxM
9e8752b096
timeframe strings 2017-10-29 02:06:06 +02:00
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
255e9d0dff
Move initialized flag to ComoPump class. 2017-10-28 13:12:55 +02:00
Johannes Mockenhaupt
4befa38d46
Close bolus progress dialog better in case of error. 2017-10-28 11:46:54 +02:00
AdrianLxM
7d82870203
Show remaining time of TT 2017-10-28 02:16:30 +02:00
Johannes Mockenhaupt
36d5c4d806
Clean up ComboFragment, related string resources. 2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt
c53936a7ac
Revert inadvertent change to keepAlive interval. 2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt
b6a62dedae
Fix merge conflict. 2017-10-27 22:26:47 +02:00
Johannes Mockenhaupt
d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (26 commits)
  fix RS response code
  use max absorption time for AAPS and weighted average sensitivity detection
  log.debug -> log.error on RS comm
  read status after bolus
  RS connectivity & bolus improvement
  Better bolusing with different speeds (R & Rv2)
  Detailed onscreen history logging
  Split to smaller pieces
  Update strings.xml
  Sensitivity logging optional
  RS synchronized change
  fix displaying XX:30 time intervals
  CS translations
  allow to use actual profile in wizard
  getUnits from active profile not interface
  Update strings.xml
  Update strings.xml
  Update dutch
  Update strings.xml
  Update strings.xml
  ...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt
4bc970091e
More i18n. 2017-10-27 21:51:15 +02:00