Commit graph

3680 commits

Author SHA1 Message Date
boysim 5c9173d14b Added Dutch combo translations 2018-02-18 18:19:46 +01:00
Simon Pauwels 55193d3e75
Merge pull request #33 from jotomo/combo-scripter-v2
18 feb V2
2018-02-18 16:39:38 +01:00
AdrianLxM 641b39b4e5
Merge pull request #697 from jotomo/phantom-fusion
AndroidAPS should support more pumps
2018-02-18 13:50:00 +01:00
Johannes Mockenhaupt a42d95df14
Unbreak unit test. 2018-02-18 13:33:24 +01:00
Johannes Mockenhaupt 71dfb6d314
Set combo version. 2018-02-18 12:42:18 +01:00
Johannes Mockenhaupt 832138398f
Crappy hack to deal with applying the first profile switch. 2018-02-18 11:53:41 +01:00
Simon Pauwels 25b9436ea8
Merge pull request #32 from jotomo/combo-scripter-v2
18 feb
2018-02-18 11:47:49 +01:00
Johannes Mockenhaupt 1e3f6dd192
Disable wear plugin by default. 2018-02-18 02:20:49 +01:00
Johannes Mockenhaupt 00d02802ce
Merge pull request #61 from jotomo/commandQueueblcok
block writing profile if no switch exists
2018-02-18 02:20:35 +01:00
AdrianLxM 36b838fc49 remove switch-missing notification on profile switch 2018-02-18 02:13:21 +01:00
AdrianLxM 7b3d370564 Notification on missing profile switch 2018-02-18 01:10:27 +01:00
AdrianLxM 59a1e007ad
block if no profile switch is set 2018-02-18 00:55:37 +01:00
Johannes Mockenhaupt d155616c0b
Minor fixes. 2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt 256bb09775
Set version. 2018-02-17 20:50:33 +01:00
Johannes Mockenhaupt 52aa27de05
Sanity check bolus timestamp on start, after bolusing. 2018-02-16 17:33:59 +01:00
Simon Pauwels 4629b54a96
Merge pull request #31 from jotomo/combo-scripter-v2
16 feb
2018-02-16 10:06:41 +01:00
Johannes Mockenhaupt 223d22795a
Set version 1.57-combo-csv2-beta-4. 2018-02-13 21:18:01 +01:00
Johannes Mockenhaupt bcc3de6d8c
Merge branch 'combo' into combo-scripter-v2
* combo:
  Make new behaviour configurable, default on.
  Create NS-anouncements for error dialogs and local alerts.
  Don't disconnect after history read when queue is busy.
  Show notification to check pump date if last bolus is older than 24h.
  Disable unfinished dialogs.
  Clean up some Combo strings.
  Combo: more setup screenshots.
  Update strings.xml
  Add documentation folder.
  remove unused import
  add links to about
  Combo: Answer detected TBR mismatches.
  Set version 1.58-combo.
  Moved docs to wiki.
2018-02-13 21:17:15 +01:00
Johannes Mockenhaupt df4ad822fc
Make new behaviour configurable, default on.
(cherry picked from commit f807592)
2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt 1cd4e72541
Create NS-anouncements for error dialogs and local alerts.
(cherry picked from commit 0df796d)
2018-02-13 20:44:50 +01:00
Johannes Mockenhaupt c5e0eb9968
Don't disconnect after history read when queue is busy.
Temporary hack, ComboPlugin.runCommand will still run commands
synchronously.
2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt aae9f7d153
Show notification to check pump date if last bolus is older than 24h. 2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt 3ff56c7fa2
Disable unfinished dialogs. 2018-02-13 19:30:48 +01:00
Johannes Mockenhaupt f88894ea02
Clean up some Combo strings. 2018-02-10 19:07:03 +01:00
Johannes Mockenhaupt f3bc034247
Combo: more setup screenshots. 2018-02-10 18:13:20 +01:00
Johannes Mockenhaupt 4784eaef2c
Merge pull request #56 from swissalpine/patch-1
Update strings.xml: Deutsche Übersetzung
2018-02-10 18:12:49 +01:00
swissalpine db07723e8a
Update strings.xml 2018-02-10 17:59:31 +01:00
Johannes Mockenhaupt 82bc620ddf
Add documentation folder. 2018-02-10 15:27:58 +01:00
Johannes Mockenhaupt d40a4bf57e
Merge pull request #55 from AdrianLxM/comborc01
links unten in über
2018-02-10 15:19:17 +01:00
AdrianLxM c5057f3d5a remove unused import 2018-02-10 14:55:29 +01:00
AdrianLxM 4587a47840 add links to about 2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt 573c818eb7
Combo: Answer detected TBR mismatches. 2018-02-10 14:33:44 +01:00
Simon Pauwels 9e956cdf5e
Merge pull request #29 from jotomo/combo-scripter-v2
Feb 9
2018-02-09 06:43:23 +01:00
Johannes Mockenhaupt 5b63008774
Set version 1.58-combo. 2018-02-08 22:47:41 +01:00
Johannes Mockenhaupt 811b07449e
Moved docs to wiki. 2018-02-08 22:47:32 +01:00
Johannes Mockenhaupt 0cbf65d2d4
Set version. 2018-02-08 22:19:26 +01:00
Johannes Mockenhaupt 89c832b5aa
Use pager sound instead of smoke detector alarm for bolus error.
(cherry picked from commit 6767d8b)
2018-02-08 22:18:41 +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 7fa51a9248
Revert: Combo: retry twice to establish connection before giving up.
Only increases number of failed connection attempts.
2018-02-08 22:15:36 +01:00
Simon Pauwels c57bb61d20
Merge pull request #28 from jotomo/combo-scripter-v2
feb 7 V2
2018-02-07 23:17:58 +01:00
Simon Pauwels 9c95a75ede Added dutch translations (#52) 2018-02-07 23:17:50 +01:00
boysim a95cd95cb0 Added Dutch combo translations 2018-02-07 23:11:40 +01:00
Johannes Mockenhaupt 483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup.
(cherry picked from commit c0cf06a)
2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt 46ea4be4eb
ComboFragment: display last bolus regardless of age.
(cherry picked from commit 197874e)
2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt 6b36dd27d8
Don't create a cancel record for requests to cancel a TBR when none is running.
(cherry picked from commit a46b475)
2018-02-07 22:08:16 +01:00
Simon Pauwels 7c27146237
Merge pull request #27 from jotomo/combo-scripter-v2
feb 7
2018-02-07 20:50:17 +01:00
Johannes Mockenhaupt 6fb5f5bad4
Check result.success when hard cancelling TBR.
(cherry picked from commit 654f984)
2018-02-07 15:30:02 +01:00
Johannes Mockenhaupt b435bb3cd5
Update version. 2018-02-06 00:51:40 +01:00
Simon Pauwels 5093b7b815
Merge pull request #26 from jotomo/combo-scripter-v2
feb 6
2018-02-06 00:06:51 +01:00
Johannes Mockenhaupt c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00