diff --git a/doc/qtcreator/images/qtcreator-baremetal-eblink.png b/doc/qtcreator/images/qtcreator-baremetal-eblink.png deleted file mode 100644 index c372292b524..00000000000 Binary files a/doc/qtcreator/images/qtcreator-baremetal-eblink.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-eblink.webp b/doc/qtcreator/images/qtcreator-baremetal-eblink.webp new file mode 100644 index 00000000000..bdd75bd04f6 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-baremetal-eblink.webp differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-jlink.png b/doc/qtcreator/images/qtcreator-baremetal-jlink.png deleted file mode 100644 index 1e221766dde..00000000000 Binary files a/doc/qtcreator/images/qtcreator-baremetal-jlink.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-jlink.webp b/doc/qtcreator/images/qtcreator-baremetal-jlink.webp new file mode 100644 index 00000000000..5d1fd1f933a Binary files /dev/null and b/doc/qtcreator/images/qtcreator-baremetal-jlink.webp differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-openocd.png b/doc/qtcreator/images/qtcreator-baremetal-openocd.png deleted file mode 100644 index d84b91ceec9..00000000000 Binary files a/doc/qtcreator/images/qtcreator-baremetal-openocd.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-openocd.webp b/doc/qtcreator/images/qtcreator-baremetal-openocd.webp new file mode 100644 index 00000000000..2f04c4f8b19 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-baremetal-openocd.webp differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-stlink.png b/doc/qtcreator/images/qtcreator-baremetal-stlink.png deleted file mode 100644 index f759eb355be..00000000000 Binary files a/doc/qtcreator/images/qtcreator-baremetal-stlink.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-baremetal-stlink.webp b/doc/qtcreator/images/qtcreator-baremetal-stlink.webp new file mode 100644 index 00000000000..3e2502e1e78 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-baremetal-stlink.webp differ diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc index 722cf8d89ba..368e313851a 100644 --- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc @@ -59,8 +59,9 @@ \section1 Specifying Settings for Debug Server Providers To create connections to bare metal devices using a debug server provider, - select \preferences > \uicontrol Devices - > \uicontrol {Bare Metal} > \uicontrol Add > \uicontrol Default. + select \preferences > \uicontrol Devices > \uicontrol {Bare Metal} > + \uicontrol Add. + The available settings depend on the debug server provider. \section2 EBlink @@ -68,7 +69,7 @@ \l{https://github.com/EmBitz/EBlink}{EBlink} is an ARM Cortex-M debug tool that supports squirrel scripting, live variables, and hot-plugging. - \image qtcreator-baremetal-eblink.png "Bare metal device preferences for EBlink" + \image qtcreator-baremetal-eblink.webp {Bare metal device preferences for EBlink} To specify settings for \EBlink: @@ -105,7 +106,7 @@ \l{https://www.segger.com/products/debug-probes/j-link/}{J-Link} is a line of debug probes by Segger. - \image qtcreator-baremetal-jlink.png "Bare metal device preferences for J-Link" + \image qtcreator-baremetal-jlink.webp "Bare metal device preferences for J-Link" To specify settings for J-Link debug probes: @@ -137,7 +138,7 @@ (JTAG) facility. It enables source level debugging with the GDB compiled for the ARM architecture. - \image qtcreator-baremetal-openocd.png "Bare metal device preferences for OpenOCD" + \image qtcreator-baremetal-openocd.webp "Bare metal device preferences for OpenOCD" To specify settings for \OpenOCD: @@ -163,7 +164,7 @@ \l{https://www.st.com/en/development-tools/stm32-programmers.html#products} {ST-LINK Utility} is used for programming STM32 microcontrollers. - \image qtcreator-baremetal-stlink.png "Bare metal device preferences for St-Link" + \image qtcreator-baremetal-stlink.webp "Bare metal device preferences for St-Link" To specify settings for St-Link: @@ -202,7 +203,7 @@ \image qtcreator-baremetal-uvision-simulator.png "Bare metal device preferences for uVision Simulator" - To specify settings for uVision Simulator or uVision St-Link Debugger: + To specify settings for uVision Simulator: \list 1 @@ -215,11 +216,11 @@ \endlist - \section3 uVision St-Link Debugger + \section3 uVision St-Link or JLink Debugger \image qtcreator-baremetal-uvision-st-link.png "Bare metal device preferences for uVision St-Link" - To specify settings for uVision St-Link Debugger: + To specify settings for uVision St-Link or JLink Debugger: \list 1 diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc index cce6b41d6d4..ea35fe9855b 100644 --- a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc +++ b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc @@ -1,4 +1,4 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only //! [baremetal-common] @@ -6,6 +6,8 @@ \li In the \uicontrol Name field, enter a name for the connection. \li In the \uicontrol {Startup mode} field, select the mode to start the debug server provider in. + \li In the \uicontrol {Peripheral description file} field, specify a path to + a file that describes the peripherals on the device. \li In the \uicontrol Host field, select the host name and port number to connect to the debug server provider. \li In the \uicontrol {Executable file} field, enter the path to the