Philoul
df3a595ef4
Create strings for ReadStatus reason translation
2021-11-20 20:57:30 +01:00
Milos Kozak
79fc1aad66
update datasync logging tag
2021-11-19 17:50:57 +01:00
Milos Kozak
ad7a5cf2db
initialize PersistentNotificationPlugin first
2021-11-18 22:56:45 +01:00
Milos Kozak
1de515bf33
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-11-18 19:57:22 +01:00
Milos Kozak
284dc19bd1
ProfileFragment disable spinner for invalid profile
2021-11-18 19:57:12 +01:00
Milos Kozak
9fb20917c5
unify xDrip broadcasts
2021-11-18 15:47:22 +01:00
Milos Kozak
b2c12d233c
fix WizardInfoDialog crash
2021-11-17 21:44:08 +01:00
Milos Kozak
d9f68bca3f
Dana: fix disabling loop
2021-11-16 23:50:28 +01:00
Milos Kozak
5569974714
log service start
2021-11-16 21:45:58 +01:00
Milos Kozak
f48dcc77e2
fix double profile
2021-11-16 17:09:47 +01:00
Milos Kozak
17d5fcf07d
remove duplicated code
2021-11-16 13:06:23 +01:00
Milos Kozak
3e6aa56e94
remove IOB AS=1 prediction
2021-11-15 23:30:53 +01:00
Milos Kozak
6aaedefbed
Profile: fix Save button behavior
2021-11-15 18:45:55 +01:00
Milos Kozak
17630394c7
active insulin in green color
2021-11-15 14:14:51 +01:00
Milos Kozak
54b8d0613c
fix build
2021-11-12 16:53:03 +01:00
Milos Kozak
3891fb70c2
Merge pull request #891 from nightscout/glunovo
...
Glunovo support
2021-11-12 10:30:34 +01:00
Milos Kozak
50861f237d
Merge pull request #906 from 0pen-dash/avereha/connQuality
...
dash: connection quality
2021-11-12 08:19:09 +01:00
Milos Kozak
8bac468306
IOB: fix calculation for EB
2021-11-11 22:40:52 +01:00
Milos Kozak
579c9dac7c
Glunovo rearrange
2021-11-11 20:41:32 +01:00
Milos Kozak
774beb2cb3
Glunovo process calibrations
2021-11-11 20:39:17 +01:00
Andrei Vereha
6ab2a7bb7e
display the performed operation
2021-11-11 17:41:19 +01:00
Milos Kozak
51c6237d02
limit logging
2021-11-11 17:26:19 +01:00
Milos Kozak
88a8d08f56
restore xdrip broadcast
2021-11-11 14:23:22 +01:00
Andrei Vereha
d5ae4cabf2
call stopConnecting only once
2021-11-10 23:10:26 +01:00
Milos Kozak
3dc2f073fe
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-11-10 17:10:48 +01:00
Milos Kozak
584e91f8dc
prepare XDripBroadcast
2021-11-10 17:10:10 +01:00
Milos Kozak
7b39fb1e69
Merge pull request #887 from dlvoy/fix/882_optimize_tdd_calculation
...
Speed up TDD statistics calculation
2021-11-10 15:40:21 +01:00
Milos Kozak
bb7632aa80
Glunovo change schedule
2021-11-10 12:25:07 +01:00
Milos Kozak
081e8bd684
inject context
2021-11-10 09:15:05 +01:00
Milos Kozak
f942e9a3c3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-11-09 23:06:36 +01:00
Milos Kozak
5ae83c47c0
optimize screen refreshing
2021-11-09 23:06:24 +01:00
Milos Kozak
56d97861e3
fix glunovo loop
2021-11-09 20:22:33 +01:00
Dominik Dzienia
c2c6bb810a
Fixes #882 by aggregating DAO query for temporary basals and moving it outside loop
2021-11-09 19:51:22 +01:00
Milos Kozak
ffa4120cd5
improve glunovo logic
2021-11-09 18:42:55 +01:00
Milos Kozak
04de964e97
cleanup
2021-11-09 17:57:51 +01:00
Milos Kozak
b9a3a72e86
fix BG backfill rule
2021-11-09 17:45:20 +01:00
Milos Kozak
25c048640d
Glunovo plugin
2021-11-09 15:26:09 +01:00
Milos Kozak
35c9c4d678
load 36h to BG tab
2021-11-08 15:48:02 +01:00
Milos Kozak
22fced61fe
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-11-08 13:37:05 +01:00
Milos Kozak
2a2bb4edc6
fix storing carbs
2021-11-08 13:36:54 +01:00
Milos Kozak
21d7f7c13b
Merge pull request #869 from dlvoy/fix/868_anr_in_tdd_profile_helper
...
Fix ANR in Profile Helper by moving slow TDD calc into separate thread
2021-11-08 09:44:29 +01:00
Milos Kozak
7cf4db5fcc
revert subscribe
2021-11-07 23:45:16 +01:00
Dominik Dzienia
4c19b2006e
Fix ANR in Profile Helper by moving slow TDD calc into separate thread #868
2021-11-07 23:34:18 +01:00
Milos Kozak
5d3035c09c
do not cache TBE and EB for displaying
2021-11-07 23:02:38 +01:00
Milos Kozak
2b20aa3e38
fix EditQuickWizardDialog
2021-11-07 21:57:10 +01:00
Milos Kozak
22eb524556
increase bg validity check red range to 20s
2021-11-07 20:14:44 +01:00
Milos Kozak
cb4b4b5e21
add missing pump types, hide buttons in Action tab, fix configuration sync
2021-11-07 19:54:15 +01:00
Milos Kozak
dcf3c9cc57
try to fix closed BolusProggressDialog and storing carbs if bolus was canceled
2021-11-07 18:15:15 +01:00
Milos Kozak
0db34981d4
rename CommandQueue
2021-11-07 17:19:06 +01:00
Milos Kozak
e14fc44957
better sync TBR
2021-11-07 16:55:34 +01:00
Milos Kozak
f09d967e59
show TBR and EB tab
2021-11-07 11:02:31 +01:00
Milos Kozak
175f008d3b
fix screen refresh after unit change
2021-11-06 22:56:34 +01:00
Milos Kozak
f9d24a0153
log red state
2021-11-06 19:21:28 +01:00
Milos Kozak
8ccef29dff
do not request location permission for nsclient
2021-11-06 17:53:07 +01:00
Milos Kozak
23777330cf
make default sync values consistent
2021-11-06 17:46:55 +01:00
Milos Kozak
2b021ffafc
BgQualityCheckPlugin
2021-11-05 13:16:23 +01:00
Milos Kozak
6fb83d4949
PfofileSwitchDialog fix
2021-11-05 09:53:59 +01:00
Milos Kozak
0321d4cd07
treat 100% TBR as temp off
2021-11-04 23:21:39 +01:00
Milos Kozak
ae399f0bf5
allow slower NS upload
2021-11-04 17:08:15 +01:00
Milos Kozak
ebeac72e74
fix storing effective profile
2021-11-04 15:58:57 +01:00
Milos Kozak
756957ed8c
resourceHelper -> rh
2021-11-04 10:56:12 +01:00
Milos Kozak
7b07178b93
EventNewHistoryData logging
2021-11-04 10:03:08 +01:00
Milos Kozak
d06ae6b0bc
resourceHelper -> rh
2021-11-04 09:32:34 +01:00
Milos Kozak
b592054c18
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-11-04 09:32:16 +01:00
Milos Kozak
d07a935314
fix transferring units setting
2021-11-04 09:15:28 +01:00
Milos Kozak
e715167254
hack for PL language
2021-11-02 15:11:08 +01:00
Milos Kozak
2ad7d9f4d2
pre-sort data for rendering
2021-11-02 14:36:09 +01:00
Milos Kozak
ff1a9b24db
Do not use bus for dismissing notification from UI
2021-11-02 13:14:01 +01:00
Milos Kozak
b4dec7195c
more profile tweaking
2021-11-02 12:45:34 +01:00
Milos Kozak
ca39802e6d
fix profile validity check
2021-11-02 10:39:13 +01:00
Milos Kozak
bb2fced905
fix NaN in statistics
2021-11-02 09:53:16 +01:00
Milos Kozak
760261e258
exclude invalid profiles from ProfileSwitchDialog
2021-11-02 09:19:56 +01:00
Milos Kozak
d53071297e
fix showing Save button
2021-11-01 22:54:55 +01:00
Milos Kozak
fa23f30ab1
lints
2021-11-01 22:51:13 +01:00
Milos Kozak
7442774ab7
notify about wrong profiles from NS
2021-11-01 22:29:02 +01:00
Milos Kozak
f700c22966
prevent Missing BG notification on start
2021-11-01 18:43:07 +01:00
Milos Kozak
ba9a5dc97b
better handle wrong profile
2021-10-31 17:44:04 +01:00
Milos Kozak
2b71bfdeb0
hide button without active profile
2021-10-31 17:24:15 +01:00
Milos Kozak
42daad43f4
EROS: so not run commands on UI thread
2021-10-30 19:44:54 +02:00
Milos Kozak
c4765b42f0
enable logging of EVENTS again
2021-10-30 18:29:00 +02:00
Milos Kozak
1dd64b5958
relocate default profile
2021-10-30 14:14:37 +02:00
Milos Kozak
6663b9db4f
better handle missed bg readings
2021-10-30 13:43:22 +02:00
Milos Kozak
8fe7e7ce2b
report AAPS version to NSClient log
2021-10-29 18:41:25 +02:00
Milos Kozak
51dcfd9a29
Merge pull request #786 from Philoul/New/RemoveReminder
...
Remove EatReminder/BolusReminder if Carbs/Insulin entered before remind
2021-10-28 20:25:36 +02:00
Milos Kozak
a56bdcc7c8
AUTO: user actions & new layout
2021-10-28 20:22:13 +02:00
Philoul
4616d11c5d
Remove EatReminder/BolusReminder if Carbs/Bolus entered before remind
2021-10-26 22:39:52 +02:00
Milos Kozak
04a104a9b0
Merge pull request #780 from Philoul/New/BolusReminder
...
New function : Bolus reminder
2021-10-26 19:24:03 +02:00
Milos Kozak
c1290ce766
stop alarm service on terminate app
2021-10-26 13:41:48 +02:00
Milos Kozak
c727b745a5
simplify NSC setting
2021-10-26 13:34:30 +02:00
Milos Kozak
da52daeefe
carbs info in engineering mode
2021-10-26 12:58:16 +02:00
Milos Kozak
15c166586f
NSC: hide virtual pump
2021-10-26 12:54:51 +02:00
Milos Kozak
8efa66f23d
fix TriggerProfilePercent and ProfileDialog
2021-10-25 18:09:53 +02:00
Milos Kozak
3d94f3f840
NSClient: missing initial profile workaround
2021-10-25 14:32:21 +02:00
Milos Kozak
60c14cda21
NS: Sync BolusCalculatorResult
2021-10-25 14:17:06 +02:00
Philoul
c3ef4af700
Fix delta
2021-10-25 10:09:32 +02:00
Milos Kozak
22cad1a761
prevent NPE
2021-10-24 00:58:17 +02:00
Milos Kozak
5e3db95297
do not show Treatments menu without profile
2021-10-24 00:42:58 +02:00
Milos Kozak
3b30f73209
fix NS profile sync
2021-10-24 00:20:07 +02:00
Milos Kozak
d9fcf61b0a
Log app start optional
2021-10-23 21:08:31 +02:00
Philoul
2ace719e2a
Add Bolus Reminder to CarbsDialog
2021-10-22 16:15:26 +02:00
Milos Kozak
6ada88b1f8
set min graph vertical labels
2021-10-21 16:33:37 +02:00
Milos Kozak
30af551cbd
Toast for error in profile
2021-10-21 09:45:34 +02:00
Milos Kozak
aee569e9a9
set Rx error handler
2021-10-20 22:54:32 +02:00
Milos Kozak
c966dfda13
do not throw exception if profile doesn't exist
2021-10-20 15:57:07 +02:00
Milos Kozak
29da63d264
remove ClassicPrefsFormat
2021-10-19 23:20:50 +02:00
Milos Kozak
674909fdd0
synchronize on cache object
2021-10-19 21:27:44 +02:00
Milos Kozak
2e0c7e48ba
do not create default profile at app start
2021-10-19 13:01:54 +02:00
Milos Kozak
8631ab12de
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-10-19 12:06:04 +02:00
Milos Kozak
f7f7ba3a2b
fix carbs limit
2021-10-19 12:05:52 +02:00
Milos Kozak
c2f7be77ad
Merge pull request #755 from Philoul/Fix/TT_From_Watch_mmol
...
Fix TT From Watch (mmol) double convertion
2021-10-19 00:02:37 +02:00
Milos Kozak
67c53b412d
fix safety carbs sync
2021-10-18 21:55:09 +02:00
Philoul
f10080686b
It's better to make convertion in generateTempTarget for uel.log
...
Sorry
This reverts commit 9db58726
2021-10-18 21:07:06 +02:00
Philoul
9db587269a
Remove second one finally to be consistent with master 2.8.2
2021-10-18 20:17:52 +02:00
Milos Kozak
3f8e56d50e
Fix Objectives processing
2021-10-18 20:10:18 +02:00
Philoul
e68d2d080d
Fix #746
2021-10-18 19:59:24 +02:00
Milos Kozak
50e31a4b2b
Merge pull request #745 from Philoul/Fix/AddWorkerCsvExport
...
Add Worker to launch exportUserEntriesCsv in Background
2021-10-18 15:01:12 +02:00
Philoul
c723058628
Create a new worker for export
2021-10-18 09:59:26 +02:00
Sam Spycher
289ec5668d
feat(eros-database): add history module
2021-10-18 00:06:45 +02:00
Philoul
26c702c7c0
Add Worker to launch exportUserEntriesCsv in Background
2021-10-17 20:26:35 +02:00
Milos Kozak
a0bc179aea
clear large profile cache
2021-10-17 18:03:55 +02:00
Milos Kozak
e01f6f6cb0
SpinnerHelper update
2021-10-17 17:47:41 +02:00
Milos Kozak
516630215c
Worker DB pruning
2021-10-17 12:07:23 +02:00
Milos Kozak
3093a84d65
Merge pull request #735 from Philoul/Fix/FixCrashExportCSV
...
Fix crash during csv export
2021-10-17 10:32:41 +02:00
Andrei Vereha
e536c29351
another tailCall
2021-10-16 23:20:48 +02:00
Andrei Vereha
310ab3e3ae
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/tailrec
2021-10-16 23:17:48 +02:00
Milos Kozak
8656f19e81
Optimize NS full sync
2021-10-16 21:24:03 +02:00
Andrei Vereha
b330e7af00
make processChangedGlucoseValuesCompat tailrec
2021-10-16 21:14:01 +02:00
Milos Kozak
6ed9024769
fix text
2021-10-16 20:19:51 +02:00
Philoul
6e318cfaa0
Limit csv export to 90 days
2021-10-16 18:06:18 +02:00
Milos Kozak
6ad50d2979
do not full_sync DeviceStatus
2021-10-16 16:10:09 +02:00
Milos Kozak
dabf4bf33c
Application expired check
2021-10-16 13:02:31 +02:00
Milos Kozak
1f65ee38c7
RxBusWrapper -> RxBus
2021-10-15 14:56:22 +02:00
Milos Kozak
a963f140c6
lints
2021-10-15 13:24:22 +02:00
Milos Kozak
db83bf4653
catch InterruptedException
2021-10-14 23:25:18 +02:00
Milos Kozak
c4ac42f738
@Synchronized access to cache
2021-10-14 23:14:03 +02:00
Milos Kozak
5906c5f0fa
SpinnerHelper -> kt
2021-10-14 22:43:23 +02:00
Milos Kozak
d5892a81f9
Optimize NSClient sync
2021-10-12 23:54:04 +02:00
Milos Kozak
252cc685a4
Merge pull request #723 from nightscout/rxDogtag
...
Rx dogtag
2021-10-11 13:58:29 +02:00
Milos Kozak
036b64d018
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-10-10 23:28:14 +02:00
Milos Kozak
e8d2d03c16
Better EffectiveProfileSwitch handling
2021-10-10 23:26:50 +02:00
AdrianLxM
78001e7f99
Hook in RxDogtag
2021-10-10 18:05:55 +02:00
Milos Kozak
7169c78225
Merge pull request #722 from 0pen-dash/dash
...
Dash updates
2021-10-10 16:16:17 +02:00
Milos Kozak
df700da045
cleanup
2021-10-08 10:19:09 +02:00
Milos Kozak
bdffe22803
fix duration sync to NSClient
2021-10-07 22:53:46 +02:00
Andrei Vereha
4a3cff1688
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-11
2021-10-05 22:56:41 +02:00
Milos Kozak
a4aae47b8b
pass safety values to NSClient
2021-10-04 23:47:47 +02:00
Milos Kozak
1b45d4fe31
allow start activity TT from profile switch
2021-10-04 22:40:02 +02:00
Andrei Vereha
01c88b0de3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings
2021-10-04 17:55:05 +02:00
Milos Kozak
f802cc488e
Pump status line refactor
2021-10-04 17:35:17 +02:00
Andrei Vereha
d5619dc469
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings
2021-10-03 23:32:18 +02:00
Philoul
9a1de97564
Add shortname for NSClient BG plugin
2021-10-03 21:48:02 +02:00
Andrei Vereha
a4a6f45372
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings
2021-10-03 21:01:50 +02:00
Milos Kozak
214078b477
fix displaying profile status
2021-10-03 19:01:03 +02:00
Andrei Vereha
b4cdd4e7b3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/warnings
2021-10-03 12:33:40 +02:00
Milos Kozak
13330aef1e
fix wrong scheduler
2021-10-03 12:16:47 +02:00
Milos Kozak
c8f5f4a116
optimize history browser
2021-10-03 12:04:03 +02:00
Milos Kozak
29acc3d17f
optimize query if TBR is not faked by EB
2021-10-03 11:37:23 +02:00
Andrei Vereha
0eb103c199
Revert "disable dash for now"
...
Enable dash.
This reverts commit f5c6367495
2021-10-02 10:38:33 +02:00
Milos Kozak
2c89dc1807
suppress warnings
2021-10-01 23:17:24 +02:00
Milos Kozak
8050fedaf6
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-10-01 16:55:40 +02:00
Milos Kozak
defdb28f93
code cleanup
2021-10-01 11:07:16 +02:00
Milos Kozak
9f1a87110d
NSCLIENT mode: do not create local profile switch
2021-09-30 19:08:38 +02:00
Milos Kozak
45b58719a6
Merge branch 'epssync' into dev
2021-09-30 17:46:18 +02:00
Andrei Vereha
f5c6367495
disable dash for now
2021-09-25 19:05:49 +02:00
Andrei Vereha
0cd9beb2cf
merge with dev
2021-09-25 13:55:57 +02:00
Milos Kozak
8d07a697c3
EffectiveProfileSwitch sync
2021-09-24 14:58:17 +02:00
Milos Kozak
b2c45d0a26
remove PowerMock from all modules except wear
2021-09-23 17:35:55 +02:00
Milos Kozak
b40428c986
Merge pull request #607 from Philoul/NewUelLog
...
New UserEntries
2021-09-22 18:20:06 +02:00
Milos Kozak
a1a5fbaa4f
Display EventType properly
2021-09-21 22:17:06 +02:00
Milos Kozak
d33f62b23d
remove PowerMockRunner where possible
2021-09-21 21:57:56 +02:00
Andrei Vereha
2a2cf9fa3c
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-6
2021-09-21 21:17:53 +02:00
Milos Kozak
d43393e2af
unify trend arrow AAPS <-> watch
2021-09-21 16:46:12 +02:00
Milos Kozak
ce59c3afd4
lints
2021-09-21 15:35:59 +02:00
Milos Kozak
9e42f91848
finish removing Objective8
2021-09-21 15:16:19 +02:00
Andrei Vereha
09675de3f1
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dash
2021-09-20 18:32:52 +02:00
Milos Kozak
7bb2f446b7
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-09-20 17:20:22 +02:00
Milos Kozak
374e251801
remove @Jvm directives where possible
2021-09-20 17:20:09 +02:00
Milos Kozak
71093db68a
prevent IndexOutOfBounds
2021-09-20 17:17:01 +02:00
Milos Kozak
f2cc8fb5f5
Merge pull request #678 from Philoul/Fix/ProfileTotalBasal
...
Fix total basal in Local Profile Fragment
2021-09-20 16:03:00 +02:00
Milos Kozak
72a309a055
reset password procedure
2021-09-20 14:13:56 +02:00
Milos Kozak
4b6d4d287c
Ask for old apssword in SetupWizard
2021-09-20 13:04:13 +02:00
Milos Kozak
02b77ae554
Remove Objective8 (9)
2021-09-20 11:10:47 +02:00
Milos Kozak
b80e2a7648
Improve COB handling
2021-09-19 09:59:35 +02:00
Philoul
45f576b838
Add getEditProfile function to calculate SumLabel
2021-09-18 21:54:29 +02:00
Milos Kozak
fb9f5220d3
Ignore future events for status lights
2021-09-18 18:06:11 +02:00
Philoul
bafc8e951a
Merge remote-tracking branch 'Nightscout/dev' into Fix/ProfileTotalBasal
2021-09-17 18:10:39 +02:00
Andrei Vereha
e31c77a858
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-5
2021-09-16 23:38:55 +02:00
Milos Kozak
a448efe09c
fix profile editor (ISF limits)
2021-09-16 00:18:02 +02:00
Milos Kozak
c611674b3b
show only valid data
2021-09-16 00:02:27 +02:00
Milos Kozak
56a0c97e96
Merge pull request #634 from Philoul/Fix_DisableLoop
...
Fix Overview LoopDialog (Disable Loop)
2021-09-15 23:54:15 +02:00
Milos Kozak
444915ebf7
fix displaying bg data on range change
2021-09-15 23:19:25 +02:00
Andrei Vereha
cb86438c27
Revert "Revert "avereha/merge dev 2""
2021-09-15 18:38:27 +02:00
Andrei Vereha
7fff6fc564
Revert "avereha/merge dev 2"
2021-09-15 00:12:35 +02:00
Andrei Vereha
efad748939
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2
2021-09-14 23:55:15 +02:00
Milos Kozak
7690419c6c
always show basal in NSClient mode
2021-09-13 21:05:01 +02:00
Milos Kozak
ba71e0db9b
more Profile validity checks
2021-09-13 19:06:32 +02:00
Andrei Vereha
d4b0935d6b
Merge remote-tracking branch 'upstream/dev' into dash
2021-09-13 18:39:23 +02:00
Philoul
fc83e41148
Avoid disconect pump during suspend
2021-09-10 00:34:17 +02:00
Philoul
4420189310
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
2021-09-09 00:03:27 +02:00
Milos Kozak
d18c05205c
Resolve warnings
2021-09-07 12:08:19 +02:00
Milos Kozak
c9897da78d
Merge pull request #641 from nightscout/openhumans_v2
...
Update Open Humans uploader for new database
2021-09-06 13:54:16 +02:00
Philoul
c00000e079
Simplify a bit more LoopPlugin
2021-08-29 22:24:52 +02:00
Philoul
8770cfa4ad
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
2021-08-29 17:59:21 +02:00
Milos Kozak
5411f4fb3c
key_ns_receive_profile_store default true to fetch NS profiles in setup wizard
2021-08-28 20:58:27 +02:00
Philoul
69839b5395
Add Disconnect Bloc when Loop is suspended or disabled
2021-08-25 09:00:13 +02:00
TebbeUbben
dbf1772397
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
...
Conflicts:
build.gradle
2021-08-20 19:42:59 +02:00
TebbeUbben
3aadb92250
Update Open Humans uploader for new database
2021-08-20 19:37:38 +02:00
Philoul
ee89687653
Fix Basal Sum
...
But sum is only upated when profile is saved
2021-08-20 09:00:51 +02:00
Philoul
0918880415
Allow direct modification of duration of suspend loop or disconnect pump
2021-08-19 22:16:38 +02:00
Philoul
226e968bfd
Clean previous code
2021-08-19 01:03:34 +02:00
Philoul
a28be52faa
Simplify Overview code
2021-08-19 01:01:12 +02:00
Philoul
00c07b91e7
Fix Overview LoopDialog trial
2021-08-17 08:30:10 +02:00
Milos Kozak
4761a1a5ba
kotlin-allopen, fixed tests
2021-08-16 13:47:14 +02:00
Milos Kozak
0af345e340
Make sync variables volatile
2021-08-11 19:55:42 +02:00
Milos Kozak
c5857da42f
StatsActivity fix
2021-08-11 19:01:19 +02:00
Milos Kozak
24fc69c26b
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-08-11 18:10:48 +02:00
Milos Kozak
1c065c75e8
API 30 lints
2021-08-11 18:10:44 +02:00
Milos Kozak
b5ea857ced
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-08-10 21:36:38 +02:00
Milos Kozak
0a66ed307a
HistoryBrowser improvement
2021-08-10 21:36:26 +02:00
Milos Kozak
6649386c58
Merge branch 'dev' into gradleupdate
2021-08-06 11:03:26 +02:00
Milos Kozak
0e928bbb9c
compileSdkVersion 30
2021-08-06 00:08:49 +02:00
AdrianLxM
fa27d409ce
refactor build helper
2021-07-31 13:25:20 +02:00
Philoul
d0cde1b07a
Add UserEntries for Alerts (Pump unreachable and Missing BG Readings)
2021-07-14 17:30:09 +02:00
Milos Kozak
b995243947
Dana-i icon
2021-07-12 15:43:02 +02:00
Andrei Vereha
5752369377
Merge remote-tracking branch 'upstream/dev' into avereha/merge
2021-07-11 12:26:41 +02:00
Milos Kozak
444d5aeebd
Merge pull request #571 from andyrozman/mdt_new_fix_2
...
Fixes for medtronic driver refactoring
2021-07-01 12:38:51 +02:00
Milos Kozak
272cdbbb00
use package for nsclient broadcast
2021-06-27 12:39:42 +02:00
Andrei Vereha
2133a90ac5
Merge remote-tracking branch 'upstream/dev' into avereha/merge
2021-06-27 11:30:50 +02:00
Andy Rozman
d5a8838cab
- changed/reverted change
2021-06-26 22:00:29 +01:00
Milos Kozak
cf006790b9
make automation profile switch based on last profile switch instead of profile store
2021-06-26 22:57:40 +02:00
Milos Kozak
dc90c6b140
fix switching to virtual pump
2021-06-26 22:52:51 +02:00
Andy Rozman
3288eb2966
Merge branch 'dev' into mdt_new_fix_2
2021-06-26 21:50:00 +01:00
Milos Kozak
62cb1bb506
reduce warnings amount
2021-06-26 19:53:09 +02:00
Andrei Vereha
7b0702b8eb
compile. fix build warnings
2021-06-26 15:58:40 +02:00
Andrei Vereha
1018a41346
Merge remote-tracking branch 'upstream/dev' into avereha/conn
2021-06-26 15:21:40 +02:00
Milos Kozak
7bb03c4c13
Merge pull request #580 from nightscout/diaconn
...
Diaconn
2021-06-24 19:34:22 +02:00
Milos Kozak
a70f24a68a
fix TherapyEvent upload
2021-06-23 22:33:58 +02:00
Milos Kozak
884ecd9f2b
cleanup
2021-06-23 21:01:42 +02:00
Milos Kozak
e06ec0eba1
getProfile synchronized
2021-06-23 21:01:10 +02:00
Milos Kozak
90baf8e0ea
prevent failed requirement
2021-06-21 21:47:38 +02:00
Andy Rozman
e30c5162ef
Merge branch 'dev' into mdt_new_fix_2
2021-06-20 19:45:03 +01:00
Milos Kozak
0af2cff26f
Merge pull request #557 from Philoul/NewTempFolderForLogExports
...
temp Dir for log export
2021-06-17 22:01:05 +02:00
Milos Kozak
b79d86f0b8
Merge pull request #561 from Philoul/FixDeleteLogs
...
Fix delete logs
2021-06-16 08:22:15 +02:00
Milos Kozak
c3aea16c72
reset cached data on db reset
2021-06-15 14:54:32 +02:00
Milos Kozak
fcf7faa3e0
queue independentConnect fix for DanaR pumps
2021-06-14 15:52:43 +02:00
Philoul
c005243dfd
Fix DeleteLogs
2021-06-11 21:39:23 +02:00
Andy Rozman
95326a2894
- storage fix (new key)
2021-06-11 15:57:14 +01:00
Milos Kozak
62005b437a
Improve SMSCommunicator safety
2021-06-10 22:35:50 +02:00
Philoul
539ca3131d
temp Dir for log export
2021-06-10 08:33:15 +02:00
Milos Kozak
8e466be92c
Diaconn support
2021-06-08 23:27:14 +02:00
Milos Kozak
c0dba456d7
fix lst bolus query and smb pocessing
2021-06-02 22:40:30 +02:00
Milos Kozak
74dfe80433
immutable flag for PendingIntent
2021-06-02 16:56:13 +02:00
Milos Kozak
db95670be5
fix loop dialog
2021-06-01 22:34:18 +02:00
Milos Kozak
1d12883f95
fix receiving NOTEs form NS
2021-06-01 20:04:59 +02:00
Milos Kozak
596012ab10
move logs, eng_mode to AAPS directory
2021-05-31 15:29:42 +02:00
Milos Kozak
67297d60d3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-30 14:52:30 +02:00
Milos Kozak
beb8ba7efc
enable MDT plugin
2021-05-30 14:51:57 +02:00
Milos Kozak
7ed7736b4f
Merge pull request #543 from Philoul/FixCancelExtendedBolus
...
Fix cancel extended bolus (Overview)
2021-05-29 23:47:15 +02:00
Milos Kozak
9d29cafbe6
remove old db code
2021-05-29 23:38:19 +02:00
Andrei Vereha
7ee7cdd83b
Merge remote-tracking branch 'upstream/dev' into avereha/merge-dev
2021-05-28 22:12:21 +02:00
Milos Kozak
8db5b808ac
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-28 16:11:31 +02:00
Milos Kozak
6735d22934
OfflineEvent -> room
2021-05-28 16:06:44 +02:00
Philoul
330728299d
Fix Extended Bolus in Overview
2021-05-28 08:56:58 +02:00
Milos Kozak
66a70fcd22
Merge pull request #531 from andyrozman/meallink-mdt
...
Medtronic driver changes - Kotlin and PumpSync
2021-05-27 23:23:03 +02:00
Philoul
93046d0354
Revert to val for ratio and dev slope Scale
2021-05-27 08:43:45 +02:00
Philoul
ede1468bbb
Modify shift
2021-05-26 22:04:42 +02:00
Philoul
506fbde587
Merge branch 'dev' into FixSensScale
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
2021-05-26 21:50:58 +02:00
Andy Rozman
766b2b4bea
- changes after comments
2021-05-26 20:16:17 +01:00
Milos Kozak
6e19d60796
Scale -> kt
2021-05-26 14:17:49 +02:00
Andy Rozman
029eb55f0e
- changes according to comment in PR
...
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
2021-05-26 13:14:17 +01:00
Milos Kozak
43e6ba43b6
fix expiring intervals
2021-05-26 09:01:22 +02:00
Philoul
3a24af1a4c
Merge branch 'dev' into FixSensScale
2021-05-25 22:56:00 +02:00
Milos Kozak
84cc4d0c00
fix setting din in profile
2021-05-25 22:10:12 +02:00
Milos Kozak
e170503f82
lint
2021-05-25 21:53:00 +02:00
Milos Kozak
3d1b7e8ded
fix updating non basal profile changes
2021-05-25 21:19:18 +02:00
Milos Kozak
3ed45fdd11
improve NS profile sync
2021-05-25 20:59:41 +02:00
Milos Kozak
bee6d289c0
HistoryBrowseActivity
2021-05-25 17:42:21 +02:00
Andy Rozman
e24af3934f
- refactorings kotlin !!
...
- moved 2 filed into pump-common module (newly created)
2021-05-24 16:57:54 +01:00
Milos Kozak
966f7b35f2
move treatments to upper right menu
2021-05-23 21:38:30 +02:00
Philoul
6532d9111e
Fix same curve on different graphs
2021-05-23 15:28:33 +02:00
Philoul
62c063a5bc
Fix Sens curve scale if alone on a graph
...
=> I also fix deviation slope curve if secondary behind Sens curve
2021-05-23 14:37:18 +02:00
Philoul
37bd7495fd
Convert status Message to Kotlin (+ associated null management in localInsightPlugin)
2021-05-23 10:50:37 +02:00
Milos Kozak
ea940ea165
remove redundant carbTime
2021-05-22 21:24:49 +02:00
Andy Rozman
4dcc8dc46f
- removed dropbox files
2021-05-22 10:26:32 +01:00
Milos Kozak
6e012ec75f
fix dbUpdate
2021-05-21 22:53:49 +02:00
Milos Kozak
bd8787c209
update iob regularly
2021-05-21 22:53:34 +02:00
Milos Kozak
0bb52acfe0
fix therapy event rendering
2021-05-21 17:24:33 +02:00
Milos Kozak
af3df53f10
fix receiving dexcom calibrations
2021-05-21 15:49:42 +02:00
Milos Kozak
11f00d1776
make it compile with kotlin 1.4
2021-05-20 19:42:44 +02:00
Milos Kozak
b548325059
lints
2021-05-18 22:31:08 +02:00
Milos Kozak
328ec9a9ff
Merge pull request #523 from Philoul/FIX_Extended_Remove
...
Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment
2021-05-18 21:40:15 +02:00
Philoul
1606b8c274
Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment
...
More information in uel.log added and Fix information for Absolute / Percent values
2021-05-18 18:28:03 +02:00
Milos Kozak
219dfd375f
disable unfinished plugins
2021-05-17 21:17:15 +02:00
Milos Kozak
a1c1355ce6
MVVM like for overview
2021-05-17 21:05:24 +02:00
Andy Rozman
06f079d6fd
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-17 00:42:18 +01:00
Andy Rozman
fd5e7a3c5c
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-17 00:20:44 +01:00
Milos Kozak
3040be317c
TBR as live
2021-05-14 21:45:48 +02:00
Milos Kozak
1af0cc5aeb
NSClient sync improvement
2021-05-14 08:54:11 +02:00
Milos Kozak
6c851b5e7b
Merge pull request #517 from Philoul/LoopDialog_Improvement
...
Loop Dialog improvement
2021-05-13 17:47:33 +02:00
Milos Kozak
60cae5c2bd
Merge branch 'dev2_dana_combo_only' into Fix_NSClient_UseAbsolute
2021-05-13 17:46:10 +02:00
Milos Kozak
e83375f754
NSClient update
2021-05-13 17:44:07 +02:00
Andy Rozman
14b7895f20
- final changes on Bolus (checking if bolus entry was changed in last 35 minutes)
...
- added class for Dropbox support (not yet implemented)
2021-05-13 13:33:25 +01:00
Philoul
9d87dec574
NSClient Fix Use Absolute
2021-05-12 18:28:52 +02:00
Milos Kozak
bcd74897d4
Merge pull request #502 from Philoul/dev2_Insight_v2
...
Dev2 insight v2
2021-05-12 11:12:53 +02:00
Philoul
3b581dce49
uel.log Fix Source for Dexcom calibration and Sensor insertion
2021-05-12 01:24:03 +02:00
Philoul
8819859e7c
Merge remote-tracking branch 'Nightscout/dev2_dana_combo_only' into dev2_Insight_v2
2021-05-12 00:31:41 +02:00
Milos Kozak
50720b8497
NSClient mode sync
2021-05-11 21:24:39 +02:00
Philoul
afb16210ae
Remove old insight db tables
2021-05-09 17:02:20 +02:00
Philoul
dfd6c6e859
Move Insight database package outside plugins\pump
2021-05-07 11:33:51 +02:00
Philoul
f789888afd
Fix SMB
...
remove comment linked to previous version
2021-05-07 10:21:34 +02:00
Andy Rozman
9526e8228b
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-05 17:02:03 +01:00
Andy Rozman
3b35c01f22
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-05 16:59:01 +01:00
Andy Rozman
12a3609565
- started working TBR
...
- added Dropbox stuff (not part of project)
2021-05-05 16:57:48 +01:00
Milos Kozak
0f2f5cd1fa
Profile sync, removed NSProfile
2021-05-04 21:07:47 +02:00
Milos Kozak
88f5eec306
do not run AcceptTemp on UI thread
2021-05-03 20:46:23 +02:00
Milos Kozak
e8ecf43894
ProfileSwitch improvements, resolve initial PS
2021-05-03 18:19:10 +02:00
Milos Kozak
5d55bdadf4
Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-03 14:59:20 +02:00
Milos Kozak
07b3557b81
NSClientService -> kt
2021-05-03 14:59:10 +02:00
Milos Kozak
ac7da44336
Merge pull request #498 from jotomo/dev2_dana_combo_only
...
Fix: turn APSResult.bolusRequested into a function.
2021-05-03 14:42:59 +02:00
Milos Kozak
840de7b3b9
NSClient -> kt
2021-05-03 14:15:19 +02:00
Milos Kozak
c75d4e8e4e
eliminate old NS sync style
2021-05-03 12:49:11 +02:00
Milos Kozak
37bc7c040c
invalidateTemporaryBasalWithTempId
2021-05-03 10:56:26 +02:00
Milos Kozak
e17f96ac5c
Merge pull request #497 from jotomo/dev2-cd+insight
...
Insight fixes and refactorings
2021-05-03 09:36:03 +02:00
Milos Kozak
5747f97201
DanaHistoryDatabase
2021-05-03 09:33:14 +02:00
Andrei Vereha
e3f7608de7
Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge
2021-05-01 20:11:48 +02:00
Andy Rozman
67a2c0dca3
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-01 12:11:29 +01:00
Andy Rozman
5abdba0579
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-01 11:26:53 +01:00
Johannes Mockenhaupt
dc2d64ceb7
Fix: turn APSResult.bolusRequested into a function.
...
Previously this var was set while parsing determine-basal output, setting it to true if determine-basal provided a value which was assigned to var smb. However, the variable smb is changed when constraints are applied, making the val bolusRequested invalid afterwards. Hence, dynamically evaluate the smb var by turning bolusRequested into a function.
2021-05-01 00:23:32 +02:00
Milos Kozak
e48d317d55
ProfileSwitch NS sync
2021-04-30 17:21:24 +02:00
Andy Rozman
6504498cd2
- added bolus handling (complete)
...
- added PumpSyncStorage class for handling temporary data
2021-04-30 15:28:24 +01:00
Milos Kozak
37e3c4532a
Profiles -> room (no NS sync yet)
2021-04-29 20:42:45 +02:00
Johannes Mockenhaupt
970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor().
2021-04-29 14:51:04 +02:00
Andy Rozman
727862c743
- DailyTotals changes
...
- GraphData merge
2021-04-25 18:15:53 +01:00
Andy Rozman
e7d4f57c84
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-04-24 19:22:57 +01:00
Andy Rozman
edb7f42e7f
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-04-24 19:19:09 +01:00
Philoul
e7578b4c8f
Loop Dialog, hide loop buttons if pump disconnected or loop suspended
2021-04-23 00:31:40 +02:00
Andy Rozman
08a5c50037
- kotlin changes almost done, 1 file left
2021-04-20 23:23:03 +01:00
Milos Kozak
cada2919d1
prepare Profile interface
2021-04-19 18:44:17 +02:00
Milos Kozak
430a871993
fix DeviceStatus upload
2021-04-18 18:31:21 +02:00
Milos Kozak
3928b579a7
TDD -> room
2021-04-18 13:31:25 +02:00
Andy Rozman
99946dd728
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-04-16 21:49:31 +01:00
Milos Kozak
481ba32b3b
Merge remote-tracking branch 'ns/dev' into dev2_dana_combo_only
2021-04-15 18:38:32 +02:00
Philoul
90ff9d972b
Fix order of curves for scale
2021-04-15 00:10:08 +02:00
Philoul
f08eefbf9c
Fix Scale
2021-04-14 23:30:04 +02:00
Milos Kozak
4effade9a4
lints
2021-04-14 23:10:11 +02:00
Milos Kozak
9c8f99b331
lints
2021-04-14 23:07:17 +02:00
Milos Kozak
312136451b
ProfileInterface rename
2021-04-14 22:58:21 +02:00
Milos Kozak
bb82f41b9e
NotificationHolderInterface rename
2021-04-14 22:44:24 +02:00
Milos Kozak
4e604124c5
SmsCommunicatorInterface rename
2021-04-14 22:37:34 +02:00
Philoul
015ec3a937
Merge branch 'dev' into test_sec_scale
2021-04-14 22:32:35 +02:00
Philoul
591e9bab89
100% for 0 value
2021-04-14 22:31:49 +02:00
Milos Kozak
24164eee98
PumpInterface rename
2021-04-14 19:36:13 +02:00
Milos Kozak
eacdbffebc
ImportExportPrefsInterface rename
2021-04-14 19:15:10 +02:00
Milos Kozak
6ac01a26cd
DanaRInterface rename
2021-04-14 19:03:50 +02:00
Milos Kozak
176fc4bb47
ConstriantsInterface rename
2021-04-14 19:01:49 +02:00
Milos Kozak
8ecc02c994
rename ConfigInterface
2021-04-14 18:42:12 +02:00
Milos Kozak
58c185a75a
Workers for NSAcks
2021-04-14 15:54:09 +02:00
Milos Kozak
c04993ddad
rename interfaces, cleanup
2021-04-14 00:45:30 +02:00
Milos Kozak
3aa38d46bb
ConfigBuilderInterface rename
2021-04-13 23:27:55 +02:00
Milos Kozak
05bfb957ec
IconsProvider rename
2021-04-13 23:02:47 +02:00
Milos Kozak
e57c9ea0b8
utils -> kt
2021-04-13 22:52:40 +02:00
Milos Kozak
429842ecd0
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
2021-04-13 18:35:15 +02:00
Milos Kozak
7e5cf23115
remove logging
2021-04-13 18:35:10 +02:00
Milos Kozak
36040b7ed2
IobCobCalculator refactor
2021-04-13 18:33:44 +02:00
Milos Kozak
25de9a60f6
Merge pull request #469 from Philoul/meallink_VWU_v2
...
Remove StringResource
2021-04-13 15:37:20 +02:00
Milos Kozak
c637b7072c
IobCobCalculator refactor
2021-04-12 19:49:12 +02:00
Milos Kozak
639328bdc3
show bucketed data in dev mode
2021-04-12 16:04:06 +02:00
Milos Kozak
a6b67b2bb7
optimize events for IobCobCalculator
2021-04-12 14:31:15 +02:00
Milos Kozak
aadeeeebbf
lints
2021-04-11 22:03:22 +02:00
Philoul
0ad53011c1
Merge branch 'meallink' into meallink_VWU_v2
2021-04-11 18:09:20 +02:00
Milos Kozak
dcc0b040df
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
2021-04-11 17:59:02 +02:00
Milos Kozak
8ce5a881d3
_now() -> now()
2021-04-11 17:58:50 +02:00
Milos Kozak
998eba8b9f
DateUtil -> kt, static funcs removed
2021-04-11 17:47:55 +02:00
Philoul
09aa909cd6
Move uel.log outside Callback
2021-04-11 16:11:37 +02:00
Philoul
f5330287e9
Replace ValueWithUnit.StringResource by ValueWithUnit.SimpleString
2021-04-11 16:02:53 +02:00
Milos Kozak
b0a12dab1a
Merge pull request #468 from Philoul/meallink_VWU_v2
...
Fix double Entries in Treatment Dialog (+ add new uel.log for plugin enabled/disabled
2021-04-11 08:39:43 +02:00
Philoul
62443f6738
Merge branch 'meallink' into meallink_VWU_v2
2021-04-10 20:44:08 +02:00
Philoul
4d1f330064
Fix double userEntry with VirtualPump if we enter Carbs + Insulin
2021-04-10 19:56:28 +02:00
Philoul
baa37c4e3a
uel.log for plugin enabled / disabled
2021-04-10 19:55:24 +02:00
Milos Kozak
ebf0781f47
Merge pull request #466 from Philoul/meallink_VWU_v2
...
New uel.log
2021-04-10 18:23:40 +02:00
Milos Kozak
4eef2507fb
fix tests
2021-04-10 12:19:31 +02:00
Philoul
c728f8689b
uel.log for Start and Exit AAPS
2021-04-10 11:35:38 +02:00
Milos Kozak
194cf305fd
Rv2,RKorean
2021-04-10 10:41:53 +02:00
Philoul
5a143b5444
Merge branch 'meallink' into meallink_VWU_v2
2021-04-09 12:38:42 +02:00
Philoul
5023225650
Add uel.log for Alert Carbs required
2021-04-09 12:00:33 +02:00
Milos Kozak
4120e9eef9
DanaR working
2021-04-09 08:02:46 +02:00
Philoul
ff0e6e9c87
Use icon of activeBgSource for uel Log
2021-04-08 18:47:00 +02:00
Philoul
8bba73a6ca
Fix Plugin Type for BGSource in PluginStore.kt
...
I don't know if it could have side effect...
2021-04-08 11:24:10 +02:00
Philoul
6114effb22
Add BG sources for uel (Calibration and Sensor Change)
2021-04-08 10:06:00 +02:00
Philoul
ffa9c04496
Remove dependency and create 2 classes for drivers
2021-04-06 23:30:16 +02:00
Philoul
e490c2df04
Update uel.log NSClientAddUpdateWorker
2021-04-06 00:43:51 +02:00
Milos Kozak
d27b7a6139
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
2021-04-05 23:13:17 +02:00
Milos Kozak
2463f8fc47
ExtendedBolus, TemporaryBasal -> room, DanaRS working
2021-04-05 22:41:28 +02:00
Philoul
f74cd6796f
Same Color for DEV and BGI in menu + SEN value * 100
2021-04-05 10:44:52 +02:00
Philoul
1e4983e659
Merge branch 'meallink' into meallink_ValueWithUnit
2021-04-04 19:55:36 +02:00
Milos Kozak
0782878725
Merge pull request #458 from nightscout/meallink-carb-callback
...
callback if carbs are added to db but not pump
2021-04-04 16:18:27 +02:00
Philoul
cc3919e9fc
Add SITE/RESERVOIR CHANGE Action and improve Colors
2021-04-04 15:05:43 +02:00
Philoul
22c1233201
Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Philoul
3cc7a72b3d
Fix XXXValueWithUnit Refactoring
2021-04-04 09:20:02 +02:00
AdrianLxM
94a0283eb6
callback if carbs are added to db but not pump
2021-04-03 22:51:34 +02:00
AdrianLxM
d62456f2e2
Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit
2021-04-03 21:34:41 +02:00
AdrianLxM
c2b3e617df
pair programming session
2021-04-03 21:29:26 +02:00
Philoul
ae9503dcc0
Add StringResource to uel.log Food
2021-04-03 19:04:08 +02:00
Philoul
206bac6da8
Safe Delete old ValueWithUnit Class in UserEntry
2021-04-03 12:51:49 +02:00
Philoul
dc87bfa303
Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions
2021-04-03 12:25:44 +02:00
Philoul
442e64e3f0
Add dao for Fragment
2021-04-02 18:59:41 +02:00
Milos Kozak
e26e023ebf
prepare TemporaryBasal
2021-04-01 23:46:21 +02:00
Philoul
bb147deb92
CalibrationDialog + CarbDialog
2021-04-01 23:22:22 +02:00
Philoul
16959d4de9
Merge branch 'meallink' into meallink_ValueWithUnit
2021-04-01 23:02:52 +02:00
Philoul
9b9bafb4bc
CarePortal, ExtendedBolusDialog, FillDialog, InsulinDialog
...
Some cleaning in Imports
2021-04-01 22:59:05 +02:00
Philoul
1a1d718fa2
TreatmentDialog (fix missing uel.log if only carbs), BolusWizard, and TempTargetDialog
2021-04-01 22:23:53 +02:00
Philoul
83f4d25527
UserEntry refactor to include XXXValueWithUnit (Loop Dialog and ProfileSwitchDialog only)
2021-04-01 19:27:13 +02:00
Philoul
a07b685e8d
UserEntry refactor to include XXXValueWithUnit (first test)
2021-04-01 18:26:13 +02:00
Milos Kozak
46793abbfc
Treatment cleanup
2021-04-01 18:14:31 +02:00
Philoul
e13e5e10eb
Merge branch 'meallink' into meallink_ValueWithUnit
2021-04-01 08:13:48 +02:00
Milos Kozak
699413dd6f
fix tests
2021-04-01 00:37:15 +02:00
Milos Kozak
ab0f64bd46
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
2021-04-01 00:03:54 +02:00
Milos Kozak
2df8c4fc74
provide Worker failure results
2021-04-01 00:03:49 +02:00
Milos Kozak
28f366d5fe
Merge pull request #453 from jotomo/meallink+revert-lint-suggestion
...
Revert incorrect Lint suggestion.
2021-04-01 00:01:14 +02:00
Milos Kozak
cacf239d17
VirtualPump plugin remove init
2021-03-31 22:59:05 +02:00
Philoul
3d9ef71045
Merge branch 'meallink' into meallink_ValueWithUnit
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
2021-03-31 22:18:50 +02:00
Milos Kozak
a5ea0d9027
DeviceStatus
2021-03-31 21:54:49 +02:00
Johannes Mockenhaupt
edcdc4c785
Revert incorrect Lint suggestion.
2021-03-31 20:44:35 +02:00
Philoul
ab0c739281
Clean Imports and add missing Sources in existing uel
2021-03-31 00:18:55 +02:00
Philoul
21f382f0ae
Remove unused code
2021-03-30 23:29:43 +02:00
Philoul
348c260d3d
QuickWizard
2021-03-30 23:13:20 +02:00
Philoul
bf218e9ff4
Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
2021-03-30 23:05:19 +02:00
Milos Kozak
299d0a9b01
finish Dana pumps
2021-03-30 22:45:45 +02:00
Philoul
9b0226719f
Remove used import
2021-03-30 22:25:28 +02:00
Philoul
78a98358d7
Add QuickWizard Source (final solution)
2021-03-30 22:20:21 +02:00
Milos Kozak
07d060c2b5
carbs with duration
2021-03-30 22:05:44 +02:00
Milos Kozak
1ae4823a9a
Merge remote-tracking branch 'ns/dev' into meallink
2021-03-30 19:39:22 +02:00
Milos Kozak
e9f4f87894
Remove Tratment.class where possible
2021-03-30 19:37:26 +02:00
Philoul
07e2e0eaf4
Add QuickWizard Source (final solution)
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
2021-03-30 12:22:49 +02:00
Philoul
61d84e66fe
Add QuickWizard Source (Solution TBC, information got through Note, so I create a "complicated String" to avoid Fake QuickWizard in UserEntry)
2021-03-29 23:47:21 +02:00
Philoul
d607b855b0
Add QuickWizard Source (not sure if it's the best solution...)
2021-03-29 23:03:53 +02:00
Philoul
6c8b4dfab0
Merge branch 'meallink' into meallink_ValueWithUnit
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
2021-03-29 22:39:12 +02:00
Philoul
e829a6918c
Fix uel after merge
2021-03-29 22:30:44 +02:00
Milos Kozak
cb298a2646
eliminate treatments cache from TreatmentsPlugin
2021-03-29 19:15:46 +02:00
Philoul
22384ef2e8
Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
# combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
# core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
# core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
# omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
2021-03-29 13:51:28 +02:00
Philoul
6956a17bf6
Move Colored Action to UserEntryPresentationHelper.kt
...
Treatment is now replaced by Bolus + Carbs (blue and orange)
2021-03-29 09:49:08 +02:00
Milos Kozak
f37e3ab4c2
Simplify IOB calculation call
2021-03-29 09:43:25 +02:00
Milos Kozak
e3ac451f8d
PumpSync interface, VirtualPump, remove pump driver dependency to database
2021-03-29 00:31:40 +02:00
Philoul
74b911d875
Remove SerializedName (all) and Text (Sources)
2021-03-28 21:45:40 +02:00
Philoul
9d4a1d5944
Remove UserEntryExt file and move UserEntryPresentationHelper.kt in utils folder
2021-03-28 18:52:13 +02:00
Philoul
09349fddd4
Fix Action Name and Translator
2021-03-28 17:54:18 +02:00
Philoul
87fecfd255
Fix Build 2
2021-03-28 17:37:32 +02:00
Philoul
654ca35dd1
Merge branch 'UserEntryImprovement' into AdrianVWU_Update
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
2021-03-28 17:04:52 +02:00
Milos Kozak
df1e2c53db
Bolus, Carbs, BolusCalcResult new way of upload to NS
2021-03-28 13:45:27 +02:00
AdrianLxM
4e77902bdb
correct call of teardown wear plugin
2021-03-27 23:35:57 +01:00
