Skip to content

Commit 330963f

Browse files
Merge pull request #3944 from raspberrypi/develop
Roll out latest changes to production
2 parents 88850a3 + 96f054d commit 330963f

File tree

7 files changed

+46
-59
lines changed

7 files changed

+46
-59
lines changed

documentation/asciidoc/accessories/camera/camera_hardware.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The Raspberry Pi AI Camera uses the Sony IMX500 imaging sensor to provide low-la
2020

2121
image::images/ai-camera-hero.png[The Raspberry Pi AI Camera]
2222

23-
Finally, there is the Global Shutter camera, which was http://raspberrypi.com/news/new-raspberry-pi-global-shutter-camera[released in 2023]. There is no infrared version of the GS Camera, however the IR Filter can be removed if required.
23+
Finally, there is the Global Shutter camera, which was http://raspberrypi.com/news/new-raspberry-pi-global-shutter-camera[released in 2023]. There is no infrared version of the GS Camera, however the xref:camera.adoc#filter-removal[IR Filter can be removed] if required.
2424

2525
.Global Shutter Camera
2626
image::images/gs-camera.jpg[GS Camera]

documentation/asciidoc/accessories/camera/filters.adoc

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,48 +30,41 @@ The HQ and GS Cameras use a Hoya CM500 infrared filter. Its transmission charact
3030

3131
image::images/hoyacm500.png[CM500 Transmission Graph,width="65%"]
3232

33-
== Filter Removal
33+
== IR Filter
3434

35-
NOTE: This procedure applies to both the HQ and GS cameras.
35+
Both the High Quality Camera and Global Shutter Camera contain an IR filter to reduce the camera's sensitivity to infrared light and help outdoor photos look more natural. However, you may remove the filter to:
3636

37-
WARNING: *This procedure cannot be reversed:* the adhesive that attaches the filter will not survive being lifted and replaced, and while the IR filter is about 1.1mm thick, it may crack when it is removed. *Removing it will void the warranty on the product*. Nevertheless, removing the filter will be desirable to some users.
37+
* Enhance colours in certain types of photography, such as images of plants, water, and the sky
38+
* Provide night vision in a location that is illuminated with infrared light
3839

39-
image:images/FILTER_ON_small.jpg[width="65%"]
40-
41-
Both the High Quality Camera and Global Shutter Camera contain an IR filter, which is used to reduce the camera's sensitivity to infrared light. This ensures that outdoor photos look more natural. However, some nature photography can be enhanced with the removal of this filter; the colours of sky, plants, and water can be affected by its removal. The camera can also be used without the filter for night vision in a location that is illuminated with infrared light.
40+
=== Filter Removal
4241

43-
WARNING: Before proceeding read through all of the steps and decide whether you are willing to void your warranty. *Do not proceed* unless you are sure that you are willing to void your warranty.
42+
WARNING: *This procedure cannot be reversed:* the adhesive that attaches the filter will not survive being lifted and replaced, and while the IR filter is about 1.1mm thick, it may crack when it is removed. *Removing it will void the warranty on the product*.
4443

45-
To remove the filter:
44+
You can remove the filter from both the HQ and GS cameras. The HQ camera is shown in the demonstration below.
4645

47-
* Work in a clean and dust-free environment, as the sensor will be exposed to the air.
46+
image:images/FILTER_ON_small.jpg[width="65%"]
4847

49-
* Unscrew the two 1.5 mm hex lock keys on the underside of the main circuit board. Be careful not to let the washers roll away. There is a gasket of slightly sticky material between the housing and PCB which will require some force to separate.
48+
NOTE: Make sure to work in a clean and dust-free environment, as the sensor will be exposed to the air.
5049

50+
. Unscrew the two 1.5 mm hex lock keys on the underside of the main circuit board. Be careful not to let the washers roll away.
51+
+
5152
image:images/SCREW_REMOVED_small.jpg[width="65%"]
52-
53-
* Lift up the board and place it down on a very clean surface. Make sure the sensor does not touch the surface.
54-
53+
. There is a gasket of slightly sticky material between the housing and PCB which will require some force to separate. You may try some ways to weaken the adhesive, such as a little isopropyl alcohol and/or heat (~20-30 C).
54+
. Once the adhesive is loose, lift up the board and place it down on a very clean surface. Make sure the sensor does not touch the surface.
55+
+
5556
image:images/FLATLAY_small.jpg[width="65%"]
56-
57-
* You may try some ways to weaken the adhesive, such as a little isopropyl alcohol and/or heat (~20-30 C).
58-
57+
. Face the lens upwards and place the mount on a flat surface.
58+
+
5959
image:images/SOLVENT_small.jpg[width="65%"]
60-
61-
* Turn the lens mount around so that it is "looking" upwards and place it on a table.
62-
63-
* Using a pen top or similar soft plastic item, push down on the filter only at the very edges where the glass attaches to the aluminium - to minimise the risk of breaking the filter. The glue will break and the filter will detach from the lens mount.
64-
60+
. To minimise the risk of breaking the filter, use a pen top or similar soft plastic item to push down on the filter only at the very edges where the glass attaches to the aluminium. The glue will break and the filter will detach from the lens mount.
61+
+
6562
image:images/REMOVE_FILTER_small.jpg[width="65%"]
66-
67-
* Given that changing lenses will expose the sensor, at this point you could affix a clear filter (for example, OHP plastic) to minimize the chance of dust entering the sensor cavity.
68-
69-
* Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board.
70-
71-
* The nylon washer prevents damage to the circuit board; apply this washer first. Next, fit the steel washer, which prevents damage to the nylon washer.
72-
73-
* Screw down the two hex lock keys. As long as the washers have been fitted in the correct order, they do not need to be screwed very tightly.
74-
63+
. Given that changing lenses will expose the sensor, at this point you could affix a clear filter (for example, OHP plastic) to minimize the chance of dust entering the sensor cavity.
64+
. Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board.
65+
. Apply the nylon washer first to prevent damage to the circuit board.
66+
. Next, fit the steel washer, which prevents damage to the nylon washer. Screw down the two hex lock keys. As long as the washers have been fitted in the correct order, they do not need to be screwed very tightly.
67+
+
7568
image:images/FILTER_OFF_small.jpg[width="65%"]
7669

7770
NOTE: It is likely to be difficult or impossible to glue the filter back in place and return the device to functioning as a normal optical camera.

documentation/asciidoc/computers/compute-module/cm-emmc-flashing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To flash the Compute Module eMMC, you need the following:
1515

1616
* Another computer, referred to in this guide as the *host device*. You can use Linux (we recommend Raspberry Pi OS or Ubuntu), Windows, or macOS.
1717
* The Compute Module IO Board xref:compute-module.adoc#io-board-compatibility[that corresponds to your Compute Module model].
18-
* A micro USB cable, or a USB-C cable for Compute Module models since CM5.
18+
* A micro USB cable, or a USB-C cable for Compute Module models since CM5IO.
1919

2020
=== Set up the IO Board
2121

@@ -25,7 +25,7 @@ To begin, physically set up your IO Board. This includes connecting the Compute
2525
======
2626
Compute Module 5 IO Board::
2727
+
28-
To set up the Compute Module 4 IO Board:
28+
To set up the Compute Module 5 IO Board:
2929
+
3030
. Connect the Compute Module to the IO board. When connected, the Compute Module should lie flat.
3131
. Fit `nRPI_BOOT` to J2 (`disable eMMC Boot`) on the IO board jumper.

documentation/asciidoc/computers/compute-module/introduction.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ Raspberry Pi IO Boards provide the following functionality:
7373
* power the module
7474
* connects the GPIO to pin headers
7575
* connects the camera and display interfaces to FFC connectors
76-
* connects HDMI to an HDMI port
76+
* connects HDMI to HDMI ports
7777
* connects USB to USB ports
7878
* connects activity monitoring to LEDs
7979
* eMMC programming over USB
8080
* connects PCIe to connectors used to physically connect storage or peripherals
8181

82-
IO Boards are breakout boards intended for development; in production, you should use a smaller, potentially custom board that provides only the ports and peripherals required for your use-case.
82+
IO Boards are breakout boards intended for development or personal use; in production, you should use a smaller, potentially custom board that provides only the ports and peripherals required for your use-case.
8383

8484
=== Compute Module 5 IO Board
8585

@@ -98,8 +98,8 @@ Compute Module 5 IO Board provides the following interfaces:
9898
* 2× MIPI DSI/CSI-2 combined display/camera FPC connectors (22-pin 0.5 mm pitch cable)
9999
* Real-time clock with battery socket
100100
* four-pin JST-SH PWM fan connector
101-
* 5V @ 5A power input via USB-C using the same standard as Raspberry Pi 5
102-
* Jumpers to disable features such as eMMC boot, EEPROM write, the power button, and the USB OTG connection
101+
* USB-C power using the same standard as Raspberry Pi 5 (5V, 5A (25W) or 5V, 3A (15W) with a 600mA peripheral limit)
102+
* Jumpers to disable features such as eMMC boot, EEPROM write, and the USB OTG connection
103103

104104
=== Compute Module 4 IO Board
105105

@@ -178,11 +178,11 @@ The Case provides cut-outs for all externally-facing ports and LEDs on the CM5IO
178178
.Compute Module 5 IO Board Case ports
179179
image::images/cm5io-case-front.png[alt="the port selection on the Compute Module 5 IO Board Case", width="60%"]
180180

181-
To mount a CM5IO Board within your Case, position your Board in the bottom section of the case, aligning the four mount points inset slightly from each corner of the Board. Fasten four screws into the mount points. Take care not to over-tighten the screws.
181+
To mount a CM5IO Board within your Case, position your Board in the bottom section of the case, aligning the four mounting points inset slightly from each corner of the Board. Fasten four screws into the mounting points. Take care not to over-tighten the screws.
182182

183183
To use the Case fan, connect the fan cable to the FAN (J14) port on the Board.
184184

185-
To close the case, put the top case on top of the bottom case. Facing the front of the case, which has port pass-throughs, carefully align the screw holes on the left and right side of the case and the power button on the back of the case. Tighten four screws into the screw holes. Take care not to over-tighten the screws.
185+
To close the case, put the top section of the case on top of the bottom section of the case. Facing the front of the case, which has port pass-throughs, carefully align the screw holes on the left and right side of the case and the power button on the back of the case. Tighten four screws into the screw holes. Take care not to over-tighten the screws.
186186

187187
TIP: The Case comes with a fan pre-installed. To close the case with the passive Cooler attached to your Compute Module, remove the fan. To remove the fan, remove the four screws positioned in the corners of the fan from the bottom of the top case.
188188

@@ -224,7 +224,7 @@ The CM5 Cooler helps dissipate heat from your CM5, improving CPU performance, lo
224224
.CM5 Cooler
225225
image::images/cm5-cooler.jpg[alt="CM5 Cooler", width="60%"]
226226

227-
To mount the Cooler to your CM5, attach the thermally conductive silicone at the bottom of the Cooler to the top of your CM5. Align the cut-out in the heatsink with the antenna https://en.wikipedia.org/wiki/Hirose_U.FL[U.FL connector]. As the CM5 heats during use, the silicone will gradually attach more securely to the heat sinks on the CM5.
227+
To mount the Cooler to your CM5, attach the thermally conductive silicone at the bottom of the Cooler to the top of your CM5. Align the cut-out in the heatsink with the antenna https://en.wikipedia.org/wiki/Hirose_U.FL[U.FL connector]. Optionally, fasten screws in the mounting points found in each corner to secure the Cooler. If you omit the screws, the bond between your Cooler and your Compute Module will improve through time, use, and trust.
228228

229229
.CM5 Cooler physical specification
230230
image::images/cm5-cooler-physical.png[alt="CM5 Cooler physical specification", width="80%"]

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ a|
3232
* DSI display port
3333
* 3.5mm audio jack
3434
* RCA composite video
35-
* 100Mb/s Ethernet RJ45 with PoE support
35+
* 100Mb/s Ethernet RJ45
3636
* SD card slot
3737
* micro USB power
3838
^.^a|
@@ -58,7 +58,7 @@ a|
5858
* CSI camera port
5959
* DSI display port
6060
* 3.5mm AV jack
61-
* 100Mb/s Ethernet RJ45 with PoE support
61+
* 100Mb/s Ethernet RJ45
6262
* microSD card slot
6363
* micro USB power
6464
^.^a|
@@ -87,7 +87,7 @@ a|
8787
* CSI camera port
8888
* DSI display port
8989
* 3.5mm AV jack
90-
* 100Mb/s Ethernet RJ45 with PoE support
90+
* 100Mb/s Ethernet RJ45
9191
* microSD card slot
9292
* micro USB power
9393
^.^a|
@@ -100,7 +100,7 @@ a|
100100
* CSI camera port
101101
* DSI display port
102102
* 3.5mm AV jack
103-
* 100Mb/s Ethernet RJ45 with PoE support
103+
* 100Mb/s Ethernet RJ45
104104
* 2.4GHz single-band 802.11n Wi-Fi (35Mb/s)
105105
* Bluetooth 4.1, Bluetooth Low Energy (BLE)
106106
* microSD card slot
@@ -153,7 +153,7 @@ a|
153153
* CSI camera port
154154
* DSI display port
155155
* 3.5mm AV jack
156-
* Gigabit (1Gb/s) Ethernet RJ45 with PoE support
156+
* Gigabit (1Gb/s) Ethernet RJ45 with PoE+ support
157157
* 2.4/5GHz dual-band 802.11ac Wi-Fi (120Mb/s)
158158
* Bluetooth 5, Bluetooth Low Energy (BLE)
159159
* microSD card slot
@@ -335,8 +335,6 @@ a|
335335
4GB
336336

337337
8GB
338-
339-
16GB
340338
a|
341339
0GB (Lite)
342340

documentation/asciidoc/microcontrollers/microcontroller_docs.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,3 @@ https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-python-sdk.pdf[Raspber
4848

4949
The API level Doxygen documentation for the Raspberry Pi Pico C/{cpp} SDK is also available https://rptl.io/pico-doxygen[as a micro-site].
5050

51-
NOTE: A https://github.com/raspberrypi/pico-setup-windows/releases/latest/download/pico-setup-windows-x64-standalone.exe[one-click installer] for the Pico C/{cpp} SDK for Windows 10 and Windows 11 is available.
52-

documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
Pico-series devices are organised into **families** based on product generation.
22

3-
The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in four variants:
3+
The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in the following variants:
44

5-
* Raspberry Pi Pico
6-
* Raspberry Pi Pico H
7-
* Raspberry Pi Pico W
8-
* Raspberry Pi Pico WH
5+
* Pico
6+
* Pico H
7+
* Pico W
8+
* Pico WH
99
10-
The second-generation Raspberry Pi Pico family is referred to as Pico 2. Pico 2 comes in two variants:
10+
The second-generation Raspberry Pi Pico family is referred to as Pico 2. Pico 2 comes in the following variants:
1111

12-
* Raspberry Pi Pico 2
13-
* Raspberry Pi Pico 2 with headers
12+
* Pico 2
13+
* Pico 2 W
1414
1515
== Pico 2 family
1616

1717
image::images/pico-2.png[width="75%"]
1818

19-
The Raspberry Pi Pico 2 family consists of two boards; Raspberry Pi Pico 2, and Raspberry Pi Pico 2 with headers.
20-
2119
[[pico-2-technical-specification]]
2220
=== Raspberry Pi Pico 2
2321

0 commit comments

Comments
 (0)