Skip to content

Commit

Permalink
samples: counter: use shell instead of serial by default
Browse files Browse the repository at this point in the history
  • Loading branch information
martinjaeger committed Jul 22, 2023
1 parent 5eea70e commit 0556587
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:
west build -p -b olimex_lora_stm32wl_devkit samples/counter -- -DOVERLAY_CONFIG=lorawan.conf
west build -p -b esp32c3_devkitm samples/counter
west build -p -b native_posix samples/counter
west build -p -b nucleo_l073rz samples/counter -- -DOVERLAY_CONFIG=serial.conf
west build -p -b nucleo_l073rz samples/counter -- -DOVERLAY_CONFIG=storage_eeprom.conf
west build -p -b native_posix samples/counter -- -DOVERLAY_CONFIG=auth.conf
west build -p -b native_posix samples/counter -- -DOVERLAY_CONFIG=can.conf
west build -p -b native_posix samples/counter -- -DOVERLAY_CONFIG=log_backend.conf
west build -p -b native_posix samples/counter -- -DOVERLAY_CONFIG=shell.conf
- name: Build documentation
working-directory: thingset-zephyr-sdk
Expand Down
4 changes: 0 additions & 4 deletions samples/counter/boards/native_posix.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Copyright (c) The ThingSet Project Contributors
# SPDX-License-Identifier: Apache-2.0

# native_posix does not support interrupt-driven UART at the moment
CONFIG_UART_INTERRUPT_DRIVEN=n
CONFIG_NATIVE_UART_0_ON_STDINOUT=y

# required to generate device ID
CONFIG_ENTROPY_GENERATOR=y
CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
19 changes: 9 additions & 10 deletions samples/counter/prj.conf
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
# Copyright (c) The ThingSet Project Contributors
# SPDX-License-Identifier: Apache-2.0

CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y

CONFIG_STDOUT_CONSOLE=y
CONFIG_CBPRINTF_FP_SUPPORT=y

CONFIG_LOG=y
CONFIG_LOG_MODE_MINIMAL=y

CONFIG_PICOLIBC=y

# ThingSet library
CONFIG_THINGSET=y
CONFIG_THINGSET_LOG_LEVEL_DBG=y

# ThingSet SDK
CONFIG_THINGSET_SDK=y
CONFIG_THINGSET_SERIAL=y
CONFIG_THINGSET_REPORTING_LIVE_ENABLE_PRESET=n
CONFIG_THINGSET_REPORTING_LIVE_PERIOD_PRESET=10

CONFIG_SHELL=y
# Avoid conflicts with ThingSet ? command
CONFIG_SHELL_WILDCARD=n
# Support `select thingset` to run ThingSet requests directly
CONFIG_SHELL_CMDS_SELECT=y

CONFIG_THINGSET_SHELL=y
7 changes: 7 additions & 0 deletions samples/counter/serial.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright (c) The ThingSet Project Contributors
# SPDX-License-Identifier: Apache-2.0

CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y

CONFIG_THINGSET_SERIAL=y

0 comments on commit 0556587

Please sign in to comment.