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

6314 commits

Author SHA1 Message Date
Bart Sopers fead64aa16 Revert "Prepare Omnipod for upstream merge" 
This reverts commit 7c82dbdf93.
 2020-09-01 22:19:08 +02:00
Bart Sopers 5bd623e322 Remove unresolved Omnipod import after merge 2020-09-01 22:05:59 +02:00
Bart Sopers b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Milos Kozak 3457f8f511 remove language setting from wizard 2020-09-01 10:02:35 +02:00
Milos Kozak 7c7d115612 ns_upload_only true everywhere 2020-09-01 09:53:24 +02:00
Bart Sopers 01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Bart Sopers aa7e57512a Move Omnipod RileyLink classes into subpackages 2020-08-28 01:22:50 +02:00
Bart Sopers d26cd9f069 Create fake 0 TBR when Pod is not running 2020-08-28 01:18:32 +02:00
Milos Kozak 134b79dd8a show tir range 2020-08-27 10:38:53 +02:00
Milos Kozak d7817792ca show correct constraint in loop plugin 2020-08-26 18:12:03 +02:00
Bart Sopers 5a7c14fb2e Fix dependency injection in RLHistoryItemOmnipod 2020-08-26 14:30:36 +02:00
Bart Sopers 2fdbbd9057 Check in files forgotten in previous commit 2020-08-25 14:00:04 +02:00
Milos Kozak f2d89ac428 lint recommendations 2020-08-24 21:54:53 +02:00
Milos Kozak 20e7020b07
Merge pull request #2917 from GermanBluefox/patch-3 
Show time string instead of ms in JSON structures
 2020-08-24 21:51:27 +02:00
Milos Kozak cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab 
Add Manual BG or Calibration in CarePortal Tab of Treatment
 2020-08-24 21:45:56 +02:00
Bart Sopers ddd9687425 Reorganized packages and removed a few unused classes 2020-08-23 19:21:01 +02:00
Bart Sopers 4a10a04f79 Remove OmnipodUiComm and OmnipodUiTask 2020-08-23 16:15:35 +02:00
Philoul 0d3d83806b Add Calibration in Translator.kt 
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
 2020-08-22 18:33:13 +02:00
Bluefox f224cb1af1
Show time string instead of ms in JSON structures 2020-08-22 17:17:43 +02:00
Bart Sopers 7c82dbdf93 Prepare Omnipod for upstream merge 2020-08-22 11:06:33 +02:00
Bart Sopers 1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Milos Kozak e7627f4f6c try to fix IllegalStateException 2020-08-21 13:41:48 +02:00
Milos Kozak 8c987c8be9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-08-21 10:30:41 +02:00
Milos Kozak 7282f460fc better synchronize graph rendering 2020-08-21 10:29:23 +02:00
Bart Sopers c22119bb85 Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields 2020-08-20 18:39:16 +02:00
Bart Sopers 7d63671d7b fix import 2020-08-20 02:30:15 +02:00
Bart Sopers 0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00
Milos Kozak 09e5c82d4d unify units spacing 2020-08-19 21:24:01 +02:00
Milos Kozak 9ca20f425f BG input in wizard improvement 2020-08-19 10:58:45 +02:00
bartsopers 6c3e7a8f43
Merge pull request #143 from smuething/move-protection-to-core 
Move protection to core
 2020-08-18 20:00:57 +02:00
Steffen Müthing d0cbaeeb32 Move protection infrastructure to core 
The protection infrastructure is useful for other modules like pump drivers,
so it should be in core.
 2020-08-18 19:33:50 +02:00
Steffen Müthing 75cbc87b4a Move SingleClickButton to core 
SingleClickButton is a utility used in a number of modules and such should be
in core. While the app seems to built with the button in app, this wrong
structure should be fixed.

As the button is a UI element, the patch also moves the class to the package
info.nightscout.androidaps.utils.ui.
 2020-08-18 15:09:14 +02:00
bartsopers 228441f54c
Merge pull request #139 from smuething/more-daggerization 
More daggerization
 2020-08-18 12:44:21 +02:00
Steffen Müthing 80f1ed52b3 Move CryptoUtil to core 
CryptoUtil is a dependency of ProtectionCheck, so it needs to move to core.
 2020-08-18 12:36:25 +02:00
Bart Sopers 48ad85ae6a Move Omnipod tab closer to Overview tab 2020-08-18 12:33:26 +02:00
Steffen Müthing 3646ef083e Simplify provisioning of PodStateManager 
PodStateManager can be provided by AapsPodStateManager, that's much easier than
getting the constructor signature right in the dependency injection module.
 2020-08-18 00:25:14 +02:00
Steffen Müthing 7d52228e15 Move RileyLink components to a separate dependency injection module 
Having them in the Medtronic module will only create confusion later on.
 2020-08-18 00:22:24 +02:00
Bart Sopers 5c4b9846e6 WIP on moving Omnipod into a separate module 2020-08-17 19:53:43 +02:00
Bart Sopers 2a55c6413c Remove redundant DeviceCommandExecutor interface 2020-08-17 00:07:56 +02:00
Bart Sopers b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00
bartsopers a30ca700f7
Merge pull request #137 from smuething/protect-pod-management 
Add protection to Pod management activity
 2020-08-16 21:10:14 +02:00
Bart Sopers 100f8fe235 Some Omnipod cleanup after merge 2020-08-16 17:05:32 +02:00
Bart Sopers 5d3426dc70 Replace custom functional interfaces with built in types 2020-08-16 13:56:39 +02:00
Bart Sopers 5bd873cd0e Remove unused Dash code 2020-08-16 13:22:31 +02:00
Bart Sopers a3cb8ff648 Merge remote-tracking branch 'upstream/dev' into omnipod_eros_dev_merge_from_upstream 2020-08-16 12:37:28 +02:00
Steffen Müthing 1bae8526d0 Add protection to Pod management activity 
Pod management should be protected, as it lets you stop the current
Pod. The available activities semm preferences-like to me, so that's
the protection type that I used.
 2020-08-15 22:09:29 +02:00
Bart Sopers f37a2452fb Small cleanup and added some TODOs 2020-08-15 19:01:48 +02:00
Bart Sopers 59ad718969 Remove SetupProgress enum in favor of PodProgressStatus, which comes directly from the Pod 2020-08-15 11:23:45 +02:00
Milos Kozak d7f9208acf fix LP reset button 2020-08-14 17:22:06 +02:00
Milos Kozak 9318f0637a
Merge pull request #2887 from Philoul/ExtendedIOBCalc 
Replace Default Dia by profile Dia in extendedBolus's Iob calculation
 2020-08-14 13:57:26 +02:00
Milos Kozak 3dfa066cf5 MINDIA = 5.0 2020-08-14 11:25:30 +02:00
Philoul 5c7d0a8516 Replace Default Dia by profile Dia in extendedBolus Iob calculation 2020-08-14 10:00:53 +02:00
Milos Kozak f546fdf837 ignore Can not perform this action after onSaveInstanceState 2020-08-13 13:55:39 +02:00
Bart Sopers c56bc5ae61 Temporary workaround for pod activation and deactivation wizard crashes on rotation 2020-08-13 12:22:36 +02:00
Bart Sopers 159c1f941d Ignore IllegalPacketTypeException in AssignAddressAction if packetType is ACK and we already successfully assigned the address before 2020-08-12 18:30:57 +02:00
Bart Sopers 07d520313f Set String instead of int value for pod LOT in RileyLinkStatusGeneralFragment 2020-08-11 22:46:02 +02:00
Bart Sopers b5d55adb2e Store PodProgressStatus in PodState 2020-08-11 21:17:37 +02:00
Bart Sopers 0584cbd6af Use PodStateManager as a source for displaying info in Omnipod tab (and some other small changes) 2020-08-11 21:00:03 +02:00
Milos Kozak b8327f6b3a fix ABS IOB calculation 2020-08-11 14:32:48 +02:00
Bart Sopers 1b2c91a6f9 Fix message sequence numbers when resyncing nonce 2020-08-11 13:10:53 +02:00
Bart Sopers 84ce2d1790 Set pump driver to busy and set state to suspended when Pod has a fault event 2020-08-11 13:10:00 +02:00
Bart Sopers 1ba9244ecd Don't duplicately log request message when exchanging OmnipodMessage 2020-08-11 10:16:06 +02:00
Bart Sopers 0ba26e8b2c Update last failed communication time when an exception is thrown in OmnipodCommunicationManager.transportMessages and add log response from the Pod when exchanging messages 2020-08-11 10:16:05 +02:00
Andy Rozman 5e20444bf4 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-08-10 23:07:14 +01:00
Bart Sopers a55be8d33f - Fix local alerts 
- Remove duplicate RL error from Pod tab
 2020-08-10 22:27:52 +02:00
Bart Sopers 906b8c2585 Remove argument checks for piVersion in internal pod state representation 2020-08-10 20:49:48 +02:00
Bart Sopers 341474295f - Allow resetting pairingParameters in PodStateManager if the setup state is ADDRESS_ASSIGNED 
- Improve pod status screen
- Improve event dispatching in AapsPodStateManager (send less events)
- Add more FIXMEs and TODOs
 2020-08-10 20:15:52 +02:00
Bart Sopers a0ca8cf9cc - Partial fix for display of RL status 
- Fix IllegalStateException when AssignAddressAction is executed when an address has already been assigned
- Improve (not yet used) custom unreachable alert check
- Remove hasFixedUnreachableAlert from PumpType
- Remove omnipodPumpStatus.podAvailable in favor of PodStateManager
- Remove some unused code / comments
- Add a bunch of TODOs
 2020-08-10 17:58:54 +02:00
Andy Rozman 1ebb7144ec - reenable fabric events 2020-08-10 14:18:04 +01:00
Milos Kozak 4bacfad0db fix empty mgdl local profile 2020-08-10 13:06:27 +02:00
Milos Kozak 1bbca2787b BolusWizard typographic 2020-08-10 12:35:59 +02:00
Bart Sopers 8ed802d91b Improve information on Pod tab 2020-08-09 21:03:40 +02:00
Bart Sopers e74e80a4ce Inject RileyLinkServiceData in SetPreamble command and remove some unused code 2020-08-09 19:11:00 +02:00
Milos Kozak 817ec086a1 prevent IndexOutOfBoundsException 2020-08-09 17:43:51 +02:00
Bart Sopers 1787afda98 Daggerize AapsPodStateManager 2020-08-09 16:41:16 +02:00
Bart Sopers da2c2110da Load pod state after initializing PodStateManager 2020-08-09 14:06:45 +02:00
Bart Sopers 050816ddf9 Restore accidentally removed code 2020-08-09 14:04:24 +02:00
Bart Sopers 62bda451a0 Prevent NPE 2020-08-09 13:36:08 +02:00
Bart Sopers e5274e2d3a - Extract abstract class for PodStateManager on driver level 
- Remove PodStateChangedHandler
- Add new fields to PodState
- Add Lot, Tid and Firmware Version in Pod tab
- Various small improvements
- Add some FIXMEs
 2020-08-09 13:24:48 +02:00
Philoul b70c6c9f1b Update BGSourceFragment 
Arrow color a little bit lighter than text (don't find exact text color)
Default color for arrows swtiched to white
 2020-08-09 10:49:54 +02:00
Bart Sopers 31938547a5 Fixes for PodStateManager 2020-08-08 21:38:08 +02:00
Philoul adc71aae08 Update Overview Layout for Arrow icons 
Add a directionToIcon function in BGReading
Move arrow icons to core
 2020-08-08 19:09:21 +02:00
Bart Sopers 10cde3e744 More improvements for PodStateManager 2020-08-08 19:05:36 +02:00
Bart Sopers 2a73127202 Small code improvements for PodStateManager 2020-08-08 18:52:49 +02:00
Bart Sopers 76d267dce4 Prevent NPE 2020-08-08 18:44:33 +02:00
Bart Sopers 3bc53544a2 Bug fixes and improvements in PodStateManager stuff 2020-08-08 18:37:10 +02:00
Bart Sopers b50670cceb Replace PodState with PodStateManager 2020-08-08 18:16:37 +02:00
Andy Rozman 337c61d500 - added dependency 2020-08-08 15:16:50 +01:00
Bart Sopers a06d78b0b7 Add dagger annotations in AapsPodStateManager 2020-08-08 15:42:53 +02:00
Bart Sopers ffb518f50f Introduce PodStateManager 2020-08-08 15:26:51 +02:00
Bart Sopers 80e8d094df Improve pod status text 2020-08-06 23:01:28 +02:00
Bart Sopers d446751d8a Correctly load Pod state from Shared Preferences after startup 2020-08-06 20:19:15 +02:00
Andy Rozman eafb68d496 - small change init of RfSpyReader 
- changed log in RfSpy
 2020-08-02 15:28:07 +01:00
Andy Rozman 11c71149ad - added firmware versions 
- changed faulty init in RadioResponse
- added some logging
 2020-08-02 14:46:07 +01:00
Andy Rozman faeb2576a9 - added real pod status to pod status 2020-08-01 19:54:58 +01:00
Philoul 4bf1e886a4 Fix Plugin Preference enable for Overview 2020-08-01 19:14:38 +02:00
Andy Rozman 54d30cd8c4 - reverted some of my changes 
- fixed problem that service doesn't start with AAPS, but with Tab click
 2020-07-31 19:00:00 +01:00
Andy Rozman 557568b353 - fixed some cosmetical changes 
- fixed problem with initialization, now MDT is initialized at once
 2020-07-31 16:39:56 +01:00
Andy Rozman 20e2bf0b06 Merge branch 'dev' into medtronic_modules 2020-07-31 11:21:05 +01:00
Milos Kozak ba4f599242 include EB in statistics 2020-07-28 13:51:03 +02:00
Milos Kozak ed969300ef fix tests 2020-07-27 22:27:47 +02:00
Milos Kozak 400e9399a5 MinutesNumberPicker 2020-07-27 21:11:57 +02:00
Milos Kozak b7221aa286 prevent missing pump status in NS 2020-07-27 15:21:36 +02:00
Andy Rozman 6ad35510f3 - moved tests 
- some other minor changes
 2020-07-26 14:36:00 +01:00
Milos Kozak 007df3aab3 make SMB prefs more clear 2020-07-26 12:56:47 +02:00
Milos Kozak 1edef7fb4e prevent stack overflow 2020-07-26 11:11:14 +02:00
Andy Rozman 996417bb47 Merge branch 'dev' into medtronic_modules 2020-07-25 00:44:09 +01:00
Andy Rozman 8e438f05fe - some changes with package fixes 2020-07-25 00:39:56 +01:00
Milos Kozak bad7a584c6 cleanup nsclient settings 2020-07-24 13:30:19 +02:00
Milos Kozak 7bf9b8d588 better info in nsclient mode 2020-07-24 13:00:11 +02:00
Milos Kozak 80f2467694 remove logging 2020-07-24 12:42:28 +02:00
Milos Kozak d51a7c9461 scheduleBgHistoryChange 2020-07-24 12:39:18 +02:00
Milos Kozak 6b676a1dfd prevent NPE 2020-07-24 10:18:19 +02:00
Milos Kozak fc69e851d1
Merge pull request #2849 from dlvoy/fix-prefs-import-crash 
Fix preferences import/export related crashes
 2020-07-24 10:06:46 +02:00
Milos Kozak f9806162e1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-24 07:48:00 +02:00
Milos Kozak 0a6cd80257 fix keepalive 2020-07-24 07:47:54 +02:00
Dominik Dzienia 310c0b9137 Refactor hardcoded error messages to be translatable 2020-07-23 13:42:55 +02:00
Dominik Dzienia 3d0c214f44 Fix crash when user insist on exporting preferences while denying granting storage permission 
* Handles IO errors and display toast about FS / permission errors
* Clarify text - storage permissions are needed not only for logs, but for export too
 2020-07-23 13:33:15 +02:00
Dominik Dzienia 4068cd72ca Fix crash when preferences import list is opened for the second time (due to buggy implementation of ActivityResult and Contracts in early androidx) 
* updated to newest version of fragments where bug is fixed
* catched exception and inform user with Toast
* refactor duplicated code in ImportExportPrefs
 2020-07-23 12:59:42 +02:00
Milos Kozak 66a19cce22 remove unneeded variable 2020-07-21 22:24:13 +02:00
Milos Kozak 74ca36bb6e fix NPE 2020-07-21 22:14:46 +02:00
Milos Kozak 05eee2ebb9 fix user message time 2020-07-20 13:28:07 +02:00
Milos Kozak 35a2692d25
Merge pull request #2822 from Philoul/ProfileHelperImprovement 
Profile helper UI improvement (color & icon)
 2020-07-20 12:57:54 +02:00
Milos Kozak 15586abe52 fix AS calculation 2020-07-20 12:33:35 +02:00
Milos Kozak 3174b8219e
Merge pull request #2821 from Philoul/FixOverviewTBRIcon 
Fix TBR icon even with 100% percent set
 2020-07-20 08:14:12 +02:00
Andy Rozman 23cd1d9143 - some minor changes on dependency (removed full path) 
- removed some logging
- fixed DailyTotalsDTO toString
- changed level of some logging
 2020-07-18 15:18:25 +01:00
Philoul 507e04a30b Compare Profile icon and tab2 color 
Change tab 2 color (to red) and Profile type label color (to red when tab 2 selected)
 2020-07-17 01:09:30 +02:00
Milos Kozak e3cd61cffc DPV profile 2020-07-16 17:30:04 +02:00
Milos Kozak 39b4eac60f add delay to executing automations 2020-07-15 22:46:59 +02:00
Philoul 61c3391eb5 Fix TBR icon even with TBR 100% set 2020-07-15 21:15:49 +02:00
Milos Kozak 9ff3011514 fix current location button 2020-07-15 20:06:45 +02:00
Milos Kozak 24f60ebc65 profile helper 2020-07-14 16:51:13 +02:00
Andy Rozman 6e50c3651d Merge branch 'dev' into medtronic_modules 2020-07-12 20:21:03 +01:00
Andy Rozman ea80eb3c9b - created 2 modules: rileylink and medtronic 
- refactored some classes
 2020-07-12 20:15:11 +01:00
Milos Kozak 639e5b8302 Merge branch 'dev' into profilehelper 2020-07-09 18:59:25 +02:00
Milos Kozak 1d8120d051 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 18:58:58 +02:00
Milos Kozak c2e5470da7 prevent ArrayIndexOutOfBoundsException 2020-07-09 18:52:09 +02:00
Milos Kozak f39df8e8eb check for input data 2020-07-09 18:48:28 +02:00
Milos Kozak 4b967d237c Merge branch 'dev' into profilehelper 2020-07-09 18:40:48 +02:00
Milos Kozak 112032ab0e fix nullable params 2020-07-09 14:26:19 +02:00
Milos Kozak 9401fd0d80 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-07-09 14:21:58 +02:00
Milos Kozak 950e3a677b
Merge pull request #2804 from Tornado-Tim/greenbox-fix 
Fix: Green Glucose Target override
 2020-07-08 23:07:31 +02:00
Milos Kozak 45f168d427 fix nsclient layout 2020-07-08 22:29:26 +02:00
Tim Gunn a93485a3c0
Fix the greenbox 2020-07-09 00:46:10 +12:00
Milos Kozak 2b7cb0d558 prevent kotlin exceptions 2020-07-07 17:16:22 +02:00
Milos Kozak 2c884821e0 ProfileHelper 2020-07-06 21:14:00 +02:00
Milos Kozak b91f8e668a Profile comparator 2020-07-06 13:52:10 +02:00
AdrianLxM 73cb485607 Warn user of insecure fallback on missing master password and activated fingerprint 2020-07-04 21:57:27 +02:00
Milos Kozak 91bc31ba1b fix tablet mode 2020-07-04 10:22:37 +02:00
Milos Kozak b02992e46b fix tests 2020-07-03 21:07:20 +02:00
Milos Kozak 888e7f4ab6 keep reference time for cached values 2020-07-03 20:10:47 +02:00
Milos Kozak 9c57e6b9b9 prevent NPE 2020-07-03 10:46:19 +02:00
Milos Kozak 1f71da4346 overview target logging 2020-07-03 10:38:16 +02:00
Milos Kozak 045b79d22f do not run RandomBgPlugin in main thread 2020-07-03 00:24:01 +02:00
Milos Kozak 9361010e46 do not run automation in main thread 2020-07-03 00:19:51 +02:00
Milos Kozak c2ae713cc4 prevent NPE: 2020-07-02 23:50:38 +02:00
Milos Kozak e9670dd20a fix displaying cob for nsclient 2020-07-02 23:35:19 +02:00
Milos Kozak 6e88d127e5 fix grabbing SSID info 2020-07-02 22:45:47 +02:00
Milos Kozak 3a2790acc3 remove BgSource from setup wizard 2020-07-02 20:28:42 +02:00
Milos Kozak b13c39ebc5 set predefined values for nsclient 2020-07-02 16:41:48 +02:00
Milos Kozak a08c1d5269 fix clash comming from RS history 2020-07-01 20:54:49 +02:00
Milos Kozak d66d362aa3
Merge pull request #2775 from Philoul/BGDeltaConsistency 
BG Deltas consistency enhancement
 2020-06-30 23:01:56 +02:00
Tim Gunn c4a317f515
Dismiss carb notifications automatically if no longer needed, crossfingers fix double wear OS notifications 2020-06-27 01:06:28 +12:00
Tim Gunn 2391ebe399
Remove the amount of carbs required from the main overview if a carb treatment has been made after APS run 2020-06-27 01:03:25 +12:00
Milos Kozak d04cf567b8
Merge pull request #2776 from Philoul/AutomationTempTargetMmol 
Fix mmol units in automation Temp Target Action
 2020-06-26 10:59:48 +02:00
Philoul 5f02a1cc84 Fix units in Automation TT Action 2020-06-26 09:28:12 +02:00
Philoul d28770ac08 Forgotten prediction lines 2020-06-25 21:33:45 +02:00
Philoul 2656e6a12c BG Deltas consistency enhancement 
- Delta after minutes and label right aligned in layout (hard coded for label as it was in OverviewFragment)
- Signed delta avg values
 2020-06-25 18:16:10 +02:00
Philoul 2606e51eb1 Second Fix, send all raw values sent in mg/dl (BG values, lowline and highline) 
It's hard coded in mg/dl in Wear
Minor improvement in Wear code (just increase a little bit highest BG value in graphs, 400 mg/dl is sometimes too low => updated to 450 mg/dl)
 2020-06-25 17:02:18 +02:00
Milos Kozak 0b0b4fc637 handle NS announcements properly 2020-06-24 19:15:35 +02:00
Milos Kozak 4d5880f034
Merge pull request #2741 from Philoul/Vector_Icons 
Vector icons
 2020-06-23 10:31:52 +02:00
Milos Kozak be6c184061 try to catch startup error 2020-06-22 23:31:13 +02:00
Milos Kozak 3305a5979d fix displaying profile switches 2020-06-22 22:55:50 +02:00
Milos Kozak 6783c78d32 remove TODO 2020-06-22 22:20:11 +02:00
Milos Kozak 6cbdd6b98a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-22 22:19:34 +02:00
Milos Kozak 6a1394b7b9 activate correct profile 2020-06-22 22:19:27 +02:00
Milos Kozak 63bf758636
Merge pull request #2747 from Philoul/Fix_Color_Watch_mmol 
Fix "always yellow" in watch even if within range (mmol unit)
 2020-06-22 21:06:30 +02:00
Milos Kozak 500de5fa2d fix status lights 2020-06-22 21:01:32 +02:00
Philoul 7f32881e10 Fix "always yellow" in watch 2020-06-20 14:54:54 +02:00
Philoul d55c9d9ff6 Update Layout and code with new icons 2020-06-19 14:24:31 +02:00
Milos Kozak c66084d3ab revert RandomBg safety 2020-06-19 11:13:30 +02:00
Dominik Dzienia 7f62450d99 Fix prediction data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:53:46 +02:00
Dominik Dzienia 6b7420d0b7 Fix data sent to WearOS by properly reacalculating them into current app unit 2020-06-17 15:10:25 +02:00
Milos Kozak 782b109ebe
Merge pull request #2716 from Philoul/Replace_Png_Icons 
Replace some png icons by vector
 2020-06-16 22:16:34 +02:00
Philoul 5c2c8b5190 Safe Delete done 
Forgotten usage added
 2020-06-16 19:46:42 +02:00
Philoul 87f7dc0422 Delta added and clone lightened 2020-06-15 19:15:06 +02:00
Philoul acfd9621b7 replace 4 LowRes Icons (add, remove, clone and as) 
For add, remove and clone I set width and height to 16dp (automatically scaled in Local Profile layout but not in automation)
for as, I replaced low res icon by double arrows of overview fragment (size a little bit increased because in automation icons are very small)
 2020-06-15 16:48:35 +02:00
Milos Kozak 0f971ebe29
Merge pull request #2712 from Philoul/Clean_double_string_names 
Clean double string names
 2020-06-15 12:34:01 +02:00
Milos Kozak dae39d4379 fix NPE 2020-06-15 11:23:06 +02:00
Milos Kozak bb5157bcca synchronized updateGui 2020-06-15 11:21:39 +02:00
Philoul 129c3d82d6 Seven loop icons done 2020-06-14 01:57:54 +02:00
Philoul 5ef52ea90f Some new vector icons again 2020-06-13 17:37:52 +02:00
Philoul d3e98fb09b Create vector icon to replace png 2020-06-12 22:17:15 +02:00
Milos Kozak dae717d524 try to fix crash 2020-06-11 23:33:29 +02:00
Milos Kozak b5c72cb4a9
Merge pull request #2614 from Tornado-Tim/carbs-required 
Show Carbs required - Updated from #1974
 2020-06-11 20:42:43 +02:00
Milos Kozak b73196a8d1 Merge branch 'dev' into insight-artificial-end-delay 2020-06-11 14:56:58 +02:00
Milos Kozak 6826bed92f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-06-11 14:56:38 +02:00
Milos Kozak 17d71d218b allow RandomBg upload 2020-06-11 14:55:29 +02:00
Milos Kozak e09fd75a9b
Merge pull request #2680 from Lexsus/dev_Milos 
add PUMP CONNECT and PUMP DISCONNECT commands
 2020-06-11 14:14:39 +02:00
Milos Kozak deb99f236b better automation logging 2020-06-11 12:26:38 +02:00
Milos Kozak 8d2139fb59 history browser x-axis fix 2020-06-11 11:34:33 +02:00
Philoul ac98f2e144 Rename Exam double Strings 2020-06-10 15:38:26 +02:00
Milos Kozak 8b45464f30 secondary graphs layout improvements 2020-06-04 16:24:53 +02:00
Milos Kozak 064389d066 fix HistoryBrowser crash 2020-06-04 14:34:40 +02:00
Tim Gunn 3b3df40ef5
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-03 20:54:29 +12:00
Milos Kozak 15378fb2b8 InMemoryGlucoseValue 2020-06-02 21:59:51 +02:00
Milos Kozak 484f3a2a98 invalidate cache including bg after bg change 2020-06-02 19:28:56 +02:00
Tim Gunn 2c2201129b
Remove oref SMB carbs required preference 2020-06-03 00:17:05 +12:00
Tim Gunn 8142df9487
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-02 23:57:15 +12:00
Lexsus 94390ca32f fixed after review. 2020-06-01 19:29:37 +03:00
Milos Kozak 3f97530b02
Merge pull request #2691 from Philoul/AbsCurveBackgroung 
ABS Curve in background
 2020-06-01 13:28:03 +02:00
Tim Gunn ec188f1329
revert change 2020-06-01 12:14:45 +12:00
Milos Kozak 4efeb77fdc remove deprecation 2020-06-01 00:06:05 +02:00
Tim Gunn 8fefa0b5aa
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-06-01 02:14:17 +12:00
Milos Kozak 55bccafef5 Large display skin 2020-05-31 12:02:42 +02:00
Milos Kozak 09de329934 libs update & cleanup 2020-05-31 11:27:12 +02:00
Milos Kozak 95e6b02873 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-31 10:12:45 +02:00
Milos Kozak 31b3177561 upgrade fabric to firebase 2020-05-31 10:12:36 +02:00
Tim Gunn f69c11af40
Refractor to use new function 2020-05-31 16:43:32 +12:00
Tim Gunn 8aabf15dfe
snooze carb alerts for 15 min after treatments 2020-05-31 16:43:07 +12:00
Tim Gunn 28f2630a91
Eliminate Double notifications 2020-05-31 16:42:13 +12:00
Tim Gunn 04bd98e0e5
Add Last Carb Time 2020-05-31 16:41:19 +12:00
Philoul a39b7be520 Order in menu changed too for consistency 
So it's necessary to select again curves in secondary graphs...
 2020-05-31 00:52:32 +02:00
Philoul 51739c31b7 ABS Curve in background 
I didn't change order in selection menu (otherwise selected curves are changed in secondary graphs...)
 2020-05-31 00:18:23 +02:00
Milos Kozak f4293d4183
Merge pull request #2688 from Philoul/Add_Translation_Secondary_Graph_Title 
Add translation for secondary graph title
 2020-05-30 21:50:02 +02:00
Tebbe Ubben 5395ca4e71
Update LocalInsightPlugin.java 2020-05-29 19:51:13 +02:00
Lexsus 4af06620fb add tests for PUMP DISCONNECT sms command 2020-05-29 19:15:11 +03:00
Tim Gunn 15717f0271
fix duplicate vals 2020-05-29 22:42:54 +12:00
Tim Gunn 0dfdf6c68a
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-29 21:51:05 +12:00
Milos Kozak df0e46f47b remove duplicated files 2020-05-28 22:00:16 +02:00
Milos Kozak 02aff75dff
change delay to 1.5s 2020-05-28 21:33:36 +02:00
Milos Kozak 458efe467f
Merge pull request #2689 from Philoul/FixCOBHistoryBrowser 
Fix Missing COB in history browser
 2020-05-28 21:21:19 +02:00
Philoul bef8b38b76 Fix Missing COB in history browser 
But more calculation and slower :(
 2020-05-28 18:06:32 +02:00
Lexsus 9a1993c5f6 corrections. 
add some test for sms commands
 2020-05-28 17:33:51 +03:00
Philoul 1a94d3d55e Add Strings for secondary graph title for translation 2020-05-28 16:26:57 +02:00
TebbeUbben 79cafc14f5 Insight: Log end events five seconds earlier 2020-05-28 15:24:53 +02:00
TebbeUbben fa8e784733 Fix Open Humans Uploader 2020-05-28 15:19:35 +02:00
Milos Kozak 0abfb4c4f3
Merge branch 'dev' into carbs-required 2020-05-27 23:19:24 +02:00
Milos Kozak 49274ac0ef
Merge pull request #2602 from Tornado-Tim/skip-neutral-temps 
WIP: Add skip Neutral Temps preference
 2020-05-27 23:16:42 +02:00
Milos Kozak 77df5cdc10
Merge pull request #2679 from andyrozman/bug_2654_1 
Bug 2654 (2)
 2020-05-26 20:16:46 +02:00
Milos Kozak c5aa12c5ba double SMB fix 2020-05-26 19:58:50 +02:00
Lexsus 11f768636e add PUMP CONNECT and PUMP DISCONNECT commands 2020-05-26 12:48:21 +03:00
TebbeUbben 5533f87bbc Also upload APS data 2020-05-26 01:42:33 +02:00
Andy Rozman 3bbbeed07d - There are few fields hidden between implementations MedtronicCommunicationManager and RileyLinkCommunicationManager. If there is error in packet (if MySentry is configugured on Pump), there is NPE when trying to write to log. 2020-05-25 22:40:55 +01:00
Milos Kozak ec3ebd17db History activity performance improvement 2020-05-25 13:54:43 +02:00
Tim Gunn 7622d272c3
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-25 21:16:32 +12:00
Milos Kozak 8a731a9187 SMSCommunicator LOOP command auth 2020-05-24 23:40:51 +02:00
Milos Kozak 0a33f4c0db fix TriggerRecurringTime #2 2020-05-24 21:10:44 +02:00
Milos Kozak 1cb648c09a fix TriggerRecurringTime 2020-05-24 20:23:22 +02:00
Milos Kozak 87eb8021de configbuilder fix 2020-05-23 22:49:05 +02:00
Milos Kozak 3d1b500395 fix ProfileSwitch loading 2020-05-23 22:16:55 +02:00
Milos Kozak 8ae817cdda nsalarm notifications fix 2020-05-23 21:54:01 +02:00
Milos Kozak 8e49717794
Merge pull request #2647 from Philoul/Insight_Pref_Vibration 
Add vibration in Insight preferences
 2020-05-23 18:08:53 +02:00
Milos Kozak 88adf04652
Merge pull request #2663 from Tornado-Tim/show-targets 
Show oref internal overridden targets
 2020-05-23 18:01:28 +02:00
Philoul 4f41890add Add additionnal setting for automated deliveries and add both in pumpcontrol pref 
- previous setting is for manual bolus and extended bolus
- This new setting is for SMB and temp basal with TBR emulation
You can change settings name and summary if you find better...
 2020-05-23 16:30:03 +02:00
Milos Kozak d40188f04e Default language option 2020-05-23 15:39:05 +02:00
Tim Gunn 72943a5236
Add back setting adjustment 2020-05-22 11:08:01 +12:00
TebbeUbben 3fc2aede23 Improve performance of copy operation 2020-05-21 00:21:31 +02:00
TebbeUbben db1f9366aa Increase maximum wakelock duration 2020-05-21 00:05:54 +02:00
TebbeUbben c7df607d97 Some UI candy 2020-05-20 23:59:14 +02:00
AdrianLxM 06e97400f7 Simplify show-targets view logic 2020-05-20 22:34:09 +02:00
TebbeUbben 09b81093dc Also upload preferences 2020-05-20 22:11:31 +02:00
TebbeUbben b239100c13 Open Humans Uploader: Initial commit 2020-05-20 21:49:01 +02:00
Tim Gunn bf412ea798
refractor 2020-05-21 04:19:22 +12:00
Tim Gunn 723c029228
Deal with 0.0 if AMA is used 2020-05-21 02:20:38 +12:00
Tim Gunn 77a5af75e2
Display when Target BG is overidden 2020-05-21 00:11:36 +12:00
Tim Gunn a20008c0db
Add TargetBG 2020-05-21 00:10:51 +12:00
Philoul 6229161c96 Add constraintChecker for autosens icon in overview 2020-05-19 19:32:27 +02:00
Tim Gunn 3ae1bb669d
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-20 00:09:57 +12:00
Milos Kozak b2b1485c27 fix Actions buttons visibility 2020-05-19 13:22:02 +02:00
Milos Kozak d9b8a32aea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-19 12:52:15 +02:00
Milos Kozak eeb4ce1686 fix HistoryBrowser injection 2020-05-19 12:52:01 +02:00
Philoul 72e541908c Revert "Fix Wear Control Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)" 
=> Second proposal better than my first one, split works with regex if it is of type Regex (it doesn't recognize first \ as a regex string but as an escape character...)
This reverts commit 480542a1
 2020-05-17 08:09:58 +02:00
Philoul 480542a143 Fix Wear Control 
Kotlin doesn't like regex... (AAPS crashed on these lines with ""\\s+", replaced by a space)
 2020-05-17 01:58:07 +02:00
Milos Kozak 8729fe18bd fix urgent NS alarm preference 2020-05-16 22:43:18 +02:00
Milos Kozak ca94e6cc67 layout #2 2020-05-15 22:41:14 +02:00
Philoul 1dd579fd19 Add disable vibration in insight settings (local_full only) 
Build works but as it related to pump communication, I prefer to not test it on my pump before Tebbe confirmation... (code is very simple, so it should work!)
 2020-05-15 11:37:09 +02:00
Milos Kozak 51ab43416a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-05-15 08:20:24 +02:00
Milos Kozak c311d593c1 show actions tab in NSC 2020-05-15 08:20:09 +02:00
Tim Gunn b1c6b81bb7
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-15 16:26:23 +12:00
Tim Gunn 32e4bb1220
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-15 16:25:35 +12:00
Milos Kozak be883afabe
Merge pull request #2644 from Philoul/Sensitivity_Icon 
Sensitivity icon
 2020-05-14 21:13:33 +02:00
Milos Kozak 2d3f1323dd layout update 2020-05-14 21:07:51 +02:00
Philoul 66c2bab60f Sensitivity Icon end proposal with a new icon 
Svg file added in icons folder
 2020-05-14 14:39:27 +02:00
Philoul 47725ad5d5 Sensitivity Icon (50% alpha if autosens disable) 2020-05-14 12:42:33 +02:00
Milos Kozak a241a23c99 fix pref parsing 2020-05-13 23:28:07 +02:00
Milos Kozak bc217438e9 fix message call MDT 2020-05-13 21:16:29 +02:00
Tim Gunn bcfd5e0149
revert counter logic 2020-05-13 11:36:32 +12:00
Tim Gunn 81ea43b218
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-13 10:34:07 +12:00
Tim Gunn 15df6f3349
merge n fix 2020-05-13 10:14:02 +12:00
Milos Kozak c03a89db16 HistoryBrowser fix 2020-05-13 00:11:48 +02:00
Tim Gunn fa74cf4804
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-13 09:37:50 +12:00
Milos Kozak 903555ed9f Dana msg refactor 2020-05-12 23:33:42 +02:00
Milos Kozak 65982ab94a
Merge branch 'dev' into carbs-required 2020-05-12 17:01:29 +02:00
Milos Kozak 666ce54b1f lint & deprecation 2020-05-12 15:07:50 +02:00
Milos Kozak 7060c51681 lint & deprecation 2020-05-12 14:33:47 +02:00
Milos Kozak b7ef191003 lint & deprecation 2020-05-12 13:34:32 +02:00
Milos Kozak 9c472e4e05 simplify RL code 2020-05-12 12:58:59 +02:00
Milos Kozak 66c567f0e7 lint & deprecation 2020-05-12 12:33:23 +02:00
Milos Kozak 1d1d57a458 fix SPBackupAgent 2020-05-12 00:04:09 +02:00
Milos Kozak 1b625265d0 Merge remote-tracking branch 'origin/master' into dev 2020-05-11 23:53:20 +02:00
Milos Kozak b5770d8e1b
Merge pull request #2638 from MilosKozak/danarefactor 
Dana: refactor to modules
 2020-05-11 20:36:50 +02:00
Milos Kozak b0513be8bf remove crashing dump 2020-05-11 20:15:35 +02:00
Milos Kozak 9e8124bc29 fix dana bolusing dialog 2020-05-11 20:05:12 +02:00
Milos Kozak 14b9ee3798 update manifests 2020-05-11 17:32:02 +02:00
Milos Kozak 5dea964b89 final dana renaming 2020-05-11 16:58:59 +02:00
Milos Kozak 441e5fdf3e extend pump interface for neutral temps 2020-05-11 14:50:35 +02:00
AdrianLxM 28dd3dedac
fix Java -> Kotlin nullability issue 2020-05-11 13:34:10 +02:00
Tim Gunn a4f4894985
fixes 2020-05-11 21:54:32 +12:00
Tim Gunn add8b71ea3
Internationalisation 2020-05-11 21:51:32 +12:00
Tim Gunn ea3ce995d8
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-11 21:14:33 +12:00
Andy Rozman 19675b1951 - change onStart 2020-05-10 23:19:11 +01:00
Milos Kozak b24690c2fa move RSCommModule 2020-05-10 23:45:49 +02:00
Milos Kozak 2375b159fa resources cleanup 2020-05-10 22:31:36 +02:00
Milos Kozak b43e7e5930
Merge pull request #2627 from Philoul/TempBasal_Icon_Switched 
Temp Basal new icons for temp basal in overview
 2020-05-10 21:11:41 +02:00
Milos Kozak 9ac88f7def remove mdtp library 2020-05-10 21:07:58 +02:00
Milos Kozak 05f73cd3ff elimitate careportal 2020-05-10 20:10:08 +02:00
Andy Rozman 95ef79e8e0 - fix for FoodFragment (fixed by Adrian on dev) 2020-05-10 16:11:36 +01:00
AdrianLxM cd84597058
Kotlin interface not stricter than Java superclass 
Intrinsic check in Kotlin if view is null lead to crashes.
view is not even used so we can accept null.
 2020-05-10 16:56:48 +02:00
Andy Rozman 80f5b3cf4b - changes on service starting (moved from cnst to onStart method) 
- change RileyLinkBLE to stop reader
- added log for start and stop of service
 2020-05-10 14:08:56 +01:00
Milos Kozak 54e68ef248 clean up 2020-05-10 11:49:37 +02:00
Tim Gunn efc25ddcd5
Use preferences 2020-05-10 21:25:14 +12:00
Tim Gunn a501b37159
Show animation if carbs are required 2020-05-10 21:24:46 +12:00
Milos Kozak 311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Tim Gunn c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak a99be409eb dana module 2020-05-09 20:18:12 +02:00
Andy Rozman c00d6344e5 - added some code to RileyLinkBLE 2020-05-09 12:09:47 +01:00
Andy Rozman d177e08355 - changed build file 
- some changes to RileyLinkBLE to handle displaying Error
- loadSessionState from util used
- remove driver specific identifier functionality from RileyLinkService
 2020-05-09 12:03:17 +01:00
Milos Kozak 7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Andy Rozman e2e4c6a17f - show RL status 2020-05-08 18:38:04 +01:00
Philoul 84f032a7a2 Revert "Temp Basal icon switched" 
I replace first proposal with a new one with 3 icons

This reverts commit 24112eb4
 2020-05-08 17:58:01 +02:00
Andy Rozman 480aac2d18 - RL status refresh 2020-05-08 15:23:02 +01:00
Milos Kozak 040c76d839 move pass 1 2020-05-08 14:59:30 +02:00
Andy Rozman 2243ec6061 - dagger 2020-05-08 13:05:31 +01:00
Andy Rozman de78ceb080 - added dagger deps 2020-05-08 12:47:35 +01:00
Andy Rozman 745b59cbed -initpodtask possible fix 2020-05-08 12:20:29 +01:00
Milos Kozak 61a077542c DanaRPump -> danars 2020-05-08 11:56:02 +02:00
Andy Rozman 9a36e9def8 - added dagger dependency for InitPodTask 2020-05-08 10:47:12 +01:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak 15207d1bf1 Omni comments 2 2020-05-08 01:09:30 +02:00
Milos Kozak 7dc7c9528b Omni comments 2020-05-08 00:23:17 +02:00
Milos Kozak 25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Andy Rozman bd39e246f3 - refactor OmnipodUIComm to support Dagger injections 
- added DeviceCommandExecutor interface
- added method to interface RileyLinkPumpDevice
 2020-05-07 22:41:24 +01:00
Milos Kozak 70e9d3e88a fix tests 2020-05-07 23:40:59 +02:00
Andy Rozman a915c279d4 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 21:22:22 +01:00
Andy Rozman 6f3379037b - added logging at RfSpy where we select frequency 2020-05-07 21:21:47 +01:00
Bart Sopers 4dc3440637 Restore null check in RuleyLinkCommunicationManager 2020-05-07 22:09:23 +02:00
Bart Sopers 7f2448adeb Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-05-07 21:16:36 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00