Merge pull request #3554 from raspberrypi/develop

Push to production

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           version: 1.10.2
       - name: Install arm-none-eabi-gcc GNU Arm Embedded Toolchain
-        uses: carlosperate/[email protected].0
+        uses: carlosperate/[email protected].1
       - name: Install Doxygen
         run: |
           wget https://www.doxygen.nl/files/doxygen-1.9.6.linux.bin.tar.gz

Gemfile

@@ -36,5 +36,5 @@ gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
 gem "nokogiri", "~> 1.16"
 
 # So we can add custom element templates
-gem 'slim', '~> 5.2.0'
+gem 'slim', '~> 5.2.1'
 gem 'thread_safe', '~> 0.3.5'

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     asciidoctor (2.0.20)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -57,7 +57,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
@@ -74,7 +74,7 @@ GEM
     sass-embedded (1.69.6)
       google-protobuf (~> 3.25)
       rake (>= 13.0.0)
-    slim (5.2.0)
+    slim (5.2.1)
       temple (~> 0.10.0)
       tilt (>= 2.1.0)
     temple (0.10.3)
@@ -84,7 +84,7 @@ GEM
     tilt (2.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     unicode-display_width (2.5.0)
     wdm (0.1.1)
@@ -99,7 +99,7 @@ DEPENDENCIES
   jekyll-feed (~> 0.17)
   minima (~> 2.0)
   nokogiri (~> 1.16)
-  slim (~> 5.2.0)
+  slim (~> 5.2.1)
   thread_safe (~> 0.3.5)
   tzinfo (~> 2.0)
   tzinfo-data

documentation/asciidoc/accessories/camera/camera_hardware.adoc

@@ -223,6 +223,7 @@ Available mechanical drawings;
 * Camera Module 2 https://datasheets.raspberrypi.com/camera/camera-module-2-mechanical-drawing.pdf[PDF]
 * Camera Module 3 https://datasheets.raspberrypi.com/camera/camera-module-3-standard-mechanical-drawing.pdf[PDF]
 * Camera Module 3 Wide https://datasheets.raspberrypi.com/camera/camera-module-3-wide-mechanical-drawing.pdf[PDF]
+* Camera Module 3 https://datasheets.raspberrypi.com/camera/camera-module-3-step.zip[STEP files]
 * HQ Camera Module (CS-mount version) https://datasheets.raspberrypi.com/hq-camera/hq-camera-cs-mechanical-drawing.pdf[PDF]
 ** The CS-mount https://datasheets.raspberrypi.com/hq-camera/hq-camera-cs-lensmount-drawing.pdf[PDF]
 * HQ Camera Module (M12-mount version) https://datasheets.raspberrypi.com/hq-camera/hq-camera-m12-mechanical-drawing.pdf[PDF]

documentation/asciidoc/accessories/camera/lens.adoc

@@ -14,14 +14,11 @@ We recommend two lenses, a 6mm wide angle lens and a 16mm telephoto lens. These
 
 2+| Resolution | 10MP | 3MP
 2+| Image format | 1" | 1/2"
-2+| Aperture | F1.4 to 1.6 | F1.2
+2+| Aperture | F1.4 to F16 | F1.2
 2+| Mount | C | CS
-.4+| Field Angle
-| 1" | 44.6°× 33.6° 
-.4+| 63°
-| 2/3" | 30.0°× 23.2°
-| 1/1.8" | 24.7°× 18.6°
-| 1/2" | 21.8°× 16.4°
+.2+| Field of View H°×V° (D°)
+| HQ | 22.2°×16.7° (27.8°)| 55°×45° (71°)
+| GS| 17.8°×13.4° (22.3) | 45°×34° (56°)
 2+| Back focal length | 17.53mm | 7.53mm
 2+| M.O.D. | 0.2m | 0.2m
 2+| Dimensions | φ39.00×50.00mm |	φ30×34mm
@@ -41,5 +38,5 @@ We recommend three lenses manufactured by https://www.gaojiaoptotech.com/[Gaojia
 2+| Image format | 1/1.7" | 1/2" | 1/2.3"
 2+| Aperture | F1.8 | F2.4 | F2.5
 2+| Mount 3+| M12
-2+| Field of View (D/H/V) | 72.64°/57.12°/42.44° | 18.3°/14.7°/11.1° | 184.6°/140°/102.6°
+2+| HQ Field of View H°×V° (D°) | 49°×36° (62°) | 14.4°×10.9° (17.9)° | 140°×102.6° (184.6°)
 |===

documentation/asciidoc/accessories/camera/synchronous_cameras.adoc

@@ -10,7 +10,7 @@ For correct operation, both cameras require a 1.65V pull up voltage on the XVS l
 
 image::images/synchronous_camera_wiring.jpg[alt="Image showing potential divider setup",width="50%"]
 
-Create a potential divider from two 10kΩ resistors to 3.3V and ground (to make 1.65V with an effective source impedence of 5kΩ). This can be connected to either Raspberry Pi.
+Create a potential divider from two 10kΩ resistors to 3.3V and ground (to make 1.65V with an effective source impedance of 5kΩ). This can be connected to either Raspberry Pi.
 
 Solder the GND and XVS test points of each HQ Camera board to each other.
 
@@ -62,7 +62,7 @@ To operate as source and sink together, the Global Shutter Cameras also require
 
 The wiring setup is identical to the xref:camera.adoc#using-the-hq-camera[HQ Camera method], except that you will also need to connect the XHS pins together.
 
-Create a potential divider from two 10kΩ resistors to 3.3V and ground (to make 1.65V with an effective source impedence of 5kΩ). This can be connected to either Raspberry Pi.
+Create a potential divider from two 10kΩ resistors to 3.3V and ground (to make 1.65V with an effective source impedance of 5kΩ). This can be connected to either Raspberry Pi.
 
 Solder 2 wires to the XVS test points on each board and connect both of these wires together to the 1.65V potential divider.
 

documentation/asciidoc/accessories/display/display_intro.adoc

@@ -1,17 +1,17 @@
 == Raspberry Pi Touch Display
 
-The https://www.raspberrypi.com/products/raspberry-pi-touch-display/[Raspberry Pi Touch Display] is an LCD display that connects to the Raspberry Pi using the DSI connector. While the panel is connected, you can use both it and the the normal HDMI display output at the same time.
+The https://www.raspberrypi.com/products/raspberry-pi-touch-display/[Raspberry Pi Touch Display] is an LCD display that connects to the Raspberry Pi using the DSI connector. You can use both the Touch Display and an HDMI display output at the same time.
 
 .The Raspberry Pi 7-inch Touch Display
 image::images/display.png[The Raspberry Pi 7-inch Touch Display, width="70%"]
 
-The Touch Display functions with all models of Raspberry Pi. However, the earliest Raspberry Pi models lack appropriate mounting holes, requiring additional mounting hardware to fit the stand-offs on the display PCB.
+The Touch Display is compatible with all models of Raspberry Pi except the Raspberry Pi Zero and Zero 2 W, which lack a DSI connector. The earliest Raspberry Pi models lack appropriate mounting holes, requiring additional mounting hardware to fit the stand-offs on the display PCB.
 
 The display has the following key features: 
 
 * 800×480 RGB LCD display
 * 24-bit colour
-* Industrial quality: 140-degree viewing angle horizontal, 130-degree viewing angle vertical
+* Industrial quality: 140 degree viewing angle horizontal, 120 degree viewing angle vertical
 * 10-point multi-touch touchscreen
 * PWM backlight control and power control over I2C interface
 * Metal-framed back with mounting points for Raspberry Pi display conversion board and Raspberry Pi
@@ -29,27 +29,8 @@ The display has the following key features:
 * Outer dimensions: 192.96 × 110.76mm
 * Viewable area: 154.08 × 85.92mm
 
-[NOTE]
-====
-If you use Raspberry Pi OS Bullseye or earlier, you can install an on-screen keyboard by typing `sudo apt install matchbox-keyboard` in a terminal. You can also enable right-click emulation by adding the following section to the `/etc/X11/xorg.conf` file.
 
-[source]
-----
-Section "InputClass"
-   Identifier "calibration"
-   Driver "evdev"
-   MatchProduct "FT5406 memory based driver"
-
-   Option "EmulateThirdButton" "1"
-   Option "EmulateThirdButtonTimeout" "750"
-   Option "EmulateThirdButtonMoveThreshold" "30"
-EndSection
-----
-
-These features are not available when running Raspberry Pi OS Bookworm.
-====
-
-=== Mounting the Touch Display 
+=== Mount the Touch Display
 
 You can mount a Raspberry Pi to the back of the Touch Display using its stand-offs and then connect the appropriate cables. You can also mount the Touch Display in a separate chassis if you have one available. The connections remain the same, though you may need longer cables depending on the chassis.
 
@@ -62,37 +43,48 @@ If the FFC is not fully inserted or positioned correctly, you will experience is
 
 NOTE: A https://datasheets.raspberrypi.com/display/7-inch-display-mechanical-drawing.pdf[mechanical drawing] of the Touch Display is available for download.
 
-=== Powering the Touch Display
+=== Power the Touch Display
 
 We recommend using the Raspberry Pi's GPIO to provide power to the Touch Display. Alternatively, you can power the display directly with a separate micro USB power supply.
 
-==== Using the Raspberry Pi
+==== Power from a Raspberry Pi
 
-To power the Touch Display using a Raspberry Pi, you need to connect two jumper wires between the 5V and GND pins on xref:../computers/raspberry-pi.adoc#gpio-and-the-40-pin-header[Raspberry Pi's GPIO] and the 5V and GND pins on the display, as shown in the following illustration.
+To power the Touch Display using a Raspberry Pi, you need to connect two jumper wires between the 5V and `GND` pins on xref:../computers/raspberry-pi.adoc#gpio-and-the-40-pin-header[Raspberry Pi's GPIO] and the 5V and `GND` pins on the display, as shown in the following illustration.
 
-.The location of the display's 5V and GND pins
+.The location of the display's 5V and `GND` pins
 image::images/display_plugs.png[Illustration of display pins, width="40%"]
 
-Before you begin, make sure the Raspberry Pi is powered off and not connected to any power source. Connect one end of the black jumper wire to pin six (GND) on the Raspberry Pi and one end of the red jumper wire to pin two (5V). If pin six isn't available, you can use any other open GND pin to connect the black wire. If pin two isn't available, you can use any other 5V pin to connect the red wire, such as pin four.
+Before you begin, make sure the Raspberry Pi is powered off and not connected to any power source. Connect one end of the black jumper wire to pin six (`GND`) on the Raspberry Pi and one end of the red jumper wire to pin four (5V). If pin six isn't available, you can use any other open `GND` pin to connect the black wire. If pin four isn't available, you can use any other 5V pin to connect the red wire, such as pin two.
 
 .The location of the Raspberry Pi headers
 image::images/pi_plugs.png[Illustration of Raspberry Pi headers, width="40%"]
 
-Next, connect the other end of the black wire to the GND pin on the display and the other end of the red wire to the 5V pin on the display. Once all the connections are made, you should see the Touch Display turn on the next time you turn on your Raspberry Pi.
+Next, connect the other end of the black wire to the `GND` pin on the display and the other end of the red wire to the 5V pin on the display. Once all the connections are made, you should see the Touch Display turn on the next time you turn on your Raspberry Pi.
 
-The other three pins on the Touch Display are used to connect the display to an original Raspberry Pi 1 Model A or B. Refer to our documentation on xref:display.adoc#legacy-support[legacy support] for more information.
+Use the other three pins on the Touch Display to connect the display to an original Raspberry Pi 1 Model A or B. Refer to our documentation on xref:display.adoc#legacy-support[legacy support] for more information.
 
 NOTE: To identify an original Raspberry Pi, check the GPIO header connector. Only the original model has a 26-pin GPIO header connector; subsequent models have 40 pins.
 
-==== Using a micro USB supply
+==== Power from a micro USB supply
 
 If you don't want to use a Raspberry Pi to provide power to the Touch Display, you can use a micro USB power supply instead. We recommend using the https://www.raspberrypi.com/products/micro-usb-power-supply/[Raspberry Pi 12.5W power supply] to make sure the display runs as intended.
 
 Do not connect the GPIO pins on your Raspberry Pi to the display if you choose to use micro USB for power. The only connection between the two boards should be the Flat Flexible Cable.
 
 WARNING: When using a micro USB cable to power the display, mount it inside a chassis that blocks access to the display's PCB during usage.
 
-=== Changing the screen orientation
+=== Use an on-screen keyboard
+
+In Raspberry Pi OS Bookworm and later, you can use the https://github.com/jjsullivan5196/wvkbd[`wvkbd`] on-screen keyboard as an input device. To install `wvkbd`, run the following command:
+
+[source,console]
+----
+$ sudo apt install wvkbd
+----
+
+TIP: In Raspberry Pi OS releases prior to Bookworm, you can use `matchbox-keyboard` instead.
+
+=== Change screen orientation
 
 If you want to physically rotate the display, or mount it in a specific position, you can use software to adjust the orientation of the screen to better match your setup.
 

documentation/asciidoc/accessories/sense-hat/hardware.adoc

@@ -10,9 +10,10 @@ The Sense HAT has an 8×8 RGB LED matrix and a five-button joystick, and include
 * Humidity
 * Colour and brightness
 
-Schematics and mechanical drawings for the Sense HAT are available for download.
+Schematics and mechanical drawings for the Sense HAT and the Sense HAT V2 are available for download.
 
-* https://datasheets.raspberrypi.com/sense-hat/sense-hat-schematics.pdf[Sense HAT schematics].
+* https://datasheets.raspberrypi.com/sense-hat/sense-hat-schematics.pdf[Sense HAT V1 schematics].
+* https://datasheets.raspberrypi.com/sense-hat/sense-hat-v2-schematics.pdf[Sense HAT V2 schematics].
 * https://datasheets.raspberrypi.com/sense-hat/sense-hat-mechanical-drawing.pdf[Sense HAT mechanical drawings].
 
 === LED matrix