Skip to content

Commit e3fcef9

Browse files
Merge pull request #3849 from raspberrypi/develop
Roll out latest dev changes to prod
2 parents 1b7709f + 80483d9 commit e3fcef9

File tree

5 files changed

+36
-40
lines changed

5 files changed

+36
-40
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source "https://rubygems.org"
88
#
99
# This will help ensure the proper Jekyll version is running.
1010
# Happy Jekylling!
11-
gem "jekyll", "~> 4.3.3"
11+
gem "jekyll", "~> 4.3.4"
1212

1313
# This is the default theme for new Jekyll sites. You may change this to anything you like.
1414
gem "minima", "~> 2.0"

Gemfile.lock

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.6)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
66
asciidoctor (2.0.20)
77
asciidoctor-tabs (1.0.0.beta.6)
88
asciidoctor (>= 2.0.0, < 3.0.0)
9+
bigdecimal (3.1.8)
910
colorator (1.1.0)
10-
concurrent-ruby (1.2.3)
11+
concurrent-ruby (1.3.4)
1112
em-websocket (0.5.3)
1213
eventmachine (>= 0.12.9)
1314
http_parser.rb (~> 0)
1415
eventmachine (1.2.7)
15-
ffi (1.16.3)
16+
ffi (1.17.0)
1617
forwardable-extended (2.6.0)
17-
google-protobuf (3.25.1)
18+
google-protobuf (4.28.1)
19+
bigdecimal
20+
rake (>= 13)
1821
http_parser.rb (0.8.0)
19-
i18n (1.14.1)
22+
i18n (1.14.6)
2023
concurrent-ruby (~> 1.0)
21-
jekyll (4.3.3)
24+
jekyll (4.3.4)
2225
addressable (~> 2.4)
2326
colorator (~> 1.0)
2427
em-websocket (~> 0.5)
@@ -50,7 +53,7 @@ GEM
5053
kramdown-parser-gfm (1.1.0)
5154
kramdown (~> 2.0)
5255
liquid (4.0.4)
53-
listen (3.8.0)
56+
listen (3.9.0)
5457
rb-fsevent (~> 0.10, >= 0.10.3)
5558
rb-inotify (~> 0.9, >= 0.9.10)
5659
mercenary (0.4.0)
@@ -64,18 +67,18 @@ GEM
6467
racc (~> 1.4)
6568
pathutil (0.16.2)
6669
forwardable-extended (~> 2.6)
67-
public_suffix (5.0.4)
70+
public_suffix (6.0.1)
6871
racc (1.8.0)
69-
rake (13.1.0)
72+
rake (13.2.1)
7073
rb-fsevent (0.11.2)
71-
rb-inotify (0.10.1)
74+
rb-inotify (0.11.1)
7275
ffi (~> 1.0)
73-
rexml (3.2.6)
74-
rouge (4.2.0)
76+
rexml (3.3.7)
77+
rouge (4.3.0)
7578
safe_yaml (1.0.5)
76-
sass-embedded (1.69.6)
77-
google-protobuf (~> 3.25)
78-
rake (>= 13.0.0)
79+
sass-embedded (1.78.0)
80+
google-protobuf (~> 4.27)
81+
rake (>= 13)
7982
slim (5.2.1)
8083
temple (~> 0.10.0)
8184
tilt (>= 2.1.0)
@@ -88,7 +91,7 @@ GEM
8891
concurrent-ruby (~> 1.0)
8992
tzinfo-data (1.2024.1)
9093
tzinfo (>= 1.0.0)
91-
unicode-display_width (2.5.0)
94+
unicode-display_width (2.6.0)
9295
wdm (0.2.0)
9396
webrick (1.8.1)
9497

@@ -98,7 +101,7 @@ PLATFORMS
98101
DEPENDENCIES
99102
asciidoctor
100103
asciidoctor-tabs (>= 1.0.0.beta.6)
101-
jekyll (~> 4.3.3)
104+
jekyll (~> 4.3.4)
102105
jekyll-asciidoc
103106
jekyll-feed (~> 0.17)
104107
minima (~> 2.0)

documentation/asciidoc/computers/configuration/headless.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ NOTE: Previous versions of Raspberry Pi OS made use of a `wpa_supplicant.conf` f
2626
With no keyboard or monitor, you need a way to xref:remote-access.adoc[remotely control] your headless Raspberry Pi. On first boot, the only option is SSH. To enable SSH on a fresh installation of Raspberry Pi OS, choose one of the following methods:
2727

2828
* enable SSH in the OS customisation menu in Raspberry Pi Imager, then enter a username and password
29-
* create a file named `ssh` at the root of the SD card, then configure a user manually with `userconf.txt` following the instructions in the section below
29+
* create a file named `ssh` at the root of the first partition of the SD card (labeled `bootfs`), then configure a user manually with `userconf.txt` following the instructions in the section below
3030

3131
For more information, see xref:remote-access.adoc#ssh[set up an SSH server]. Once you've connected over SSH, you can use `raspi-config` to xref:remote-access.adoc#vnc[enable VNC] if you'd prefer a graphical desktop environment.
3232

3333
[[configuring-a-user]]
3434
==== Configure a user manually
3535

36-
At the root of your SD card, create a file named `userconf.txt`.
36+
At the root of the first partion of your SD card (the filesystem labeled `bootfs`), create a file named `userconf.txt`.
3737

3838
This file should contain a single line of text, consisting of `<username>:<password>`: your desired username, followed immediately by a colon, followed immediately by an *encrypted* representation of the password you want to use.
3939

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
== Raspberry Pi Pico C/{cpp} SDK
22

3-
Our official C SDK can be used from the command line, or from popular integrated development environments like Visual Studio Code, Eclipse, and CLion. To get started, download our C/{cpp} SDK and Examples, and take a look at our 'https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf[getting started]' documentation to get going. Or for a quick setup see the next section.
3+
Our official C SDK can be used from the command line, or from popular integrated development environments like Visual Studio Code, Eclipse, and CLion. To get started, download our C/{cpp} SDK and Examples, and take a look at our 'https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf[getting started]' documentation. Or for a quick setup see the next section.
44

5-
* The SDK https://github.com/raspberrypi/pico-sdk[Github repository]
5+
You can find documentation around the C/{cpp} SDK at:
66

7-
* The Examples https://github.com/raspberrypi/pico-examples[Github repository]
8-
9-
You can find documentation around the C/{cpp} SDK at;
10-
11-
https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf[Getting started with Raspberry Pi Pico]:: C/{cpp} development with Raspberry Pi Pico and other RP2040-based microcontroller boards
7+
https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf[Getting started with Raspberry Pi Pico-series]:: C/{cpp} development with Raspberry Pi Pico, Pico 2, and other Raspberry Pi microcontroller-based boards
128

139
https://datasheets.raspberrypi.com/picow/connecting-to-the-internet-with-pico-w.pdf[Connecting to the Internet with Raspberry Pi Pico W]:: Getting Raspberry Pi Pico W online with C/{cpp} or MicroPython
1410

15-
https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-c-sdk.pdf[Raspberry Pi Pico C/{cpp} SDK]:: Libraries and tools for C/{cpp} development on RP2040 microcontrollers
11+
https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-c-sdk.pdf[Raspberry Pi Pico-series C/{cpp} SDK]:: Libraries and tools for C/{cpp} development on Raspberry Pi microcontrollers
1612

1713
xref:../pico-sdk/index_doxygen.adoc[API level documentation]:: Documentation for the Raspberry Pi Pico C/{cpp} SDK
1814

19-
[NOTE]
20-
====
21-
If you are building applications with the C/{cpp} SDK and targeting boards other than the Raspberry Pi Pico, you will need to pass `-DPICO_BOARD=boardname` to CMake. Here `boardname` is the name of your board, e.g. for the Adafruit Feather RP2040 you should pass `-DPICO_BOARD=adafruit_feather_rp2040`. See the https://github.com/raspberrypi/pico-sdk/tree/master/src/boards[`boards/` directory] in the Raspberry Pi Pico SDK, and the https://forums.raspberrypi.com/viewtopic.php?f=147&t=304393[forums], for more information.
22-
====
15+
https://github.com/raspberrypi/pico-examples[The pico-examples repository]:: Example projects
16+
17+
SDK source code is open source, available via the https://github.com/raspberrypi/pico-sdk[pico-sdk Github repository].
2318

2419
[NOTE]
2520
====
26-
Documentation introducing working with Wi-Fi and Bluetooth on Raspberry Pi Pico W with C/{cpp} or MicroPython is presented in the https://datasheets.raspberrypi.com/picow/connecting-to-the-internet-with-pico-w.pdf[Connecting to the Internet with Raspberry Pi Pico W] book.
27-
====
21+
To build applications with the C/{cpp} SDK for a board _other than the Raspberry Pi Pico_, pass `-DPICO_BOARD=boardname` to CMake, where `boardname` is the name of your board. For example:
2822
29-
[NOTE]
23+
* to build an application for the Adafruit Feather RP2040, pass `-DPICO_BOARD=adafruit_feather_rp2040`
24+
* to build an application for Pico W, pass `-DPICO_BOARD=pico_w` (in addition to -DWIFI_SSID="Your Network" -DWIFI_PASSWORD="Your Password", should you wish to connect to a wireless network)
25+
26+
For more information, see the https://github.com/raspberrypi/pico-sdk/tree/master/src/boards[`boards/` directory] in the Raspberry Pi Pico SDK and the https://forums.raspberrypi.com/viewtopic.php?f=147&t=304393[forums].
3027
====
31-
If you are building applications with the C/{cpp} SDK for Raspberry Pi Pico W and, to connect to a network you will need to pass `-DPICO_BOARD=pico_w -DWIFI_SSID="Your Network" -DWIFI_PASSWORD="Your Password"` to CMake. If you only need to enable Bluetooth support then you do not need to pass a SSID and password, but still need to pass the `-DPICO_BOARD=pico_w` string to CMake.
32-
====

documentation/asciidoc/microcontrollers/c_sdk/your_first_binary.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
== Your First Binaries
22

3-
WARNING: If you are using an Apple Mac, and running macOS Ventura, there has been a change in how the Finder works which causes drag-and-drop to fail. Please see our https://www.raspberrypi.com/news/the-ventura-problem/[blog post] for a full explanation, and workarounds, and our https://github.com/raspberrypi/pico-sdk/issues/1081[Github issue] tracking the problem for the current status.
4-
53
=== Blink an LED
64

75
The first program anyone writes when using a new microcontroller is to blink an LED on and off. The Raspberry Pi Pico comes with a single LED on-board. The LED is connected to `GP25` on the board's Raspberry Pi RP2040 for Pico, and `WL_GPIO0` on the Infineon 43439 wireless chip for Pico W.

0 commit comments

Comments
 (0)