Commit graph

3297 commits

Author SHA1 Message Date
AdrianLxM
874915e7b4 adapt wear actions to command queue 2017-12-08 06:00:49 +01:00
Johannes Mockenhaupt
6e5f848c6b
Updating Testing-Combo.md to reflect removed history functionality. 2017-12-07 23:23:37 +01:00
Johannes Mockenhaupt
a38afe7a2a
Merge pull request #2 from AdrianLxM/ghostbusters
bend translations
2017-12-07 22:04:15 +01:00
AdrianLxM
795292d891 bend translations 2017-12-07 20:51:17 +01:00
Milos Kozak
dc3c853aca Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt
81bde2cbde
Set version to 1.56-combo-csv2-test 2017-12-07 18:20:11 +01:00
Johannes Mockenhaupt
87ab6432c6
Revert "Custom: Disable Crashlytics."
This reverts commit 015a852ab5.
2017-12-07 18:19:27 +01:00
AdrianLxM
0013050860 remove wear-overview notifications as replaced by system notifications 2017-12-07 17:07:32 +01:00
Roumen Georgiev
1d8dd5e35e
removing the whole if() statement 2017-12-07 17:11:54 +02:00
Milos Kozak
d3e11d9331
Merge pull request #530 from PoweRGbg/patch-7
fix of extended bolus size
2017-12-07 15:24:55 +01:00
Milos Kozak
89cf340d6d
Merge pull request #531 from AdrianLxM/adrian156work
fix NPE when profile not loaded
2017-12-07 15:23:32 +01:00
AdrianLxM
aea47420e1 fix NPE when profile not loaded 2017-12-07 10:40:00 +01:00
Roumen Georgiev
242ed7217a
fix of extended bolus size 2017-12-07 10:08:26 +02:00
Johannes Mockenhaupt
9e03e078b6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Add missing synchronized so guard works properly.
  Log full class name (not just filename), so logs can be filtered by package name.
2017-12-06 20:32:50 +01:00
Johannes Mockenhaupt
dc3aa000f4
Update docs. 2017-12-06 20:27:36 +01:00
Johannes Mockenhaupt
8009b32b16
Fix reading history when bolus was attempted to cancel but bolus finished before pump accepted request. 2017-12-06 20:06:56 +01:00
Johannes Mockenhaupt
60d6f305b5
Debug code. 2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt
865fc63bd4
RuffyScripter: consider pump connected when BT connection is there AND menu updates are being received. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
de06c54f1d
Minor cleanups in ComboPlugin. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
b0d55b09d4
Minor cleanups around the Command queue. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
86b63cb27d
Combo tab: show command queue if non-empty. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
1cbfefffb8
RuffyScripter: wait for command thread to finish up. 2017-12-06 16:06:16 +01:00
Milos Kozak
648b918e3a
Merge pull request #528 from jotomo/log-packages
Log full class name (not just filename), so logs can be filtered by p…
2017-12-06 14:16:20 +01:00
Milos Kozak
6f172bf084
Merge pull request #529 from jotomo/synchronize-for-guard
Add missing synchronized so guard works properly.
2017-12-06 14:16:03 +01:00
Johannes Mockenhaupt
51b51c159c
Clean up earlier merge blunder. 2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt
ab456d5966
Remove missed reference to pref in NSProfilePlugin. 2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly. 2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt
7d07982181
Log full class name (not just filename), so logs can be filtered by package name. 2017-12-06 11:53:51 +01:00
Johannes Mockenhaupt
b548d092d1
Remove unneeded dependencies. 2017-12-06 11:50:44 +01:00
Johannes Mockenhaupt
32b7df39f9
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Update strings.xml
  Update strings.xml
2017-12-06 11:34:32 +01:00
Johannes Mockenhaupt
77bd3b51fa
Update docs. 2017-12-06 11:33:30 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev
Dev
2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt
5caec45760
Fix add bolus record from pump history when bolus was cancelled. 2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt
0f034dd662
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  check for duration in json
  untranslatable strings
  greek language
  check for null
  queue logging
2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt
db46d3be9b
Update docs. 2017-12-05 23:17:05 +01:00
Johannes Mockenhaupt
960cb92789
Remove idle-disconnect-monitor and let the command queue take care of that. 2017-12-05 23:17:05 +01:00
Milos Kozak
7be5c041cc
Merge pull request #526 from MilosKozak/untranslatable
untranslatable strings greek
2017-12-05 22:37:34 +01:00
Milos Kozak
455383cfd5 check for duration in json 2017-12-05 22:08:37 +01:00
AdrianLxM
50cbff6fa4 untranslatable strings 2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt
21fc05a707
Remove ComboPlugin.checkHistory(). 2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt
f9867c69fb
Remove warning if pump time is off. 2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt
7b88ec9e93
Device-Status: provide pseudo-levels or reservoir. 2017-12-05 21:07:49 +01:00
Milos Kozak
a47fe757b9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-05 17:03:58 +01:00
Milos Kozak
188762519c greek language 2017-12-05 17:03:40 +01:00
Milos Kozak
1adbee5c9e check for null 2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode 2017-12-05 09:23:57 +02:00
Milos Kozak
6c714261d0 queue logging 2017-12-05 07:34:34 +01:00
Johannes Mockenhaupt
01c52e753c
Remove 'sync to profile' pref. 2017-12-05 01:24:43 +01:00