Milos Kozak
9b1acf6958
add missing classes. convert to use AAPS data
2019-06-01 18:40:33 +02:00
Andy Rozman
86ffc3370a
Merge branch 'dev' into medtronic_andy
2019-06-01 17:34:30 +01:00
Andy Rozman
67862d3385
- fix for task #126 - battery display, it will work for Alakaline and Lithium battery, but probably not for recharchargables
2019-05-26 14:44:33 +01:00
Tebbe Ubben
552298496f
Pump control: Fix crash when opening Insight paring activity
2019-05-12 02:20:00 +02:00
Milos Kozak
4ae7efc75f
Merge branch 'dev' into automation
2019-04-16 21:08:08 +02:00
Andy Rozman
ad17c66b1b
Merge branch 'dev' into medtronic_andy
2019-04-10 17:05:56 +01:00
Milos Kozak
3b1d96ecc9
LINT: xml
2019-04-08 17:03:18 +02:00
Milos Kozak
a339e0cf28
LINT: xml
2019-04-08 16:39:41 +02:00
Andy Rozman
03b3bf7388
Merge branch 'dev' into medtronic_andy
2019-04-07 23:48:20 +01:00
AdrianLxM
6378d0a6bf
Merge branch 'dev' into 221-fix
2019-04-07 18:16:42 +02:00
AdrianLxM
5fbc274c5b
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into 221-fix
2019-04-07 17:00:36 +02:00
AdrianLxM
5e720f8081
deactivate TT raises/lowers target
2019-04-07 16:57:51 +02:00
Tebbe Ubben
e3f45aa6be
Fix automatic careportal entries
2019-04-03 00:07:20 +02:00
Andy Rozman
bd3529e650
Merge branch 'dev' into medtronic_andy
2019-03-31 20:03:49 +01:00
Nico Schmitz
fc7e65c4d1
Update to recent upstream/dev
2019-03-22 23:08:13 +01:00
Nico Schmitz
91e4b01f10
Display actions and merge recent upstream/dev
...
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Tebbe Ubben
9524818c4d
Headline for Insight related settings
2019-03-07 15:25:29 +01:00
Andy Rozman
5a8b5f3e7b
Merge branch 'dev' into medtronic_andy
2019-03-03 23:35:12 +00:00
Tebbe Ubben
91c3123865
Fix crash in Insight plugin
2019-03-02 22:20:37 +01:00
Andy Rozman
011aaf5336
Moved medtronic to correct package
2019-03-02 20:39:14 +00:00
Milos Kozak
f24b32bc8c
fix overview intent name
2019-03-02 19:25:22 +01:00
Andy Rozman
289902633e
Merge branch 'dev' into medtronic_andy
2019-03-02 18:20:37 +00:00
Milos Kozak
395faa7dc9
pumps package refactor
2019-02-26 20:38:27 +01:00
Milos Kozak
be2866d894
fix key_smbmaxminutes
2019-02-25 20:15:28 +01:00
Andy Rozman
5aa5d9f749
Merge branch 'dev' into medtronic_andy
2019-02-16 20:50:36 +00:00
TebbeUbben
d2b0665af1
Merge branch 'master' into insight-dev2
2019-02-12 15:01:29 +01:00
TebbeUbben
a4312acb3e
Incremental recovery duration
2019-02-12 14:54:27 +01:00
Milos Kozak
f540c70f22
Merge branch 'dev' into G6
2019-02-08 19:11:38 +01:00
TebbeUbben
cc189d360f
Merge remote-tracking branch 'nico/dev-wip' into dev-nico
2019-02-02 16:58:21 +01:00
TebbeUbben
d1f7086651
Merge branch 'master' into insight-dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
2770a49869
Local Insight driver
2019-01-18 22:40:22 +01:00
Andy Rozman
8fc694e812
Merge branch 'dev' into medtronic_andy
2019-01-04 22:24:44 +01:00
Andy Rozman
56eaacb3a2
[0.6]
...
Configuration:
- added delay for Bolus delivery
- added choice for decoding (done on RL or in software)
Code:
- encoding DailyTotals for 522 and 523
- some minor fixes reported by Crashalytics
- refactoring history
- added history display
- changes to delivering Bolus (canceling)
- started adding 6b4b hardware decoding
2019-01-04 14:02:10 +01:00
Milos Kozak
2b9b3b4f16
Eversense support
2018-12-11 21:56:57 +01:00
Nico Schmitz
9e03f0f8ca
Update to current dev branch
2018-12-11 14:51:26 +01:00
Milos Kozak
8610dcc21d
G5 2018 app version support
2018-12-10 19:35:01 +01:00
gregorybel
2d04b277ff
add xml
2018-11-12 22:40:13 +01:00
Andy Rozman
75d3f3b4bc
Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018)
2018-10-24 12:18:20 +01:00
Andy Rozman
ca536ee97e
[0.3.1]
...
- removed code that sends wakeup on every command
- added checking if device is present
- fixed reading data when no data present (PostProcessingUI)
- work done on showing hardware in configuration (added RileyLinkSelectPreference)
- fixing configuration (in wizard)
2018-10-20 13:24:36 +01:00
Milos Kozak
97cc9a6370
log language used to fabric
2018-10-04 23:04:32 +02:00
Andy Rozman
70065c1343
- merge RileyLink2 support from RileyLinkAAPS
2018-09-19 20:51:40 +01:00
Milos Kozak
3eee5b13c7
LocationService
2018-09-19 15:26:58 +02:00
Andy Rozman
da75ed643d
Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable
2018-09-14 18:14:45 +01:00
Milos Kozak
f7269a806d
nsclient allow general preferences
2018-09-11 20:08:59 +02:00
Milos Kozak
bc84020f54
loop_openmode_min_change 0-50
2018-09-11 19:04:55 +02:00
Milos Kozak
e577e8555d
openloop mode min change threshold configurable
2018-09-09 12:15:44 +02:00
Milos Kozak
178c2b90fe
min_5m_carbimpact to AMA settings
2018-08-29 18:17:11 +02:00
Milos Kozak
b0f8ab9922
extract key_virtualpump_type
2018-08-23 18:46:06 +02:00
Milos Kozak
2c5837a235
Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863
2018-08-23 17:53:28 +02:00
Milos Kozak
8ec3649cea
key_nsclient_localbroadcasts default to false
2018-08-20 23:01:11 +02:00
Nico Schmitz
5386c7db4a
Update to upstream/dev and resolve conflicts
2018-08-19 14:37:42 +02:00
Milos Kozak
31e050be4a
loop mode in setup wizard
2018-08-14 17:06:09 +02:00
Milos Kozak
fcf47ecc03
NSClient2 flavor
2018-08-07 21:07:43 +02:00
Milos Kozak
c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863
2018-08-01 11:57:48 +02:00
Markus M. May
61dba0633a
Merge again
2018-07-30 19:42:18 +02:00
Markus M. May
f70909d6c6
Refactore logshipper to maintenance, move funcs from menu to plugin
2018-07-28 22:45:40 +02:00
Andy Rozman
1b8ceb83cf
Merge branch 'dev' into medtronic_andy
2018-07-26 16:48:52 +01:00
Markus M. May
c34104b906
move log shipment to own plugin
2018-07-25 22:00:58 +02:00
Markus M. May
60721c8395
First working version
2018-07-24 22:34:10 +02:00
Andy Rozman
0b180d3d65
- tbr start is succesful, but tbr is not displayed
2018-07-22 16:45:26 +01:00
Nico Schmitz
2ce38702e2
Merge branch 'dev' into dev-wip
2018-07-01 22:44:11 +02:00
Milos Kozak
8c695255d6
Merge pull request #1143 from jotomo/strings
...
Rename "Lock screen" -> "Keep screen on".
2018-06-24 13:58:35 +02:00
Johannes Mockenhaupt
a8d783874c
Rename "Lock screen" -> "Keep screen on".
2018-06-24 12:50:11 +02:00
Johannes Mockenhaupt
784c071f53
Small oref1 sens corrections.
2018-06-24 01:03:38 +02:00
Milos Kozak
586665e19f
nsclient table mode improvements
2018-06-23 18:24:04 +02:00
Milos Kozak
370008f41e
oref 0.6.0 sens
2018-06-20 18:39:47 +02:00
Milos Kozak
e913cfe454
prepare oref1 plugin
2018-06-19 20:41:40 +02:00
Nico Schmitz
d88b4da5a9
Don't show statuslight preferences in NSCLIENT build
2018-06-17 22:41:34 +02:00
Andy Rozman
47427ec68e
- integration started
...
- states visible
- command framework added
- we get currect profile and compare it with AAPS profile
- setProfile command is disabled, if pumps profile is different we get warning
- bolus is enabled and working
- get remaining reservoir level
2018-06-16 18:13:29 +01:00
Nico Schmitz
1604b53327
Fix bugs, refactor code and add preferences
2018-06-14 20:49:58 +02:00
Nico Schmitz
4ebc149783
Add changes of schmitzn/reservoir-view
2018-06-12 23:28:11 +02:00
Milos Kozak
e7eec8fe69
Poctech BG source
2018-06-11 17:26:31 +02:00
TebbeUbben
a86c654f8d
Use real TBR cancels and dismiss their alerts
2018-06-03 10:56:29 +02:00
Andy Rozman
e8f860be8b
- copied RL code
...
- copied Medtronic code
- added BLE Scan
- added RL Stats activity
- added RL configuration display
2018-05-20 20:53:55 +01:00
Milos Kozak
06e52bb6ae
remove duplicated key
2018-05-20 10:56:32 +02:00
Andy Rozman
2cc4fe4450
Added options Max Bolus and Max Basal
...
Little bit of refactoring in Medtronic code
2018-05-12 00:41:44 +01:00
Johannes Mockenhaupt
a2a165d510
Wear wizard: make TT option depend on BG being enabled.
2018-05-09 16:46:22 +02:00
Johannes Mockenhaupt
ce6e53e9c6
Wear wizard: add TT config option.
2018-05-08 13:28:01 +02:00
Andy Rozman
41205d4ba7
Merge branch 'dev' into riley_link_medtronic
2018-05-07 12:11:38 +01:00
Milos Kozak
f5a23b2921
Merge branch 'dev' into virtual_pump_Bug863
2018-05-04 19:18:52 +02:00
Andy Rozman
f2df13dbfb
Merge branch 'dev' into virtual_pump_Bug863
2018-05-04 10:06:18 +01:00
AdrianLxM
fb75346bcd
ecarb make settings consistent
2018-05-03 22:08:50 +02:00
Andy Rozman
421946269a
Merge branch 'dev' into riley_link_medtronic
2018-05-03 17:23:23 +01:00
Andy Rozman
f6110bd096
Merge branch 'virtual_pump_Bug863' into riley_link_medtronic
2018-05-03 16:54:03 +01:00
AdrianLxM
43dc7d1846
wear cathegorize preferences
2018-05-03 17:49:31 +02:00
AdrianLxM
fe0f2e3ce6
wearwizard settings on phone
2018-05-03 17:49:13 +02:00
Andy Rozman
416bd2ff41
Feature Request/Bug #863
...
- added package PumpCommon for common pump files
- added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType
- added PumpType which contains all definitions for pumps
- extended fragement to display Pump Type and Pump Type definitions
- extended plugin to read configuration and set pumpDescription object
- extended pref_virtualpump to add pump type selection
2018-05-02 23:59:33 +01:00
Milos Kozak
42164489c8
cs translations
2018-05-02 17:05:20 +02:00
Andy Rozman
4b121ae892
- copied roundtrip2 project into here (for easier use), some of it might be reused
...
- added PumpCommon
- added PumpMedtronic
2018-05-01 22:44:53 +01:00
Markus M. May
12d80e96ef
Merge latest dev version
2018-05-01 21:56:33 +02:00
Markus M. May
099cb6c4e4
add battery charging state
2018-04-29 22:49:43 +02:00
Milos Kozak
c490499d03
preferences cleanup
2018-04-24 00:11:52 +02:00
Johannes Mockenhaupt
896f919f37
Disable roaming (pref) when wifi-only is enabled.
2018-04-22 21:43:31 +02:00
Milos Kozak
6851adbfd3
NSClient connection settings
2018-04-22 18:24:06 +02:00
Milos Kozak
c4db1c5e2d
move quickwizard preferences under overview
2018-04-21 21:58:07 +02:00
Milos Kozak
1f55078aa3
extract strings from overview preferences
2018-04-21 21:37:50 +02:00
Milos Kozak
cab592efb5
overview preferences cleanup
2018-04-21 21:31:42 +02:00
Milos Kozak
fe762248a5
nsclient preferences cleanup
2018-04-21 21:14:09 +02:00
Milos Kozak
ea59458383
nsclient preferences cleanup
2018-04-21 20:46:55 +02:00
Milos Kozak
41b5636c13
clear autosens cache on new preferences change
2018-04-20 12:44:19 +02:00