Skip to content

Commit 3babdf0

Browse files
ppsxppsx
committed
Merge remote-tracking branch 'upstream/main' into rm690b0
2 parents 9099f83 + 8fb29d9 commit 3babdf0

45 files changed

Lines changed: 1246 additions & 186 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎locale/cs.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2090,10 +2090,13 @@ msgstr ""
20902090

20912091
#: ports/espressif/common-hal/socketpool/SocketPool.c
20922092
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2093-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
20942093
msgid "SocketPool can only be used with wifi.radio"
20952094
msgstr "SocketPool je možné použít pouze s wifi.radio"
20962095

2096+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2097+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2098+
msgstr ""
2099+
20972100
#: shared-bindings/aesio/aes.c
20982101
msgid "Source and destination buffers must be the same length"
20992102
msgstr "Zdrojové a cílové buffery musí být stejné délky"

‎locale/el.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,10 +2095,13 @@ msgstr ""
20952095

20962096
#: ports/espressif/common-hal/socketpool/SocketPool.c
20972097
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2098-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
20992098
msgid "SocketPool can only be used with wifi.radio"
21002099
msgstr ""
21012100

2101+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2102+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2103+
msgstr ""
2104+
21022105
#: shared-bindings/aesio/aes.c
21032106
msgid "Source and destination buffers must be the same length"
21042107
msgstr ""

‎locale/hi.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2069,10 +2069,13 @@ msgstr ""
20692069

20702070
#: ports/espressif/common-hal/socketpool/SocketPool.c
20712071
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2072-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
20732072
msgid "SocketPool can only be used with wifi.radio"
20742073
msgstr ""
20752074

2075+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2076+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2077+
msgstr ""
2078+
20762079
#: shared-bindings/aesio/aes.c
20772080
msgid "Source and destination buffers must be the same length"
20782081
msgstr ""

‎locale/ko.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2142,10 +2142,13 @@ msgstr ""
21422142

21432143
#: ports/espressif/common-hal/socketpool/SocketPool.c
21442144
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2145-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
21462145
msgid "SocketPool can only be used with wifi.radio"
21472146
msgstr ""
21482147

2148+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2149+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2150+
msgstr ""
2151+
21492152
#: shared-bindings/aesio/aes.c
21502153
msgid "Source and destination buffers must be the same length"
21512154
msgstr ""

‎locale/ru.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2120,10 +2120,13 @@ msgstr "Фрагменты не поддерживаются"
21202120

21212121
#: ports/espressif/common-hal/socketpool/SocketPool.c
21222122
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2123-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
21242123
msgid "SocketPool can only be used with wifi.radio"
21252124
msgstr "SocketPool можно использовать только с wifi.radio"
21262125

2126+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2127+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2128+
msgstr ""
2129+
21272130
#: shared-bindings/aesio/aes.c
21282131
msgid "Source and destination buffers must be the same length"
21292132
msgstr "Исходный и конечный буферы должны иметь одинаковую длину"

‎locale/tr.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,10 +2091,13 @@ msgstr ""
20912091

20922092
#: ports/espressif/common-hal/socketpool/SocketPool.c
20932093
#: ports/raspberrypi/common-hal/socketpool/SocketPool.c
2094-
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
20952094
msgid "SocketPool can only be used with wifi.radio"
20962095
msgstr ""
20972096

2097+
#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
2098+
msgid "SocketPool can only be used with wifi.radio or hostnetwork.HostNetwork"
2099+
msgstr ""
2100+
20982101
#: shared-bindings/aesio/aes.c
20992102
msgid "Source and destination buffers must be the same length"
21002103
msgstr ""

‎ports/espressif/common-hal/_bleio/Adapter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {
733733
}
734734

735735
bool common_hal_bleio_adapter_get_advertising(bleio_adapter_obj_t *self) {
736-
return ble_gap_adv_active();
736+
return common_hal_bleio_adapter_get_enabled(self) && ble_gap_adv_active();
737737
}
738738

739739
bool common_hal_bleio_adapter_get_connected(bleio_adapter_obj_t *self) {

‎ports/zephyr-cp/AGENTS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
- The files (not folders) in `boards/` directory are used by Zephyr.
44
- To flash it on a board do `make BOARD=<vendor>_<board_name> flash`.
55
- Zephyr board docs are at `zephyr/boards/<vendor>/<board_name>`.
6+
- Run zephyr-cp tests with `make test`.

‎ports/zephyr-cp/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ if(CONFIG_BOARD_NATIVE_SIM)
1010
target_sources(app PRIVATE native_sim_i2c_emul_control.c)
1111
endif()
1212

13+
if(CONFIG_TRACING_PERFETTO)
14+
zephyr_include_directories(${ZEPHYR_BINARY_DIR}/subsys/tracing/perfetto/proto)
15+
endif()
16+
1317
# From: https://github.com/zephyrproject-rtos/zephyr/blob/main/samples/application_development/external_lib/CMakeLists.txt
1418
# The external static library that we are linking with does not know
1519
# how to build for this platform so we export all the flags used in

‎ports/zephyr-cp/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ BUILD ?= build-$(BOARD)
88

99
TRANSLATION ?= en_US
1010

11+
.DEFAULT_GOAL := $(BUILD)/zephyr-cp/zephyr/zephyr.elf
12+
1113
.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash recover debug run run-sim clean menuconfig all clean-all test fetch-port-submodules
1214

1315
$(BUILD)/zephyr-cp/zephyr/zephyr.elf:
@@ -23,6 +25,9 @@ $(BUILD)/firmware.hex: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
2325
$(BUILD)/firmware.exe: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
2426
cp $(BUILD)/zephyr-cp/zephyr/zephyr.exe $@
2527

28+
$(BUILD)/firmware.uf2: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
29+
cp $(BUILD)/zephyr-cp/zephyr/zephyr.uf2 $@
30+
2631
flash: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
2732
west flash -d $(BUILD)
2833

0 commit comments

Comments
 (0)