Skip to content

Commit 6f80adc

Browse files
authored
Merge pull request #4190 from raspberrypi/develop
Deploy to production
2 parents 3d66728 + 3624ce4 commit 6f80adc

26 files changed

+950
-184
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ documentation/asciidoc/pico-sdk
77
venv
88
.venv
99
.env
10+
.vscode

documentation/asciidoc/computers/config_txt/overclocking.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ WARNING: Setting any overclocking parameters to values other than those used by
1515
| Option | Description
1616

1717
| arm_freq
18-
| Frequency of the ARM CPU in MHz.
18+
| Frequency of the Arm CPU in MHz.
1919

2020
| arm_boost
2121
| Increases `arm_freq` to the highest supported frequency for the board-type and firmware. Set to `1` to enable.
@@ -55,7 +55,7 @@ WARNING: Setting any overclocking parameters to values other than those used by
5555

5656
| over_voltage_sdram_p
5757
| SDRAM phy voltage adjustment. [-16,8] equates to [0.8V,1.4V] with 0.025V steps. Not supported on Raspberry Pi 4 or later devices.
58-
58+
5959
| force_turbo
6060
| Forces turbo mode frequencies even when the ARM cores are not busy. Enabling this may set the warranty bit if `over_voltage_*` is also set.
6161

@@ -111,7 +111,7 @@ This table gives the default values for the options on various Raspberry Pi mode
111111

112112
[cols="m,^,^,^,^,^,^,^,^,^,^"]
113113
|===
114-
| Option | Pi 0/W | Pi1 | Pi2 | Pi3 | Pi3A+/Pi3B+ | CM4 & Pi4B <= R1.3 | Pi4B R1.4 | Pi 400 | Pi Zero 2 W | Pi 5
114+
| Option | Pi Zero W | Pi 1 | Pi 2 | Pi 3 | Pi 3A+/Pi 3B+ | CM4 & Pi 4B <= R1.3 | Pi 4B R1.4 | Pi 400 | Pi Zero 2 W | Pi 5/500/500+
115115

116116
| arm_freq
117117
| 1000
@@ -171,7 +171,7 @@ This table gives the default values for the options on various Raspberry Pi mode
171171
| 500
172172
| 500
173173
| 300
174-
| 910
174+
| 960
175175

176176
| hevc_freq
177177
| N/A

documentation/asciidoc/computers/getting-started/configuring.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ image::images/initial-setup/connect.png[alt="The Enable Raspberry Pi Connect pag
7474

7575
Once your Raspberry Pi has internet access, this page helps you update your operating system and software to the latest versions. During the software update process, the wizard will remove the non-default browser if you opted to uninstall it in the browser selection step. Downloading updates may take several minutes.
7676

77+
NOTE: If you are updating your Raspberry Pi 500+ for the first time, this can take up to half an hour. Grab a cup of coffee or go for a walk while you wait.
78+
7779
image::images/initial-setup/update.png[alt="You can download the latest software updates during the wizard before you boot for the first time.",width="80%"]
7880

7981
image::images/initial-setup/download.png[alt="You can download the latest software updates during the wizard before you boot for the first time.",width="80%"]

documentation/asciidoc/computers/getting-started/setting-up.adoc

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ You can use any high-quality power supply that provides the correct power mode.
2626
|Recommended power supply (voltage/current)
2727
|Raspberry Pi power supply
2828

29-
|Raspberry Pi 5
29+
|Raspberry Pi 5 and Raspberry Pi 500
3030
|5V/5A, 5V/3A limits peripherals to 600mA
3131
|https://www.raspberrypi.com/products/27w-power-supply/[27W USB-C power supply]
3232

33-
|Raspberry Pi 4 Model B
33+
|Raspberry Pi 4 Model B and Raspberry Pi 400
3434
|5V/3A
3535
|https://www.raspberrypi.com/products/type-c-power-supply/[15W USB-C power supply]
3636

3737
|Raspberry Pi 3 (all models)
3838
|5V/2.5A
3939
|https://www.raspberrypi.com/products/micro-usb-power-supply/[12.5W Micro USB power supply]
4040

41-
|Raspberry Pi 2 (all models)
41+
|Raspberry Pi 2 Model B
4242
|5V/2.5A
4343
|https://www.raspberrypi.com/products/micro-usb-power-supply/[12.5W Micro USB power supply]
4444

@@ -101,22 +101,19 @@ Raspberry Pi models have the following display connectivity:
101101
|Model
102102
|Display outputs
103103

104-
|Raspberry Pi 5
104+
|Raspberry Pi 5, Raspberry Pi 400 and Raspberry Pi 500
105105
|2× micro HDMI
106106

107-
|Raspberry Pi 4 (all models)
107+
|Raspberry Pi 4 Model B
108108
|2× micro HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
109109

110110
|Raspberry Pi 3 (all models)
111111
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
112112

113-
|Raspberry Pi 2 (all models)
113+
|Raspberry Pi 2 Model B
114114
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
115115

116-
|Raspberry Pi 1 Model B+
117-
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
118-
119-
|Raspberry Pi 1 Model A+
116+
|Raspberry Pi 1 (all models)
120117
|HDMI, audio and composite out via 3.5mm http://en.wikipedia.org/wiki/Phone_connector_(audio)#TRRS_standards[TRRS] jack
121118

122119
|Raspberry Pi Zero (all models)
@@ -142,10 +139,11 @@ All variants of the Raspberry Pi 1, 2, 3, and 4 include a 3.5mm auxiliary http:/
142139
The following Raspberry Pi models come with Wi-Fi and Bluetooth connectivity:
143140

144141
* Flagship models since Raspberry Pi 3 Model B
142+
* All Keyboard models
145143
* All Zero W models
146144
* All Pico W models
147145
* Compute Modules configured with wireless (available since CM4)
148146

149-
The "Model B" suffix indicates variants with an Ethernet port; "Model A" indicates no Ethernet port. If your Raspberry Pi doesn't have an Ethernet port, you can still connect to a wired internet connection using a USB-to-Ethernet adapter.
147+
The "Model B" suffix indicates variants with an Ethernet port; "Model A" indicates no Ethernet port. The Keyboard models also include an Ethernet port. If your Raspberry Pi doesn't have an Ethernet port, you can still connect to a wired internet connection using a USB-to-Ethernet adapter.
150148

151149
image::images/peripherals/cable-net.png[alt="Plugging an Ethernet cable into a Raspberry Pi.",width="80%"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include::keyboard-computers/intro.adoc[]
1.79 MB
Loading
2.09 MB
Loading
2.11 MB
Loading
3.05 MB
Loading
2.23 MB
Loading

0 commit comments

Comments
 (0)