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

7054 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Rozman 2c07bc4c3b - Removed test 2019-07-13 19:55:14 +01:00
Andy Rozman 094d81c5ce - Fixed wrong UTest 2019-07-13 19:52:31 +01:00
Andy Rozman 92b9643b43 Merge branch 'medtronic_andy_merge' of https://github.com/andyrozman/AndroidAPS into medtronic_andy_merge 2019-07-13 19:22:07 +01:00
Andy Rozman 675dcc1b5b Fixes: 
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
 2019-07-13 19:15:44 +01:00
Paulus 106d30394c Included insulin activity on both primary and secondary graphs 2019-07-13 18:28:16 +02:00
Paulus 2a4e9e2cc6 Changed scale factor so IA is always displayed at same scale (even if only selected option) 2019-07-13 17:54:27 +02:00
Paulus d528e800f6 Fixed code so IA is also correctly displayed in ssecondary if it is the only selected option. 2019-07-13 17:46:57 +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
Milos Kozak 4f903cd53d
Merge branch 'dev' into medtronic_andy_merge 2019-07-13 16:17:12 +02:00
Milos Kozak adf1a0da66 libraries update 2019-07-13 16:16:43 +02:00
Andy Rozman 8c8fba5522 - Added separate method for TreatmentService.createOrUpdate for Medtronic (createOrUpdateMedtronic) 
- MedtronicUtil added method to detect if pump is Medtronic (reads ConfigBuilder.getActivePump().deviceID)
- TreatementService call from NS checks pump type and calls correct method
- TreatmentPlugin checks pumptype and calls correct createOrUpdate method
 2019-07-13 14:28:24 +01:00
Andy Rozman 0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Paulus d7cb84e693 Fixed handling of null profile 2019-07-13 10:26:15 +02:00
Milos Kozak 1eed348fe0 Merge branch 'dev' into automation 2019-07-13 10:11:14 +02:00
Milos Kozak 606122bae0 fix kotlin warnings 2019-07-13 10:09:57 +02:00
Milos Kozak 4dd4408273 gradle update 2019-07-13 10:01:01 +02:00
Andy Rozman 39c3f5ddfe Added engineering mode for Medtronic driver. 2019-07-12 19:31:43 +01:00
Andy Rozman a5a36332f3 Prepared for PR 2019-07-12 19:29:36 +01:00
Andy Rozman 264bbdee20 Merge branch 'dev' into medtronic_andy 2019-07-12 18:54:15 +01:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak f5c22a33ff icons 2019-07-11 18:56:50 +01:00
Milos Kozak 777896855d
Merge pull request #1864 from jotomo/ruffyscripter-unparsable-menu-reset 
Bugfix, Combo: recovery after encountering an unknown menu
 2019-07-11 18:54:34 +01:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Milos Kozak a356e5cbc7 New translations strings.xml (Polish) 2019-07-11 07:51:58 +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 7aa4716870 - changed all ui files to conform to androidx classes/implementation 2019-07-05 16:04:54 +01: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 bec954b8a2 New translations strings.xml (French) 2019-07-05 13:07:53 +01:00
Andy Rozman 4088b38883 - minor change in code 
- renamed version to 0.11, preparing for tag
 2019-07-05 12:21:49 +01:00
Milos Kozak 91cc5e1adb New translations strings.xml (German) 2019-07-05 12:04:39 +01:00
Paulus 4b5189403c #1851 initial commit 2019-07-05 12:12:19 +02:00
Milos Kozak 18f9fa195b New translations strings.xml (Afrikaans) 2019-07-05 04:32:32 +01:00
Milos Kozak 829ef9b6ad fix test import 2019-07-05 00:49:41 +01:00
Milos Kozak 635e7cc60f uncomment 2019-07-05 00:28:19 +01:00
Milos Kozak 1bb314406c remove duplicates in gradle 2019-07-05 00:24:39 +01:00
Milos Kozak f48cb6af2c automation in engineering mode 2019-07-05 00:22:45 +01:00
Milos Kozak 9706f68be2 automation -> jetpack 2019-07-05 00:21:31 +01:00
Andy Rozman 7713270524 medtronic-0.11.12-SNAPSHOT 
- another look at duplicate bolus problem. This should have fixed the problem, if we still get duplicated, we will
have to investigate NS angle
 2019-07-05 00:15:45 +01:00
Johannes Mockenhaupt a17947ff12
RuffyScripter: reset unparsableMenuEncountered flag on command start. 2019-07-05 00:57:07 +02:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 3a73e3cd2e New translations strings.xml (Portuguese) 2019-07-04 21:52:56 +01:00
Milos Kozak 9f2269c372 New translations strings.xml (Swedish) 2019-07-04 21:33:38 +01:00
Milos Kozak de55606217
Merge pull request #1837 from PoweRGbg/triggerLastBolus 
Trigger lastBolus
 2019-07-04 20:50:20 +01:00
Milos Kozak aa1d24381b New translations strings.xml (Portuguese, Brazilian) 2019-07-04 20:48:35 +01:00
Milos Kozak 0693a599d5
Merge pull request #1798 from MilosKozak/sdk28 
targetsdk 28
 2019-07-04 20:45:04 +01:00
Milos Kozak abcc4ba65f
Merge pull request #1858 from MilosKozak/l10n_dev 
New Crowdin translations
 2019-07-04 20:35:33 +01:00
Milos Kozak 6258d473b0 fix merge 2019-07-04 20:28:22 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Andy Rozman 38f13cd6db medtronic-0.11.11-SNAPSHOT 
- #152 fixed double bolus problem: code is now looking for AAPS Events that happened within 2 minutes.
 2019-07-04 13:24:46 +01:00