Skip to content
This repository was archived by the owner on Jul 31, 2024. It is now read-only.

Commit 7f828df

Browse files
sam-goliothsam-golioth
committed
samples: enable wifi settings in runtime settings conf overlay
Enable wifi settings shell when using the runtime settings config overlay file. Also rename the config overlay from `runtime_psk.conf` to `runtime_settings.conf`. Signed-off-by: Sam Friedman <[email protected]>
1 parent 4013051 commit 7f828df

File tree

14 files changed

+14
-13
lines changed

14 files changed

+14
-13
lines changed

‎samples/common/runtime_psk.conf renamed to ‎samples/common/runtime_settings.conf

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ CONFIG_NVS=y
77
CONFIG_SETTINGS=y
88
CONFIG_SETTINGS_RUNTIME=y
99
CONFIG_GOLIOTH_SAMPLE_PSK_SETTINGS=y
10+
CONFIG_GOLIOTH_SAMPLE_WIFI_SETTINGS=y
1011
CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
1112
CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y

‎samples/dfu/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ file:
5454

5555
.. code-block:: console
5656
57-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
57+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5858
5959
Alternatively, you can add the following options to ``prj.conf``:
6060

‎samples/hello/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/hello/sample.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ tests:
7474
- CONFIG_GOLIOTH_AUTH_METHOD_CERT=y
7575
sample.golioth.hello.psk.runtime.buildonly:
7676
build_only: true
77-
extra_args: EXTRA_CONF_FILE="../common/runtime_psk.conf"
77+
extra_args: EXTRA_CONF_FILE="../common/runtime_settings.conf"

‎samples/hello_sporadic/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/lightdb/delete/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ file:
5050

5151
.. code-block:: console
5252
53-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
53+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5454
5555
Alternatively, you can add the following options to ``prj.conf``:
5656

‎samples/lightdb/get/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ file:
5050

5151
.. code-block:: console
5252
53-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
53+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5454
5555
Alternatively, you can add the following options to ``prj.conf``:
5656

‎samples/lightdb/observe/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/lightdb/set/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/lightdb_led/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/lightdb_stream/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ file:
5353

5454
.. code-block:: console
5555
56-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
56+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5757
5858
Alternatively, you can add the following options to ``prj.conf``:
5959

‎samples/logging/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/rpc/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ file:
5151

5252
.. code-block:: console
5353
54-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
54+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5555
5656
Alternatively, you can add the following options to ``prj.conf``:
5757

‎samples/settings/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ file:
5353

5454
.. code-block:: console
5555
56-
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_psk.conf
56+
$ west build -- -DEXTRA_CONF_FILE=${ZEPHYR_GOLIOTH_MODULE_DIR}/samples/common/runtime_settings.conf
5757
5858
Alternatively, you can add the following options to ``prj.conf``:
5959

0 commit comments

Comments
 (0)