Commit graph

6418 commits

Author SHA1 Message Date
Tebbe Ubben 7e5c738d76
Update strings.xml 2019-02-24 14:33:23 +01:00
Milos Kozak c94dda1f0a
Merge branch 'dev' into ench_1455_custom_actions 2019-02-22 15:27:00 +01:00
Andy Rozman b0fe8fc5aa Merge branch 'dev' into ench_1455_custom_actions 2019-02-20 23:41:09 +00:00
Andy Rozman 8b3b1e67ea First implementation 2019-02-20 22:57:31 +00:00
Milos Kozak 582101a3e9
Merge pull request #1639 from MilosKozak/fixes
Fix applying basal constraints in non APS mode
2019-02-19 18:24:16 +01:00
Milos Kozak 9f66e0b96e Fabric update 2019-02-19 18:03:18 +01:00
Milos Kozak 1e37ce5ba7 bump 2.1-dev 2019-02-19 17:10:33 +01:00
Milos Kozak 95297a6292 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-02-19 16:26:35 +01:00
Milos Kozak 1f3696608e Tomato BGSource plugin 2019-02-19 16:26:16 +01:00
AdrianLxM 58f4012323
Merge pull request #1637 from TebbeUbben/insight-dev
Improvement for timeout during handshake notification
2019-02-17 22:21:14 +01:00
TebbeUbben 71f73210c9 Send dismiss event in main thread 2019-02-17 22:02:51 +01:00
TebbeUbben 8f7a29bd7a Only show notification after three timeouts during handshake 2019-02-17 22:01:01 +01:00
TebbeUbben 5fb0fe62f4 Remove timeout during handshake notification when connection was successful 2019-02-17 21:58:17 +01:00
AdrianLxM 924f90ffb5
Merge pull request #1636 from MilosKozak/AdrianLxM-patch-1
key not translatable
2019-02-17 21:19:44 +01:00
AdrianLxM c38d07950a
key not translatable 2019-02-17 21:01:06 +01:00
Milos Kozak 57d472212b
New Crowdin translations (#1622)
* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

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

* New translations strings.xml (Russian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* 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 insight_alert_codes.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations strings.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations strings.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_exceptions.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)
2019-02-17 18:26:59 +01:00
AdrianLxM 166ec37f25
Merge pull request #1634 from TebbeUbben/insight-dev
Timeout during handshake notification
2019-02-17 14:32:53 +01:00
TebbeUbben 361cc158e8 Timeout during handshake notification 2019-02-16 20:28:49 +01:00
AdrianLxM 65c5aebbda
Merge pull request #1627 from TebbeUbben/insight-dev
Insight: Trial to improve connection stability
2019-02-13 07:31:25 +01:00
TebbeUbben d2b0665af1 Merge branch 'master' into insight-dev2 2019-02-12 15:01:29 +01:00
TebbeUbben e49cc10e1c Log exceptions that occur in alert service 2019-02-12 14:57:14 +01:00
TebbeUbben a4312acb3e Incremental recovery duration 2019-02-12 14:54:27 +01:00
TebbeUbben c564cc2214 Reuse socket of failed connection 2019-02-12 14:36:56 +01:00
AdrianLxM f0ad9e8fda
Merge pull request #1623 from TebbeUbben/insight-dev
Updates to Insight driver
2019-02-10 00:23:55 +01:00
TebbeUbben ee704c3988 Merge branch 'master' into insight-dev 2019-02-10 00:05:43 +01:00
TebbeUbben 4a11723a61 Fix zero-temp for pump stopped periods 2019-02-10 00:03:59 +01:00
TebbeUbben 7a4d721c29 Fix bolus progress dialog with bolus cancel 2019-02-09 23:50:12 +01:00
TebbeUbben 4146c8a770 Don't send final bolus event after bolus cancel 2019-02-09 23:14:57 +01:00
TebbeUbben a8a182dc9d Change way of checking operating mode during bolus delivery 2019-02-09 23:12:36 +01:00
TebbeUbben 0b1e181662 Quick wizard fix 2 2019-02-09 23:06:11 +01:00
TebbeUbben 05aa369bae Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
2019-02-09 22:52:01 +01:00
TebbeUbben f5d65e044c Fix wear bolus for Insight 2019-02-09 22:49:38 +01:00
TebbeUbben 7035b9a5f2 Fix Quick Wizard for Insight pump 2019-02-09 22:47:45 +01:00
TebbeUbben 2ad4670f07 Refresh overview when pump is unpaired 2019-02-09 22:43:05 +01:00
TebbeUbben 7a7bebc5fe Return false in isConnected and isConnecting when connection lock is not held. 2019-02-09 22:30:41 +01:00
TebbeUbben 317f171286 Fetch pump status after pairing 2019-02-09 22:25:07 +01:00
TebbeUbben baac836d64 Don't read past history events when pump is newly paired. 2019-02-09 22:14:10 +01:00
TebbeUbben e4fd293027 Stop fetching bolus progress when pump has switched operating mode
(e.g. because of an empty cartridge)
2019-02-09 22:08:49 +01:00
TebbeUbben c5241b6cad Remove unneeded variable 2019-02-09 22:04:09 +01:00
TebbeUbben 6cb3b5fcac Change Insight driver strings 2019-02-09 22:01:11 +01:00
Milos Kozak cc117e6cd5
Merge pull request #1621 from MilosKozak/G6
G6
2019-02-08 21:38:46 +01:00
Milos Kozak aa6ae253b9 fix tests 2019-02-08 20:44:39 +01:00
Milos Kozak 42032eede8 Merge branch 'dev' into G6 2019-02-08 19:25:33 +01:00
Milos Kozak f540c70f22 Merge branch 'dev' into G6 2019-02-08 19:11:38 +01:00
Milos Kozak 97ace868d0
New Crowdin translations (#1614)
* New translations strings.xml (Czech)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

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

* New translations insight_exceptions.xml (Slovak)

* New translations insight_alert_titles.xml (Slovak)

* New translations insight_alert_codes.xml (Slovak)

* New translations insight_alert_descriptions.xml (Slovak)

* New translations strings.xml (Bulgarian)
2019-02-08 18:53:19 +01:00
TebbeUbben c730d3244f Log app error codes 2019-02-04 23:56:24 +01:00
AdrianLxM 9df8273694
Merge pull request #1613 from TebbeUbben/dev-nico
Status lights with Insight support
2019-02-02 23:45:52 +01:00
Milos Kozak 5b462c4931
Merge pull request #1600 from tim2000s/dev
Upadted AMA Autosens string
2019-02-02 18:07:28 +01:00
Milos Kozak 3e694de755
New Crowdin translations (#1581)
* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

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

* New translations strings.xml (Dutch)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations insight_alert_codes.xml (Polish)

* New translations insight_alert_codes.xml (Romanian)

* New translations insight_exceptions.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_alert_descriptions.xml (Portuguese)

* New translations insight_alert_codes.xml (Portuguese)

* New translations insight_exceptions.xml (Polish)

* New translations insight_alert_titles.xml (Polish)

* New translations insight_alert_descriptions.xml (Polish)

* New translations insight_alert_titles.xml (Romanian)

* New translations insight_exceptions.xml (Korean)

* New translations insight_alert_titles.xml (Korean)

* New translations insight_alert_descriptions.xml (Korean)

* New translations insight_alert_codes.xml (Korean)

* New translations insight_exceptions.xml (Japanese)

* New translations insight_alert_titles.xml (Japanese)

* New translations insight_alert_descriptions.xml (Japanese)

* New translations insight_alert_codes.xml (Japanese)

* New translations insight_alert_descriptions.xml (Romanian)

* New translations insight_exceptions.xml (Romanian)

* New translations insight_alert_titles.xml (Italian)

* New translations insight_alert_descriptions.xml (Spanish)

* New translations insight_alert_titles.xml (Turkish)

* New translations insight_alert_descriptions.xml (Turkish)

* New translations insight_alert_codes.xml (Turkish)

* New translations insight_exceptions.xml (Swedish)

* New translations insight_alert_titles.xml (Swedish)

* New translations insight_alert_descriptions.xml (Swedish)

* New translations insight_alert_codes.xml (Swedish)

* New translations insight_exceptions.xml (Spanish)

* New translations insight_alert_titles.xml (Spanish)

* New translations insight_alert_codes.xml (Spanish)

* New translations insight_exceptions.xml (Slovak)

* New translations insight_alert_titles.xml (Slovak)

* New translations insight_alert_descriptions.xml (Slovak)

* New translations insight_alert_codes.xml (Slovak)

* New translations insight_exceptions.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations insight_alert_codes.xml (Russian)

* New translations insight_exceptions.xml (Italian)

* New translations insight_alert_descriptions.xml (Italian)

* New translations insight_alert_titles.xml (Chinese Simplified)

* New translations insight_exceptions.xml (Dutch)

* New translations insight_alert_titles.xml (Dutch)

* New translations insight_alert_descriptions.xml (Dutch)

* New translations insight_alert_codes.xml (Dutch)

* New translations insight_exceptions.xml (Czech)

* New translations insight_alert_titles.xml (Czech)

* New translations insight_alert_descriptions.xml (Czech)

* New translations insight_alert_codes.xml (Czech)

* New translations insight_exceptions.xml (Chinese Simplified)

* New translations insight_alert_descriptions.xml (Chinese Simplified)

* New translations insight_alert_codes.xml (Chinese Simplified)

* New translations insight_exceptions.xml (Bulgarian)

* New translations insight_alert_titles.xml (Bulgarian)

* New translations insight_alert_descriptions.xml (Bulgarian)

* New translations insight_alert_codes.xml (Bulgarian)

* New translations insight_exceptions.xml (Afrikaans)

* New translations insight_alert_titles.xml (Afrikaans)

* New translations insight_alert_descriptions.xml (Afrikaans)

* New translations insight_alert_codes.xml (Afrikaans)

* New translations insight_alert_codes.xml (French)

* New translations insight_alert_codes.xml (Italian)

* New translations insight_exceptions.xml (Irish)

* New translations insight_alert_titles.xml (Irish)

* New translations insight_alert_descriptions.xml (Irish)

* New translations insight_alert_codes.xml (Irish)

* New translations insight_exceptions.xml (Hebrew)

* New translations insight_alert_titles.xml (Hebrew)

* New translations insight_alert_descriptions.xml (Hebrew)

* New translations insight_alert_codes.xml (Hebrew)

* New translations insight_exceptions.xml (Greek)

* New translations insight_alert_descriptions.xml (French)

* New translations insight_alert_titles.xml (Greek)

* New translations insight_alert_descriptions.xml (Greek)

* New translations insight_alert_codes.xml (Greek)

* New translations insight_exceptions.xml (German)

* New translations insight_alert_titles.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations insight_alert_codes.xml (German)

* New translations insight_exceptions.xml (French)

* New translations insight_alert_titles.xml (French)

* New translations insight_exceptions.xml (Turkish)

* New translations strings.xml (German)

* New translations insight_alert_codes.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations insight_alert_titles.xml (German)

* New translations insight_exceptions.xml (German)

* New translations strings.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations insight_exceptions.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_exceptions.xml (Portuguese)
2019-02-02 18:02:19 +01:00
TebbeUbben b670900e02 Merge branch 'master' into dev-nico 2019-02-02 17:09:03 +01:00