Commit graph

718 commits

Author SHA1 Message Date
Milos Kozak 7cd71f727f libs update 2021-08-19 13:33:09 +02:00
Milos Kozak 4761a1a5ba kotlin-allopen, fixed tests 2021-08-16 13:47:14 +02:00
Milos Kozak 1c065c75e8 API 30 lints 2021-08-11 18:10:44 +02:00
Milos Kozak e8f946ad3f
New Crowdin updates (#604)
* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Spanish)

* Update source file strings.xml

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)
2021-08-06 23:34:21 +02:00
Milos Kozak 6649386c58
Merge branch 'dev' into gradleupdate 2021-08-06 11:03:26 +02:00
Milos Kozak 0e928bbb9c compileSdkVersion 30 2021-08-06 00:08:49 +02:00
AdrianLxM fa27d409ce refactor build helper 2021-07-31 13:25:20 +02:00
Philoul 4e00389622 Add DanaI and add UserEntry.Sources in Pumptype to simplify code 2021-07-15 00:30:57 +02:00
Philoul 7c9ea0b528 Add DiaconnG8 in userEntry sources 2021-07-14 17:31:35 +02:00
Milos Kozak b995243947 Dana-i icon 2021-07-12 15:43:02 +02:00
Andrei Vereha 5752369377 Merge remote-tracking branch 'upstream/dev' into avereha/merge 2021-07-11 12:26:41 +02:00
Milos Kozak 581bb0af01
New Crowdin updates (#588)
* New translations strings.xml (Czech)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Italian)

* 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 (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Irish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Catalan)

* New translations strings.xml (Danish)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations alert_titles.xml (Korean)

* New translations alert_descriptions.xml (Korean)

* New translations alert_descriptions.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Korean)

* New translations strings.xml (Croatian)

* New translations exam.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations exam.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations exam.xml (Korean)

* New translations objectives.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (French)
2021-07-09 21:54:34 +02:00
AdrianLxM a6fc9fee0f update jacoco and add global config 2021-07-09 20:02:22 +02:00
AdrianLxM da55d65907 update flexbox and delete maven repository 2021-07-09 18:20:10 +02:00
Milos Kozak 444d5aeebd
Merge pull request #571 from andyrozman/mdt_new_fix_2
Fixes for medtronic driver refactoring
2021-07-01 12:38:51 +02:00
Andrei Vereha 2133a90ac5 Merge remote-tracking branch 'upstream/dev' into avereha/merge 2021-06-27 11:30:50 +02:00
Andy Rozman 3288eb2966 Merge branch 'dev' into mdt_new_fix_2 2021-06-26 21:50:00 +01:00
Milos Kozak 49776c8872 remove unused import 2021-06-26 20:54:13 +02:00
Milos Kozak 62cb1bb506 reduce warnings amount 2021-06-26 19:53:09 +02:00
Andrei Vereha 1018a41346 Merge remote-tracking branch 'upstream/dev' into avereha/conn 2021-06-26 15:21:40 +02:00
Milos Kozak 7bb03c4c13
Merge pull request #580 from nightscout/diaconn
Diaconn
2021-06-24 19:34:22 +02:00
Milos Kozak a70f24a68a fix TherapyEvent upload 2021-06-23 22:33:58 +02:00
miyeongkim 0050857973 1. 변수 이름 변경
2. 확장볼러스 에러 처리.
3. 에러메시지 추가
4. TDD 조회시 정렬 처리.
2021-06-23 11:08:29 +09:00
Milos Kozak 8c8bd6360c
Merge pull request #567 from nightscout/travis
gradle update
2021-06-22 19:02:32 +02:00
Milos Kozak 62375cdcfe
New Crowdin updates (#545)
* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* 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 (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* 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 (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* 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 (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2021-06-21 07:59:08 +02:00
Andy Rozman e30c5162ef Merge branch 'dev' into mdt_new_fix_2 2021-06-20 19:45:03 +01:00
Milos Kozak 0af2cff26f
Merge pull request #557 from Philoul/NewTempFolderForLogExports
temp Dir for log export
2021-06-17 22:01:05 +02:00
Milos Kozak 740c009471 gradle:7.1.0-alpha02 2021-06-16 08:23:55 +02:00
Milos Kozak c3aea16c72 reset cached data on db reset 2021-06-15 14:54:32 +02:00
Andrei Vereha 89b08054e6 update comment 2021-06-12 23:39:59 +02:00
Andrei Vereha 25c44f4206 add invalidateTemporaryBasalWithPumpId 2021-06-12 23:32:34 +02:00
Andrei Vereha fc7fc2df5b add invalidateTemporaryBasalWithPumpId 2021-06-12 23:21:57 +02:00
Andy Rozman 6fd1a8bd8d - fix for reading history TBR readings (with duration less than minute) 2021-06-10 18:15:52 +01:00
Philoul 539ca3131d temp Dir for log export 2021-06-10 08:33:15 +02:00
Milos Kozak 8e466be92c Diaconn support 2021-06-08 23:27:14 +02:00
Milos Kozak c0dba456d7 fix lst bolus query and smb pocessing 2021-06-02 22:40:30 +02:00
Milos Kozak f74955d062 Improve APS result logging 2021-06-02 16:54:58 +02:00
Milos Kozak c00d7448e2 fix NS IOB upload 2021-06-01 10:32:42 +02:00
Milos Kozak 1e1fac90b3 RS refactor & test fix 2021-05-31 21:35:03 +02:00
Milos Kozak 596012ab10 move logs, eng_mode to AAPS directory 2021-05-31 15:29:42 +02:00
Milos Kozak 9d29cafbe6 remove old db code 2021-05-29 23:38:19 +02:00
Andrei Vereha 7ee7cdd83b Merge remote-tracking branch 'upstream/dev' into avereha/merge-dev 2021-05-28 22:12:21 +02:00
Milos Kozak 91ad9a3ca9
New Crowdin updates (#541)
* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Lithuanian)

* 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 (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (Croatian)

* 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 (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Tamil)

* New translations validator.xml (Lithuanian)

* New translations validator.xml (Korean)

* New translations validator.xml (Greek)

* New translations validator.xml (Chinese Simplified)

* New translations validator.xml (Turkish)

* New translations validator.xml (Swedish)

* New translations validator.xml (Portuguese, Brazilian)

* New translations validator.xml (Polish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Lithuanian)

* 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 (Korean)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* 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 (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (Danish)

* New translations validator.xml (Afrikaans)

* New translations validator.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations exam.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2021-05-28 16:12:38 +02:00
Milos Kozak 8db5b808ac Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-05-28 16:11:31 +02:00
Milos Kozak 6735d22934 OfflineEvent -> room 2021-05-28 16:06:44 +02:00
Milos Kozak 66a70fcd22
Merge pull request #531 from andyrozman/meallink-mdt
Medtronic driver changes - Kotlin and PumpSync
2021-05-27 23:23:03 +02:00
Milos Kozak 867e205ab6 AutosensResult -> kt 2021-05-26 16:00:35 +02: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
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 30e04164ed fix test 2021-05-25 21:24:23 +02:00
Milos Kozak 3ed45fdd11 improve NS profile sync 2021-05-25 20:59:41 +02:00
Milos Kozak 5ef92462a7 do not use last record in DetailedBolusInfoStorage 2021-05-25 18:31:01 +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
Andy Rozman fb5ff409f8 - kotlin refactoring !! 2021-05-22 23:46:32 +01:00
Milos Kozak ea940ea165 remove redundant carbTime 2021-05-22 21:24:49 +02:00
Andy Rozman 921302bdbf - kotlin !! refactorings 2021-05-22 16:16:05 +01:00
Milos Kozak 6e012ec75f fix dbUpdate 2021-05-21 22:53:49 +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 fceed4e4fd @JvmDefault warning resolve 2021-05-18 23:02:40 +02:00
Milos Kozak b548325059 lints 2021-05-18 22:31:08 +02:00
Milos Kozak d766bc6635 gradle:4.2.1 2021-05-18 21:37:03 +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 a1c1355ce6 MVVM like for overview 2021-05-17 21:05:24 +02:00
Andy Rozman cae5dab285 - restoring some files from medtronic -> core and from rileylink -> core (pump.common) 2021-05-17 01:13:53 +01:00
Andy Rozman 06f079d6fd Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-17 00:42:18 +01:00
Andy Rozman f37b954ae6 - fixed events from history
- added some additional logging for TBR handling
- changed PumpSyncStorage to use xstream instead json
2021-05-15 20:24:23 +01:00
Milos Kozak feb37888d2
Merge pull request #516 from Philoul/UserEntryImprovement
User entry improvement
2021-05-13 17:47:08 +02:00
Milos Kozak f1d9706c0b
Merge pull request #515 from Philoul/Fix_TherapieEventNote
Fix Missing note in InsertTherapyEventNewWithTimestamp
2021-05-13 17:46:44 +02:00
Milos Kozak 60cae5c2bd
Merge branch 'dev2_dana_combo_only' into Fix_NSClient_UseAbsolute 2021-05-13 17:46:10 +02:00
Philoul 98aac56c1c UserEntryPresentationHelper / csv improvement 2021-05-13 15:10:53 +02:00
Milos Kozak 4f5a407a2f fix PS sync 2021-05-13 14:56:10 +02:00
Philoul 4cadec78e5 Improvement Action String (TT) 2021-05-13 14:38:04 +02:00
Philoul da444c2043 Missing note in InsertTherapyEventNewWithTimestamp 2021-05-13 12:15:00 +02:00
Philoul 9d87dec574 NSClient Fix Use Absolute 2021-05-12 18:28:52 +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 afb16210ae Remove old insight db tables 2021-05-09 17:02:20 +02:00
Andy Rozman 2b43ee186f - final changes to pumpSync integration
- removed commented code that is not used
2021-05-08 15:43:19 +01:00
Andy Rozman f285b59b44 - finished implementation of TBR and Bolus, needs more testing
- missing 35 minutes
2021-05-06 20:30:18 +01:00
Andy Rozman 9526e8228b Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-05 17:02:03 +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 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +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 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
Andy Rozman 1e88a1a1ed Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-02 15:28:48 +01:00
Milos Kozak a9e6cfaa66 sync TBR with temp id 2021-05-02 16:08:24 +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 5bd41d9abd - some cleanup
- prelim work on TBR
2021-05-01 11:24:50 +01:00