Merge pull request #3800 from raspberrypi/develop

Roll out Pico 2 and 2350 to production docs

documentation/asciidoc/accessories/build-hat/introduction.adoc

@@ -22,7 +22,7 @@ NOTE: The HAT works with all 40-pin GPIO Raspberry Pi boards, including Raspberr
 * Controls up to 4 LEGO® Technic™ motors and sensors included in the SPIKE™ Portfolio
 * Easy-to-use https://buildhat.readthedocs.io/[Python library] to control your LEGO® Technic™ devices
 * Fits onto any Raspberry Pi computer with a 40-pin GPIO header
-* Onboard xref:../microcontrollers/rp2040.adoc[RP2040] microcontroller manages low-level control of LEGO® Technic™ devices
+* Onboard xref:../microcontrollers/silicon.adoc[RP2040] microcontroller manages low-level control of LEGO® Technic™ devices
 * External 8V PSU https://raspberrypi.com/products/build-hat-power-supply[available separately] to power both Build HAT and Raspberry Pi
 
 [NOTE]

documentation/asciidoc/computers/camera/rpicam_options_common.adoc

@@ -477,7 +477,7 @@ Specifies the autofocus speed. Accepts the following values:
 
 This option is only supported for certain camera modules.
 
-==== `autofocus-range`
+==== `autofocus-window`
 
 Specifies the autofocus window within the full field of the sensor. Accepts four decimal values, _ranged 0 to 1_, in the following format: `<x>,<y>,<w>,h>`. Each of these values represents a percentage of the available width and heights as a decimal between 0 and 1.
 

documentation/asciidoc/computers/camera/rpicam_options_libav.adoc

@@ -28,7 +28,7 @@ Enables audio recording. When enabled, you must also specify an xref:camera_soft
 
 Default value: `aac`
 
-Selects an audio codec for output. For a list of available codecs, run `ffmpeg -codec`.
+Selects an audio codec for output. For a list of available codecs, run `ffmpeg -codecs`.
 
 ==== `audio-bitrate`
 

documentation/asciidoc/computers/linux_kernel/building.adoc

@@ -39,7 +39,7 @@ $ git clone --depth=1 --branch <branch> https://github.com/raspberrypi/linux
 For a full list of available branches, see the https://github.com/raspberrypi/linux[the Raspberry Pi kernel repository].
 ====
 
-Now that you have the kernel source, build a fresh kernel xref:linux_kernel.adoc#natively-build-a-kernel[natively] or via xref:linux_kernel.adoc#cross-compiled-build[cross-compilation].
+Now that you have the kernel source, build a fresh kernel xref:linux_kernel.adoc#natively-build-a-kernel[natively] or via xref:linux_kernel.adoc#cross-compile-the-kernel[cross-compilation].
 
 === Natively build a kernel
 

documentation/asciidoc/computers/raspberry-pi/introduction.adoc

@@ -333,29 +333,33 @@ Models with the *H* suffix have header pins pre-soldered to the GPIO header. Mod
 |===
 | Model | SoC | Memory | Storage | GPIO | Wireless Connectivity
 
+a|
+.Raspberry Pi Pico 2
+image::images/pico-2.png[alt="Raspberry Pi Pico 2"]
+| xref:../microcontrollers/silicon.adoc#rp2350[RP2350] | 520KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
 a|
 .Raspberry Pi Pico
 image::images/pico.png[alt="Raspberry Pi Pico"]
-| xref:../microcontrollers/rp2040.adoc#welcome-to-rp2040[RP2040] | 264kB | 2MB | 40-pin GPIO header (unpopulated) ^| none
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
 a|
 .Raspberry Pi Pico H
 image::images/pico-h.png[alt="Raspberry Pi Pico H"]
-| xref:../microcontrollers/rp2040.adoc#welcome-to-rp2040[RP2040] | 264kB | 2MB | 40-pin GPIO header (unpopulated) ^| none
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated) ^| none
 a|
 .Raspberry Pi Pico W
 image::images/pico-w.png[alt="Raspberry Pi Pico W"]
-| xref:../microcontrollers/rp2040.adoc#welcome-to-rp2040[RP2040] | 264kB | 2MB | 40-pin GPIO header (unpopulated)
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header (unpopulated)
 a|
 * 2.4GHz single-band 802.11n Wi-Fi (10Mb/s)
 * Bluetooth 5.2, Bluetooth Low Energy (BLE)
 a|
 .Raspberry Pi Pico WH
 image::images/pico-wh.png[alt="Raspberry Pi Pico WH"]
-| xref:../microcontrollers/rp2040.adoc#welcome-to-rp2040[RP2040] | 264kB | 2MB | 40-pin GPIO header
+| xref:../microcontrollers/silicon.adoc#rp2040[RP2040] | 264KB | 2MB | 40-pin GPIO header
 a|
 * 2.4GHz single-band 802.11n Wi-Fi (10Mb/s)
 * Bluetooth 5.2, Bluetooth Low Energy (BLE)
 
 |===
 
-For more information about Raspberry Pi Pico models, see xref:../microcontrollers/raspberry-pi-pico.adoc[the Pico documentation].
+For more information about Raspberry Pi Pico models, see xref:../microcontrollers/pico-series.adoc[the Pico documentation].

documentation/asciidoc/microcontrollers/debug-probe/getting-started.adoc

@@ -2,7 +2,7 @@
 
 image:images/labelled-wiring.jpg[width="100%"]
 
-Depending on your setup, there are several ways to wire the Debug Probe to a xref:raspberry-pi-pico.adoc[Raspberry Pi Pico]. Below, we connect the Debug Probe to a Raspberry Pi Pico H which has the newer three-pin JST-SH connector for SWD.
+Depending on your setup, there are several ways to wire the Debug Probe to a xref:pico-series.adoc[Pico-series device]. Below, we connect the Debug Probe to a Raspberry Pi Pico H which has the newer three-pin JST-SH connector for SWD.
 
 video::4RCZBZsfsek[youtube]
 

documentation/asciidoc/microcontrollers/microcontroller_docs.adoc

@@ -1,15 +1,27 @@
-// Included from both rp2040.adoc and raspberry-pi-pico.adoc
+// Included from both silicon.adoc and pico-series.adoc
 
 == Documentation
 
-Documentation for Raspberry Pi Pico and other RP2040-based boards.
+Documentation for Pico-series and other Raspberry Pi microcontroller-based boards.
 
-=== RP2040 Device
+=== RP2350
+
+https://datasheets.raspberrypi.com/rp2350/rp2350-datasheet.pdf[RP2350 Datasheet]:: A microcontroller by Raspberry Pi
+
+https://datasheets.raspberrypi.com/rp2350/hardware-design-with-rp2350.pdf[Hardware design with RP2350]:: Using RP2350 microcontrollers to build boards and products
+
+=== RP2040
 
 https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf[RP2040 Datasheet]:: A microcontroller by Raspberry Pi
 
 https://datasheets.raspberrypi.com/rp2040/hardware-design-with-rp2040.pdf[Hardware design with RP2040]:: Using RP2040 microcontrollers to build boards and products
 
+=== Raspberry Pi Pico 2
+
+https://datasheets.raspberrypi.com/pico/pico-2-datasheet.pdf[Raspberry Pi Pico 2 Datasheet]:: An RP2350-based microcontroller board
+
+https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf[Getting started with Raspberry Pi Pico-series Microcontrollers]:: C/{cpp} development with Raspberry Pi Pico-series devices and other Raspberry Pi microcontroller-based boards
+
 === Raspberry Pi Pico
 
 https://datasheets.raspberrypi.com/pico/pico-datasheet.pdf[Raspberry Pi Pico Datasheet]:: An RP2040-based microcontroller board

documentation/asciidoc/microcontrollers/pico-series.adoc

@@ -0,0 +1,5 @@
+include::pico-series/about_pico.adoc[]
+
+include::microcontroller_docs.adoc[]
+
+include::pico-series/utilities.adoc[]

documentation/asciidoc/microcontrollers/raspberry-pi-pico/about_pico.adoc → documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc

@@ -1,17 +1,71 @@
-== The family
+Pico-series devices are organised into **families** based on product generation.
 
-image::images/four_picos.jpg[width="75%"]
+The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in four variants:
 
-The Raspberry Pi Pico family currently consists of four boards; Raspberry Pi Pico (far left), Pico H (middle left), Pico W (middle right), and Pico WH (far right).
+* Raspberry Pi Pico
+* Raspberry Pi Pico H
+* Raspberry Pi Pico W
+* Raspberry Pi Pico WH
 
-[[technical-specification]]
-== Raspberry Pi Pico and Pico H
+The second-generation Raspberry Pi Pico family is referred to as Pico 2. Pico 2 comes in two variants:
+
+* Raspberry Pi Pico 2
+* Raspberry Pi Pico 2 with headers
+
+== Pico 2 family
+
+image::images/pico-2.png[width="75%"]
+
+The Raspberry Pi Pico 2 family consists of two boards; Raspberry Pi Pico 2, and Raspberry Pi Pico 2 with headers.
+
+[[pico-2-technical-specification]]
+=== Raspberry Pi Pico 2
+
+Raspberry Pi Pico 2 is a low-cost, high-performance microcontroller board with flexible digital interfaces. Key features include:
+
+* xref:silicon.adoc#rp2350[RP2350] microcontroller chip designed by Raspberry Pi in the United Kingdom
+* Dual Cortex-M33 or Hazard3 processors at up to 150MHz
+* 520KB of SRAM, and 4MB of on-board flash memory
+* USB 1.1 with device and host support
+* Low-power sleep and dormant modes
+* Drag-and-drop programming using mass storage over USB
+* 26× multi-function GPIO pins including 3 that can be used for ADC
+* 2× SPI, 2× I2C, 2× UART, 3× 12-bit 500ksps Analogue to Digital Converter (ADC), 24× controllable PWM channels
+* 2× Timer with 4 alarms, 1× AON Timer
+* Temperature sensor
+* 3 × Programmable IO (PIO) blocks, 12 state machines total for custom peripheral support
+** Flexible, user-programmable high-speed IO
+** Can emulate interfaces such as SD Card and VGA
+
+The Raspberry Pi Pico 2 comes as a castellated module which allows soldering direct to carrier boards, while the Pico 2 _with headers_ comes with pre-soldered headers.
+
+NOTE: Both boards have a three pin Serial Wire Debug (SWD) header. However, the Pico 2 with headers breaks this out into a small, keyed, https://datasheets.raspberrypi.com/debug/debug-connector-specification.pdf[3-pin connector] while the Pico has three castellated through-hole pins adjacent to the edge of the board.
+
+=== Pinout and design files
+
+image::images/pico-2-r4-pinout.svg[]
+
+* Download the https://datasheets.raspberrypi.com/pico/Pico-2-Pinout.pdf[Pinout Diagram] (PDF)
+* Download https://datasheets.raspberrypi.com/pico/RPi-Pico-2-PUBLIC-20240708.zip[Design Files] (Cadence Allegro)
+* Download https://datasheets.raspberrypi.com/pico/Pico-2-step-20240708.zip[STEP File]
+* Download https://datasheets.raspberrypi.com/pico/Pico-2-Fritzing-20240708.fzpz[Fritzing Part] for Raspberry Pi Pico
+
+NOTE: More information on Fritzing is available on the https://fritzing.org/[fritzing.org] website.
+
+== Pico 1 family
+
+image::images/pico-1s.png[width="75%"]
+
+The Raspberry Pi Pico 1 family consists of four boards; Raspberry Pi Pico (far left), Pico H (middle left), Pico W (middle right), and Pico WH (far right).
+
+[[pico-1-technical-specification]]
+=== Raspberry Pi Pico and Pico H
 
 Raspberry Pi Pico is a low-cost, high-performance microcontroller board with flexible digital interfaces. Key features include:
 
-* xref:rp2040.adoc#welcome-to-rp2040[RP2040] microcontroller chip designed by Raspberry Pi in the United Kingdom
+* xref:silicon.adoc#rp2040[RP2040] microcontroller chip designed by Raspberry Pi in the United Kingdom
 * Dual-core Arm Cortex M0+ processor, flexible clock running up to 133 MHz
-* 264kB of SRAM, and 2MB of on-board flash memory
+* 264KB of SRAM, and 2MB of on-board flash memory
 * USB 1.1 with device and host support
 * Low-power sleep and dormant modes
 * Drag-and-drop programming using mass storage over USB
@@ -22,11 +76,11 @@ Raspberry Pi Pico is a low-cost, high-performance microcontroller board with fle
 * Accelerated floating-point libraries on-chip
 * 8 × Programmable I/O (PIO) state machines for custom peripheral support
 
-The Raspberry Pi Pico comes as a castellated module allows soldering direct to carrier boards, while the Pico H comes with pre-soldered headers.
+The Raspberry Pi Pico comes as a castellated module which allows soldering direct to carrier boards, while the Pico H comes with pre-soldered headers.
 
 NOTE: Both boards have a three pin Serial Wire Debug (SWD) header. However, the Pico H has this broken out into a small, keyed, https://datasheets.raspberrypi.com/debug/debug-connector-specification.pdf[3-pin connector] while the Pico has three castellated through-hole pins adjacent to the edge of the board.
 
-=== Pinout and design files
+==== Pinout and design files
 
 image::images/pico-pinout.svg[]
 
@@ -38,7 +92,8 @@ image::images/pico-pinout.svg[]
 
 NOTE: More information on Fritzing is available on the https://fritzing.org/[fritzing.org] website.
 
-== Raspberry Pi Pico W and Pico WH
+[[picow-technical-specification]]
+=== Raspberry Pi Pico W and Pico WH
 
 Raspberry Pi Pico W adds on-board single-band 2.4GHz wireless interfaces (802.11n) using the Infineon CYW43439 while retaining the Pico form factor. The on-board 2.4GHz wireless interface has the following features:
 
@@ -50,7 +105,7 @@ Raspberry Pi Pico W adds on-board single-band 2.4GHz wireless interfaces (802.11
 ** Support for Bluetooth Classic
 
 The antenna is an onboard antenna licensed from ABRACON (formerly ProAnt). The wireless interface is connected via
-SPI to the xref:rp2040.adoc#welcome-to-rp2040[RP2040] microcontroller.
+SPI to the xref:silicon.adoc#rp2040[RP2040] microcontroller.
 
 Due to pin limitations, some of the wireless interface pins are shared. The CLK is shared with VSYS monitor, so only
 when there isn't an SPI transaction in progress can VSYS be read via the ADC. The Infineon CYW43439 DIN/DOUT and
@@ -67,7 +122,7 @@ IMPORTANT: By default `libcyw43` is licensed for non-commercial use, but Pico W
 
 IMPORTANT: In addition to the https://github.com/bluekitchen/btstack/blob/master/LICENSE[standard BTstack licensing] terms, a https://github.com/raspberrypi/pico-sdk/blob/master/src/rp2_common/pico_btstack/LICENSE.RP[supplemental licence] which covers commercial use of BTstack with Raspberry Pi Pico W or Raspberry Pi Pico WH is provided.
 
-=== Pinout and design files
+==== Pinout and design files
 
 image::images/picow-pinout.svg[]