Skip to content

Commit 8fa33f0

Browse files
andy31415restyled-commitsarkq
authored
Add support for log control variants to NXP build targets (project-chip#36122)
* Add support for controlling logging amount in NXP builds * Remove the many reformat issues * Restyled by isort * Update scripts/build/builders/nxp.py Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
1 parent 0060e0e commit 8fa33f0

File tree

3 files changed

+47
-4
lines changed

3 files changed

+47
-4
lines changed

‎scripts/build/build/targets.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from builders.mw320 import MW320App, MW320Builder
2929
from builders.nrf import NrfApp, NrfBoard, NrfConnectBuilder
3030
from builders.nuttx import NuttXApp, NuttXBoard, NuttXBuilder
31-
from builders.nxp import NxpApp, NxpBoard, NxpBoardVariant, NxpBuilder, NxpBuildSystem, NxpOsUsed
31+
from builders.nxp import NxpApp, NxpBoard, NxpBoardVariant, NxpBuilder, NxpBuildSystem, NxpLogLevel, NxpOsUsed
3232
from builders.openiotsdk import OpenIotSdkApp, OpenIotSdkBuilder, OpenIotSdkCryptoBackend
3333
from builders.qpg import QpgApp, QpgBoard, QpgBuilder
3434
from builders.stm32 import stm32App, stm32Board, stm32Builder
@@ -562,6 +562,10 @@ def BuildNxpTarget():
562562
target.AppendModifier(name="iw416", iw416_transceiver=True).OnlyIfRe('rt1060')
563563
target.AppendModifier(name="w8801", w8801_transceiver=True).OnlyIfRe('rt1060')
564564
target.AppendModifier(name="iwx12", iwx12_transceiver=True).OnlyIfRe('rt1060|rt1170')
565+
target.AppendModifier(name="log-all", log_level=NxpLogLevel.ALL).ExceptIfRe("-log-(progress|error|none)")
566+
target.AppendModifier(name="log-progress", log_level=NxpLogLevel.PROGRESS).ExceptIfRe("-log-(all|error|none)")
567+
target.AppendModifier(name="log-error", log_level=NxpLogLevel.ERROR).ExceptIfRe("-log-(progress|all|none)")
568+
target.AppendModifier(name="log-none", log_level=NxpLogLevel.NONE).ExceptIfRe("-log-(progress|error|all)")
565569

566570
return target
567571

‎scripts/build/builders/nxp.py

+41-2
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,14 @@ def BuildRoot(self, root, board, os_env):
158158
return os.path.join(root, 'examples', self.ExampleName(), 'nxp', board.FolderName(os_env))
159159

160160

161+
class NxpLogLevel(Enum):
162+
DEFAULT = auto() # default everything
163+
ALL = auto() # enable all logging
164+
PROGRESS = auto() # progress and above
165+
ERROR = auto() # error and above
166+
NONE = auto() # no chip_logging at all
167+
168+
161169
class NxpBuilder(GnBuilder):
162170

163171
def __init__(self,
@@ -187,7 +195,9 @@ def __init__(self,
187195
disable_pairing_autostart: bool = False,
188196
iw416_transceiver: bool = False,
189197
w8801_transceiver: bool = False,
190-
iwx12_transceiver: bool = False):
198+
iwx12_transceiver: bool = False,
199+
log_level: NxpLogLevel = NxpLogLevel.DEFAULT,
200+
):
191201
super(NxpBuilder, self).__init__(
192202
root=app.BuildRoot(root, board, os_env),
193203
runner=runner)
@@ -217,12 +227,16 @@ def __init__(self,
217227
self.iw416_transceiver = iw416_transceiver
218228
self.w8801_transceiver = w8801_transceiver
219229
self.iwx12_transceiver = iwx12_transceiver
230+
if self.low_power and log_level != NxpLogLevel.NONE:
231+
logging.warning("Switching log level to 'NONE' for low power build")
232+
log_level = NxpLogLevel.NONE
233+
self.log_level = log_level
220234

221235
def GnBuildArgs(self):
222236
args = []
223237

224238
if self.low_power:
225-
args.append('chip_with_low_power=1 chip_logging=false')
239+
args.append('chip_with_low_power=1')
226240
if self.board == NxpBoard.K32W0:
227241
args.append('chip_pw_tokenizer_logging=false chip_with_OM15082=0')
228242

@@ -244,6 +258,31 @@ def GnBuildArgs(self):
244258
if self.enable_rotating_id:
245259
args.append('chip_enable_rotating_device_id=1 chip_enable_additional_data_advertising=1')
246260

261+
if self.log_level == NxpLogLevel.DEFAULT:
262+
pass
263+
elif self.log_level == NxpLogLevel.ALL:
264+
args.append("chip_logging=true")
265+
args.append("chip_error_logging=true")
266+
args.append("chip_progress_logging=true")
267+
args.append("chip_detail_logging=true")
268+
args.append("chip_automation_logging=true")
269+
elif self.log_level == NxpLogLevel.PROGRESS:
270+
args.append("chip_logging=true")
271+
args.append("chip_error_logging=true")
272+
args.append("chip_progress_logging=true")
273+
args.append("chip_detail_logging=false")
274+
args.append("chip_automation_logging=false")
275+
elif self.log_level == NxpLogLevel.ERROR:
276+
args.append("chip_logging=true")
277+
args.append("chip_error_logging=true")
278+
args.append("chip_progress_logging=false")
279+
args.append("chip_detail_logging=false")
280+
args.append("chip_automation_logging=false")
281+
elif self.log_level == NxpLogLevel.NONE:
282+
args.append("chip_logging=false")
283+
else:
284+
raise Exception("Unknown log level: %r", self.log_level)
285+
247286
if self.has_sw_version_2:
248287
args.append('nxp_software_version=2')
249288

‎scripts/build/testdata/all_targets_linux_x64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,therm
1313
linux-x64-efr32-test-runner[-clang]
1414
imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
1515
infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage][-trustm]
16-
nxp-{k32w0,k32w1,rt1060,rt1170,rw61x,rw61x_eth,mcxw71}-{zephyr,freertos}-{lighting,contact-sensor,lock-app,all-clusters,laundry-washer,thermostat}[-factory][-low-power][-lit][-fro32k][-smu2][-dac-conversion][-rotating-id][-sw-v2][-ota][-wifi][-ethernet][-thread][-matter-shell][-data-model-disabled][-data-model-enabled][-factory-build][-frdm][-cmake][-evkc][-iw416][-w8801][-iwx12]
16+
nxp-{k32w0,k32w1,rt1060,rt1170,rw61x,rw61x_eth,mcxw71}-{zephyr,freertos}-{lighting,contact-sensor,lock-app,all-clusters,laundry-washer,thermostat}[-factory][-low-power][-lit][-fro32k][-smu2][-dac-conversion][-rotating-id][-sw-v2][-ota][-wifi][-ethernet][-thread][-matter-shell][-data-model-disabled][-data-model-enabled][-factory-build][-frdm][-cmake][-evkc][-iw416][-w8801][-iwx12][-log-all][-log-progress][-log-error][-log-none]
1717
mbed-cy8cproto_062_4343w-{lock,light,all-clusters,all-clusters-minimal,pigweed,ota-requestor,shell}[-release][-develop][-debug][-data-model-disabled][-data-model-enabled]
1818
mw320-all-clusters-app
1919
nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,light-switch,shell,pump,pump-controller,window-covering}[-rpc][-data-model-disabled][-data-model-enabled]

0 commit comments

Comments
 (0)