Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

samples: cellular: MMSS: Support Wi-Fi #11863

Merged
merged 6 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions doc/nrf/links.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
.. _`nRF Cloud JSON protocol schemas`: https://github.com/nRFCloud/application-protocols
.. _`device_credentials_installer.py`: https://github.com/nRFCloud/utils/blob/master/python/modem-firmware-1.3%2B/device_credentials_installer.py
.. _`nrf_cloud_provision.py`: https://github.com/nRFCloud/utils/blob/master/python/modem-firmware-1.3%2B/README.md#nrf-cloud-device-provisioning
.. _`nRF Cloud Utilities Create CA Cert`: https://github.com/nRFCloud/utils/blob/master/python/modem-firmware-1.3%2B/README.md#create-ca-cert
.. _`nRF Cloud Utilities Create Device Credentials`: https://github.com/nRFCloud/utils/blob/master/python/modem-firmware-1.3%2B/README.md#create-device-credentials
.. _`nRF Cloud Utilities documentation`: https://github.com/nRFCloud/utils/blob/master/python/modem-firmware-1.3%2B/README.md

.. _`TF-M sample incompatibility issue`: https://github.com/zephyrproject-rtos/zephyr/issues/34658
Expand Down Expand Up @@ -812,6 +814,8 @@
.. _`Set up your AWS account`: https://docs.aws.amazon.com/iot/latest/developerguide/setting-up.html
.. _`AWS IoT Core policy examples`: https://docs.aws.amazon.com/iot/latest/developerguide/example-iot-policies.html
.. _`Security best practices in AWS IoT Core`: https://docs.aws.amazon.com/iot/latest/developerguide/security-best-practices.html
.. _`AWS IoT Core Server Authentication`: https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html
.. _`CA certificates for server authentication in AWS IoT Core`: https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs

.. _`AWS IoT console`: https://console.aws.amazon.com/iot/home
.. _`AWS S3 console`: https://console.aws.amazon.com/s3/home
Expand All @@ -838,6 +842,10 @@
.. _`Matter Simple Setup for Thread Overview`: https://developer.amazon.com/docs/frustration-free-setup/matter-simple-setup-for-thread-overview.html
.. _`Amazon Alexa integration with Matter`: https://developer.amazon.com/en-US/docs/alexa/smarthome/matter-support.html

.. ### Source: *.amazontrust.com

.. _`Amazon Root CA 1`: https://www.amazontrust.com/repository/AmazonRootCA1.pem

.. ### Source: openthread.io

.. _`OpenThread.io`: https://openthread.io/
Expand Down Expand Up @@ -961,6 +969,7 @@
.. _`nRF Cloud documentation`:
.. _`nRF Connect for Cloud documentation`: https://docs.nrfcloud.com/
.. _`nRF Cloud Device Messages`: https://docs.nrfcloud.com/Devices/MessagesAndAlerts/DeviceMessages.html
.. _`nRF Cloud Device ID`: https://docs.nrfcloud.com/Devices/Properties/DeviceId.html
.. _`nRF Cloud Device Shadows`: https://docs.nrfcloud.com/Devices/Properties/Shadows.html
.. _`nRF Cloud Security`: https://docs.nrfcloud.com/Devices/Security/Security.html
.. _`nRF Cloud Just-In-Time-Provisioning`: https://docs.nrfcloud.com/Devices/Associations/Provisioning.html#just-in-time-provisioning
Expand All @@ -981,8 +990,11 @@
.. _`nRF Connect for Cloud Patch Device State`: https://api.nrfcloud.com/v1#operation/UpdateDeviceState
.. _`nRF Cloud REST API ListMessages`: https://api.nrfcloud.com/v1#tag/Messages/operation/ListMessages
.. _`nRF Cloud Location Services`: https://api.nrfcloud.com/v1#tag/Location-Services
.. _`nRF Cloud REST API ProvisionDevices`: https://api.nrfcloud.com/v1#tag/IP-Devices/operation/ProvisionDevices
.. _`nRF Cloud RegisterPublicKeys Endpoint`: https://api.nrfcloud.com/v1/#operation/RegisterPublicKeys

.. _`nRF Cloud Portal Provision Devices`: https://nrfcloud.com/#/provision-devices
.. _`nRF Cloud Portal Devices`: https://nrfcloud.com/#/devices


.. ### Source: zigbeealliance.org & csa-iot.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,20 @@ Cellular samples (renamed from nRF9160 samples)
* :ref:`nrf_cloud_multi_service` sample:

* Renamed Cellular: nRF Cloud MQTT multi-service to Cellular: nRF Cloud multi-service.
* Added documentation for using the :ref:`lib_nrf_cloud_alert` and :ref:`lib_nrf_cloud_log` libraries.
* Changed the :file:`overlay_nrfcloud_logging.conf` file to enable JSON logs by default.
* The :c:struct:`nrf_cloud_obj` structure and associated functions are now used to encode and decode nRF Cloud data.
* Cleaned up and simplified connection logic.
* Switched from using the :ref:`lte_lc_readme` library directly to using Zephyr's ``conn_mgr`` and the :kconfig:option:`CONFIG_LTE_CONNECTIVITY` Kconfig option.
* Added:

* Documentation for using the :ref:`lib_nrf_cloud_alert` and :ref:`lib_nrf_cloud_log` libraries.
* An overlay that allows the sample to be used with Wi-Fi instead of LTE.
* The :file:`overlay_coap.conf` file and made changes to the sample to enable the use of CoAP instead of MQTT to connect with nRF Cloud.

* Updated:

* The :file:`overlay_nrfcloud_logging.conf` file to enable JSON logs by default.
* The encoding and decoding of nRF Cloud data to use the :c:struct:`nrf_cloud_obj` structure and associated functions.
* The connection logic by cleaning and simplifying it.
* From using the :ref:`lte_lc_readme` library directly to using Zephyr's ``conn_mgr`` and the :kconfig:option:`CONFIG_LTE_CONNECTIVITY` Kconfig option.

* Removed the Kconfig options :kconfig:option:`CONFIG_LTE_INIT_RETRY_TIMEOUT_SECONDS` and :kconfig:option:`CLOUD_CONNECTION_REESTABLISH_DELAY_SECONDS` as they are no longer needed.
* Added the :file:`overlay_coap.conf` file and made changes to the sample to enable the use of CoAP instead of MQTT to connect with nRF Cloud.

* :ref:`http_application_update_sample` sample:

Expand Down Expand Up @@ -581,6 +588,7 @@ Libraries for networking
* :c:func:`nrf_cloud_obj_pgps_request_create` function that creates a P-GPS request for nRF Cloud.
* A new internal codec function :c:func:`nrf_cloud_obj_location_request_payload_add`, which excludes local Wi-Fi access point MAC addresses from the location request.
* Support for CoAP CBOR type handling to nrf_cloud_obj.
* Warning message discouraging use of :kconfig:option:`CONFIG_NRF_CLOUD_PROVISION_CERTIFICATES` for purposes other than testing.

* Updated:

Expand Down
1 change: 1 addition & 0 deletions samples/cellular/nrf_cloud_multi_service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
certs
3 changes: 3 additions & 0 deletions samples/cellular/nrf_cloud_multi_service/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(nrf_cloud_multi_service)
zephyr_compile_definitions(PROJECT_NAME=${PROJECT_NAME})

# Include certs files if enabled.
zephyr_include_directories_ifdef(CONFIG_NRF_CLOUD_PROVISION_CERTIFICATES certs)

# NORDIC SDK APP START
target_sources(app PRIVATE src/main.c)
target_sources(app PRIVATE src/application.c)
Expand Down
Loading
Loading