Commit graph

7505 commits

Author SHA1 Message Date
Philoul
7fc215db90 Add byoda icon for CGM button 2021-12-06 23:06:27 +01:00
swissalpine
98f2df943c
Allow/reenable the setting of TempTargets while pump is suspended or disconnected
Unfortunately, it is currently no longer possible to set a TempTarget when the pump is disconnected or suspended (TBR: 0%). This seems logical at first sight (why a TempTarget when the pump is not connected or the loop suspended!), but prevents many useful possibilities, namely when the TempTarget should be set immediately after the disconnection or suspension has expired.
An example of this are f. e. sport activities: To reduce IOB, I set a 0% TBR half an hour before sport for one hour with the function "pump disconnected", so that the associated 0% TBR continues for a while while sport starts. I also set a three hour Activity TempTarget. This continues to be active when the pump loops again with the pump disconnected time expired.
The fix allows/reenables setting a TempTarget even if the pump is suspended or disconnected.
2021-12-05 14:11:51 +01:00
Milos Kozak
2ec9517b02
Merge pull request #1030 from Philoul/Fix/UserEntryUnitsConvertion
User entry Add Glucose Value in TherapyEvents NSClient
2021-12-04 13:35:23 +01:00
Milos Kozak
4a899365db Poctech: fix unit conversion 2021-12-03 19:29:45 +01:00
Milos Kozak
d7a4740e7d do not clear disk full message 2021-12-02 21:07:12 +01:00
Milos Kozak
9c09b3c526 better logs 2021-12-02 09:49:31 +01:00
Milos Kozak
6ba6cd6edd mark too close BG records 2021-11-30 22:03:19 +01:00
Philoul
9f6a2fcc4e Add BG value in CarePortal events 2021-11-30 21:55:24 +01:00
Milos Kozak
21818546e7
Merge pull request #1010
Fix user entry units convertion
2021-11-30 21:33:06 +01:00
Milos Kozak
babbf8e7c9 hide controls if pump is disconnected 2021-11-30 21:21:30 +01:00
Philoul
98ef5768be Fix Calibration value in uel.log 2021-11-30 20:25:48 +01:00
Milos Kozak
85140a9c2e Loop cleanup 2021-11-30 17:08:31 +01:00
Milos Kozak
102f73fbc9 reset AS on PS instead of EPS 2021-11-29 23:13:52 +01:00
Philoul
009d428e89 Add glucose value for calibration (DexcomPlugin and GlunovoPlugin)
=> To review
2021-11-29 22:56:18 +01:00
Milos Kozak
370b504d74 improve notification dismiss 2021-11-29 22:36:20 +01:00
Milos Kozak
ac62217984 allow bolus update in NSC mode 2021-11-29 19:06:04 +01:00
Milos Kozak
7f3f1c6c8b fix RandomBg start interval 2021-11-29 18:06:39 +01:00
Milos Kozak
3ee1a3a9d8 hide insulin plugin in NSClient mode 2021-11-29 17:26:29 +01:00
Milos Kozak
3739db489f Fix EB sync 2021-11-29 08:29:13 +01:00
Milos Kozak
28a6a0a8ab wrong logging tag 2021-11-28 22:40:33 +01:00
Milos Kozak
9ca1ab1f83 allow other kinds of identification 2021-11-28 18:20:52 +01:00
Milos Kozak
7374ff2eb1
Merge pull request #990 from 0pen-dash/avereha/hide-do-not-bolus
hide "do not bolus"
2021-11-27 23:15:13 +01:00
Milos Kozak
6095a29595 unify Handlers 2021-11-25 20:19:27 +01:00
Andrei Vereha
3dae8bfd6f hide the 'do not bolus' box 2021-11-25 19:26:43 +01:00
Milos Kozak
0dbfa6182f DanaRS: improve history sync 2021-11-24 21:31:23 +01:00
Milos Kozak
6c990a4423
Merge pull request #965 from Philoul/Nex/AddMoreStrings
Add strings for Command Queue translation
2021-11-23 23:21:19 +01:00
Milos Kozak
2b6e51cbfd Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-11-23 23:15:56 +01:00
Milos Kozak
38738018ef AutosensData -> kt 2021-11-23 23:15:51 +01:00
Milos Kozak
090994ab51 DataPointWithLabelInterface -> kt 2021-11-23 22:20:59 +01:00
Milos Kozak
e0268a1172 ToastUtils -> kt 2021-11-23 21:34:50 +01:00
Milos Kozak
68793233e8 NumberPicker -> kt 2021-11-23 19:53:45 +01:00
Milos Kozak
95deaf8b98 fix processing automations 2021-11-22 16:26:33 +01:00
Philoul
518f283650 Add string Command Queue 2021-11-21 19:32:52 +01:00
Milos Kozak
2aa85c80a6
Merge pull request #962 from Philoul/New/StringsForReadStatusreason
Add strings for readstatus reason
2021-11-21 10:56:38 +01:00
AdrianLxM
f668cc4af3
Update PersistentNotificationPlugin.kt 2021-11-20 22:20:54 +01:00
AdrianLxM
e4c3e4c560
Update NotificationHolderImpl.kt 2021-11-20 22:20:08 +01:00
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