Commit graph

627 commits

Author SHA1 Message Date
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
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
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
Andy Rozman
a3f0bf41cd - removed unused (old) methods from MedtronicHistoryData
- PumpSyncStorage added method addCarbs, that is now used in PUmpPluginAbstract and in MetronicPumpPlugin and MedtronicHistoryData
- extended PumpDbEntry with other data classes: for Bolus, TBR (incomplete) and Carbs
2021-04-30 20:05:03 +01: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
c62d92e984
Refactor: Remove (now) superflous BLUETOOTH from ACCU_CHEK_INSIGHT_BLUETHOOTH.
This aligns with the naming of other pumps and BLUETOOTH doesn't provide much information.
2021-04-29 14:58:58 +02:00
Johannes Mockenhaupt
884eb497bd
Refactor: Rename ACCU_CHEK_INSIGHT -> ACCU_CHEK_VIRTUAL. 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt
970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor(). 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt
18e19ae4c9
Fix: Insight capabilities; fix reference to basal/bolus. 2021-04-29 14:51:03 +02:00
Andy Rozman
e7d4f57c84 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-04-24 19:22:57 +01:00
Andy Rozman
28c0f1b894 - all files kotlinized
- started some refactoring
- added adrians refactoring of MedtronicCommunicationManager
2021-04-24 19:11:01 +01:00
Philoul
2ba10469b8 Fix UTC Offset in csv 2021-04-21 21:54:04 +02:00
Philoul
0f18d43da8 Icon overview of userEntry updated 2021-04-20 22:28:58 +02:00
Philoul
0b928c3140 Add uel.log for Cancel Bolus Button 2021-04-20 20:00:07 +02:00
Milos Kozak
cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
Andy Rozman
a202178426 - kotlin changes to most of the classes, most of it is tested 2021-04-18 15:30:05 +01: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
e6d93ef0a1 remove jcenter dependency 2021-04-15 20:07:42 +02: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
Milos Kozak
312136451b ProfileInterface rename 2021-04-14 22:58:21 +02:00
Milos Kozak
bb82f41b9e NotificationHolderInterface rename 2021-04-14 22:44:24 +02:00
Milos Kozak
4e604124c5 SmsCommunicatorInterface rename 2021-04-14 22:37:34 +02:00
Milos Kozak
24164eee98 PumpInterface rename 2021-04-14 19:36:13 +02:00
Milos Kozak
eacdbffebc ImportExportPrefsInterface rename 2021-04-14 19:15:10 +02:00
Milos Kozak
6ac01a26cd DanaRInterface rename 2021-04-14 19:03:50 +02:00
Milos Kozak
176fc4bb47 ConstriantsInterface rename 2021-04-14 19:01:49 +02:00
Milos Kozak
8ecc02c994 rename ConfigInterface 2021-04-14 18:42:12 +02:00
Milos Kozak
c04993ddad rename interfaces, cleanup 2021-04-14 00:45:30 +02:00
Milos Kozak
3aa38d46bb ConfigBuilderInterface rename 2021-04-13 23:27:55 +02:00
Milos Kozak
05bfb957ec IconsProvider rename 2021-04-13 23:02:47 +02:00
Milos Kozak
e57c9ea0b8 utils -> kt 2021-04-13 22:52:40 +02:00
Milos Kozak
429842ecd0 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-13 18:35:15 +02:00
Milos Kozak
36040b7ed2 IobCobCalculator refactor 2021-04-13 18:33:44 +02:00
Milos Kozak
c637b7072c IobCobCalculator refactor 2021-04-12 19:49:12 +02:00
Milos Kozak
639328bdc3 show bucketed data in dev mode 2021-04-12 16:04:06 +02:00
Milos Kozak
a6b67b2bb7 optimize events for IobCobCalculator 2021-04-12 14:31:15 +02:00
Philoul
0ad53011c1 Merge branch 'meallink' into meallink_VWU_v2 2021-04-11 18:09:20 +02:00
Milos Kozak
dcc0b040df Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-11 17:59:02 +02:00
Milos Kozak
8ce5a881d3 _now() -> now() 2021-04-11 17:58:50 +02:00
Milos Kozak
998eba8b9f DateUtil -> kt, static funcs removed 2021-04-11 17:47:55 +02:00
Philoul
f5330287e9 Replace ValueWithUnit.StringResource by ValueWithUnit.SimpleString 2021-04-11 16:02:53 +02:00
Philoul
04ef92eb78 Add gsNotLocalised in ResourceHelper 2021-04-11 12:50:11 +02:00
Milos Kozak
b0a12dab1a
Merge pull request #468 from Philoul/meallink_VWU_v2
Fix double Entries in Treatment Dialog (+ add new uel.log for plugin enabled/disabled
2021-04-11 08:39:43 +02:00
Philoul
62443f6738 Merge branch 'meallink' into meallink_VWU_v2 2021-04-10 20:44:08 +02:00
Philoul
baa37c4e3a uel.log for plugin enabled / disabled 2021-04-10 19:55:24 +02:00
Milos Kozak
ebf0781f47
Merge pull request #466 from Philoul/meallink_VWU_v2
New uel.log
2021-04-10 18:23:40 +02:00
Milos Kozak
4eef2507fb fix tests 2021-04-10 12:19:31 +02:00
Philoul
c728f8689b uel.log for Start and Exit AAPS 2021-04-10 11:35:38 +02:00
Milos Kozak
194cf305fd Rv2,RKorean 2021-04-10 10:41:53 +02:00
Philoul
5a143b5444 Merge branch 'meallink' into meallink_VWU_v2 2021-04-09 12:38:42 +02:00
Milos Kozak
4120e9eef9 DanaR working 2021-04-09 08:02:46 +02:00
Philoul
6114effb22 Add BG sources for uel (Calibration and Sensor Change) 2021-04-08 10:06:00 +02:00
Philoul
22dfea652d RRemove unused injection and try to fix tests...
It works for LoopPluginTest, but not for ClassicPrefsFormatTest as many other... (don't know if it's my config or not)
2021-04-06 23:58:54 +02:00
Philoul
ffa9c04496 Remove dependency and create 2 classes for drivers 2021-04-06 23:30:16 +02:00
Philoul
e490c2df04 Update uel.log NSClientAddUpdateWorker 2021-04-06 00:43:51 +02:00
Milos Kozak
d27b7a6139 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-05 23:13:17 +02:00
Milos Kozak
2463f8fc47 ExtendedBolus, TemporaryBasal -> room, DanaRS working 2021-04-05 22:41:28 +02:00
Philoul
cc3919e9fc Add SITE/RESERVOIR CHANGE Action and improve Colors 2021-04-04 15:05:43 +02:00
Philoul
22c1233201 Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Philoul
3cc7a72b3d Fix XXXValueWithUnit Refactoring 2021-04-04 09:20:02 +02:00
AdrianLxM
d62456f2e2 Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit 2021-04-03 21:34:41 +02:00
AdrianLxM
c2b3e617df pair programming session 2021-04-03 21:29:26 +02:00
Philoul
be35597da4 Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump) 2021-04-03 18:51:36 +02:00
Philoul
41ffa873f1 Add a new Color Group for Basal
when Loop entries are shown in fragment, it better...
2021-04-03 18:13:33 +02:00
Philoul
82299e430b Move MGDL and MMOL Constants to XXXValueWithUnits 2021-04-03 17:56:19 +02:00
Philoul
8d8abd65a7 Safe delete Units enum class in UserEntry 2021-04-03 16:35:57 +02:00
Philoul
2a03d1d7ca Remove presentation of StringResource with Param to avoid crash
Move String used in uel.log to core
2021-04-03 15:39:43 +02:00
Philoul
206bac6da8 Safe Delete old ValueWithUnit Class in UserEntry 2021-04-03 12:51:49 +02:00
Philoul
195c810606 Update list of Sources in translator 2021-04-03 12:32:37 +02:00
Philoul
dc87bfa303 Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions 2021-04-03 12:25:44 +02:00
Philoul
38fb53b4ce Prepare Translator for missing translations 2021-04-02 18:07:05 +02:00
Philoul
c0aedc7736 Move CSV generation to UserEntryPresentationHelper 2021-04-02 16:37:01 +02:00
Philoul
0b00f4b401 Remove redundancies in UserEntryLogger 2021-04-02 08:54:12 +02:00
Milos Kozak
e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +02:00
Philoul
16959d4de9 Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 23:02:52 +02:00
Philoul
bb3effcda3 Fix null XXXValueWithUnit and aapsLogger string 2021-04-01 20:17:11 +02:00
Philoul
83f4d25527 UserEntry refactor to include XXXValueWithUnit (Loop Dialog and ProfileSwitchDialog only) 2021-04-01 19:27:13 +02:00
Philoul
a07b685e8d UserEntry refactor to include XXXValueWithUnit (first test) 2021-04-01 18:26:13 +02:00
Milos Kozak
9f66f88832
Merge pull request #455 from jotomo/meallink+interface-iteration
Iterate on PumpInterface/PumpSync documentation.
2021-04-01 18:14:56 +02:00
Milos Kozak
46793abbfc Treatment cleanup 2021-04-01 18:14:31 +02:00
Johannes Mockenhaupt
808d3a5a5d
Mention VirtualPumpPlugin as an example how to push data to AAPS-core. 2021-04-01 12:51:07 +02:00
Johannes Mockenhaupt
e5be6b35b9
Iterate on PumpInterface/PumpSync documentation. 2021-04-01 12:43:56 +02:00
Philoul
e13e5e10eb Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 08:13:48 +02:00