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

7045 commits

This branch
This branch
All branches
Author SHA1 Message Date
AdrianLxM 148e336003
Merge pull request #1473 from MilosKozak/carbs-fix 
Carbs fix
 2018-09-26 14:55:40 +02:00
AdrianLxM 126f3925e0 don't send carbs entered in the past to the pump 2018-09-26 13:59:04 +02:00
AdrianLxM e9883dcc3a Revert "fix carb generator" 
This reverts commit 6403c5d997.
 2018-09-26 13:37:24 +02:00
AdrianLxM 95ea377d71 Revert "fix addToHistoryTreatment" 
This reverts commit d707ea7fb0.
 2018-09-26 13:37:05 +02:00
Milos Kozak 23a91b3838 2.0h-dev 2018-09-25 17:56:16 +02:00
Milos Kozak 60066950a5
New Crowdin translations (#1470) 2018-09-25 14:15:03 +02:00
Milos Kozak e4e3112f77
New Crowdin translations (#1469) 2018-09-25 10:24:57 +02:00
Nico Schmitz c60aae8630 Work on implementation for automation plugin. 
- Use butterknife
- Import weekdays selector
- Implement layout for trigger connection and trigger time
- Implement view holders
- Implement adapters
- Implement dummy code for quick testings
- Refactor code
 2018-09-25 00:00:09 +02:00
Milos Kozak 794c80f7e3 Fix accesing wrong DanaRPump instance 2018-09-24 22:43:23 +02:00
Milos Kozak f128a33266
New Crowdin translations (#1466) 2018-09-24 22:11:12 +02:00
Milos Kozak d707ea7fb0 fix addToHistoryTreatment 2018-09-23 18:58:13 +02:00
Milos Kozak b474e9146f
New Crowdin translations (#1463) 
* New translations strings.xml (Spanish)

* New translations strings.xml (Chinese Simplified)
 2018-09-23 10:16:25 +02:00
Milos Kozak 1c44981494 Fix wrong message during refill 2018-09-22 21:25:07 +02:00
Milos Kozak 6403c5d997 fix carb generator 2018-09-21 23:24:50 +02:00
Milos Kozak eb1075dd04
New Crowdin translations (#1457) 2018-09-21 13:01:16 +02:00
Milos Kozak 6ffc0cf28e
Merge pull request #1461 from pimeys/vibe_tbr_max_fix 
Fix TBR maximum for Animas Vibe
 2018-09-21 13:00:40 +02:00
Julius de Bruijn 84e41122fc Fix TBR maximum for Animas Vibe 
Animas actually supports 300% TBR, but uses a different way of
displaying it:

0% is the same as 100% in AAPS.
-100% (OFF) is 0% in AAPS
200% therefore is 300% in AAPS.

Maybe there should be a better indicator for this in AAPS, but for now
this fix gives better control of the TBR values, if using the open loop.
 2018-09-21 11:09:41 +02:00
Andy Rozman e2ddb48498 Some extension on VirtualPump for testing. 2018-09-20 18:04:06 +01:00
Andy Rozman 48e4a041f8 - First changes for CustomActions 
- changed PumpInterface to add CustomActions
  - added class CustomActions and CustomActionType
  - changed all PumpImplementations to use new methods
  - started changing ActionsFragment (most should be done)
 2018-09-20 17:23:36 +01:00
Milos Kozak 58b3f96c9e
New Crowdin translations (#1456) 2018-09-20 09:05:35 +02:00
Nico Schmitz b5f30a0f46 Add some content to automation plugin fragment 2018-09-19 22:29:35 +02:00
Nico Schmitz 4985864343 Add title. Generate getters. 2018-09-19 22:27:30 +02:00
Andy Rozman 70065c1343 - merge RileyLink2 support from RileyLinkAAPS 2018-09-19 20:51:40 +01:00
Nico Schmitz e32050d565 Replace constants by comparator enum 2018-09-19 21:13:02 +02:00
Milos Kozak 1d3c4509f2
New Crowdin translations (#1454) 
* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)
 2018-09-19 20:56:05 +02:00
Milos Kozak 3eee5b13c7 LocationService 2018-09-19 15:26:58 +02:00
Milos Kozak 8ce4e01415
New Crowdin translations (#1447) 2018-09-19 08:44:44 +02:00
Milos Kozak efec01c6e5 Some Actions 2018-09-18 23:17:00 +02:00
Milos Kozak 2bf07eb0d4 TriggerBg 2018-09-18 20:17:45 +02:00
AdrianLxM 92e5acbc26
Update strings.xml (#1452) 2018-09-18 13:31:32 +02:00
Milos Kozak ca7e9d2a7f TriggerAnd-Or json saving, loading 2018-09-18 12:32:34 +02:00
Milos Kozak 4ba1adabf4 TriggerAnd, TriggerOr 2018-09-18 10:38:12 +02:00
Milos Kozak d317ec94ad AutomationPlugin 2018-09-18 10:05:19 +02:00
Milos Kozak 9a96d29dc3 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-17 19:57:15 +02:00
Milos Kozak a7e64c79f0 remove static MainApp.sConfigBuilder 2018-09-17 19:56:56 +02:00
Milos Kozak 924bc97e3b remove static ConfigBuilderPlugin.commandQueue 2018-09-17 19:29:01 +02:00
Milos Kozak f6c113550f remove static ConfigBuilderPlugin.activeSensitivity 2018-09-17 18:30:57 +02:00
Milos Kozak dc563df5f0 remove static ConfigBuilderPlugin.activeInsulin 2018-09-17 18:18:50 +02:00
Milos Kozak 1b086e6776 remove static ConfigBuilderPlugin.activeAPS 2018-09-17 17:59:44 +02:00
Milos Kozak 0b32431f9e remove static ConfigBuilderPlugin.activeProfile 2018-09-17 17:48:11 +02:00
Milos Kozak bc19973ce0 remove static ConfigBuilderPlugin.activePump 2018-09-17 17:43:42 +02:00
Milos Kozak dcbf093514
Merge pull request #1399 from MarkMpn/temp-target-units 
Assume md/dl units for temp targets created through Nightscout
 2018-09-17 16:46:33 +02:00
Milos Kozak 0504619b39
New Crowdin translations (#1443) 2018-09-17 16:44:29 +02:00
Milos Kozak 2acc956e04
Merge pull request #1446 from dmelliott20/dev 
Update PumpType.java - fixes issue that zero temps cannot be enacted when very small basals are running
 2018-09-17 16:43:57 +02:00
dmelliott20 167ed27659
Update PumpType.java 
Ammended the basebasalstep values fro the insight and the combo.

this was preventing AAPS from implementing zero basals where the basalstep was higher than the current running basal rate e.g. basal of 0.06u\hr running and a basalstep 0f 0.1u\hr resulted in no zero temp being enacted because of logic in the loop plugin.
 2018-09-17 12:26:00 +00:00
Milos Kozak 21c7da4ae2
New Crowdin translations (#1435) 2018-09-16 19:38:19 +02:00
Milos Kozak 2eefcfcbd9
Merge pull request #1440 from quizzmaster/fix_1438 
fixed typos of pairing
 2018-09-16 19:37:33 +02:00
Sebastian Lenz 6323f2dd49 fixed typo 2018-09-16 18:32:51 +02:00
Andy Rozman da75ed643d Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable 2018-09-14 18:14:45 +01:00
Milos Kozak 53389fea3b fix import settings 2018-09-14 17:54:32 +02:00