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

Commit

Permalink
samples: enable wifi settings in runtime settings conf overlay
Browse files Browse the repository at this point in the history 
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 <sam@golioth.io>
  • Loading branch information
@sam-golioth
sam-golioth committed Nov 1, 2023
1 parent 4013051 commit 7f828df
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions samples/common/runtime_psk.conf → samples/common/runtime_settings.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ CONFIG_NVS=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_RUNTIME=y
CONFIG_GOLIOTH_SAMPLE_PSK_SETTINGS=y
CONFIG_GOLIOTH_SAMPLE_WIFI_SETTINGS=y
CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
2 changes: 1 addition & 1 deletion samples/dfu/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/hello/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/hello/sample.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ tests:
- CONFIG_GOLIOTH_AUTH_METHOD_CERT=y
sample.golioth.hello.psk.runtime.buildonly:
build_only: true
extra_args: EXTRA_CONF_FILE="../common/runtime_psk.conf"
extra_args: EXTRA_CONF_FILE="../common/runtime_settings.conf"
2 changes: 1 addition & 1 deletion samples/hello_sporadic/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb/delete/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb/get/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb/observe/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb/set/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb_led/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/lightdb_stream/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/logging/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/rpc/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ file:

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

Expand Down
2 changes: 1 addition & 1 deletion samples/settings/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ file:

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

Expand Down

0 comments on commit 7f828df

Please sign in to comment.