From 732848d6e47bb23b0ead8f41ccb60dbbe8a2836d Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Sun, 19 Jun 2022 14:35:31 +0100 Subject: [PATCH 1/4] Small typos --- .../asciidoc/accessories/camera/libcamera_apps_libav.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/asciidoc/accessories/camera/libcamera_apps_libav.adoc b/documentation/asciidoc/accessories/camera/libcamera_apps_libav.adoc index b4ad3aa74..4b9c30e3f 100644 --- a/documentation/asciidoc/accessories/camera/libcamera_apps_libav.adoc +++ b/documentation/asciidoc/accessories/camera/libcamera_apps_libav.adoc @@ -21,13 +21,13 @@ libcamera-vid --codec libav --libav-format mkv -o test.raw --libav-audio, Enable audio recording ---- -Set this option to enable audio encoding together with the video stream. When audio encodding is enabled, an output format that supports audio (e.g. mpegts, mkv, mp4) must be used. +Set this option to enable audio encoding together with the video stream. When audio encoding is enabled, an output format that supports audio (e.g. mpegts, mkv, mp4) must be used. ---- --audio-codec, Selects the audio codec ---- -Selects which software audio codec is used for encoding. By default `aac` is used. To list the available audio codecs, use the ``ffmpeg -codec`` command. +Selects which software audio codec is used for encoding. By default `aac` is used. To list the available audio codecs, use the `ffmpeg -codec` command. ---- --audio-bitrate, Selects the audio bitrate @@ -38,10 +38,10 @@ Sets the audio encoding bitrate in bits per second. Example: To record audio at 16 kilobits/sec with the mp2 codec use `libcamera-vid --codec libav -o test.mp4 --audio_codec mp2 --audio-bitrate 16384` ---- - --audio-device, Chooses and audio recording device to use + --audio-device, Chooses an audio recording device to use ---- -Selects which ALSA input device to use for audio encoding. The audio device string can be obtained by the following command: +Selects which ALSA input device to use for audio recording. The audio device string can be obtained with the following command: ---- pi@pi4:~ $ pactl list | grep -A2 'Source #' | grep 'Name: ' From 8c4f31a724f70fbfaed249384ecfa92c196df238 Mon Sep 17 00:00:00 2001 From: Liz Upton Date: Thu, 30 Jun 2022 07:54:47 +0100 Subject: [PATCH 2/4] Style Capitalisation. It's a pathology. --- .../raspberry-pi-pico/about_pico.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/asciidoc/microcontrollers/raspberry-pi-pico/about_pico.adoc b/documentation/asciidoc/microcontrollers/raspberry-pi-pico/about_pico.adoc index ddfc1148e..d85b3d3d6 100644 --- a/documentation/asciidoc/microcontrollers/raspberry-pi-pico/about_pico.adoc +++ b/documentation/asciidoc/microcontrollers/raspberry-pi-pico/about_pico.adoc @@ -1,4 +1,4 @@ -== The Family +== The family image::images/three_picos.jpg[width="75%"] @@ -11,7 +11,7 @@ Raspberry Pi Pico is a low-cost, high-performance microcontroller board with fle * xref:rp2040.adoc#welcome-to-rp2040[RP2040] microcontroller chip designed by Raspberry Pi in the United Kingdom * Dual-core Arm Cortex M0+ processor, flexible clock running up to 133 MHz -* 264kB of SRAM, and 2MB of on-board Flash memory +* 264kB of SRAM, and 2MB of on-board flash memory * USB 1.1 with device and host support * Low-power sleep and dormant modes * Drag-and-drop programming using mass storage over USB @@ -26,7 +26,7 @@ The Raspberry Pi Pico comes as a castellated module allows soldering direct to c NOTE: Both boards have a three pin Serial Wire Debug (SWD) header. However, the Pico H has this broken out into a small, keyed, https://datasheets.raspberrypi.com/debug/debug-pin-connector-specification.pdf[3-pin connector] while the Pico has three castellated through-hole pins adjacent to the edge of the board. -=== Pinout and Design Files +=== Pinout and design files image::images/pico-pinout.svg[] @@ -35,15 +35,15 @@ image::images/pico-pinout.svg[] * Download https://datasheets.raspberrypi.com/pico/Pico-R3-step.zip[STEP File] * Download https://datasheets.raspberrypi.com/pico/Pico-R3-Fritzing.fzpz[Fritzing Part] -NOTE: More information on Fritzing is available on the https://fritzing.org/[fritzing.org] web site. +NOTE: More information on Fritzing is available on the https://fritzing.org/[fritzing.org] website. == Raspberry Pi Pico W Raspberry Pi Pico W adds on-board single-band 2.4GHz wireless interfaces (802.11n) using the Infineon CYW4343 while retaining the Pico form factor. The on-board 2.4GHz wireless interface has the following features: -* Wireless (802.11n), Single-band (2.4 GHz) +* Wireless (802.11n), single-band (2.4 GHz) * WPA3 -* Soft Access Point supporting up to 4 clients +* Soft access point supporting up to four clients The antenna is an onboard antenna licensed from ABRACON (formerly ProAnt). The wireless interface is connected via SPI to the xref:rp2040.adoc#welcome-to-rp2040[RP2040] microcontroller. @@ -57,7 +57,7 @@ For best wireless performance, the antenna should be in free space. For instance antenna can reduce its performance both in terms of gain and bandwidth. Adding grounded metal to the sides of the antenna can improve the antenna’s bandwidth. -=== Pinout and Design Files +=== Pinout and design files image::images/picow-pinout.svg[] From 7bc9c2f0108b9f432bdb7e0b10b79bf7f43decbe Mon Sep 17 00:00:00 2001 From: RuffaloLavoisier Date: Fri, 1 Jul 2022 11:33:49 +0900 Subject: [PATCH 3/4] index.json : fix raspberry word in description --- documentation/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/index.json b/documentation/index.json index 36dbc5962..4940025f5 100644 --- a/documentation/index.json +++ b/documentation/index.json @@ -158,7 +158,7 @@ }, { "title": "Raspberry Pi Pico and Pico W", - "description": "Support for Rapsbery Pi Pico, Pico H, and Pico W", + "description": "Support for Raspberry Pi Pico, Pico H, and Pico W", "image": "full-sized/Pico.png", "subpath": "raspberry-pi-pico.adoc" }, From c55fbfa67ea69bc2d8ad362e2538e81938cced92 Mon Sep 17 00:00:00 2001 From: Alasdair Allan Date: Sun, 3 Jul 2022 11:29:59 +0100 Subject: [PATCH 4/4] What hardware --- .../microcontrollers/micropython.adoc | 4 +++- .../micropython/what-board.adoc | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 documentation/asciidoc/microcontrollers/micropython/what-board.adoc diff --git a/documentation/asciidoc/microcontrollers/micropython.adoc b/documentation/asciidoc/microcontrollers/micropython.adoc index 8fb74a438..0658e9643 100644 --- a/documentation/asciidoc/microcontrollers/micropython.adoc +++ b/documentation/asciidoc/microcontrollers/micropython.adoc @@ -1,5 +1,7 @@ include::micropython/what-is-micropython.adoc[] +NOTE: If you’re new to MicroPython, our official guide, "https://hsmag.cc/picobook[Get started with MicroPython on Raspberry Pi Pico]", is a great place to start. Learn the basics of MicroPython and physical computing, connect your Pico to displays and sensors, build alarms, reaction games, and more. + include::micropython/drag-and-drop.adoc[] -NOTE: If you’re new to MicroPython, our official guide, "https://hsmag.cc/picobook[Get started with MicroPython on Raspberry Pi Pico]", is a great place to start. Learn the basics of MicroPython and physical computing, connect your Pico to displays and sensors, build alarms, reaction games, and more. +include::micropython/what-board.adoc[] diff --git a/documentation/asciidoc/microcontrollers/micropython/what-board.adoc b/documentation/asciidoc/microcontrollers/micropython/what-board.adoc new file mode 100644 index 000000000..0bafc6a99 --- /dev/null +++ b/documentation/asciidoc/microcontrollers/micropython/what-board.adoc @@ -0,0 +1,21 @@ +== Which hardware am I running on? + +There is no direct method for software written in MircoPython to discover whether it is running on a Raspberry Pi Pico or a Pico W by looking at the hardware. However, you can tell indirectly by looking to see if network functionality is included in your particular MicroPython firmware: + +[source,python] +---- +import network +if hasattr(network, "WLAN"): + # the board has WLAN capabilities +---- + +Alternatively, you can inspect the MicroPython firmware version to check whether it was compiled for Raspberry Pi Pico or for Pico W using the `sys` module. + +[source] +---- +>>> import sys +>> sys.implementation +(name='micropython', version=(1, 19, 1), _machine='Raspberry Pi Pico W with RP2040', _mpy=4102) +---- + +So `if 'Pico W' in sys.implementation._machine` can be used to detect whether your firmware was compiled for Pico W. \ No newline at end of file