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

1179 commits

Author SHA1 Message Date
Milos Kozak 6d3abd3c22 TempBasalDialog refactor 2019-12-20 11:43:21 +01:00
Milos Kozak 68533437bb Merge branch 'dev' into dialogs 2019-12-19 23:13:35 +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
Bart Sopers 43f6c3dfd2 Show warning for uncertain failures and refresh overview when pod suspended state has changed 2019-12-18 23:25:47 +01:00
Milos Kozak 8d874e14d3 ProfileSwitchDialog 2019-12-18 20:59:33 +01:00
Andy Rozman b4abf00d98 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-11 22:44:20 +00:00
Andy Rozman 2133d347f0 - changed initpod_init_action dialog: added Retry button 
- extracted InitPodTask into separate class, since it needs to be called several times
 2019-12-11 22:38:52 +00:00
Milos Kozak 921655c0e2 SetupWizardActivityTest 2019-12-11 23:15:36 +01:00
Bart Sopers b120959532 Show fault code in pod fault error message 2019-12-11 13:22:29 +01:00
Roumen Georgiev c113cc23b2
Merge pull request #89 from MilosKozak/dev 
Dev
 2019-12-10 14:25:47 +02:00
Roumen Georgiev cc514520e6 Typo in string outside 2019-12-10 14:10:10 +02:00
Roumen Georgiev 55e6246646 some strings and tests broken 2019-12-10 12:34:27 +02:00
Bart Sopers 9ef83c19f8 WIP: don't kill the pod when switching profile 2019-12-10 01:11:51 +01:00
Milos Kozak bb98ec94a5 RandomBg source 2019-12-09 22:50:54 +01:00
Milos Kozak 1c0eb9f803 Stats activity 2019-12-09 19:03:26 +01:00
Milos Kozak a9e08bd08d Measure activity 2019-12-08 23:14:46 +01:00
Milos Kozak 00cd2ba343 Calculate TIR 2019-12-08 21:55:49 +01:00
Andy Rozman ad6223046c - PodManagemntActivity: 
- when reset is done, buttons are refreshed
   - when dialog is closed, tab is refreshed
- Configuration added: PumpStatus, preference dialog
 2019-12-08 18:20:11 +00:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Milos Kozak 9d787505cf Merge branch 'dev' into biometric 2019-12-08 16:43:07 +01:00
Bart Sopers 52e0b0cf82 - Show active alerts 
- Set low reservoir alert in pod
- Add some tests
 2019-12-08 15:31:07 +01:00
Milos Kozak 8124c0ae4d RC warnings 2019-12-07 19:15:26 +01:00
Roumen Georgiev 7889e3755d Adding GOING_IN & GOING_OUT modes 2019-12-06 15:03:17 +02:00
Tim Gunn a9e7590756 Merge Dev 2019-12-06 18:34:29 +13:00
Tim Gunn 280e075ada Remove Bolus Increment setting 2019-12-06 18:16:09 +13:00
Roumen Georgiev 6c8a5aee47
Merge pull request #88 from MilosKozak/dev 
Dev
 2019-12-05 15:06:15 +02:00
Milos Kozak a66b3f7090 allow sorting of automation tasks 2019-12-03 21:07:31 +01:00
Roumen Georgiev aae2e21bef trigger works 2019-12-03 16:49:08 +02:00
Roumen Georgiev 2fa3805030
Merge pull request #87 from anbraten/automation-location-left-trigger 
Automation location left trigger
 2019-12-02 11:22:44 +02:00
Milos Kozak 87d3c43a33 low_mark, high_mark to setup wizard 2019-12-02 00:07:08 +01:00
Milos Kozak c0ad125934 warn if profile is not uploadable to NS 2019-12-01 21:59:12 +01:00
Milos Kozak 702e1f0675 allow clone from existing switch 2019-12-01 20:42:23 +01:00
Bart Sopers efcd1cdfe1 Fix string parameter in Omnipod string resource 2019-12-01 16:16:12 +01:00
Bart Sopers 5c1728489a Fix floating point parameter in Omnipod string resource 2019-12-01 15:23:38 +01:00
Bart Sopers b808bc3228 Merge branch 'dev' into omnipod_eros 2019-12-01 02:21:49 +01:00
Bart Sopers 27cf316dc7 Add verification mechanism for Omnipod bolus 2019-11-30 22:51:49 +01:00
Milos Kozak 0fdc789e1f Merge branch 'dev' into localprofile 2019-11-30 22:43:15 +01:00
Milos Kozak c23794fa6e allow revert objective 2019-11-30 22:15:15 +01:00
Bart Sopers 0e8baedc8b Omnipod: add more user-friendly error messages by using string resources; add exception logging 2019-11-30 18:49:44 +01:00
Andy Rozman e955331259 see previous commit corrent 2019-11-30 12:17:02 +00:00
Milos Kozak 034c16690f temp 2019-11-30 10:16:38 +01:00
Milos Kozak eba66da4a4 allow go back with objectives 2019-11-29 12:38:07 +01:00
Tim Gunn 8eeb91a0a8 Add New preferences for oref 0.7.0 2019-11-29 21:23:12 +13:00
Tim Gunn 1dbc4a7aa2 Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2019-11-29 19:35:24 +13:00
Milos Kozak 2dd7c758f4 Local profile clone support 2019-11-28 23:18:42 +01:00
Milos Kozak 8a75d4f6b9 tabs in local profile 2019-11-28 21:58:07 +01:00
Milos Kozak ec535b9c61 low_mark, high_mark units dependent 2019-11-28 19:54:59 +01:00
Milos Kozak 599261081b upload local profile to NS 2019-11-28 00:30:22 +01:00
Milos Kozak fed2839a72 Merge branch 'dev' into localprofile 2019-11-26 16:40:46 +01:00
Andy Rozman 5b3ca232e9 - Fixed wizardpager library, so that there is no longer NPE when cancel is used 
- added Deactivate Pod Wizard
- changed some strings
 2019-11-25 22:54:06 +00:00
Milos Kozak 6969dc4873
Merge pull request #2222 from MilosKozak/2186 
New SMS commands
 2019-11-25 22:40:00 +01:00
Andy Rozman 3a1e5f5741 Init pod integration is finished. 2019-11-24 18:24:23 +00:00
Andy Rozman 0749a7864c - Added library for Wizard pages and all the classes for the integration. 
- integration of Init Pod Wizard is done from visual point of view, now it just needs to be connected to driver
 2019-11-23 20:31:29 +00:00
fabriziocasellato f26e683dbe Removed + control for Phone Numbers, Added Tests for TT, Added TARGET STOP/CANCEL command 2019-11-22 15:58:03 +01:00
Milos Kozak bcfb1feda3 Merge branch 'dev' into pull/2185 2019-11-22 15:39:16 +01:00
Milos Kozak e9aa4835ed SBS CARBS command 2019-11-22 10:40:48 +01:00
Milos Kozak d227013496 SmsCommunicatorPlugin -> kt 2019-11-22 00:12:46 +01:00
Anton Bracke d122b3e329 Added mode (entered / left) to location trigger 2019-11-12 21:48:07 +01:00
Milos Kozak 128e8a024d units selection in setup wizard 2019-11-12 15:19:18 +01:00
Milos Kozak 02891a14fc use global units setting 2019-11-12 00:01:58 +01:00
Milos Kozak 1f622e3517 Merge branch 'dev' into localprofile 2019-11-11 16:37:46 +01:00
Milos Kozak 09c1ab5960 smbmaxminutes fix 2019-11-11 14:57:56 +01:00
Andy Rozman c77cc018f0 - changes for running, so that everything is correctly initalized, moved ui classes to .driver 
- moved manager to .comm package
- started adding dialog for Pod History
 2019-11-10 17:23:40 +00:00
Andy Rozman 5c8f0a2a39 After merge changes 2019-11-09 16:38:05 +00:00
Andy Rozman 6387799ba4 Merge branch 'omnipod_eros_bart' of https://github.com/bartsopers/AndroidAPS into omnipod_eros_bart 2019-11-09 16:22:07 +00:00
Andy Rozman ef50bc5365 Merge branch 'dev' into omnipod_eros_bart 2019-11-09 16:17:43 +00:00
Bart Sopers 1a202dc8a3 Merge branch 'omnipod_eros_andy' into omnipod_eros_bart 2019-11-09 17:08:00 +01:00
Andy Rozman 4351b65a92 - changes to make driver running (no init pod yet), just fixed some running pains with driver 2019-11-09 13:58:43 +00:00
Andy Rozman 9b0a4b742d Merge branch 'dev' into omnipod_eros_andy 2019-11-08 20:24:59 +00:00
fabriziocasellato 86d4b755ea 1) Added SMS commands: 
- SMS DISABLE/STOP to disable SMS Service;
- TARGET MEAL/ACTIVITY/HYPO to switch to the standard temp targets;
- BOLUS 0.60 MEAL, to do a bolus and set the stadard meal TT (ie 90 mg/dL for 45').

2) Modified the SMS Timeout in a range from 3' to 60'.
This preference is useful for parents that will manage many boluses in a single meal (because often, eaten foods are unpredictable with babies, so parents need to perform many closed boluses).
Due to safety reasons (prevent multiple boluses for stolen phones, cloned SIM, ...):
- Added a further SMS command to disable SMS Services (SMS DISABLE/STOP);
- To modify the default timeout of 15', 2 Phone Numbers are mandatory
In this way, if unwanted/suspicious boluses are notified, the other parent can disable Remote Management (till to re-enable it directly with the AAPS in the master smartphone).
 2019-11-07 10:39:17 +01:00
Philoul d23faf65bf Add strings for shortday (shorthour allready exists) for translation of statuslights and remaining time TT in main screen 2019-11-06 20:31:05 +01:00
Rob Kresha 64dba46a96 Typo with Daylight Savings Time strings 
-2 strings with Daylight missing a 't'
-Savings not capitalized in the 3 string
 2019-11-02 16:41:21 -05:00
Andy Rozman ea441466fc Merge branch 'dev' into omnipod_eros_andy 2019-10-28 16:32:01 +00:00
Milos Kozak 2c956f43ba biometrics support for Preferences 2019-10-26 22:29:41 +02:00
Andy Rozman a87eceb950 - finalized added BolusDebug (added debug messages, added activation by configuraton) 
- added battery type NiZn
- fixed problem with RileyLinkStatusGeneral
- added check if only one entry found, then we check if entry is in range (previously we returned the entry), and return only if value in range +- 2min
 2019-10-26 16:45:34 +01:00
Andy Rozman e5e291c4da - adding configuration option 2019-10-25 12:22:24 +01:00
Milos Kozak 59c2b24e36
Merge pull request #2139 from rkresha/dev 
Threshold battery % in Overview Plugin > Advanced Settings
 2019-10-25 11:39:15 +02:00
Milos Kozak f399f8bb1f Brasil language, better working Locale setting 2019-10-25 11:38:23 +02:00
Rob Kresha e02b5746a0 Threshold battery % in Overview Plugin > Advanced Settings 
Change from two %'s to one
 2019-10-24 23:05:07 -05:00
Milos Kozak 1d7b3e10e4 typo 2019-10-24 14:14:51 +02:00
Milos Kozak 414695c5e3 preserve show calculation checkbox state, make wizard better translatable" 2019-10-24 11:34:22 +02:00
Milos Kozak c867ae1104 VirtualPumpFragment -> kotlin 2019-10-23 22:55:49 +02:00
Milos Kozak 7bbf30ec65 Merge branch 'dev' into survey 2019-10-15 23:49:17 +02:00
Milos Kozak da447b8afe LocalProfile allow more profiles 2019-10-15 19:34:29 +02:00
Milos Kozak 60a113bda6 fragment redesign 2019-10-15 19:31:33 +02:00
Milos Kozak 1340f60b5a WizardDialog refactor 2019-10-10 23:02:35 +02:00
Milos Kozak 450f4fabf0 Survey 2019-10-08 21:20:04 +02:00
Tim Gunn 4c2c92087a Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2019-10-08 20:37:01 +13:00
Roumen Georgiev d3d7fd6cc9 renamed strings 2019-10-07 10:49:15 +03:00
Milos Kozak b108f1fa78
Merge branch 'dev' into triggerPumpDisconnected 2019-10-04 19:34:54 +02:00
Milos Kozak 532a7e3741 ActionSendSMS improvement 2019-10-04 19:34:12 +02:00
Roumen Georgiev c8443f1095 TriggerPumpDisconnected: Initial work 2019-10-04 15:16:57 +03:00
Roumen Georgiev e12217ae69 Copy&paste from ActionNotification 2019-10-04 10:55:33 +03:00
Bart Sopers 953210be78 Merge branch 'dev' into omnipod_eros_bart 2019-10-02 19:18:44 +02:00
Milos Kozak c44101ce76
Merge pull request #2089 from PoweRGbg/ChangeProfileAction 
Automation ActionCahangeProfile
 2019-10-02 16:33:58 +02:00
Milos Kozak ac69d1069e
Merge pull request #2017 from PoweRGbg/TriggerTOD 
Trigger for time of day
 2019-10-02 14:41:24 +02:00
Roumen Georgiev 157028c4fd initial work 2019-10-02 10:54:04 +03:00
Milos Kozak 2d395b625e Do not allow too low max basal 2019-10-01 11:46:54 +02:00
Milos Kozak 2f1bfc8f66
Merge branch 'dev' into TriggerTOD 2019-09-25 15:00:56 +02:00
Milos Kozak 4d9088b63e objectives: links for another tasks 2019-09-25 14:33:23 +02:00
Milos Kozak 5fa9d4df62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-09-23 19:37:42 +02:00
Milos Kozak 2e2c9c5d8f better info in wizard confirmation dialog 2019-09-23 19:36:25 +02:00
Andy Rozman 529d0111c5 - some error fixes, and changes around profile 2019-09-18 18:00:30 +01:00
Bart Sopers b9d0c8f875 Merge branch 'dev' into omnipod_eros_bart 2019-09-16 00:59:32 +02:00
Rob Kresha 4546ffa838 Consistency, typos, and labels 
Small tweaks to make things more uniform.
 2019-09-15 11:25:52 -05:00
Milos Kozak 5828e90f83 improved description 2019-09-15 15:54:43 +02:00
Milos Kozak 50041e1733 simplify statuslights preferences 2019-09-15 11:42:01 +02:00
Roumen Georgiev d525c3f220
Merge branch 'dev' into TriggerTOD 2019-09-10 10:30:20 +03:00
Roumen Georgiev e3d7d4cb67 fixed name and tests 2019-09-10 10:01:36 +03:00
Roumen Georgiev c88841b361 reworked to have start and end of time range 2019-09-09 16:50:48 +03:00
Milos Kozak 13a03c362b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-09-07 22:40:31 +02:00
Milos Kozak 7871addaad change text 2019-09-07 22:40:16 +02:00
Milos Kozak c57a6335d9
Merge pull request #2027 from triplem/ext_statusline 
Add extended statuslight to overview fragment
 2019-09-07 22:38:11 +02:00
Milos Kozak 23aedb0c6c more exams 2019-09-07 19:34:31 +02:00
Milos Kozak 9b15d9da89 more exams 2019-09-07 19:27:31 +02:00
Milos Kozak c0d65df330 exams cleanup 2019-09-07 18:52:17 +02:00
Milos Kozak 940d413d1e
Merge branch 'dev' into dev 2019-09-07 11:58:19 +02:00
Milos Kozak 45638ef5eb more exams 2019-09-07 11:56:16 +02:00
Milos Kozak b5e4c044ac display hint in exam 2019-09-07 11:32:24 +02:00
Milos Kozak 88c263bb39 better hypott question 2019-09-07 11:21:14 +02:00
Tim Gunn b231903c2e Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2019-09-07 10:46:19 +12:00
typ1-brods 18269b66d6
Update strings.xml 2019-09-06 23:29:15 +02:00
triplem cc298f81b8 add extended statuslight to overview fragment 2019-09-05 21:39:53 +02:00
Milos Kozak 64a2b45866 add rice to objective bypass code 2019-09-05 20:53:53 +02:00
Milos Kozak 91ebc11d9b ObjectivesExamDialog fine tunning 2019-09-05 20:26:23 +02:00
Roumen Georgiev a77835d541 Initial work 2019-09-04 15:50:37 +03:00
Milos Kozak 37d10fbcbf Exam objective 2019-09-04 00:00:52 +02:00
Milos Kozak 05bb5a660b simplify manual actions code 2019-09-02 23:38:14 +02:00
Milos Kozak b9e91f3d20 confirm dialog on entering code 2019-09-02 23:10:31 +02:00
Milos Kozak 99893a3ab1 allow bypass objectives 2019-09-02 08:42:25 +02:00
Milos Kozak 80efc9369c new objective Using AAPS 2019-09-01 13:43:11 +02:00
Milos Kozak 3274f372ef show accomplished 2019-09-01 10:33:17 +02:00
Tim Gunn cfe29bd8a8 Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2019-09-01 10:00:37 +12:00
Andy Rozman 86a7117e63 Merge branch 'dev' into omnipod_eros_andy 2019-08-30 10:51:19 +01:00
Milos Kozak 67fe19ee2c
Merge pull request #2003 from aviau/typo/setup-it 
strings.xml: 'setup it' -> 'set it up'
 2019-08-29 08:37:32 +02:00
aviau ee217e2bfa
typo: offline available -> available offline 2019-08-28 23:47:10 -04:00
aviau a0b1b26460
strings.xml: 'setup it' -> 'set it up' 2019-08-28 23:25:21 -04:00
Milos Kozak 7d9d70fba8 better notification layout 2019-08-28 17:57:48 +02:00
Milos Kozak 7e5d96f3f3 remove unused resources 2019-08-28 16:55:20 +02:00
Milos Kozak b9c965ac95
Merge branch 'dev' into bw 2019-08-27 21:36:51 +02:00
Milos Kozak f184aa0c6a TriggerDelta show units 2019-08-27 19:35:37 +02:00
Milos Kozak 4c7b8ef210 fast >>>Loading ...<<< notification on app start 2019-08-26 17:33:20 +02:00
Milos Kozak 792a1d7ddd code cleanup 2019-08-24 18:58:17 +02:00
Milos Kozak 0a77fb9bcb implement percentage in wizard, refactoring to kotlin 2019-08-23 16:31:30 +02:00
Milos Kozak 6ed0f9b40e more detailed message 2019-08-22 20:55:58 +02:00
Brian Quinion 450a25c3b8 Allow for Battery Optimization failing on some platforms 2019-08-21 17:38:01 +01:00
Milos Kozak 0bdaa17082 Insulin activity scale detection 2019-08-15 17:54:57 +02:00
Milos Kozak b5bc80bc52 Merge branch 'pull/1956' into dev 2019-08-15 14:40:19 +02:00
Milos Kozak 956b9947b6 fix string format 2019-08-15 14:39:42 +02:00
Milos Kozak 56d6a04e2b MDT prefs translatable=false 2019-08-14 17:49:01 +02:00
Andy Rozman 3203ad5cde - added dash package so that I can split the two implementations 
- working on omnipod implementation
- changed display fragment
 2019-08-14 16:22:19 +01:00
Andy Rozman 9a1262cc4e - refactoring to use OmnipodCommunicationManager with existing code 
- added kt for OmnipodFragment
 2019-08-13 12:30:23 +01:00
Andy Rozman a1bbf29230 - added check before bolus is attempted, if we have enough in reservoir (from local info, we don't query the pump, 
while this might not always be 100% correct, it is updated every hour (if under 50 U and every 4h if over
50U and every 15 minutes if under 20U, so it should be accurate, information is not accurate only if you cancel bolus midway...
 2019-08-12 17:20:38 +01:00
Bart Sopers ca325c18e9 Merge branch 'omnipod_eros_andy' into omnipod_eros_bart 2019-08-11 15:56:45 +02:00
Tim Gunn 585f4e2bc2 merge in SMBInterval 2019-08-10 16:18:58 +12:00
Tim Gunn 2b4f27421a Merge branch 'uam-smb-basal' into update-oref 2019-08-10 16:00:31 +12:00
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak c1a1cc3108 ProfileViewerDialog -> kotlin 2019-08-06 01:19:24 +02:00
Milos Kozak 49ae8747fd remove code redundancy 2019-08-03 21:22:24 +02:00
Andy Rozman 1047403923 - first commit for Omnipod 2019-07-30 17:49:56 +01:00
Milos Kozak 3ffa75aede
Merge pull request #1899 from MarieT1D/patch-1 
string.xml: specify description for Open Loop setting
 2019-07-28 14:25:27 +02:00
Marie 0ea9118fc6
string.xml: specify description for Open Loop setting 
Adding "Open" to description of 'Minimum request change' in open loop mode and adding " in %" to value,

so that people immediatly know for what it's for
 2019-07-28 13:32:16 +02:00
Milos Kozak a0854a895c Language cleanup 2019-07-28 10:20:31 +02:00
Milos Kozak b448bbe670
Merge branch 'dev' into signature_verifier 2019-07-26 22:28:22 +02:00
Milos Kozak 76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Milos Kozak 97c75052e5 Merge branch 'dev' into automation 2019-07-25 18:22:46 +02:00
Milos Kozak 838e19877b add Lithuanian language 2019-07-25 16:43:00 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 0b28c92c2d
Merge pull request #1868 from andyrozman/medtronic_andy_merge 
Medtronic driver merge
 2019-07-25 16:15:17 +02:00
Milos Kozak 283fa0debf fix string 2019-07-25 15:17:58 +02:00
Milos Kozak 51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman da0b3c84f9 - added translatable="false" to all new keys 2019-07-24 16:42:10 +01:00
Andy Rozman b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Milos Kozak b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph 
Insulin Activity in bg graph
 2019-07-15 15:27:04 +02:00
Milos Kozak 7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +02:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak 72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Johannes Mockenhaupt 0e37228a07
Tidepool: remove category summary (is never displayed). 2019-07-14 11:54:03 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus 96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus 4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT 
- Merge branch 'dev' into medtronic_andy
 2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Andy Rozman a77f10dc94 - small fix for 0.11.8 2019-06-29 18:25:12 +01:00
Andy Rozman 32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Milos Kozak 7e8059c3d8
Merge branch 'automation' into triggerLastBolus 2019-06-21 15:34:06 +02:00
Milos Kozak a9d8420451
Merge branch 'automation' into deltaTrigger 2019-06-21 15:22:40 +02:00
Roumen Georgiev 046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev 15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00
Tebbe Ubben 5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00
Roumen Georgiev f15ead9c6f fixed tests and added DeltaType testing 2019-06-17 16:49:57 +03:00
Milos Kozak 09e4106182 BolusWizard -> kt, code consolidation 2019-06-16 09:00:47 +02:00