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

4350 commits

Author SHA1 Message Date
Milos Kozak 595bf0314c Merge branch 'dev' into iobfix 2019-07-26 00:39:40 +02:00
Milos Kozak 7735612daf
Merge pull request #1888 from MilosKozak/bwfix 
Bolus wizard confirmation
 2019-07-25 23:59:41 +02:00
Milos Kozak 76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Johannes Mockenhaupt d9de09d7f0
Confirm pump plugin activation for all hardware pumps (MDT, Insight). 2019-07-25 22:30:47 +02:00
Johannes Mockenhaupt cf1bcf9943
Dedup pump activation confirmation. 2019-07-25 22:30:25 +02:00
Milos Kozak 75baa473f1 fix carbtime in BolusWizard 2019-07-25 21:45:54 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Andy Rozman 29d0545d47 - fixed manufacturer and model 2019-07-25 13:41:57 +01:00
Milos Kozak 51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak f778e0ac0d fix code after merge 2019-07-23 13:32:21 +02:00
Milos Kozak e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak 29c8740e08
Merge pull request #1879 from MilosKozak/psfix 
ProfileSwitch validation
 2019-07-23 09:18:12 +02:00
Milos Kozak ae7332df2d cleanup 2019-07-23 00:26:59 +02:00
Milos Kozak 47ed0acec2 ChooseTriggerDialog to kotlin 2019-07-23 00:04:44 +02:00
Milos Kozak 063c27fb89 ChooseActionDialog to kotlin 2019-07-22 22:47:26 +02:00
Milos Kozak a809c0ac35 ActionListAdapter to kotlin 2019-07-22 21:41:42 +02:00
Milos Kozak e539dbc112 fix tests, use location form service 2019-07-22 16:58:25 +02:00
Milos Kozak c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak 12f436c681 hide ok button on wrong input 2019-07-22 13:58:50 +02:00
Milos Kozak 11edd1b4a0
Merge pull request #1876 from andyrozman/ref_manufacturer 
Ref manufacturer
 2019-07-22 09:56:43 +02:00
Milos Kozak 03bcdf82b3 validate on focus change 2019-07-19 11:44:43 +02:00
Milos Kozak d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Andy Rozman 7de907f3d6 - fixed NPE in RiuleyLinkStatus History 
- added 2 Broadcast Receivers:
    - TimeDateOrTZChangeReceiver, this one in registered with MainApp in MainApp
    - RileyLinkBluetoothReceiver, this one is registered with MainApp from RileyLinkService
 2019-07-18 18:09:49 +01:00
Milos Kozak 1b937bfe08 fix passcode generation 2019-07-17 21:16:36 +02:00
Milos Kozak 1c8aae9757 fix tests 2019-07-16 22:35:46 +02:00
Andy Rozman cd4868f781 - changed manufacturer() and model() methods in PumpInterface... both now return enums... 
- manufacturer can be used with ManufacturerType.getDescription()
- model can be used with PumpType.getModel()
 2019-07-16 21:12:36 +01:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Andy Rozman be05ff3510 - Added 2 receivers... 2019-07-16 20:36:37 +01:00
Andy Rozman cfc1d7135f - Removed double methods that are not used 2019-07-16 18:40:35 +01:00
Milos Kozak 67b06f51fe remove loop from actions 2019-07-16 17:05:51 +02:00
Milos Kozak 888a63a5b0 Merge branch 'automation' of https://github.com/MilosKozak/AndroidAPS into automation 2019-07-16 16:00:21 +02:00
Milos Kozak 75b2f7f77f Location interval as constant 2019-07-16 15:58:47 +02:00
Milos Kozak c0d85e85a0 Merge branch 'dev' into iobfix 2019-07-15 15:52:02 +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
Andy Rozman c3de5d7f58 Changed files with changes to PumpInterface and Profile 2019-07-14 22:24:41 +01:00
Andy Rozman f0cc3d4ab2
Merge pull request #5 from jotomo/mdt-dialogs 
Mdt dialogs
 2019-07-14 20:18:40 +01: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
Milos Kozak 9d15ea608e static version in OpenDatasetMessage 2019-07-14 17:13:07 +01:00
Johannes Mockenhaupt 9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak d7a28bf713 Session test 2019-07-14 16:11:27 +01:00
Johannes Mockenhaupt 240c83e83a
Proper exception logging. 2019-07-14 16:59:00 +02:00
Milos Kozak beb4e004bf better null checks 2019-07-14 15:01:12 +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