From e134a874fa28c8f991b55e5e55bce3a49a2bd1c1 Mon Sep 17 00:00:00 2001 From: andvikt Date: Sat, 18 Sep 2021 22:08:52 +0300 Subject: [PATCH 1/5] add adc support for 328 mega --- .bumpversion.cfg | 21 +++++++++++++++++++++ custom_components/mega/hub.py | 3 +++ custom_components/mega/manifest.json | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..767e2d5 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,21 @@ +[bumpversion] +current_version = 1.0.10b0 +parse = (?P\d+)(\.(?P\d+))(\.(?P\d))(?P[bf]*)(?P\d*) +commit = True +tag = True +serialize = + {major}.{minor}.{patch}{release}{build} + {major}.{minor}.{patch} + +[bumpversion:part:release] +optional_value = f +values = + b + f + +[bumpversion:part:build] +first_value = 0 + +[bumpversion:file:custom_components/mega/manifest.json] +search = "version": "v{current_version}" +replace = "version": "v{new_version}" diff --git a/custom_components/mega/hub.py b/custom_components/mega/hub.py index 8b6bbd2..616c562 100644 --- a/custom_components/mega/hub.py +++ b/custom_components/mega/hub.py @@ -566,6 +566,9 @@ class MegaD: elif cfg.pty == '4' and cfg.m == '2': # scl исключаем из сканирования continue + elif cfg.pty is None and nports < 30: + # вроде как это ADC на 328 меге + ret['sensor'][port].append(dict()) elif cfg.pty in ('3', '2', '4'): http_cmd = 'get' if cfg.d == '5' and cfg.pty == '3': diff --git a/custom_components/mega/manifest.json b/custom_components/mega/manifest.json index e383d9f..3eb3a40 100644 --- a/custom_components/mega/manifest.json +++ b/custom_components/mega/manifest.json @@ -15,5 +15,5 @@ "@andvikt" ], "issue_tracker": "https://github.com/andvikt/mega_hacs/issues", - "version": "v1.0.9" + "version": "v1.0.10b0" } \ No newline at end of file From 2490e0974881e7f8c701e5a07eb700c8bf815b47 Mon Sep 17 00:00:00 2001 From: andvikt Date: Sat, 18 Sep 2021 22:10:47 +0300 Subject: [PATCH 2/5] add adc support for 328 mega --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 767e2d5..514102d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,6 +1,6 @@ [bumpversion] current_version = 1.0.10b0 -parse = (?P\d+)(\.(?P\d+))(\.(?P\d))(?P[bf]*)(?P\d*) +parse = (?P\d+)(\.(?P\d+))(\.(?P\d+))(?P[bf]*)(?P\d*) commit = True tag = True serialize = From 8738a936fe5364e17a388f30fd8230710b5e94c0 Mon Sep 17 00:00:00 2001 From: andvikt Date: Sat, 18 Sep 2021 22:10:50 +0300 Subject: [PATCH 3/5] =?UTF-8?q?Bump=20version:=201.0.10b0=20=E2=86=92=201.?= =?UTF-8?q?0.10b1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- custom_components/mega/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 514102d..d1222e1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.10b0 +current_version = 1.0.10b1 parse = (?P\d+)(\.(?P\d+))(\.(?P\d+))(?P[bf]*)(?P\d*) commit = True tag = True diff --git a/custom_components/mega/manifest.json b/custom_components/mega/manifest.json index 3eb3a40..a000327 100644 --- a/custom_components/mega/manifest.json +++ b/custom_components/mega/manifest.json @@ -15,5 +15,5 @@ "@andvikt" ], "issue_tracker": "https://github.com/andvikt/mega_hacs/issues", - "version": "v1.0.10b0" + "version": "v1.0.10b1" } \ No newline at end of file From 52ace90600df2e8e77dff220de6b965801d913de Mon Sep 17 00:00:00 2001 From: andvikt Date: Sat, 18 Sep 2021 22:11:52 +0300 Subject: [PATCH 4/5] add adc support for 328 mega --- custom_components/mega/config_flow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/mega/config_flow.py b/custom_components/mega/config_flow.py index c421f3b..969aff3 100644 --- a/custom_components/mega/config_flow.py +++ b/custom_components/mega/config_flow.py @@ -63,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data): class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): """Handle a config flow for mega.""" - VERSION = 24 + VERSION = 25 CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED async def async_step_user(self, user_input=None): From 9322f9cae1d41d79e5d646c68e0cf2a1e876003e Mon Sep 17 00:00:00 2001 From: andvikt Date: Sat, 18 Sep 2021 22:11:56 +0300 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=201.0.10b1=20=E2=86=92=201.?= =?UTF-8?q?0.10b2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- custom_components/mega/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d1222e1..bdd7687 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.10b1 +current_version = 1.0.10b2 parse = (?P\d+)(\.(?P\d+))(\.(?P\d+))(?P[bf]*)(?P\d*) commit = True tag = True diff --git a/custom_components/mega/manifest.json b/custom_components/mega/manifest.json index a000327..c741220 100644 --- a/custom_components/mega/manifest.json +++ b/custom_components/mega/manifest.json @@ -15,5 +15,5 @@ "@andvikt" ], "issue_tracker": "https://github.com/andvikt/mega_hacs/issues", - "version": "v1.0.10b1" + "version": "v1.0.10b2" } \ No newline at end of file