diff --git a/examples/zephyr-subsys-logger/src/ext_log_system_adapter.c b/examples/zephyr-subsys-logger/src/ext_log_system_adapter.c index 6f863b6..50ccf24 100644 --- a/examples/zephyr-subsys-logger/src/ext_log_system_adapter.c +++ b/examples/zephyr-subsys-logger/src/ext_log_system_adapter.c @@ -24,16 +24,22 @@ static const uint8_t log_level_lut[] = { static void log_handler(enum ext_log_level level, const char *fmt, ...) { - struct log_msg_ids src_level = { - .level = log_level_lut[level], - .domain_id = CONFIG_LOG_DOMAIN_ID, - .source_id = LOG_CURRENT_MODULE_ID() - }; va_list ap; va_start(ap, fmt); - log_generic(src_level, fmt, ap, LOG_STRDUP_CHECK_EXEC); + if (IS_ENABLED(CONFIG_LOG2)) { + log2_generic(log_level_lut[level], fmt, ap); + } else { + struct log_msg_ids src_level = { + .level = log_level_lut[level], + .domain_id = CONFIG_LOG_DOMAIN_ID, + .source_id = LOG_CURRENT_MODULE_ID() + }; + + log_generic(src_level, fmt, ap, LOG_STRDUP_CHECK_EXEC); + } + va_end(ap); } diff --git a/examples/zephyr-subsys-logger/src/main.c b/examples/zephyr-subsys-logger/src/main.c index 6ae2649..3bd58ee 100644 --- a/examples/zephyr-subsys-logger/src/main.c +++ b/examples/zephyr-subsys-logger/src/main.c @@ -69,15 +69,16 @@ static uint32_t timestamp_freq(void) * * @return Source ID. */ -static int log_source_id_get(const char *name) +static int16_t log_source_id_get(const char *name) { - for (int i = 0; i < log_src_cnt_get(CONFIG_LOG_DOMAIN_ID); i++) { + for (int16_t i = 0; i < log_src_cnt_get(CONFIG_LOG_DOMAIN_ID); i++) { if (strcmp(log_source_name_get(CONFIG_LOG_DOMAIN_ID, i), name) == 0) { return i; } } + return -1; } @@ -278,7 +279,7 @@ static void external_log_system_showcase(void) static void log_demo_thread(void *p1, void *p2, void *p3) { - bool usermode = _is_user_context(); + bool usermode = k_is_user_context(); k_sleep(K_MSEC(100)); diff --git a/examples/zephyr-subsys-logger/zephyr/prj.conf b/examples/zephyr-subsys-logger/zephyr/prj.conf index 900df40..16812b6 100644 --- a/examples/zephyr-subsys-logger/zephyr/prj.conf +++ b/examples/zephyr-subsys-logger/zephyr/prj.conf @@ -1,4 +1,5 @@ CONFIG_LOG=y +CONFIG_LOG_MODE_DEFERRED=y CONFIG_LOG_RUNTIME_FILTERING=y CONFIG_LOG_BUFFER_SIZE=2048 CONFIG_LOG_PRINTK=y diff --git a/platform.json b/platform.json index e591709..9c4463f 100644 --- a/platform.json +++ b/platform.json @@ -20,7 +20,7 @@ "type": "git", "url": "https://github.com/platformio/platform-atmelsam.git" }, - "version": "6.2.0", + "version": "6.3.0", "frameworks": { "arduino": { "package": "framework-arduino-sam", @@ -145,117 +145,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~2.20500.0" - }, - "framework-zephyr-cmsis": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.c3bd2094f9" - }, - "framework-zephyr-canopennode": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.468d350028" - }, - "framework-zephyr-civetweb": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.e6903b80c0" - }, - "framework-zephyr-fatfs": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.1d1fcc725a" - }, - "framework-zephyr-hal-atmel": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.9f0a699a2f" - }, - "framework-zephyr-hal-st": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.b52fdbf4b6" - }, - "framework-zephyr-libmetal": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.9d4ee2c3cf" - }, - "framework-zephyr-lvgl": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.31acbaa36e" - }, - "framework-zephyr-mbedtls": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.24d84ecff1" - }, - "framework-zephyr-mcuboot": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3fc59410b6" - }, - "framework-zephyr-mcumgr": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.43845e883f" - }, - "framework-zephyr-open-amp": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.de1b85a130" - }, - "framework-zephyr-loramac-node": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3f545d76a2" - }, - "framework-zephyr-openthread": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.1d668284a0" - }, - "framework-zephyr-segger": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.38c79a447e" - }, - "framework-zephyr-sof": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.b5b772dd61" - }, - "framework-zephyr-tinycbor": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.40daca97b4" - }, - "framework-zephyr-tinycrypt": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3e9a49d267" - }, - "framework-zephyr-littlefs": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.9e4498d1c7" - }, - "framework-zephyr-mipi-sys-t": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.75e671550a" - }, - "framework-zephyr-tfm-mcuboot": { - "optional": true, - "owner": "platformio", - "version": "1.7.0-rc1" - }, - "framework-zephyr-trusted-firmware-m": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.96340fb6c0" + "version": "~2.20600.0" }, "tool-avrdude": { "type": "uploader", diff --git a/platform.py b/platform.py index 5179496..3ffb845 100644 --- a/platform.py +++ b/platform.py @@ -87,8 +87,7 @@ def configure_default_packages(self, variables, targets): self.packages["tool-bossac"]["version"] = "~1.10900.0" if "zephyr" in variables.get("pioframework", []): for p in self.packages: - if p.startswith("framework-zephyr-") or p in ( - "tool-cmake", "tool-dtc", "tool-ninja"): + if p in ("tool-cmake", "tool-dtc", "tool-ninja"): self.packages[p]["optional"] = False self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0" if "windows" not in get_systype():