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

9138 commits

Author SHA1 Message Date
Philoul 93046d0354 Revert to val for ratio and dev slope Scale 2021-05-27 08:43:45 +02:00
Philoul ede1468bbb Modify shift 2021-05-26 22:04:42 +02:00
Philoul 506fbde587 Merge branch 'dev' into FixSensScale 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
 2021-05-26 21:50:58 +02:00
Andy Rozman 766b2b4bea - changes after comments 2021-05-26 20:16:17 +01:00
Andy Rozman b40f8b79d1 - reverted change to remove check 2021-05-26 16:04:47 +01:00
Milos Kozak 6e19d60796 Scale -> kt 2021-05-26 14:17:49 +02:00
Andy Rozman 029eb55f0e - changes according to comment in PR 
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
 2021-05-26 13:14:17 +01:00
Milos Kozak 43e6ba43b6 fix expiring intervals 2021-05-26 09:01:22 +02:00
Philoul 3a24af1a4c Merge branch 'dev' into FixSensScale 2021-05-25 22:56:00 +02:00
Milos Kozak 84cc4d0c00 fix setting din in profile 2021-05-25 22:10:12 +02:00
Milos Kozak e170503f82 lint 2021-05-25 21:53:00 +02:00
Milos Kozak 3d1b7e8ded fix updating non basal profile changes 2021-05-25 21:19:18 +02:00
Milos Kozak 3ed45fdd11 improve NS profile sync 2021-05-25 20:59:41 +02:00
Milos Kozak bee6d289c0 HistoryBrowseActivity 2021-05-25 17:42:21 +02:00
Andy Rozman e24af3934f - refactorings kotlin !! 
- moved 2 filed into pump-common module (newly created)
 2021-05-24 16:57:54 +01:00
Milos Kozak 966f7b35f2 move treatments to upper right menu 2021-05-23 21:38:30 +02:00
Philoul 6532d9111e Fix same curve on different graphs 2021-05-23 15:28:33 +02:00
Philoul 62c063a5bc Fix Sens curve scale if alone on a graph 
=> I also fix deviation slope curve if secondary behind Sens curve
 2021-05-23 14:37:18 +02:00
Philoul b9a9a86739 Merge remote-tracking branch 'Nightscout/dev' into FixSensScale 2021-05-23 11:15:58 +02:00
Milos Kozak 1a72129a38 Revert "remove unused libs" 
This reverts commit 158e9c65
 2021-05-23 11:13:39 +02:00
Philoul 37bd7495fd Convert status Message to Kotlin (+ associated null management in localInsightPlugin) 2021-05-23 10:50:37 +02:00
Milos Kozak ea940ea165 remove redundant carbTime 2021-05-22 21:24:49 +02:00
Andy Rozman 561d255c34 - removed mdt tag from branch 2021-05-22 10:46:13 +01:00
Andy Rozman 4dcc8dc46f - removed dropbox files 2021-05-22 10:26:32 +01:00
Milos Kozak 6e012ec75f fix dbUpdate 2021-05-21 22:53:49 +02:00
Milos Kozak bd8787c209 update iob regularly 2021-05-21 22:53:34 +02:00
Milos Kozak 0bb52acfe0 fix therapy event rendering 2021-05-21 17:24:33 +02:00
Milos Kozak af3df53f10 fix receiving dexcom calibrations 2021-05-21 15:49:42 +02:00
Milos Kozak 11f00d1776 make it compile with kotlin 1.4 2021-05-20 19:42:44 +02:00
Milos Kozak 158e9c6508 remove unused libs 2021-05-19 22:49:09 +02:00
Milos Kozak 20128c026d downgrade playServicesWearable 2021-05-19 21:11:50 +02:00
Milos Kozak c0ded2b07b remove unused lib 2021-05-19 07:43:14 +02:00
Milos Kozak b548325059 lints 2021-05-18 22:31:08 +02:00
Milos Kozak 328ec9a9ff
Merge pull request #523 from Philoul/FIX_Extended_Remove 
Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment
 2021-05-18 21:40:15 +02:00
Milos Kozak 938f3f612a mockitoVersion = '3.10.0' 2021-05-18 19:02:25 +02:00
Milos Kozak 79833dbdf1
New Crowdin updates (#490) 
* New translations strings.xml (Hebrew)

* New translations exam.xml (Lithuanian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations objectives.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations alert_descriptions.xml (Hebrew)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (French)

* New translations objectives.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)
 2021-05-18 18:31:01 +02:00
Milos Kozak 2fd093091f kotlin 1.5.0 2021-05-18 18:30:52 +02:00
Philoul 1606b8c274 Fix FakeExtended TBR removal from TreatmentTemporaryBasalsFragment 
More information in uel.log added and Fix information for Absolute / Percent values
 2021-05-18 18:28:03 +02:00
Milos Kozak a0c7e0352d typo 2021-05-17 23:03:52 +02:00
Milos Kozak 219dfd375f disable unfinished plugins 2021-05-17 21:17:15 +02:00
Milos Kozak a1c1355ce6 MVVM like for overview 2021-05-17 21:05:24 +02:00
Andy Rozman 06f079d6fd Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-17 00:42:18 +01:00
Andy Rozman fd5e7a3c5c Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-17 00:20:44 +01:00
Milos Kozak 3040be317c TBR as live 2021-05-14 21:45:48 +02:00
Milos Kozak 1af0cc5aeb NSClient sync improvement 2021-05-14 08:54:11 +02:00
Milos Kozak 6c851b5e7b
Merge pull request #517 from Philoul/LoopDialog_Improvement 
Loop Dialog improvement
 2021-05-13 17:47:33 +02:00
Milos Kozak 60cae5c2bd
Merge branch 'dev2_dana_combo_only' into Fix_NSClient_UseAbsolute 2021-05-13 17:46:10 +02:00
Milos Kozak e83375f754 NSClient update 2021-05-13 17:44:07 +02:00
Andy Rozman 14b7895f20 - final changes on Bolus (checking if bolus entry was changed in last 35 minutes) 
- added class for Dropbox support (not yet implemented)
 2021-05-13 13:33:25 +01:00
Philoul 9d87dec574 NSClient Fix Use Absolute 2021-05-12 18:28:52 +02:00
Milos Kozak bcd74897d4
Merge pull request #502 from Philoul/dev2_Insight_v2 
Dev2 insight v2
 2021-05-12 11:12:53 +02:00
Philoul 02e923d3ed Fix test 2 2021-05-12 09:43:34 +02:00
Philoul 3b581dce49 uel.log Fix Source for Dexcom calibration and Sensor insertion 2021-05-12 01:24:03 +02:00
Philoul 8819859e7c Merge remote-tracking branch 'Nightscout/dev2_dana_combo_only' into dev2_Insight_v2 2021-05-12 00:31:41 +02:00
Milos Kozak 50720b8497 NSClient mode sync 2021-05-11 21:24:39 +02:00
Philoul d5a9c2b628 Fix tests 2021-05-11 18:38:57 +02:00
Philoul afb16210ae Remove old insight db tables 2021-05-09 17:02:20 +02:00
Philoul dfd6c6e859 Move Insight database package outside plugins\pump 2021-05-07 11:33:51 +02:00
Philoul f789888afd Fix SMB 
remove comment linked to previous version
 2021-05-07 10:21:34 +02:00
Andy Rozman 9526e8228b Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-05 17:02:03 +01:00
Andy Rozman 3b35c01f22 Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-05 16:59:01 +01:00
Andy Rozman 7738520a2d - dropbox dep 2021-05-05 16:58:37 +01:00
Andy Rozman 12a3609565 - started working TBR 
- added Dropbox stuff (not part of project)
 2021-05-05 16:57:48 +01:00
Milos Kozak 61d5565d18 2.8.2.1-dev-e4 2021-05-04 21:27:11 +02:00
Milos Kozak 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +02:00
Milos Kozak 88f5eec306 do not run AcceptTemp on UI thread 2021-05-03 20:46:23 +02:00
Milos Kozak e8ecf43894 ProfileSwitch improvements, resolve initial PS 2021-05-03 18:19:10 +02:00
Milos Kozak 5d55bdadf4 Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-03 14:59:20 +02:00
Milos Kozak 07b3557b81 NSClientService -> kt 2021-05-03 14:59:10 +02:00
Milos Kozak ac7da44336
Merge pull request #498 from jotomo/dev2_dana_combo_only 
Fix: turn APSResult.bolusRequested into a function.
 2021-05-03 14:42:59 +02:00
Milos Kozak 840de7b3b9 NSClient -> kt 2021-05-03 14:15:19 +02:00
Milos Kozak c75d4e8e4e eliminate old NS sync style 2021-05-03 12:49:11 +02:00
Milos Kozak 37bc7c040c invalidateTemporaryBasalWithTempId 2021-05-03 10:56:26 +02:00
Milos Kozak e17f96ac5c
Merge pull request #497 from jotomo/dev2-cd+insight 
Insight fixes and refactorings
 2021-05-03 09:36:03 +02:00
Milos Kozak 5747f97201 DanaHistoryDatabase 2021-05-03 09:33:14 +02:00
Andrei Vereha e3f7608de7 Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge 2021-05-01 20:11:48 +02:00
Andy Rozman 67a2c0dca3 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-01 12:11:29 +01:00
Andy Rozman 5abdba0579 Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-01 11:26:53 +01:00
Johannes Mockenhaupt dc2d64ceb7
Fix: turn APSResult.bolusRequested into a function. 
Previously this var was set while parsing determine-basal output, setting it to true if determine-basal provided a value which was assigned to var smb. However, the variable smb is changed when constraints are applied, making the val bolusRequested invalid afterwards. Hence, dynamically evaluate the smb var by turning bolusRequested into a function.
 2021-05-01 00:23:32 +02:00
Milos Kozak e48d317d55 ProfileSwitch NS sync 2021-04-30 17:21:24 +02:00
Andy Rozman 6504498cd2 - added bolus handling (complete) 
- added PumpSyncStorage class for handling temporary data
 2021-04-30 15:28:24 +01:00
Milos Kozak 0731ccb6d4
Merge pull request #487 from Philoul/uel.log_BolusCancel 
Add uel.log for Cancel Bolus Button
 2021-04-29 21:04:38 +02:00
Milos Kozak 37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00
Johannes Mockenhaupt 970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor(). 2021-04-29 14:51:04 +02:00
Andy Rozman 727862c743 - DailyTotals changes 
- GraphData merge
 2021-04-25 18:15:53 +01:00
Andy Rozman e7d4f57c84 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-04-24 19:22:57 +01:00
Andy Rozman edb7f42e7f Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-24 19:19:09 +01:00
Philoul e7578b4c8f Loop Dialog, hide loop buttons if pump disconnected or loop suspended 2021-04-23 00:31:40 +02:00
Andy Rozman 08a5c50037 - kotlin changes almost done, 1 file left 2021-04-20 23:23:03 +01:00
Philoul 0f18d43da8 Icon overview of userEntry updated 2021-04-20 22:28:58 +02:00
Andy Rozman 6b7efdcb95 - more kotlinize, MedtronicHistoryActivity not yet working 2021-04-20 16:45:29 +01:00
Milos Kozak cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
Milos Kozak 430a871993 fix DeviceStatus upload 2021-04-18 18:31:21 +02:00
Milos Kozak 3928b579a7 TDD -> room 2021-04-18 13:31:25 +02:00
Andy Rozman 99946dd728 Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-16 21:49:31 +01:00
Milos Kozak 481ba32b3b Merge remote-tracking branch 'ns/dev' into dev2_dana_combo_only 2021-04-15 18:38:32 +02:00
Milos Kozak 6b16e93427
New Crowdin updates (#479) 
* New translations exam.xml (Czech)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Dutch)

* New translations objectives.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations exam.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (Slovak)

* New translations strings.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Spanish)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Hebrew)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations alert_titles.xml (Portuguese)

* New translations exceptions.xml (Portuguese)

* New translations strings.xml (Romanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations validator.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Croatian)

* New translations strings.xml (Tamil)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (Catalan)

* New translations strings.xml (Slovak)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Catalan)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations validator.xml (Portuguese)

* New translations strings.xml (Croatian)

* New translations strings.xml (Tamil)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Danish)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)
 2021-04-15 18:18:10 +02:00
Philoul 90ff9d972b Fix order of curves for scale 2021-04-15 00:10:08 +02:00
Philoul f08eefbf9c Fix Scale 2021-04-14 23:30:04 +02:00
Milos Kozak 4effade9a4 lints 2021-04-14 23:10:11 +02:00