Skip to content

Commit 11a61a2

Browse files
committed
Update to mainline
Signed-off-by: Gerson Fernando Budke <[email protected]>
1 parent 92397db commit 11a61a2

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.. Copyright (c) 2024 O.S. Systems Software LTDA.
2-
.. Copyright (c) 2024 Freedom Veiculos Eletricos
1+
.. Copyright (c) 2024-2025 O.S. Systems Software LTDA.
2+
.. Copyright (c) 2024-2025 Freedom Veiculos Eletricos
33
.. SPDX-License-Identifier: Apache-2.0
44
55
.. _zephyr_behaviour_tree_module:
@@ -14,7 +14,7 @@ Preparation
1414

1515
The first step is prepare the development machine. The developer must follow the
1616
steps at `Zephyr RTOS getting started`_. The recommendation is test using the
17-
``native_posix`` board. In this case, the last step from procedure should try
17+
``qemu_cortex_m3`` board. In this case, the last step from procedure should try
1818
using this command:
1919

2020
.. code-block:: console
@@ -23,7 +23,7 @@ using this command:
2323
2424
.. code-block:: console
2525
26-
west build -b native_posix samples/hello_world -t run
26+
west build -b qemu_cortex_m3 samples/hello_world -t run
2727
2828
The second step is add your credentials to github. This will add necessary
2929
permissions to clone using ssh and send changes. The github documentation can

include/zephyr/zephyrbt/zephyrbt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ struct zephyrbt_blackboard_item {
7575
struct zephyrbt_context {
7676
#ifdef CONFIG_ZEPHYR_BEHAVIOUR_TREE_NODE_INFO
7777
const char *name;
78-
size_t deep;
78+
uint32_t deep;
7979
#endif
8080
struct zephyrbt_node *node;
81-
const size_t nodes;
81+
const uint32_t nodes;
8282
struct zephyrbt_blackboard_item *blackboard;
8383
#ifdef CONFIG_ZEPHYR_BEHAVIOUR_TREE_USER_DATA
8484
void *user_data;

samples/subsys/zephyrbt/dynamic/sample.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright (c) 2024 O.S. Systems Software LTDA.
2-
# Copyright (c) 2024 Freedom Veiculos Eletricos
1+
# Copyright (c) 2024-2025 O.S. Systems Software LTDA.
2+
# Copyright (c) 2024-2025 Freedom Veiculos Eletricos
33
# SPDX-License-Identifier: Apache-2.0
44

55
sample:
@@ -9,7 +9,7 @@ common:
99
tests:
1010
samples.zephyrbt.dynamic:
1111
platform_allow:
12-
- native_posix/native/64
12+
- qemu_cortex_m3
1313
- nucleo_f767zi
1414
harness: console
1515
harness_config:

samples/subsys/zephyrbt/minimal/sample.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright (c) 2024 O.S. Systems Software LTDA.
2-
# Copyright (c) 2024 Freedom Veiculos Eletricos
1+
# Copyright (c) 2024-2025 O.S. Systems Software LTDA.
2+
# Copyright (c) 2024-2025 Freedom Veiculos Eletricos
33
# SPDX-License-Identifier: Apache-2.0
44

55
sample:
@@ -9,7 +9,7 @@ common:
99
tests:
1010
samples.zephyrbt.minimal:
1111
platform_allow:
12-
- native_posix/native/64
12+
- qemu_cortex_m3
1313
- nucleo_f767zi
1414
harness: console
1515
harness_config:

scripts/generate-zephyrbt-from-behaviourtreecpp-xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def getSearchBuiltinNode(builtin, name):
313313

314314
def getChildIdx(idx_table, num, elem, root, mainroot):
315315
child = None
316-
if elem:
316+
if len(elem):
317317
for subelem in elem:
318318
if subelem.tag == "SubTree":
319319
subelem = resolveSubTree(subelem, mainroot)

west.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright (c) 2024 O.S. Systems Software LTDA.
2-
# Copyright (c) 2024 Freedom Veiculos Eletricos
1+
# Copyright (c) 2024-2025 O.S. Systems Software LTDA.
2+
# Copyright (c) 2024-2025 Freedom Veiculos Eletricos
33
# SPDX-License-Identifier: Apache-2.0
44

55
manifest:
@@ -19,7 +19,7 @@ manifest:
1919
import:
2020
path-prefix: deps
2121
path-allowlist:
22-
- modules/hal/cmsis
22+
- modules/hal/cmsis_6
2323
- modules/hal/stm32
2424

2525
self:

0 commit comments

Comments
 (0)