Skip to content

Commit 01377bf

Browse files
committed
giga: fix logging without shell
1 parent f5b2210 commit 01377bf

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

loader/main.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,13 @@ static int loader(const struct shell *sh) {
219219
return 0;
220220
}
221221
#elif CONFIG_LOG
222-
printk("Sketch debug mode: %s\n", debug ? "enabled" : "disabled");
223-
if (!debug && log_backend_count_get() > 0) {
222+
for (int i = 0; i < log_backend_count_get(); i++) {
224223
const struct log_backend *backend;
225-
// Keep only the first log backend enabled
226-
for (int i = 1; i < log_backend_count_get(); i++) {
227-
backend = log_backend_get(i);
228-
printk("Disabling log backend %p\n", backend);
229-
log_backend_disable(backend);
224+
backend = log_backend_get(i);
225+
log_backend_init(backend);
226+
log_backend_enable(backend, backend->cb->ctx, CONFIG_LOG_DEFAULT_LEVEL);
227+
if (!debug) {
228+
break;
230229
}
231230
}
232231
#endif

loader/prj.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ CONFIG_ARM_MPU=n
77

88
CONFIG_LOG=y
99
CONFIG_LOG_BACKEND_UART=y
10-
CONFIG_LOG_MODE_IMMEDIATE=y
11-
CONFIG_LOG_BACKEND_UART_AUTOSTART=y
10+
#LOG_MODE_MINIMAL and LOG_MODE_IMMEDIATE do not work with usb-cdc
11+
CONFIG_LOG_MODE_DEFERRED=y
12+
CONFIG_LOG_BUFFER_SIZE=1024
13+
CONFIG_LOG_DEFAULT_LEVEL=2
14+
CONFIG_LOG_BACKEND_UART_AUTOSTART=n
1215

1316
CONFIG_HEAP_MEM_POOL_SIZE=32768
1417
CONFIG_MAIN_STACK_SIZE=32768

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
CONFIG_USB_DEVICE_STACK=y
2+
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y
23
CONFIG_USB_DEVICE_PRODUCT="Arduino GIGA R1"
34
CONFIG_USB_DEVICE_MANUFACTURER="Arduino"
45
CONFIG_USB_DEVICE_VID=0x2341
56
CONFIG_USB_DEVICE_PID=0x0066
67

78
CONFIG_USB_CDC_ACM=y
8-
CONFIG_USB_CDC_ACM_RINGBUF_SIZE=512
9+
CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
910
CONFIG_UART_LINE_CTRL=y
1011
CONFIG_CDC_ACM_DTE_RATE_CALLBACK_SUPPORT=y
1112

1213
CONFIG_LLEXT_STORAGE_WRITABLE=n
1314
CONFIG_SHARED_MULTI_HEAP=y
14-
CONFIG_HEAP_MEM_POOL_SIZE=24576
15-
CONFIG_SHELL_STACK_SIZE=32768
15+
CONFIG_HEAP_MEM_POOL_SIZE=96000
1616
CONFIG_MAIN_STACK_SIZE=32768
1717
CONFIG_LLEXT_HEAP_SIZE=128
1818

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326

327327
log_uarts: log_uarts {
328328
compatible = "zephyr,log-uart";
329-
uarts = <&usart2 &board_cdc_acm_uart>;
329+
uarts = <&usart1 &board_cdc_acm_uart>;
330330
};
331331

332332
/* used to overcome problems with _C analog pins */

0 commit comments

Comments
 (0)