Fixing style
diff --git a/docs/guides/nrfconnect_examples_software_update.md b/docs/guides/nrfconnect_examples_software_update.md
index 78eb397..fcd402c 100644
--- a/docs/guides/nrfconnect_examples_software_update.md
+++ b/docs/guides/nrfconnect_examples_software_update.md
@@ -229,91 +229,91 @@
Split status: N/A (0)
```
-7. If you are using the nRF5340DK board, which supports multi-image device firmware upgrade,
- complete the following substeps. If you are not using one, go straight to the step 8.
+7. If you are using the nRF5340DK board, which supports multi-image device
+ firmware upgrade, complete the following substeps. If you are not using one,
+ go straight to the step 8.
- a. Upload the network core firmware image to the device by running the
- following command in your example directory:
+ a. Upload the network core firmware image to the device by running the
+ following command in your example directory:
+
+ ```
+ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/net_core_app_update.bin -n 1 -w 1
+ ```
+
+ The operation can take a few minutes. Wait until the progress bar reaches
+ 100%.
+
+ b. Obtain the list of images present in the device memory by running
+ following command:
+
+ ```
+ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image list
+ ```
+
+ The displayed output contains the old application image in slot 0 that is
+ currently active, the new application image in slot 1 in pending state, and
+ the new network image which is in slot 1 and not active yet (flags field
+ empty):
+
+ ```
+ Images:
+ image=0 slot=0
+ version: 0.0.0
+ bootable: true
+ flags: active confirmed
+ hash: 7bb0e909a846e833465cbb44c581cf045413a5446c6953a30a3dcc2c3ad51764
+ image=0 slot=1
+ version: 0.0.0
+ bootable: true
+ flags: pending
+ hash: cbd58fc3821e749d3abfb00b3069f98c078824735f1b2a333e8a1579971e7de1
+ image=1 slot=1
+ version: 0.0.0
+ bootable: true
+ flags:
+ hash: d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48
+ Split status: N/A (0)
+ ```
+
+ c. Swap the firmware images by calling the following method with
+ `image-hash` replaced by the image present in the slot 1 hash (for example,
+ `d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48`):
+
+ ```
+ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image test image-hash
+ ```
+
+ You can observe that the `flags:` field in the image for slot 1 changes
+ value to `pending`:
+
+ ```
+ Images:
+ image=0 slot=0
+ version: 0.0.0
+ bootable: true
+ flags: active confirmed
+ hash: 7bb0e909a846e833465cbb44c581cf045413a5446c6953a30a3dcc2c3ad51764
+ image=0 slot=1
+ version: 0.0.0
+ bootable: true
+ flags: pending
+ hash: cbd58fc3821e749d3abfb00b3069f98c078824735f1b2a333e8a1579971e7de1
+ image=1 slot=1
+ version: 0.0.0
+ bootable: true
+ flags: pending
+ hash: d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48
+ Split status: N/A (0)
+ ```
+
+8. Reset the device with the following command to let the bootloader swap
+ images:
```
- sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/net_core_app_update.bin -n 1 -w 1
+ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' reset
```
- The operation can take a few minutes. Wait until the progress bar reaches
- 100%.
-
- b. Obtain the list of images present in the device memory by running following
- command:
-
- ```
- sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image list
- ```
-
- The displayed output contains the old application image in slot 0 that is
- currently active, the new application image in slot 1 in pending state, and
- the new network image which is in slot 1 and not active yet (flags field
- empty):
-
- ```
- Images:
- image=0 slot=0
- version: 0.0.0
- bootable: true
- flags: active confirmed
- hash: 7bb0e909a846e833465cbb44c581cf045413a5446c6953a30a3dcc2c3ad51764
- image=0 slot=1
- version: 0.0.0
- bootable: true
- flags: pending
- hash: cbd58fc3821e749d3abfb00b3069f98c078824735f1b2a333e8a1579971e7de1
- image=1 slot=1
- version: 0.0.0
- bootable: true
- flags:
- hash: d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48
- Split status: N/A (0)
- ```
-
- c. Swap the firmware images by calling the following method with `image-hash`
- replaced by the image present in the slot 1 hash (for example,
- `d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48`):
-
- ```
- sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image test image-hash
- ```
-
- You can observe that the `flags:` field in the image for slot 1 changes
- value to `pending`:
-
- ```
- Images:
- image=0 slot=0
- version: 0.0.0
- bootable: true
- flags: active confirmed
- hash: 7bb0e909a846e833465cbb44c581cf045413a5446c6953a30a3dcc2c3ad51764
- image=0 slot=1
- version: 0.0.0
- bootable: true
- flags: pending
- hash: cbd58fc3821e749d3abfb00b3069f98c078824735f1b2a333e8a1579971e7de1
- image=1 slot=1
- version: 0.0.0
- bootable: true
- flags: pending
- hash: d9e31e73cb7a959c26411250c2b3028f3510ae88a4549ae3f2f097c3e7530f48
- Split status: N/A (0)
- ```
-
-8. Reset the device with the following command to let the bootloader swap
- images:
-
- ```
- sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' reset
- ```
-
-
- The device is reset and the following notifications appear in its console:
+The device is reset and the following notifications appear in its console:
```
*** Booting Zephyr OS build zephyr-v2.5.0-1101-ga9d3aef65424 ***
@@ -324,8 +324,8 @@
I: Swap type: test
```
- Swapping operation can take some time, and after it completes, the new
- firmware is booted.
+Swapping operation can take some time, and after it completes, the new firmware
+is booted.
Visit the
[mcumgr image management](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/device_mgmt/indexhtml#image-management)
diff --git a/src/include/platform/TestOnlyCommissionableDataProvider.h b/src/include/platform/TestOnlyCommissionableDataProvider.h
index 86a3d0b..2b85c50 100644
--- a/src/include/platform/TestOnlyCommissionableDataProvider.h
+++ b/src/include/platform/TestOnlyCommissionableDataProvider.h
@@ -16,9 +16,9 @@
*/
#pragma once
-#include <platform/CommissionableDataProvider.h>
#include <lib/core/CHIPError.h>
#include <lib/support/Span.h>
+#include <platform/CommissionableDataProvider.h>
namespace chip {
namespace DeviceLayer {
diff --git a/src/platform/CommissionableDataProvider.cpp b/src/platform/CommissionableDataProvider.cpp
index f385971..d2f0eee 100644
--- a/src/platform/CommissionableDataProvider.cpp
+++ b/src/platform/CommissionableDataProvider.cpp
@@ -43,5 +43,5 @@
gCommissionableDataProvider = provider;
}
-} // namespace Credentials
+} // namespace DeviceLayer
} // namespace chip
