From 409ee1a87051e2d89939a02cf4609843d426a3f8 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 8 Jun 2023 14:34:49 -0400 Subject: [PATCH 1/4] Fix method return type (strict python noticed we return None here) --- scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py index 81a6158f13f542..81e47de716a2e4 100755 --- a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py +++ b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py @@ -5,7 +5,7 @@ import xml.etree.ElementTree from dataclasses import dataclass from enum import Enum, auto -from typing import List, MutableMapping, Tuple, Union +from typing import List, MutableMapping, Optional, Tuple, Union from lark import Lark from lark.visitors import Discard, Transformer, v_args @@ -167,7 +167,7 @@ def GetLinterRules(self): def RequireAttribute(self, r: AttributeRequirement): self._required_attributes_rule.RequireAttribute(r) - def FindClusterCode(self, name: str) -> Tuple[str, int]: + def FindClusterCode(self, name: str) -> Optionarl[Tuple[str, int]]: if name not in self._cluster_codes: # Name may be a number. If this can be parsed as a number, accept it anyway try: From b4d956d6e2ac203ab163fbd19a1678c5db116559 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 8 Jun 2023 14:35:30 -0400 Subject: [PATCH 2/4] Fix typo --- scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py index 81e47de716a2e4..9499e360399230 100755 --- a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py +++ b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py @@ -167,7 +167,7 @@ def GetLinterRules(self): def RequireAttribute(self, r: AttributeRequirement): self._required_attributes_rule.RequireAttribute(r) - def FindClusterCode(self, name: str) -> Optionarl[Tuple[str, int]]: + def FindClusterCode(self, name: str) -> Optional[Tuple[str, int]]: if name not in self._cluster_codes: # Name may be a number. If this can be parsed as a number, accept it anyway try: From fa60806efd0af13b06b8adf6c3077faa13273def Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 8 Jun 2023 18:29:25 -0400 Subject: [PATCH 3/4] Fix a typo --- src/lib/support/StringSplitter.h | 2 +- third_party/qpg_sdk/repo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/support/StringSplitter.h b/src/lib/support/StringSplitter.h index abeed6fa4567f9..8434f2b02c90dc 100644 --- a/src/lib/support/StringSplitter.h +++ b/src/lib/support/StringSplitter.h @@ -44,7 +44,7 @@ class StringSplitter } } - /// Returns the next character san + /// Returns the next character span /// /// out - contains the next element or a nullptr/0 sized span if /// no elements available diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index 6c3303e5155912..cacb7eb95985f9 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit 6c3303e51559123a76d9e93ef902d57fc8302c32 +Subproject commit cacb7eb95985f9b81359d839cd25468fb3b1aec1 From 72090f8fe7a149f50da0c82dc73154bf865e7529 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 8 Jun 2023 18:32:05 -0400 Subject: [PATCH 4/4] Revert unintended repo change --- third_party/qpg_sdk/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index cacb7eb95985f9..6c3303e5155912 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit cacb7eb95985f9b81359d839cd25468fb3b1aec1 +Subproject commit 6c3303e51559123a76d9e93ef902d57fc8302c32