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

10479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roumen Georgiev 70842b269f pass correct number of strings 2019-12-09 15:07:56 +02:00
Philoul d6c58fc35c Set number of decimal for bg value according to unit 2019-12-09 00:24:02 +01:00
Milos Kozak a9e08bd08d Measure activity 2019-12-08 23:14:46 +01:00
Philoul 5a606b5cb9 Merge remote-tracking branch 'origin/WizardInfoDialog_Translation' into WizardInfoDialog_Translation 2019-12-08 23:01:38 +01:00
Andy Rozman 7e8e57dad9 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-08 21:06:27 +00:00
Andy Rozman 6a979a1f29 - pod management another extension 2019-12-08 21:05:27 +00:00
Milos Kozak 00cd2ba343 Calculate TIR 2019-12-08 21:55:49 +01:00
Andy Rozman bdb3bc0b8e - fixed refresh of config data (I hope) 
- if podmanagement changes some pod status
 2019-12-08 20:55:24 +00:00
Philoul 9d22e177bb replaced String.format(MainApp.gs(xx), yy, zz) by MainApp.gs(xx, yy, zz) for bg, cob and carbs 2019-12-08 21:30:25 +01:00
Philoul 1525a30e01
Merge pull request #3 from Philoul/dev 
Dev
 2019-12-08 21:24:13 +01:00
Philoul 967f0f3e5c
Merge pull request #2 from MilosKozak/dev 
Dev
 2019-12-08 21:22:02 +01:00
Bart Sopers 6a4765d998 Cache last bolus in AapsOmnipodManager 2019-12-08 21:02:39 +01:00
Milos Kozak 0d6743ab82 Merge branch 'survey' of https://github.com/MilosKozak/AndroidAPS into survey 2019-12-08 20:21:29 +01:00
Bart Sopers b46914a97b Update suspended status when podstate is null 2019-12-08 20:13:15 +01:00
Milos Kozak fb23cbab54 survey fragment scrollable 2019-12-08 20:12:15 +01:00
Bart Sopers b1cc067c85 Update suspended state in PumpStatus 2019-12-08 20:03:32 +01:00
Andy Rozman 9b5535edf0 - Fix for remaining insulin 2019-12-08 18:25:58 +00:00
Andy Rozman 5711a98a77 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-08 18:22:12 +00: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
Bart Sopers 4beb62700b Ignore PodFaultException in cancelBolus 2019-12-08 19:10:12 +01:00
Milos Kozak 0e89ced3e1 Merge branch 'dev' into survey 2019-12-08 19:07:35 +01:00
Bart Sopers e350856161 Don't emit acknowledgement beeps when cancelling delivery before deactivating pod 2019-12-08 18:53:45 +01:00
Bart Sopers 057927d24e Ignore PodFaultException when deactivating pod 2019-12-08 18:46:51 +01:00
Bart Sopers 29d12eeb26 Update pump status when it gets assigned; don't schedule on main thread 2019-12-08 18:18:09 +01:00
Milos Kozak 66fd83ccb1 biometrics bolus protection 2019-12-08 18:01:52 +01:00
Bart Sopers 2905bfba86 Knit in OmnipodManager 2019-12-08 17:57:36 +01:00
Andy Rozman c5f69347eb Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-08 16:36:39 +00:00
Andy Rozman b1baf2b64a - fixed compiled error 2019-12-08 16:35:21 +00:00
Bart Sopers 680a3922b8 Fix bug in alert configurations 2019-12-08 17:24:31 +01:00
Andy Rozman 2132bf1675 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-08 16:21:47 +00:00
Andy Rozman a7153cf8b8 - Added new version of library 
- added new Cancel/Finish action that refreshes dialog
 2019-12-08 16:16:39 +00:00
Milos Kozak 3c7454884d protect MainActivity by biometrics 2019-12-08 17:04:39 +01:00
Bart Sopers 67d3ee772b Update PodSessionState.toString() 2019-12-08 16:48:38 +01:00
Milos Kozak 9d787505cf Merge branch 'dev' into biometric 2019-12-08 16:43:07 +01:00
Bart Sopers 17ad3c41e9 Add no-args constructor for PodHistory 2019-12-08 16:40:14 +01:00
Bart Sopers 3cc1113501 Update last bolus and units remaning for Omnipod in PumpStatus 2019-12-08 16:38:15 +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
Andy Rozman df82a90b36 [#15] 
- changed gradle with different version numbering
- changed the init code, to check if pod was already set, and afterwards does refresh of Tab and Overview...
 2019-12-08 12:13:55 +00:00
Andy Rozman 73f1aaf819 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-08 11:57:24 +00:00
Philoul 6d82ceacf9 Replace the text string in the code with MainApp.gs to allow translation 
For bg I leave a decimal. I tried to use valueToUnitsToString but I don't know how to get units from json (NS data I guess) and this method does not work (missing import?) On the JsonHelper object ...
 2019-12-08 01:03:49 +01:00
Philoul f6649939aa Text string in layout (but no sure if it's necessary...) 2019-12-08 00:02:21 +01:00
Philoul 401b4c170f replacing getRessources.getString with aaps.gs in java files 2019-12-07 23:14:36 +01:00
Milos Kozak ebe4eecaa5
Merge pull request #2250 from MilosKozak/rc 
RC handling
 2019-12-07 22:51:32 +01:00
Milos Kozak c4cf00cc97
Merge pull request #2251 from MilosKozak/adrian/rc2 
rc version refactor
 2019-12-07 20:27:13 +01:00
AdrianLxM 00702ae924 rc version refactor 2019-12-07 20:02:10 +01:00
Milos Kozak 0c19a4081f ignoreCase = true 2019-12-07 19:18:52 +01:00
Milos Kozak 8124c0ae4d RC warnings 2019-12-07 19:15:26 +01:00
Milos Kozak 517b9a9fa7 Handle NS TempTarget sync properly 2019-12-07 18:14:32 +01:00
Bart Sopers 3860a95e20 Distinguish between normal bolus and SMB in AapsOmnipodManager 2019-12-07 16:18:37 +01:00
Bart Sopers b186f01c11 Prepare OmnipodManager and AapsOmnipodManager for configurable beeps 2019-12-07 16:09:43 +01:00