Commit graph

137 commits

Author SHA1 Message Date
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 12a3609565 - started working TBR
- added Dropbox stuff (not part of project)
2021-05-05 16:57:48 +01:00
Andy Rozman 49f345d425 - startted adding 35 minut - before reading functionality
- some refactoring
2021-05-02 13:45:56 +01: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
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
Andy Rozman 6504498cd2 - added bolus handling (complete)
- added PumpSyncStorage class for handling temporary data
2021-04-30 15:28:24 +01:00
Andy Rozman 727862c743 - DailyTotals changes
- GraphData merge
2021-04-25 18:15:53 +01:00
Andy Rozman 28c0f1b894 - all files kotlinized
- started some refactoring
- added adrians refactoring of MedtronicCommunicationManager
2021-04-24 19:11:01 +01:00
Andy Rozman 08a5c50037 - kotlin changes almost done, 1 file left 2021-04-20 23:23:03 +01: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
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 bb657a2498 - kotlin changes
- disabled problem in Fragment for now
2021-04-16 23:41:24 +01:00
Andy Rozman 0d1ff8dd41 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-04-16 21:53:29 +01: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
Andy Rozman 05a07c1904 - kotlinlize: info/nightscout/androidaps/plugins/pump/medtronic/comm/message 2021-04-16 21:40:25 +01:00
Andy Rozman 769ab218d4 - kotlinizing mdt 2021-04-16 17:11:00 +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
Andy Rozman be35797e4e bug 476
- fixed problem on ChangeBolusReminderEnable entry (length changed from 9 -> 7)
2021-04-14 19:54:38 +01:00
Andy Rozman 1e29239bde Merge branch 'meallink' into meallink-mdt 2021-04-14 19:34:46 +01:00
Milos Kozak 24164eee98 PumpInterface rename 2021-04-14 19:36:13 +02:00
Milos Kozak 176fc4bb47 ConstriantsInterface rename 2021-04-14 19:01:49 +02:00
Andy Rozman bcc7672116 - starting pumpSync changes 2021-04-14 16:06:33 +01:00
Milos Kozak c04993ddad rename interfaces, cleanup 2021-04-14 00:45:30 +02:00
Milos Kozak e57c9ea0b8 utils -> kt 2021-04-13 22:52:40 +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
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 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 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
Milos Kozak e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +02:00
Milos Kozak 699413dd6f fix tests 2021-04-01 00:37:15 +02:00
Milos Kozak 1ae4823a9a Merge remote-tracking branch 'ns/dev' into meallink 2021-03-30 19:39:22 +02:00
Milos Kozak e9f4f87894 Remove Tratment.class where possible 2021-03-30 19:37:26 +02:00
Milos Kozak 0a61585836 core.pump.common cleanup 2021-03-29 10:45:48 +02:00
Milos Kozak e3ac451f8d PumpSync interface, VirtualPump, remove pump driver dependency to database 2021-03-29 00:31:40 +02:00
Andy Rozman e3a75a55eb Merge branch 'dev' into bug423_historyProblem 2021-03-28 20:45:19 +01:00
Andy Rozman bd72473253 - checked all PumpHistoryEntryType entries and removed most of the ones that are not in go code from Eric
- fixed problem with BGReceived512
2021-03-28 20:42:15 +01:00
Milos Kozak df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Milos Kozak 616871c95c prepare DetailedBolusInfo 2021-03-22 16:59:09 +01:00
Andy Rozman 3fde3a03a8 - Merge branch 'dev' into fr420_rl_battery_level
- fixing problem with logging, had to wrap them in String.format for this to work
- fixed problem with uploading event to nightscout, there was exception because entry was added where glucose value was not set
2021-03-19 23:34:53 +00:00
Andy Rozman 2c6f64b71f - fixed log support, it still used {} as data placeholders, which doesn't work with aapsLogger 2021-03-19 20:50:58 +00:00
Andy Rozman ba8c436136 - added battery display, should be done 2021-03-18 00:08:04 +00:00
Andy Rozman 3d725daed4 - added format codes for logging 2021-03-17 16:03:51 +00:00