From 73b7e471d141a40a2776731e1672ee10b5e9fed5 Mon Sep 17 00:00:00 2001 From: Natalie Ho Date: Mon, 25 Nov 2024 16:11:12 -0500 Subject: [PATCH 01/11] updates to readability and correctness of filter removal procedure --- .../asciidoc/accessories/camera/filters.adoc | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/filters.adoc b/documentation/asciidoc/accessories/camera/filters.adoc index 676532f8f..483215008 100644 --- a/documentation/asciidoc/accessories/camera/filters.adoc +++ b/documentation/asciidoc/accessories/camera/filters.adoc @@ -30,47 +30,41 @@ The HQ and GS Cameras use a Hoya CM500 infrared filter. Its transmission charact image::images/hoyacm500.png[CM500 Transmission Graph,width="65%"] -== Filter Removal +== IR-Cut Filter -NOTE: This procedure applies to both the HQ and GS cameras. +Both the High Quality Camera and Global Shutter Camera contain an IR-Cut 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. -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. - -image:images/FILTER_ON_small.jpg[width="65%"] +=== Filter Removal -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. +The filter removal procedure applies to both the HQ and GS cameras. The HQ camera is shown in the demonstration below. 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. -To remove the filter: +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. -* Work in a clean and dust-free environment, as the sensor will be exposed to the air. +image:images/FILTER_ON_small.jpg[width="65%"] -* 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. +Work in a clean and dust-free environment, as the sensor will be exposed to the air. 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. image:images/SCREW_REMOVED_small.jpg[width="65%"] -* Lift up the board and place it down on a very clean surface. Make sure the sensor does not touch the surface. +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). + +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. image:images/FLATLAY_small.jpg[width="65%"] -* You may try some ways to weaken the adhesive, such as a little isopropyl alcohol and/or heat (~20-30 C). +Turn the lens mount around so that it is "looking" upwards and place it on a table. image:images/SOLVENT_small.jpg[width="65%"] -* Turn the lens mount around so that it is "looking" upwards and place it on a table. +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. -* 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. +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. image:images/REMOVE_FILTER_small.jpg[width="65%"] -* 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. - -* Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board. - -* 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. - -* 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. +Realign the housing with the gasket, which remains on the circuit board. Replace the main housing over the circuit board and secure it in place. Apply the nylon washer first to prevent damage to the circuit board. 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. image:images/FILTER_OFF_small.jpg[width="65%"] From f51dd8e9a1395af5985dcd8b7fed1d7393bfad5a Mon Sep 17 00:00:00 2001 From: Natalie Ho Date: Mon, 25 Nov 2024 16:21:47 -0500 Subject: [PATCH 02/11] update link to IR filters on camera page --- .../asciidoc/accessories/camera/camera_hardware.adoc | 2 +- documentation/asciidoc/accessories/camera/filters.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/camera_hardware.adoc b/documentation/asciidoc/accessories/camera/camera_hardware.adoc index 5ec22d36d..6470e0fb7 100644 --- a/documentation/asciidoc/accessories/camera/camera_hardware.adoc +++ b/documentation/asciidoc/accessories/camera/camera_hardware.adoc @@ -20,7 +20,7 @@ The Raspberry Pi AI Camera uses the Sony IMX500 imaging sensor to provide low-la image::images/ai-camera-hero.png[The Raspberry Pi AI Camera] -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. +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. .Global Shutter Camera image::images/gs-camera.jpg[GS Camera] diff --git a/documentation/asciidoc/accessories/camera/filters.adoc b/documentation/asciidoc/accessories/camera/filters.adoc index 483215008..bb480a8b6 100644 --- a/documentation/asciidoc/accessories/camera/filters.adoc +++ b/documentation/asciidoc/accessories/camera/filters.adoc @@ -30,9 +30,9 @@ The HQ and GS Cameras use a Hoya CM500 infrared filter. Its transmission charact image::images/hoyacm500.png[CM500 Transmission Graph,width="65%"] -== IR-Cut Filter +== IR Filter -Both the High Quality Camera and Global Shutter Camera contain an IR-Cut 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. +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. === Filter Removal From 287f859dfe4e94c418a418846366fcbf5242fc76 Mon Sep 17 00:00:00 2001 From: Natalie Ho Date: Tue, 26 Nov 2024 16:17:44 -0500 Subject: [PATCH 03/11] updates per feedback --- .../asciidoc/accessories/camera/filters.adoc | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/filters.adoc b/documentation/asciidoc/accessories/camera/filters.adoc index bb480a8b6..3b701079f 100644 --- a/documentation/asciidoc/accessories/camera/filters.adoc +++ b/documentation/asciidoc/accessories/camera/filters.adoc @@ -32,40 +32,39 @@ image::images/hoyacm500.png[CM500 Transmission Graph,width="65%"] == IR Filter -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. +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: -=== Filter Removal - -The filter removal procedure applies to both the HQ and GS cameras. The HQ camera is shown in the demonstration below. +* Enhance colours in certain types of photography, such as images of plants, water, and the sky +* Provide night vision in a location that is illuminated with infrared light -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. +=== Filter Removal 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. +You can remove the filter from both the HQ and GS cameras. The HQ camera is shown in the demonstration below. + image:images/FILTER_ON_small.jpg[width="65%"] -Work in a clean and dust-free environment, as the sensor will be exposed to the air. 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. +NOTE: Make sure to work in a clean and dust-free environment, as the sensor will be exposed to the air. +1. 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. ++ image:images/SCREW_REMOVED_small.jpg[width="65%"] - -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). - -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. - +2. 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). +3. 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. ++ image:images/FLATLAY_small.jpg[width="65%"] - -Turn the lens mount around so that it is "looking" upwards and place it on a table. - +4. Turn the lens mount around so that it is "looking" upwards and place it on a table. ++ image:images/SOLVENT_small.jpg[width="65%"] - -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. - -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. - +5. 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. ++ image:images/REMOVE_FILTER_small.jpg[width="65%"] - -Realign the housing with the gasket, which remains on the circuit board. Replace the main housing over the circuit board and secure it in place. Apply the nylon washer first to prevent damage to the circuit board. 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. - +6. 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. +7. Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board. +8. Apply the nylon washer first to prevent damage to the circuit board. +9. 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. ++ image:images/FILTER_OFF_small.jpg[width="65%"] 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. From ac8f8db5da6fdaa93dc3fe9e0dfc8d0c8c3c655e Mon Sep 17 00:00:00 2001 From: Natalie Ho Date: Wed, 27 Nov 2024 10:22:43 -0500 Subject: [PATCH 04/11] bit more feedback --- .../asciidoc/accessories/camera/filters.adoc | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/filters.adoc b/documentation/asciidoc/accessories/camera/filters.adoc index 3b701079f..32ac70e02 100644 --- a/documentation/asciidoc/accessories/camera/filters.adoc +++ b/documentation/asciidoc/accessories/camera/filters.adoc @@ -39,7 +39,7 @@ Both the High Quality Camera and Global Shutter Camera contain an IR filter to r === Filter Removal -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. +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*. You can remove the filter from both the HQ and GS cameras. The HQ camera is shown in the demonstration below. @@ -47,23 +47,23 @@ image:images/FILTER_ON_small.jpg[width="65%"] NOTE: Make sure to work in a clean and dust-free environment, as the sensor will be exposed to the air. -1. 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. +. 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. + image:images/SCREW_REMOVED_small.jpg[width="65%"] -2. 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). -3. 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. +. 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). +. 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. + image:images/FLATLAY_small.jpg[width="65%"] -4. Turn the lens mount around so that it is "looking" upwards and place it on a table. +. Face the lens upwards and place the mount on a flat surface. + image:images/SOLVENT_small.jpg[width="65%"] -5. 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. +. 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. + image:images/REMOVE_FILTER_small.jpg[width="65%"] -6. 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. -7. Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board. -8. Apply the nylon washer first to prevent damage to the circuit board. -9. 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. +. 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. +. Replace the main housing over the circuit board. Be sure to realign the housing with the gasket, which remains on the circuit board. +. Apply the nylon washer first to prevent damage to the circuit board. +. 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. + image:images/FILTER_OFF_small.jpg[width="65%"] From 987e853a9fa9acfe859d3020dc9add6eedfb772b Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:37:24 +0000 Subject: [PATCH 05/11] Remove mention of 2 with headers --- .../asciidoc/microcontrollers/pico-series/about_pico.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc b/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc index a62955315..0b14cfce5 100644 --- a/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc +++ b/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc @@ -10,7 +10,6 @@ The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in f 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 From f9024407c7ba335f842f04941a8d4c22fd1e7514 Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:38:28 +0000 Subject: [PATCH 06/11] actually pico-setup-windows is NOT available --- .../asciidoc/microcontrollers/microcontroller_docs.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/documentation/asciidoc/microcontrollers/microcontroller_docs.adoc b/documentation/asciidoc/microcontrollers/microcontroller_docs.adoc index 0e13584f7..24615673c 100644 --- a/documentation/asciidoc/microcontrollers/microcontroller_docs.adoc +++ b/documentation/asciidoc/microcontrollers/microcontroller_docs.adoc @@ -48,5 +48,3 @@ https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-python-sdk.pdf[Raspber 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]. -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. - From 132621928bf657af16ccc73fc27a156cec7b6ee8 Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:39:19 +0000 Subject: [PATCH 07/11] reduce powers of 2 --- documentation/asciidoc/computers/raspberry-pi/introduction.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc index e92e813e2..7028bb86c 100644 --- a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc +++ b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc @@ -335,8 +335,6 @@ a| 4GB 8GB - -16GB a| 0GB (Lite) From 6bee160c8f843e923bd93e631407e138344a10e5 Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:41:17 +0000 Subject: [PATCH 08/11] Remove PoE support from aged models that do not support it --- .../asciidoc/computers/raspberry-pi/introduction.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc index 7028bb86c..6cb1018ea 100644 --- a/documentation/asciidoc/computers/raspberry-pi/introduction.adoc +++ b/documentation/asciidoc/computers/raspberry-pi/introduction.adoc @@ -32,7 +32,7 @@ a| * DSI display port * 3.5mm audio jack * RCA composite video -* 100Mb/s Ethernet RJ45 with PoE support +* 100Mb/s Ethernet RJ45 * SD card slot * micro USB power ^.^a| @@ -58,7 +58,7 @@ a| * CSI camera port * DSI display port * 3.5mm AV jack -* 100Mb/s Ethernet RJ45 with PoE support +* 100Mb/s Ethernet RJ45 * microSD card slot * micro USB power ^.^a| @@ -87,7 +87,7 @@ a| * CSI camera port * DSI display port * 3.5mm AV jack -* 100Mb/s Ethernet RJ45 with PoE support +* 100Mb/s Ethernet RJ45 * microSD card slot * micro USB power ^.^a| @@ -100,7 +100,7 @@ a| * CSI camera port * DSI display port * 3.5mm AV jack -* 100Mb/s Ethernet RJ45 with PoE support +* 100Mb/s Ethernet RJ45 * 2.4GHz single-band 802.11n Wi-Fi (35Mb/s) * Bluetooth 4.1, Bluetooth Low Energy (BLE) * microSD card slot @@ -153,7 +153,7 @@ a| * CSI camera port * DSI display port * 3.5mm AV jack -* Gigabit (1Gb/s) Ethernet RJ45 with PoE support +* Gigabit (1Gb/s) Ethernet RJ45 with PoE+ support * 2.4/5GHz dual-band 802.11ac Wi-Fi (120Mb/s) * Bluetooth 5, Bluetooth Low Energy (BLE) * microSD card slot From ce9e13568eb139a3ce2dccaa4ba410eed004ea9c Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:49:47 +0000 Subject: [PATCH 09/11] Implement review feedback for CM5 doc --- .../computers/compute-module/introduction.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/asciidoc/computers/compute-module/introduction.adoc b/documentation/asciidoc/computers/compute-module/introduction.adoc index b7ec8b065..70c2911f0 100644 --- a/documentation/asciidoc/computers/compute-module/introduction.adoc +++ b/documentation/asciidoc/computers/compute-module/introduction.adoc @@ -73,13 +73,13 @@ Raspberry Pi IO Boards provide the following functionality: * power the module * connects the GPIO to pin headers * connects the camera and display interfaces to FFC connectors -* connects HDMI to an HDMI port +* connects HDMI to HDMI ports * connects USB to USB ports * connects activity monitoring to LEDs * eMMC programming over USB * connects PCIe to connectors used to physically connect storage or peripherals -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. +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. === Compute Module 5 IO Board @@ -98,8 +98,8 @@ Compute Module 5 IO Board provides the following interfaces: * 2× MIPI DSI/CSI-2 combined display/camera FPC connectors (22-pin 0.5 mm pitch cable) * Real-time clock with battery socket * four-pin JST-SH PWM fan connector -* 5V @ 5A power input via USB-C using the same standard as Raspberry Pi 5 -* Jumpers to disable features such as eMMC boot, EEPROM write, the power button, and the USB OTG connection +* USB-C power using the same standard as Raspberry Pi 5 (5V, 5A (25W) or 5V, 3A (15W) with a 600mA peripheral limit) +* Jumpers to disable features such as eMMC boot, EEPROM write, and the USB OTG connection === Compute Module 4 IO Board @@ -178,11 +178,11 @@ The Case provides cut-outs for all externally-facing ports and LEDs on the CM5IO .Compute Module 5 IO Board Case ports image::images/cm5io-case-front.png[alt="the port selection on the Compute Module 5 IO Board Case", width="60%"] -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. +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. To use the Case fan, connect the fan cable to the FAN (J14) port on the Board. -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. +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. 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. @@ -224,7 +224,7 @@ The CM5 Cooler helps dissipate heat from your CM5, improving CPU performance, lo .CM5 Cooler image::images/cm5-cooler.jpg[alt="CM5 Cooler", width="60%"] -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. +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. .CM5 Cooler physical specification image::images/cm5-cooler-physical.png[alt="CM5 Cooler physical specification", width="80%"] From 10cfff43e82a2cc8533772f7acc8860ac0c00e24 Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:51:16 +0000 Subject: [PATCH 10/11] Fix minor CM flashing issues from CM5 update --- .../asciidoc/computers/compute-module/cm-emmc-flashing.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/asciidoc/computers/compute-module/cm-emmc-flashing.adoc b/documentation/asciidoc/computers/compute-module/cm-emmc-flashing.adoc index 059ff9299..e57adb39d 100644 --- a/documentation/asciidoc/computers/compute-module/cm-emmc-flashing.adoc +++ b/documentation/asciidoc/computers/compute-module/cm-emmc-flashing.adoc @@ -15,7 +15,7 @@ To flash the Compute Module eMMC, you need the following: * 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. * The Compute Module IO Board xref:compute-module.adoc#io-board-compatibility[that corresponds to your Compute Module model]. -* A micro USB cable, or a USB-C cable for Compute Module models since CM5. +* A micro USB cable, or a USB-C cable for Compute Module models since CM5IO. === Set up the IO Board @@ -25,7 +25,7 @@ To begin, physically set up your IO Board. This includes connecting the Compute ====== Compute Module 5 IO Board:: + -To set up the Compute Module 4 IO Board: +To set up the Compute Module 5 IO Board: + . Connect the Compute Module to the IO board. When connected, the Compute Module should lie flat. . Fit `nRPI_BOOT` to J2 (`disable eMMC Boot`) on the IO board jumper. From 96f054df4531c03e0663ccf0ae8b42084723a860 Mon Sep 17 00:00:00 2001 From: nate contino Date: Wed, 27 Nov 2024 15:53:18 +0000 Subject: [PATCH 11/11] Clean up about pico page --- .../pico-series/about_pico.adoc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc b/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc index 0b14cfce5..aed8798cb 100644 --- a/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc +++ b/documentation/asciidoc/microcontrollers/pico-series/about_pico.adoc @@ -1,22 +1,21 @@ Pico-series devices are organised into **families** based on product generation. -The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in four variants: +The original Raspberry Pi Pico family, referred to as Pico or Pico 1, comes in the following variants: -* Raspberry Pi Pico -* Raspberry Pi Pico H -* Raspberry Pi Pico W -* Raspberry Pi Pico WH +* Pico +* Pico H +* Pico W +* Pico WH -The second-generation Raspberry Pi Pico family is referred to as Pico 2. Pico 2 comes in two variants: +The second-generation Raspberry Pi Pico family is referred to as Pico 2. Pico 2 comes in the following variants: -* Raspberry Pi Pico 2 +* Pico 2 +* Pico 2 W == 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