Commit graph

2568 commits

Author SHA1 Message Date
Johannes Mockenhaupt
5eea6d7b8d
Fix waiting between reconnects. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7a41117a64
Experiments. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
6b19759a9f
Command stubs. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
de693c0f76
Add reservoirLevel to PumpState. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
785a01a056
Extract methods to read blinking values. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7537048a96
Finish injecting scripter. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
3238cf9c35
Remove pumpState arg from Command.execute. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
fe7f831429
Inject scripter into commands. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
04a03dedc3
Extract BaseCommand. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment.
(cherry picked from commit 4078c23)
2017-08-27 12:36:28 +02:00
Milos Kozak
03bf1abdd4 add WakeLock#isHeld() 2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb add WakeLock#isHeld() 2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93 Merge pull request #396 from warstar2187/dev
KR translation update
2017-08-27 00:38:44 +02:00
Milos Kozak
ad22737585 Merge pull request #395 from RadoslavR/patch-42
Update strings.xml
2017-08-27 00:38:07 +02:00
warstar2187
761f9f5075 Update strings.xml 2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03:00
Milos Kozak
e4c98e6cd1 make dev 1.52 2017-08-26 21:28:08 +02:00
Milos Kozak
b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak
bd016cb876 Merge pull request #394 from MilosKozak/dev
Merge 1.51 to master
2017-08-26 21:11:38 +02:00
Milos Kozak
491378caf5 1.51 bump 2017-08-26 20:42:53 +02:00
Milos Kozak
3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a fix strings 2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
Milos Kozak
12a0367e67 Merge pull request #391 from boysim/dev
Update strings.xml
2017-08-25 22:33:08 +02:00
boysim
196e0bb309 Update strings.xml 2017-08-24 23:18:21 +02:00
Milos Kozak
4e8d92a74b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02 better handling DetailedBolusInfo in v2 driver 2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt
d100509648
Log action about to be performed before the operation. 2017-08-23 16:38:28 +02:00
Johannes Mockenhaupt
6b99bb8ed1
Log ruffy messages on debug level, see if that helps debug things. 2017-08-23 16:36:31 +02:00
Johannes Mockenhaupt
fdf974cb3c
Better error message on connect attempt failure. 2017-08-23 16:36:20 +02:00
Johannes Mockenhaupt
52d2b425b8
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (21 commits)
  1.5h
  Don't change schema.
  Fix comparing non-primitives.
  Generify MainApp.getSpecificPlugin.
  Fix some warnings / simplify a bit.
  Remove now unused dia, insulinInterfaceId from Treatment.
  correct supercall
  Use bolusstep granularity in fill dialog
  bugfix: fill as invalid treatments if triggered from phone
  add invalid treatments to charts in "invalid" colour
  Use bolusstep as step for insulin correction in wizard
  Update strings.xml
  fix of fix :(
  small refactoring
  Multiply time passed instead of divide dia.
  Update strings.xml
  Fix initalizing profile with default values.
  moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
  Update strings.xml
  Update strings.xml
  ...
2017-08-23 16:36:06 +02:00
Milos Kozak
d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak
c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586 Merge pull request #389 from jotomo/cleanups
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema. 2017-08-22 18:28:36 +02:00
Milos Kozak
a4d5f9b5df Merge pull request #388 from MilosKozak/AdrianLxM-patch-1
correct supercall
2017-08-22 14:08:33 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment. 2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08 correct supercall 2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97 Use bolusstep granularity in fill dialog 2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4 bugfix: fill as invalid treatments if triggered from phone 2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197 add invalid treatments to charts in "invalid" colour 2017-08-22 12:56:17 +02:00
Milos Kozak
6c899fbf5c Merge pull request #386 from MilosKozak/boluswizard-insulin-granularity
Use bolusstep as step for insulin correction in wizard
2017-08-22 09:02:19 +02:00
samihusseingit
b7b196c077 Merge pull request #1 from MilosKozak/dev
Dev
2017-08-22 07:16:03 +02:00