From d47f2f0c406717081fca0551092bcd339ae9145e Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Sun, 15 May 2022 19:42:45 +0100 Subject: [PATCH 01/21] Update video.adoc --- .../asciidoc/computers/config_txt/video.adoc | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index ae650cff8..9fd45c4ce 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1,62 +1,5 @@ == Video Options -=== Composite Video Mode - -==== `sdtv_mode` - -The `sdtv_mode` command defines the TV standard used for composite video output. On the original Raspberry Pi, composite video is output on the RCA socket. On other Raspberry Pis, except for Raspberry Pi Zero and Compute Module, composite video is output along with sound on the 4 pole TRRS ("headphone") socket. On the Raspberry Pi Zero, there is an unpopulated header labelled "TV" which outputs composite video. On the Compute Module, composite video is available via the TVDAC pin. The default value of `sdtv_mode` is `0`. - -|=== -| sdtv_mode | result - -| 0 -| Normal NTSC - -| 1 -| Japanese version of NTSC -- no pedestal - -| 2 -| Normal PAL - -| 3 -| Brazilian version of PAL -- 525/60 rather than 625/50, different subcarrier - -| 16 -| Progressive scan NTSC - -| 18 -| Progressive scan PAL -|=== - -==== `sdtv_aspect` - -The `sdtv_aspect` command defines the aspect ratio for composite video output. The default value is `1`. - -|=== -| sdtv_aspect | result - -| 1 -| 4:3 - -| 2 -| 14:9 - -| 3 -| 16:9 -|=== - -==== `sdtv_disable_colourburst` - -Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite video output. The picture will be displayed in monochrome, but it may appear sharper. - -==== `enable_tvout` (Raspberry Pi 4 Model B Only) - -On the Raspberry Pi 4, composite output is disabled by default, due to the way the internal clocks are interrelated and allocated. Because composite video requires a very specific clock, setting that clock to the required speed on the Raspberry Pi 4 means that other clocks connected to it are detrimentally affected, which slightly slows down the entire system. Since composite video is a less commonly used function, we decided to disable it by default to prevent this system slowdown. - -To enable composite output, use the `enable_tvout=1` option. As described above, this will detrimentally affect performance to a small degree. - -On older Raspberry Pi models, the composite behaviour remains the same. - === HDMI Mode NOTE: Because the Raspberry Pi 4 and Raspberry Pi 400 have two HDMI ports, some HDMI commands can be applied to either port. You can use the syntax `:`, where port is 0 or 1, to specify which port the setting should apply to. If no port is specified, the default is 0. If you specify a port number on a command that does not require a port number, the port is ignored. Further details on the syntax and alternatives mechanisms can be found in the HDMI sub-section of the xref:config_txt.adoc#conditional-filters[conditionals section] of the documentation. @@ -1519,6 +1462,63 @@ hdmi_drive=2 This may not work if your monitor does not support standard CVT timings. +=== Composite Video Mode + +==== `sdtv_mode` + +The `sdtv_mode` command defines the TV standard used for composite video output. On most models of Raspberry Pi, composite is output on the 3.5mm jack. + +|=== +| sdtv_mode | result + +| 0 (default) +| Normal NTSC + +| 1 +| Japanese version of NTSC -- no pedestal + +| 2 +| Normal PAL + +| 3 +| Brazilian version of PAL -- 525/60 rather than 625/50, different subcarrier + +| 16 +| Progressive scan NTSC + +| 18 +| Progressive scan PAL +|=== + +==== `sdtv_aspect` + +The `sdtv_aspect` command defines the aspect ratio for composite video output. The default value is `1`. + +|=== +| sdtv_aspect | result + +| 1 +| 4:3 + +| 2 +| 14:9 + +| 3 +| 16:9 +|=== + +==== `sdtv_disable_colourburst` + +Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite video output. The picture will be displayed in monochrome, but it may appear sharper. + +==== `enable_tvout` (Raspberry Pi 4 Model B Only) + +On the Raspberry Pi 4, composite output is disabled by default, due to the way the internal clocks are interrelated and allocated. Because composite video requires a very specific clock, setting that clock to the required speed on the Raspberry Pi 4 means that other clocks connected to it are detrimentally affected, which slightly slows down the entire system. Since composite video is a less commonly used function, we decided to disable it by default to prevent this system slowdown. + +To enable composite output, use the `enable_tvout=1` option. As described above, this will detrimentally affect performance to a small degree. + +On older Raspberry Pi models, the composite behaviour remains the same. + === LCD Displays and Touchscreens ==== `ignore_lcd` From c02a5946cf4446251697ae15459f86024ce0e8fe Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Thu, 19 May 2022 12:15:36 +0100 Subject: [PATCH 02/21] Update video.adoc Pi 4 does not enable composite when HDMI is disabled, so don't claim it is. --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index ae650cff8..1825d842b 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1606,7 +1606,7 @@ Setting `hdmi_force_hotplug` to `1` pretends that the HDMI hotplug signal is ass ==== `hdmi_ignore_hotplug` -Setting `hdmi_ignore_hotplug` to `1` pretends that the HDMI hotplug signal is not asserted, so it appears that a HDMI display is not attached. In other words, composite output mode will be used, even if an HDMI monitor is detected. +Setting `hdmi_ignore_hotplug` to `1` pretends that the HDMI hotplug signal is not asserted, so it appears that a HDMI display is not attached. The HDMI output will therefore be disabled, even if a monitor is connected. ==== `overscan_left` From a3535dc02aa62a199f98554f8f45d1b2e27c72a7 Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Thu, 19 May 2022 12:16:46 +0100 Subject: [PATCH 03/21] Update video.adoc --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 1825d842b..27e97a2b4 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1606,7 +1606,7 @@ Setting `hdmi_force_hotplug` to `1` pretends that the HDMI hotplug signal is ass ==== `hdmi_ignore_hotplug` -Setting `hdmi_ignore_hotplug` to `1` pretends that the HDMI hotplug signal is not asserted, so it appears that a HDMI display is not attached. The HDMI output will therefore be disabled, even if a monitor is connected. +Setting `hdmi_ignore_hotplug` to `1` pretends that the HDMI hotplug signal is not asserted, so it appears that a HDMI display is not attached. HDMI output will therefore be disabled, even if a monitor is connected. ==== `overscan_left` From 365f5b23a18346b2c6aa8cd18def3e1c2cead6e9 Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:38:16 +0100 Subject: [PATCH 04/21] Potentially better wording --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 9fd45c4ce..e38108cbf 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1466,7 +1466,7 @@ This may not work if your monitor does not support standard CVT timings. ==== `sdtv_mode` -The `sdtv_mode` command defines the TV standard used for composite video output. On most models of Raspberry Pi, composite is output on the 3.5mm jack. +The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on the Raspberry Pi 1B where it is output on the RCA jack. |=== | sdtv_mode | result From d4ba646db1a7907ea5079654663c2a7499b557bc Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:18:51 +0100 Subject: [PATCH 05/21] Update enable_tv_out section for Pi 0 - 3 --- documentation/asciidoc/computers/config_txt/video.adoc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index e38108cbf..66f958247 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1511,13 +1511,11 @@ The `sdtv_aspect` command defines the aspect ratio for composite video output. T Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite video output. The picture will be displayed in monochrome, but it may appear sharper. -==== `enable_tvout` (Raspberry Pi 4 Model B Only) +==== `enable_tvout` -On the Raspberry Pi 4, composite output is disabled by default, due to the way the internal clocks are interrelated and allocated. Because composite video requires a very specific clock, setting that clock to the required speed on the Raspberry Pi 4 means that other clocks connected to it are detrimentally affected, which slightly slows down the entire system. Since composite video is a less commonly used function, we decided to disable it by default to prevent this system slowdown. +Raspberry Pi 4 disables composite output unless you set this option to `1`: this will slow down the operation of the system slightly because of how internal clocks are inter-related. Because composite video requires a very specific clock, setting that clock to the required speed on the Raspberry Pi 4 means that other clocks connected to it are detrimentally affected. -To enable composite output, use the `enable_tvout=1` option. As described above, this will detrimentally affect performance to a small degree. - -On older Raspberry Pi models, the composite behaviour remains the same. +On Raspberry Pi Zero, 1, 2 and 3 this option can be set to `0` to prevent composite from becoming active when HDMI output is disabled. === LCD Displays and Touchscreens From ed45dd2b81977f94bada29acedf4329803fd3496 Mon Sep 17 00:00:00 2001 From: andrum99 <97977513+andrum99@users.noreply.github.com> Date: Wed, 6 Jul 2022 11:35:30 +0100 Subject: [PATCH 06/21] Update video.adoc --- documentation/asciidoc/computers/config_txt/video.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 66f958247..0164be2f1 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1466,7 +1466,7 @@ This may not work if your monitor does not support standard CVT timings. ==== `sdtv_mode` -The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on the Raspberry Pi 1B where it is output on the RCA jack. +The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1A and B where it is output on the RCA jack. |=== | sdtv_mode | result @@ -1513,9 +1513,9 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide ==== `enable_tvout` -Raspberry Pi 4 disables composite output unless you set this option to `1`: this will slow down the operation of the system slightly because of how internal clocks are inter-related. Because composite video requires a very specific clock, setting that clock to the required speed on the Raspberry Pi 4 means that other clocks connected to it are detrimentally affected. +Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on the Raspberry Pi 4 if you set this to `1`. -On Raspberry Pi Zero, 1, 2 and 3 this option can be set to `0` to prevent composite from becoming active when HDMI output is disabled. +On Raspberry Pi Zero, 1, 2 and 3 the composite video output will be enabled if no HDMI display is detected at boot, or if `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is not active. === LCD Displays and Touchscreens From d2c862710e5484e111563adf0363200c5dcb1e95 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:01:33 +0000 Subject: [PATCH 07/21] Add table of defaults for enable_tvout --- .../asciidoc/computers/config_txt/video.adoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 0164be2f1..f4fa95493 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1517,6 +1517,19 @@ Set to `1` to enable composite video output, or `0` to disable. Composite video On Raspberry Pi Zero, 1, 2 and 3 the composite video output will be enabled if no HDMI display is detected at boot, or if `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is not active. +[%header,cols="1,1"] + +|=== +|Model +|Default + +|Pi Zero, 1, 2, 3 +|1 + +|Pi 4 +|0 +|=== + === LCD Displays and Touchscreens ==== `ignore_lcd` From 9204c2e048f0169c6ca1300cb1fd64ee23fbeff8 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:10:02 +0000 Subject: [PATCH 08/21] simplify wording --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index f4fa95493..5cf3db5c4 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1515,7 +1515,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on the Raspberry Pi 4 if you set this to `1`. -On Raspberry Pi Zero, 1, 2 and 3 the composite video output will be enabled if no HDMI display is detected at boot, or if `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is not active. +On Raspberry Pi Zero, 1, 2 and 3, if HDMI output is disabled, the composite video output will be enabled. Set `enable_tvout=0` to disable composite even if HDMI is not active. [%header,cols="1,1"] From 3076c3e3205256ae207b018ea015a3fc46dfe444 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:14:58 +0000 Subject: [PATCH 09/21] fix wording --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 5cf3db5c4..587377533 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1515,7 +1515,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on the Raspberry Pi 4 if you set this to `1`. -On Raspberry Pi Zero, 1, 2 and 3, if HDMI output is disabled, the composite video output will be enabled. Set `enable_tvout=0` to disable composite even if HDMI is not active. +On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is disabled. [%header,cols="1,1"] From 251260935440a4e04d7e0e79f6d2999ea26f4b0b Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:17:19 +0000 Subject: [PATCH 10/21] remove extranous `the` --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 587377533..ec291021f 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1513,7 +1513,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide ==== `enable_tvout` -Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on the Raspberry Pi 4 if you set this to `1`. +Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on Raspberry Pi 4 if you set this to `1`. On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is disabled. From ce7c69b5e95be4858211cb22c300f9dc8f7c2ad4 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:19:22 +0000 Subject: [PATCH 11/21] reword --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index ec291021f..bc0f42a09 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1515,7 +1515,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on Raspberry Pi 4 if you set this to `1`. -On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to disable composite even if HDMI is disabled. +On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. [%header,cols="1,1"] From 054537ca4327472af5302311f6d59c3ba12c54e1 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 6 Jul 2022 11:58:45 +0000 Subject: [PATCH 12/21] address review comments --- documentation/asciidoc/computers/config_txt/video.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index bc0f42a09..9e321d5ca 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1466,7 +1466,7 @@ This may not work if your monitor does not support standard CVT timings. ==== `sdtv_mode` -The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1A and B where it is output on the RCA jack. +The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1 Model A and B where it is output on the RCA jack. |=== | sdtv_mode | result @@ -1517,6 +1517,8 @@ Set to `1` to enable composite video output, or `0` to disable. Composite video On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. +On Raspberry Pi Zero, composite output is available on the unpopulated `TV` header. On Raspberry Pi Zero 2 W, composite output is available via test points on the underside of the board. + [%header,cols="1,1"] |=== From f4073c870161c13801ec6bab9fe4d4b97108635f Mon Sep 17 00:00:00 2001 From: andrum99 Date: Thu, 7 Jul 2022 21:03:10 +0000 Subject: [PATCH 13/21] grammar fix --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 9e321d5ca..eb7acb9b6 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1513,7 +1513,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide ==== `enable_tvout` -Set to `1` to enable composite video output, or `0` to disable. Composite video output is only available on Raspberry Pi 4 if you set this to `1`. +Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. From ffdc5e89b839b92bbc4273ff1f289917852dd7d7 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Tue, 12 Jul 2022 15:43:19 +0000 Subject: [PATCH 14/21] Address review comments --- documentation/asciidoc/computers/config_txt/video.adoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index eb7acb9b6..087574cc8 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1466,7 +1466,7 @@ This may not work if your monitor does not support standard CVT timings. ==== `sdtv_mode` -The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1 Model A and B where it is output on the RCA jack. +The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1 Model A and B, Raspberry Pi Zero and Zero 2 W. On the Raspberry Pi 1 Model A and B composite is output on the RCA jack. On Raspberry Pi Zero, composite output is available on the unpopulated `TV` header. On Raspberry Pi Zero 2 W, composite output is available via test points on the underside of the board. |=== | sdtv_mode | result @@ -1515,9 +1515,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. -On Raspberry Pi Zero, 1, 2 and 3, composite output will be enable if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. - -On Raspberry Pi Zero, composite output is available on the unpopulated `TV` header. On Raspberry Pi Zero 2 W, composite output is available via test points on the underside of the board. +On Raspberry Pi Zero, 1, 2 and 3, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. [%header,cols="1,1"] From fd01fffa2c27006a00ea7b25edf20962bf80b6a0 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Tue, 12 Jul 2022 16:00:17 +0000 Subject: [PATCH 15/21] Table-ify locations of composite output, mention Pi 400, reorder --- .../asciidoc/computers/config_txt/video.adoc | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 087574cc8..36b8f48bd 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1466,7 +1466,7 @@ This may not work if your monitor does not support standard CVT timings. ==== `sdtv_mode` -The `sdtv_mode` command defines the TV standard used for composite video output. Composite is output on the 3.5mm AV jack, except on Raspberry Pi 1 Model A and B, Raspberry Pi Zero and Zero 2 W. On the Raspberry Pi 1 Model A and B composite is output on the RCA jack. On Raspberry Pi Zero, composite output is available on the unpopulated `TV` header. On Raspberry Pi Zero 2 W, composite output is available via test points on the underside of the board. +The `sdtv_mode` command defines the TV standard used for composite video output: |=== | sdtv_mode | result @@ -1490,6 +1490,26 @@ The `sdtv_mode` command defines the TV standard used for composite video output. | Progressive scan PAL |=== +The table below describes where composite video output can be found on each model of Raspberry Pi computer: + +|=== +| model | composite output + +| Raspberry Pi 1 A and B +| RCA jack + +| Raspberry Pi Zero +| Unpopulated `TV` header + +| Raspberry Pi Zero 2 W +| Test pads on underside of board + +| All other models +| 3.5mm AV jack +|=== + +NOTE: Composite video output is not available on the Raspberry Pi 400. + ==== `sdtv_aspect` The `sdtv_aspect` command defines the aspect ratio for composite video output. The default value is `1`. From 1b0be5c6d8f4499a179a3ee52b445e7506a1a05c Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 13 Jul 2022 09:04:28 +0100 Subject: [PATCH 16/21] libcamera: Update --list-cameras output A recent update to libcamera-apps shows framerate and crop information per mode. Update the documentation to reflect this. Signed-off-by: Naushir Patuck --- .../camera/libcamera_options_common.adoc | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/libcamera_options_common.adoc b/documentation/asciidoc/accessories/camera/libcamera_options_common.adoc index 779e01883..f7f2a80cc 100644 --- a/documentation/asciidoc/accessories/camera/libcamera_options_common.adoc +++ b/documentation/asciidoc/accessories/camera/libcamera_options_common.adoc @@ -28,19 +28,27 @@ The `--list-cameras` will display the available cameras attached to the board th ---- Available cameras ----------------- -0 : imx219 [3280x2464] (/base/soc/i2c0mux/i2c@1/pca@70/i2c@0/imx219@10) - Modes: 'SRGGB10_CSI2P' : 640x480 1640x1232 1920x1080 3280x2464 - 'SRGGB8' : 640x480 1640x1232 1920x1080 3280x2464 -1 : imx477 [4056x3040] (/base/soc/i2c0mux/i2c@1/pca@70/i2c@1/imx477@1a) - Modes: 'SRGGB10_CSI2P' : 1332x990 - 'SRGGB12_CSI2P' : 2028x1080 2028x1520 4056x3040 +0 : imx219 [3280x2464] (/base/soc/i2c0mux/i2c@1/imx219@10) + Modes: 'SRGGB10_CSI2P' : 640x480 [206.65 fps - (1000, 752)/1280x960 crop] + 1640x1232 [41.85 fps - (0, 0)/3280x2464 crop] + 1920x1080 [47.57 fps - (680, 692)/1920x1080 crop] + 3280x2464 [21.19 fps - (0, 0)/3280x2464 crop] + 'SRGGB8' : 640x480 [206.65 fps - (1000, 752)/1280x960 crop] + 1640x1232 [41.85 fps - (0, 0)/3280x2464 crop] + 1920x1080 [47.57 fps - (680, 692)/1920x1080 crop] + 3280x2464 [21.19 fps - (0, 0)/3280x2464 crop] +1 : imx477 [4056x3040] (/base/soc/i2c0mux/i2c@1/imx477@1a) + Modes: 'SRGGB10_CSI2P' : 1332x990 [120.05 fps - (696, 528)/2664x1980 crop] + 'SRGGB12_CSI2P' : 2028x1080 [50.03 fps - (0, 440)/4056x2160 crop] + 2028x1520 [40.01 fps - (0, 0)/4056x3040 crop] + 4056x3040 [10.00 fps - (0, 0)/4056x3040 crop] ---- In the above example, the IMX219 sensor is available at index 0 and IMX477 at index 1. The sensor mode identifier takes the following form: ---- S_ : ---- -For the IMX219 in the above example, all modes have a `RGGB` Bayer ordering and provide either 8-bit or 10-bit CSI2 packed readout at the listed resolutions. +For the IMX219 in the above example, all modes have a `RGGB` Bayer ordering and provide either 8-bit or 10-bit CSI2 packed readout at the listed resolutions. The crop is specified as (, )/x, where (x, y) is the location of the crop window of size Width x Height in the sensor array. The units remain native sensor pixels, even if the sensor is being used in a binning or skipping mode. ---- --camera Selects which camera to use From f8ea8ea2e0ed8062a81417c246354d57fb21e8d4 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Wed, 13 Jul 2022 18:38:55 +0000 Subject: [PATCH 17/21] Reorder per review comment --- .../asciidoc/computers/config_txt/video.adoc | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 36b8f48bd..635379589 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1464,6 +1464,26 @@ This may not work if your monitor does not support standard CVT timings. === Composite Video Mode +The table below describes where composite video output can be found on each model of Raspberry Pi computer: + +|=== +| model | composite output + +| Raspberry Pi 1 A and B +| RCA jack + +| Raspberry Pi Zero +| Unpopulated `TV` header + +| Raspberry Pi Zero 2 W +| Test pads on underside of board + +| All other models +| 3.5mm AV jack +|=== + +NOTE: Composite video output is not available on the Raspberry Pi 400. + ==== `sdtv_mode` The `sdtv_mode` command defines the TV standard used for composite video output: @@ -1490,26 +1510,6 @@ The `sdtv_mode` command defines the TV standard used for composite video output: | Progressive scan PAL |=== -The table below describes where composite video output can be found on each model of Raspberry Pi computer: - -|=== -| model | composite output - -| Raspberry Pi 1 A and B -| RCA jack - -| Raspberry Pi Zero -| Unpopulated `TV` header - -| Raspberry Pi Zero 2 W -| Test pads on underside of board - -| All other models -| 3.5mm AV jack -|=== - -NOTE: Composite video output is not available on the Raspberry Pi 400. - ==== `sdtv_aspect` The `sdtv_aspect` command defines the aspect ratio for composite video output. The default value is `1`. From 43a6ef55ea162e8f58613406f54eca353b2296f3 Mon Sep 17 00:00:00 2001 From: andrum99 Date: Thu, 14 Jul 2022 10:54:31 +0000 Subject: [PATCH 18/21] Further improvements --- .../asciidoc/computers/config_txt/video.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 635379589..0686799c0 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1533,9 +1533,9 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide ==== `enable_tvout` -Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. +Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. Composite output is not available on the Raspberry Pi 400. -On Raspberry Pi Zero, 1, 2 and 3, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. +On all models except the Pi 4 and Pi 400, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. [%header,cols="1,1"] @@ -1543,11 +1543,11 @@ On Raspberry Pi Zero, 1, 2 and 3, composite output will be enabled if HDMI outpu |Model |Default -|Pi Zero, 1, 2, 3 -|1 - -|Pi 4 +|Pi 4 and 400 |0 + +|All other models +|1 |=== === LCD Displays and Touchscreens From 3af69cbb3261ad8225318a76e3d78cbe55a68fca Mon Sep 17 00:00:00 2001 From: andrum99 Date: Thu, 14 Jul 2022 10:58:45 +0000 Subject: [PATCH 19/21] Remove extraneous 'the' --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 0686799c0..724860d29 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1535,7 +1535,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. Composite output is not available on the Raspberry Pi 400. -On all models except the Pi 4 and Pi 400, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. +On all models except Pi 4 and Pi 400, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. [%header,cols="1,1"] From bda9d800d1c37a516f5c53624fe716929f4b6e8f Mon Sep 17 00:00:00 2001 From: andrum99 Date: Fri, 15 Jul 2022 11:51:32 +0000 Subject: [PATCH 20/21] Another fix --- documentation/asciidoc/computers/config_txt/video.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/config_txt/video.adoc b/documentation/asciidoc/computers/config_txt/video.adoc index 724860d29..7d88b508b 100644 --- a/documentation/asciidoc/computers/config_txt/video.adoc +++ b/documentation/asciidoc/computers/config_txt/video.adoc @@ -1535,7 +1535,7 @@ Setting `sdtv_disable_colourburst` to `1` disables colourburst on composite vide Set to `1` to enable composite video output, or `0` to disable. On Raspberry Pi 4, composite output is only available if you set this to `1`. Composite output is not available on the Raspberry Pi 400. -On all models except Pi 4 and Pi 400, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. +On all models except Raspberry Pi 4 and Raspberry Pi 400, composite output will be enabled if HDMI output is disabled. HDMI output is disabled when no HDMI display is detected, or `hdmi_ignore_hotplug=1` is set. Set `enable_tvout=0` to prevent composite being enabled when HDMI is disabled. [%header,cols="1,1"] From c012d44871d73ff1396a7c61a6e351c7a7eb66cd Mon Sep 17 00:00:00 2001 From: Alasdair Allan Date: Tue, 19 Jul 2022 11:22:44 +0100 Subject: [PATCH 21/21] Update your_first_binary.adoc --- .../asciidoc/microcontrollers/c_sdk/your_first_binary.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/microcontrollers/c_sdk/your_first_binary.adoc b/documentation/asciidoc/microcontrollers/c_sdk/your_first_binary.adoc index 0e7186944..c38723e82 100644 --- a/documentation/asciidoc/microcontrollers/c_sdk/your_first_binary.adoc +++ b/documentation/asciidoc/microcontrollers/c_sdk/your_first_binary.adoc @@ -8,7 +8,7 @@ image:images/Blink-an-LED-640x360-v2.gif[] You can blink this on and off by, -. Download the https://datasheets.raspberrypi.com/soft/blink.uf2[Blink UF2] +. Download the Blink UF2 https://datasheets.raspberrypi.com/soft/blink.uf2[for Raspberry Pi Pico], or https://datasheets.raspberrypi.com/soft/blink_picow.uf2[for Pico W]. . Push and hold the BOOTSEL button and plug your Pico into the USB port of your Raspberry Pi or other computer. . It will mount as a Mass Storage Device called RPI-RP2. . Drag and drop the Blink UF2 binary onto the RPI-RP2 volume. Pico will reboot.