caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
8025 commits 1 branch 20 tags 140 MiB
Commit graph

6912 commits

Author SHA1 Message Date
Andy Rozman
cc7100472b - Bug #51 - changed area displaying data for init_pod, area is now 150dp (previously 140dp), but marging bottom was changed from 30dp to 20dp... Needs to be checked if its ok now... 2020-01-12 18:00:21 +01:00
Andy Rozman
bee2a1b21c - changed version to omnipod-0.2-SNAPSHOT 2020-01-12 13:50:46 +01:00
Andy Rozman
08ccfe8488 - changed version to 0.1 (from snapshot) 2020-01-12 13:35:16 +01:00
Andy Rozman
c336ceba33 - trying to fix problem with exception 2020-01-12 12:42:10 +01:00
Andy Rozman
be88aa69f1 - possible fix for pod not avilable notification 2020-01-12 11:59:38 +01:00
Milos Kozak
1a7da7cc1d
New Crowdin translations (#2351) 
* New translations insight_alert_descriptions.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Italian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)
 2020-01-10 17:56:57 +01:00
Milos Kozak
ae87a6ae0c Fix statistics activity 2020-01-10 00:01:42 +01:00
Milos Kozak
67b3b2613d filter bad records in db 2020-01-09 23:30:40 +01:00
Andy Rozman
18145d91d9 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-07 22:40:28 +01:00
Andy Rozman
39ce23ec86 - notification that pod is not available... Will be refreshed every 15 minutes. 2020-01-07 22:37:37 +01:00
Bart Sopers
3a8cc12853 Add fixed 'pump unreachable' alerts for Omnipod 2020-01-07 19:26:01 +01:00
Bart Sopers
ceca00ca50 Fix cancel TBR type in Pod history 2020-01-06 22:35:24 +01:00
Bart Sopers
a2255a83cc Round to supported rates for basal, temp basal and bolus 2020-01-05 18:28:57 +01:00
Bart Sopers
d4df928aac Change insert cannula text a little 2020-01-05 18:09:00 +01:00
swissalpine
a58a6540f2
Last inverted function void handleAge() 2020-01-05 16:12:50 +01:00
swissalpine
0326f854db
Adjust handleAge too 2020-01-05 15:51:27 +01:00
Andy Rozman
9f215e607c - moving classes around a little for init pod 
- change text
 2020-01-05 15:33:35 +01:00
Andy Rozman
adf1d892da - saving last error data, when error comes 2020-01-04 16:23:35 +01:00
Milos Kozak
a5393eff84 revert TRB displaying 2020-01-03 22:52:21 +01:00
swissalpine
9b6e97e1f2
Fix for mixed up bage_warn, bage_urgent for Combo in Statuslights 
Fixes the small bug mentioned in https://github.com/MilosKozak/AndroidAPS/issues/2320
 2020-01-03 06:56:27 +01:00
Andy Rozman
db117bf736 - change order of display 2020-01-02 23:56:54 +01:00
Andy Rozman
d58075a93c - fixed problem parsing Bolus 
- reworked storing of Profile, instead of Profile we use Profile.ProfileValue[]
 2020-01-02 23:22:57 +01:00
Milos Kozak
1b4d06101d Fix creating careportal entries in Actions tab 2020-01-02 18:25:49 +01:00
Andy Rozman
7097689c28 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-02 09:47:28 +01:00
Andy Rozman
ef037470af - trying to do Profile another way 2020-01-02 09:47:13 +01:00
Bart Sopers
b08045b326 Automatically retry bolus cancellation and show error when setting TBR fails due to a PodFaultException 2020-01-02 01:08:18 +01:00
Milos Kozak
9e9ae3cf91 Allow date in CarbsDialog 2020-01-02 00:40:03 +01:00
Andy Rozman
57c35bad58 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-02 00:22:11 +01:00
Andy Rozman
0fdcb862a6 - small logging so that we can fix this date parsing problem 2020-01-02 00:11:09 +01:00
Milos Kozak
d71f036dba Revert in range color 2020-01-01 23:44:13 +01:00
Milos Kozak
1b513cabbd
New Crowdin translations (#2316) 
* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)
 2020-01-01 23:40:54 +01:00
Bart Sopers
2e926c5d8e Fix compile error 2020-01-01 23:40:38 +01:00
Milos Kozak
f1a72a3897
Merge pull request #2321 from osodebailar/refactor-header-area 
issue #2318 Refactor header area destroys layout on Atom . Fixed smal…
 2020-01-01 23:40:14 +01:00
Bart Sopers
511c078659 Revert "Add string resource" 
This reverts commit 5f4c12e487.
 2020-01-01 23:19:16 +01:00
Bart Sopers
5f4c12e487 Add string resource 2020-01-01 23:02:32 +01:00
Andy Rozman
5230a2dda0 - moved PumpHistoryEntryGroup to commons package 
- added ProfileUtil with method to show basal profile so that we can display it
- changed PodHistoryActivity to display values (for Bolus, TBR and SetProfile)
 2020-01-01 18:45:15 +01:00
Andy Rozman
827eee0c3a - removed cancel TBR 2019-12-30 21:35:30 +01:00
Andy Rozman
af44d4e7f7 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-30 21:26:35 +01:00
Andy Rozman
8610f47cdf - remove cancel TBR from OmnipoPump code 2019-12-30 21:25:35 +01:00
Bart Sopers
a17defb817 Report implicitly cancelled tbr when deactivating pod or resetting pod state 2019-12-30 13:32:06 -05:00
Bart Sopers
05d09e3530 Revert "Prevent TBR from being cancelled twice when setting a new TBR" 
This reverts commit 12a71b8d3e.
 2019-12-30 13:11:30 -05:00
Andy Rozman
1668b2634c - extension for ErrorHelperActiviity to prevent NPE 2019-12-30 18:43:44 +01:00
Andy Rozman
9de968cb26 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-30 18:37:26 +01:00
Andy Rozman
17ab0db4c3 - extended ErrorDialog to support adding to clipboard 
- changed PodDebug code to send code there...
- fixed Bolus code
 2019-12-30 18:34:49 +01:00
Bart Sopers
168dffc7fc Don't emit sound for pulse log dialog 2019-12-30 12:04:00 -05:00
Andy Rozman
b463f915e1 - fixed cancel Tbr reporting 2019-12-30 17:50:30 +01:00
Andy Rozman
f110ab2ba3 - database bolus + treatments AAPS 
- database TBR + treatments AAPS
- refactoring bolus a little
 2019-12-30 17:30:54 +01:00
Andy Rozman
0260b68fa8 - fixes for init pod #44 2019-12-30 14:38:19 +01:00
Andy Rozman
54464cf2b6 - added cpying to cplipboard for PodInfoRecentPulseLog (#41) 
- added returning pumpId from addToHistory method, so that we can use it
 2019-12-30 13:06:05 +01:00
osodebailar
bff51df41d issue #2318 Refactor header area destroys layout on Atom . Fixed small_layout to 'extra small' displays like atom 2019-12-30 11:02:26 +01:00
Andy Rozman
9dee52cd0f Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-29 22:15:58 +01:00
Andy Rozman
95623c123b - making text for initpod smaller. #47 2019-12-29 22:15:27 +01:00
Bart Sopers
943a9f0e20 Knit in Omnipod translations 2019-12-29 12:21:35 -05:00
Bart Sopers
991bde8182 Processed @ZandMarc's suggestions for init Pod wizard strings 2019-12-29 12:16:18 -05:00
Bart Sopers
a79a1c1108 Rename PodInfo*HighFlashLogDump to PodInfo*PulseLog and don't show spaces in hex string when showing the response of these commands (as per suggested by @itsmojo) 2019-12-28 21:56:10 -05:00
Milos Kozak
f1c3b5c23d
New Crowdin translations (#2289) 
* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)
 2019-12-28 22:07:47 +01:00
Milos Kozak
82882c52e6
Merge pull request #2305 from osodebailar/refactor-header-area 
refactor overview with new header area and better formated user value…
 2019-12-28 22:06:49 +01:00
Andy Rozman
16da0358eb Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-28 21:22:21 +01:00
Andy Rozman
7628e1d0a7 - fix for #44 2019-12-28 21:22:06 +01:00
Johannes Mockenhaupt
244e99f5c9
Refactor: improve misleading method name. 2019-12-28 17:10:19 +01:00
Andy Rozman
a719d44851 - add logging to task 2019-12-28 13:14:07 +01:00
Bart Sopers
ae0e18e128 Show error dialog for uncertain bolus 2019-12-27 19:32:50 -05:00
Andy Rozman
c3236352d4 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-27 21:18:02 +01:00
Andy Rozman
a55f12ebb8 - temporary solution for Pod Debig thingy 2019-12-27 21:17:35 +01:00
Bart Sopers
e8ca4259e1 Rename pulse log related stuff in UI 2019-12-27 14:27:18 -05:00
Bart Sopers
10ab880e28 Retry Get pulse log command in case of failure 2019-12-27 13:51:20 -05:00
Bart Sopers
6d377d7b6a Handle exceptions when retrieving pod pulse log 2019-12-27 13:31:40 -05:00
Bart Sopers
5cbb5c8baa Improve some Omnipod translations 2019-12-27 12:54:59 -05:00
Bart Sopers
6e47d096a9 Fix compilation error 2019-12-27 10:13:18 -05:00
Bart Sopers
12a71b8d3e Prevent TBR from being cancelled twice when setting a new TBR 2019-12-27 10:10:56 -05:00
Andy Rozman
3ebb85df46 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-27 11:07:57 +01:00
Andy Rozman
72b32be6f6 - added command for Pod Debugging as async (with pump queue) 2019-12-27 11:04:54 +01:00
Bart Sopers
505604580d Use shorter beep for cancel delivery 2019-12-26 19:50:58 -05:00
Bart Sopers
bcb7530a9a More logging 2019-12-26 14:06:29 -05:00
Bart Sopers
641b0a800e Also sound beeps for cancellng current (temp) basal when setting (temp) basal 2019-12-26 13:57:56 -05:00
Bart Sopers
1c8c49e61e Ignore Pod fault when cancelling delivery before deactivating pod 2019-12-26 13:47:24 -05:00
Bart Sopers
06e72b89a0 Match PDM beep type for cancel delivery, log status response after cancelling delivery 2019-12-26 13:27:11 -05:00
Milos Kozak
c7e1338d66
Leaked certificate update 2019-12-26 18:52:09 +01:00
Andy Rozman
64310f4e28 - small change of disposable for display of 5th button 2019-12-25 21:54:21 +01:00
Andy Rozman
3ceb5f46d8 - added Notification when Time/TZ change is made 
- changed code to display dialog
 2019-12-25 21:49:35 +01:00
Andy Rozman
b80fc3851c Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-25 19:24:47 +01:00
Andy Rozman
c589993985 - added Pod debug button (its 5th button and needs to be enabled in configuration) 
- changed PodHistoryActivity to use PodHistory entries, removed filter for now, and values are not yet supported
- added configuration for debug button
- extended DatabaseHelper t retrive PodHistory for last day...
 2019-12-25 19:21:22 +01:00
osodebailar
1186360df4 reactivate bad tuerkis and format basal 2019-12-25 17:01:38 +01:00
Bart Sopers
4e8018cd20 Improve error handling for set temp basal command and add logging for updating suspended state 2019-12-25 10:27:21 -05:00
osodebailar
a746b0fe05 add average delta again and refactor NS Client 2019-12-25 16:04:52 +01:00
Milos Kozak
61411e6bd6
Merge pull request #2303 from rkresha/dev 
Medtronic clarify error notification "Basal profiles are not enabled on pump"
 2019-12-25 13:42:50 +01:00
osodebailar
a4137a2c3b Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into refactor-header-area 2019-12-25 12:18:14 +01:00
Milos Kozak
967777f0f8
Merge pull request #2309 from andyrozman/bug_2292_doublebolus_again 
- added code to remove Treatment entries, without any insulin (for sy…
 2019-12-25 11:29:15 +01:00
Bart Sopers
0ebfc353d4 Try to retrieve pulse log before deactivating pod for diagnostics 2019-12-24 19:12:39 -05:00
Bart Sopers
36a1a13846 Don't pad messages that contain a DeactivatePodCommand message block and don't use verification for deactivatePod 2019-12-24 15:39:49 -05:00
Bart Sopers
aea725e9ad Add readPulseLog method in AapsOmnipodManager 2019-12-24 13:06:26 -05:00
Bart Sopers
49a9ddf72d Various small fixes/improvements 
- Throw podFaultException in OmnipodManager.cancelBolus() and handle in AapsOmnipodManager
- Sound confirmation beep when deactivating pod
- Add logging in verifyCommand
 2019-12-24 12:08:39 -05:00
Bart Sopers
3cb58133dd Use BeepConfigCommand as a workaround for strange beep behavior in CancelDeliveryCommand when cancelling multiple delivery types. 2019-12-24 11:54:01 -05:00
Andy Rozman
86adc19010 - added code to remove Treatment entries, without any insulin (for syncing PH Bolus entries with Treatments) 2019-12-24 17:52:28 +01:00
Bart Sopers
1e003ad188 Fix PodSessionStateTest 2019-12-24 11:48:09 -05:00
Milos Kozak
737a2c5386 KeepAlive refactor, MainApp cleanup 2019-12-24 16:07:17 +01:00
Milos Kozak
99b07521ef Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-24 11:28:53 +01:00
Milos Kozak
e423b5bc06 Upload IOB to NS without available BG 2019-12-24 00:55:09 +01:00
osodebailar
1d48536c3c refactor overview with new header area and better formated user values for iob, cob and basal 2019-12-23 18:07:51 +01:00
Bart Sopers
91f6539328 Accept ACK responses for ConfigurePodCommand 2019-12-23 17:40:10 +01:00
Rob Kresha
a166b8a56a Medtronic clarify error notification 
Adding additional information around the error message so the user can resolve. US version of the 723 Revel has no Basal 'profile' setting, just a 'patterns' setting which when enabled resolves the error.
 2019-12-22 21:54:45 -06:00
Milos Kozak
3a6f29d1dc Merge branch 'dev' into dialogs 2019-12-22 23:04:21 +01:00
Milos Kozak
034bf3ecd8 fix parsing profile units 2019-12-22 22:52:26 +01:00
Milos Kozak
60dce8fd15 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-22 22:27:58 +01:00
Milos Kozak
32ce8af144 fix loading profiles 2019-12-22 22:27:43 +01:00
Milos Kozak
91000dc1bb Confirmation dialogs cleanup 2019-12-22 21:37:26 +01:00
Milos Kozak
808dd92de1 forgotten code remove 2019-12-22 15:08:31 +01:00
Milos Kozak
9042957585 OKDialog layout 2019-12-22 15:03:00 +01:00
Milos Kozak
06d2a2cfc5 ActionProfileSwitch, ActionFragment improvement 2019-12-22 14:18:36 +01:00
Andy Rozman
91648a935f - notification on setting or failing to set new Profile (#22) 
- changed also in Medtronic module
- when bolus is correctly set, we will see it displayed in Tab (#27)
 2019-12-22 14:16:01 +01:00
Milos Kozak
648b09717e BLEScanActivity refactor 2019-12-22 12:33:05 +01:00
Andy Rozman
b16e685ecc - added option for Beep TBR 
- added line to DatabaseHelper that can be uncommented in case we make any change tp PodHistory database
- isPumpSuspended evaluates PodSessionState.isSuspended too
 2019-12-22 12:28:19 +01:00
Milos Kozak
52380cbd22 CareDialog fix 2019-12-22 02:05:50 +01:00
Milos Kozak
88e456dd1a PairingProgressDialog refactor 2019-12-22 02:00:33 +01:00
Milos Kozak
cbfb8a6a0f Automation dialogs refactor 2019-12-21 23:17:20 +01:00
Milos Kozak
0e96eb666e Spinner with larger font 2019-12-21 21:00:43 +01:00
Milos Kozak
592246211f actions layout update 2019-12-21 19:43:29 +01:00
Milos Kozak
a928c48ae0 DanaRUserOptionsActivity refactor 2019-12-21 18:21:32 +01:00
Milos Kozak
33d1d3e82d DanaRS time setting update for protocol #6 2019-12-21 16:53:50 +01:00
Milos Kozak
7176a8654b DanaRHistoryActivity refactor 2019-12-21 16:15:35 +01:00
Milos Kozak
2e687fe687 DanaRHistoryActivity layout refactor 2019-12-21 15:26:41 +01:00
Milos Kozak
6d46c39fba ProfileViewerDialog refactor 2019-12-21 14:30:14 +01:00
Bart Sopers
1dd296ef0e Pad NonceResyncableMessageBlock with GetStatusCommands to ensure > 1 packet in order to improve command verification 2019-12-21 02:01:22 +01:00
Bart Sopers
78d789db4e Add time and time change tests for PodSessionState 2019-12-21 00:55:32 +01:00
Bart Sopers
0bcdf30a7e Improve basal schedule validation and add profile to basal schedule mapping tests 2019-12-20 23:07:38 +01:00
AdrianLxM
d5e8345051 Merge remote-tracking branch 'origin/dialogs' into adrian/dialogs 2019-12-20 23:06:09 +01:00
AdrianLxM
953d6bc029 small cleanup 2019-12-20 23:05:35 +01:00
Milos Kozak
c66ca2ea43 NSClient fix 2019-12-20 22:59:16 +01:00
AdrianLxM
ddb2306cdc small cleanups 2019-12-20 22:22:58 +01:00
Milos Kozak
2ce590a700 BolusProgressDialog refactor 2019-12-20 21:52:37 +01:00
Milos Kozak
83fe8527ce ErrorDialog refactor 2019-12-20 19:46:07 +01:00
Milos Kozak
44564b91df cleanup, dark dialog title 2019-12-20 18:55:54 +01:00
Milos Kozak
226990b16f CalibrationDialog refactor 2019-12-20 16:33:01 +01:00
Milos Kozak
1a1e51020c TreatmentDialog refactor 2019-12-20 15:36:27 +01:00
Milos Kozak
99d558e99f InsulinDialog refactor 2019-12-20 14:52:10 +01:00
Milos Kozak
230224be0a CarbsDialog refactor 2019-12-20 13:58:51 +01:00
Milos Kozak
b0055c3199 ExtendedBolusDialog refactor 2019-12-20 12:29:45 +01:00
Milos Kozak
6d3abd3c22 TempBasalDialog refactor 2019-12-20 11:43:21 +01:00
Milos Kozak
526034292e FillDialog refactor 2019-12-19 23:45:27 +01:00
Milos Kozak
68533437bb Merge branch 'dev' into dialogs 2019-12-19 23:13:35 +01:00
Milos Kozak
815336c686 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-19 23:12:45 +01:00
Milos Kozak
9f27b4ae42 fix NPE 2019-12-19 23:12:24 +01:00
Milos Kozak
e58b7f8040 Simplify NSClient 2019-12-19 21:59:07 +01:00
Milos Kozak
5c9ab721ce Careportal actions to Actions plugin 2019-12-19 20:30:35 +01:00
Milos Kozak
19b680039e
Merge pull request #2244 from PoweRGbg/LocationLeft 
Location trigger - added option for Going inside/outside of area
 2019-12-19 14:53:00 +01:00
Roumen Georgiev
b90c02a2cc Removed InputOption 2019-12-19 09:23:09 +02:00
Andy Rozman
a399c24ccd - small changes 2019-12-18 23:34:16 +00:00
Andy Rozman
3ae074da57 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-18 23:33:55 +00:00
Andy Rozman
5143a2f814 - added almost all history writing 2019-12-18 23:24:20 +00:00
Bart Sopers
43c2863825 Remove redundant PodState.setFaultEvent call 2019-12-19 00:02:02 +01:00