Commit graph

11526 commits

Author SHA1 Message Date
Andrei Vereha 697e646854 Merge branch 'dash' into avereha/basal 2021-06-06 21:28:23 +02:00
Andrei Vereha 9036544516
Merge pull request #32 from 0pen-dash/avereha/temp-basals
Avereha/temp basals
2021-06-06 20:54:17 +02:00
Andrei Vereha b440003de4 ignore enforeNew for now 2021-06-05 20:14:28 +02:00
Andrei Vereha ffe3246fc0 remove 'Using connected state for unconfirmed commands' 2021-06-05 15:23:03 +02:00
Andrei Vereha 70eb5e6d0c recover unconfirmed basal 2021-06-05 14:52:58 +02:00
Andrei Vereha 7c20bfb7f0 implement basals 2021-06-05 14:18:04 +02:00
Andrei Vereha 33243a7ed4 create fake TBR on suspend. Fix createHistory timing bug 2021-06-04 22:56:58 +02:00
Andrei Vereha 5d3b2faeb9 pumpsync on suspend/resume 2021-06-04 19:32:00 +02:00
Andrei Vereha 76a0e93ee2 stop testing failed commands 2021-06-03 22:19:51 +02:00
Andrei Vereha 17c61db256 merge 2021-06-03 22:18:25 +02:00
Andrei Vereha 3dc4781692 use delivery status for checking if there is a tempbasal to cancel 2021-06-03 22:15:26 +02:00
Andrei Vereha 311d12ffe6
Merge pull request #31 from 0pen-dash/avereha/merge-dev
avereha/merge dev
2021-06-03 22:01:30 +02:00
Andrei Vereha 34103931f5 add comment 2021-06-03 22:00:42 +02:00
Andrei Vereha 25141d3939 undo the last change 2021-06-03 21:48:03 +02:00
Andrei Vereha 2afe220d28 suspend/resume 2021-06-03 19:43:59 +02:00
Andrei Vereha d392caa6e9 move private fun at the end 2021-06-01 22:00:16 +02:00
Andrei Vereha 432e06adaa simplify: use lastUpdatedSystem for lastConnection 2021-06-01 21:50:55 +02:00
Andrei Vereha b91e8506a0 move the common code to getCommandConfirmationFromState 2021-06-01 21:41:13 +02:00
Andrei Vereha c8fee31ae8 cleanup 2021-06-01 08:12:03 +02:00
Andrei Vereha d0b1757268 bugfix: send error when we can't send the command 2021-06-01 00:18:38 +02:00
Andrei Vereha e867b1397d remove maybeMarkActiveCommandFailed. this logic was moved in "updateActiveCommand" 2021-05-31 22:15:39 +02:00
Andrei Vereha a20cc1cca3 simplify 2021-05-31 22:09:49 +02:00
Andrei Vereha 9d61c8ee8a remove unused function 2021-05-31 21:00:54 +02:00
Andrei Vereha 7dc01cb1f8 add comments 2021-05-31 00:13:52 +02:00
Andrei Vereha a2b3ab5991 add TODO 2021-05-31 00:04:25 +02:00
Andrei Vereha 8e64ca134f ktlintFormat 2021-05-31 00:01:54 +02:00
Andrei Vereha c989c6a1c5 duration is in ms 2021-05-30 23:55:47 +02:00
Andrei Vereha 3ca88ef51b bugfix: set the tempbasal timestamp to the time when the historyEntry was created, not a random number :) 2021-05-30 23:09:15 +02:00
Andrei Vereha 91957930ed display bluetooth connection status. display deliveryStatus. display lastConnection 2021-05-30 22:49:35 +02:00
Andrei Vereha 3b26068faf set temp basal beeps 2021-05-30 19:03:26 +02:00
Andrei Vereha 3314df7bb7 implement TempBasal pumpSync and confirmation 2021-05-30 18:35:53 +02:00
Andrei Vereha ebb3030169 make it compile 2021-05-28 23:37:00 +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
AdrianLxM 841c49b770 fix medtronic merge 2021-05-28 11:34:41 +02:00
Milos Kozak 82cce81d0b update duration requirement 2021-05-28 08:59:52 +02:00
Milos Kozak 763c0bb766 fix Dana history parsing 2021-05-28 08:50:45 +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
Andy Rozman 3c7b5fd2b3 - fixed test
- add runtest for linux
- some refactorings
2021-05-27 18:10:35 +01:00
Milos Kozak 2845bc8714 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-05-27 13:37:06 +02:00
Milos Kozak 30eb339a88 Dana BLE error handling 2021-05-27 13:36:46 +02:00
Milos Kozak 355a9531f7
Merge pull request #533 from Philoul/FixSensScale
Fix Sens curve scale if alone on a graph
2021-05-27 09:48:36 +02:00
Philoul 93046d0354 Revert to val for ratio and dev slope Scale 2021-05-27 08:43:45 +02:00
Andy Rozman 16785838e9 - small change 2021-05-26 22:28:22 +01:00
Andy Rozman 8be367e156 - refctoring MedtronicCommandType 2021-05-26 22:19:03 +01: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