Skip to content

Commit f6db160

Browse files
Update docs (MiczFlor#2216)
* minor fixes * add "Pre-install preparation / workarounds" section add "Workaround for network related features on bookworm" * add "Workaround for 64-bit Kernels" harmonize and update description / message * minor fix * Update warning block as alerts are not supported inside of "details" * minor fix * fix Raspberry Pi OS name Co-authored-by: s-martin <[email protected]> * fix Raspberry Pi OS name * fix typo * added link to installation * updates from reviews * fix file for synchronisation doc. moved to components * add docs for samba * Apply suggestions from code review Co-authored-by: s-martin <[email protected]> * restructure builders readme --------- Co-authored-by: s-martin <[email protected]>
1 parent 6f09764 commit f6db160

File tree

13 files changed

+93
-37
lines changed

13 files changed

+93
-37
lines changed

documentation/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ project check out the [documentation of Version 2](https://github.com/MiczFlor/R
4242
Version 3 has reached a mature state and will soon be the default version.
4343
However, some features may still be missing. Please check the [Feature Status](./developers/status.md), if YOUR feature is already implemented.
4444

45-
> ![NOTE] If version 3 has all the features you need, we recommend using Version 3.
45+
> [!NOTE]
46+
> If version 3 has all the features you need, we recommend using Version 3.
4647
4748
If there is a feature missing, please open an issue.
4849

documentation/builders/README.md

+13-9
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66
* [Update](./update.md)
77
* [Configuring Phoniebox](./configuration.md)
88

9-
## Configuration
9+
## Features
1010

11-
* [Audio](./audio.md)
12-
* [RFID](./rfid.md)
11+
* Audio
12+
* [Audio Output](./audio.md)
13+
* [Bluetooth audio buttons](./bluetooth-audio-buttons.md)
1314
* [GPIO Recipes](./gpio.md)
1415
* [Card Database](./card-database.md)
15-
* [Troubleshooting](./troubleshooting.md)
16+
* [RFID Cards synchronisation](./components/synchronisation/rfidcards.md)
17+
* [Auto Hotspot](./autohotspot.md)
18+
* File Management
19+
* [Network share / Samba](./samba.md)
20+
21+
## Hardware Components
1622

17-
## Components
1823
* [Power](./components/power/)
1924
* [OnOff SHIM for safe power on/off](./components/power/onoff-shim.md)
2025
* [Soundcards](./components/soundcards/)
2126
* [HiFiBerry Boards](./components/soundcards/hifiberry.md)
22-
27+
* [RFID Readers](./../developers/rfid/README.md)
28+
2329
## Advanced
24-
25-
* [Bluetooth (and audio buttons)](./bluetooth-audio-buttons.md)
26-
* [Auto Hotspot](./autohotspot.md)
30+
* [Troubleshooting](./troubleshooting.md)
2731
* [Concepts](./concepts.md)
2832
* [System](./system.md)
2933
* [RPC Commands](./rpc-commands.md)

documentation/builders/rfid.md documentation/builders/components/synchronisation/rfidcards.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# RFID
2-
3-
## Syncronisation RFID Cards
1+
# Synchronisation RFID Cards
42

53
This component handles the synchronisation of RFID cards (audiofolder
64
and card database entries).
@@ -15,7 +13,7 @@ RFID card to the command. For the \"RFID scan sync\" feature, activate
1513
the option in the configuration or bind a RFID card to the command for
1614
dynamic activation or deactivation.
1715

18-
### Synchronisation
16+
## Synchronisation
1917

2018
The synchronisation will be FROM a server TO the Phoniebox, overriding
2119
existing files. A local configuration will be lost after the
@@ -26,7 +24,7 @@ To access the files on the server, 2 modes are supported: SSH or MOUNT.
2624
Please make sure you have the correct access rights to the source and
2725
use key-based authentication for SSH.
2826

29-
#### RFID scan sync
27+
### RFID scan sync
3028

3129
If the feature \"RFID scan sync\" is activated, there will be a check on
3230
every RFID scan against the server if a matching card entry and audiofolder is available. If so, changes will be synced. The playback
@@ -40,7 +38,7 @@ deleted on remote. This is also true for changed card entries (the old
4038
audiofolder / -files will remain). To remove not existing items us a
4139
\"sync-all\".
4240

43-
### Configuration
41+
## Configuration
4442

4543
Set the corresponding setting in `shared\settings\jukebox.yaml` to
4644
activate this feature.

documentation/builders/configuration.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ The majority of configuration options is only available by editing the config fi
77
*when the service is not running!*
88
Don't fear (overly), they contain commentaries.
99

10-
For several aspects we have [configuration tools](../developers/coreapps.md#configuration-tools) and detailed guides:
11-
12-
* [Audio Configuration](./audio.md#audio-configuration)
13-
* [RFID Reader Configuration](../developers/rfid/basics.md#reader-configuration)
14-
* [GPIO Recipes](./gpio.md)
10+
For several aspects we have [configuration tools](../developers/coreapps.md#configuration-tools) and [detailed guides](./README.md#features).
1511

1612
Even after running the tools, certain aspects can only be changed by modifying the configuration files directly.
1713

documentation/builders/installation.md

+41-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ Before you can install the Phoniebox software, you need to prepare your Raspberr
1010
1. Connect a Micro SD card to your computer (preferable an SD card with high read throughput)
1111
2. Download the [Raspberry Pi Imager](https://www.raspberrypi.com/software/) and run it
1212
3. Click on "Raspberry Pi Device" and select "No filtering"
13-
4. Select **Raspberry Pi OS Lite (32-bit)** (without desktop environment) as the operating system. `future3` does not support 64bit kernels (`aarch64`).
13+
4. As operating system select **Raspberry Pi OS (other)** and then **Raspberry Pi OS Lite (Legacy, 32-bit)** (no desktop environment). *64-bit is currently not supported*.
14+
* Bookworm support is partly broken, see [here](#workaround-for-network-related-features-on-bookworm).
15+
* For Pi 4 and newer also check [this](#workaround-for-64-bit-kernels-pi-4-and-newer).
1416
5. Select your Micro SD card (your card will be formatted)
1517
6. After you click `Next`, a prompt will ask you if you like to customize the OS settings
1618
* Click `Edit Settings`
@@ -26,12 +28,12 @@ Before you can install the Phoniebox software, you need to prepare your Raspberr
2628
8. Confirm the next warning about erasing the SD card with `Yes`
2729
9. Wait for the imaging process to be finished (it'll take a few minutes)
2830

31+
32+
### Pre-boot preparation
2933
<details>
3034

3135
<summary>In case you forgot to customize the OS settings, follow these instructions after RPi OS has been written to the SD card.</summary>
3236

33-
### Pre-boot preparation
34-
3537
You will need a terminal, like PuTTY for Windows or the Terminal app for Mac to proceed with the next steps.
3638

3739
1. Open a terminal of your choice.
@@ -77,6 +79,42 @@ You will need a terminal, like PuTTY for Windows or the Terminal app for Mac to
7779
7880
</details>
7981
82+
### Pre-install preparation / workarounds
83+
84+
#### Workaround for network related features on Bookworm
85+
<details>
86+
With Bookworm the network settings have changed. Now "NetworkManager" is used instead of "dhcpcd".
87+
This breaks breaks network related features like "Static IP", "Wifi Setup" and "Autohotspot".
88+
Before running the installation, the network config has to be changed via raspi-config, to use the "old" dhcpcd network settings.
89+
90+
:warning:
91+
If the settings are changed, your network will reset and Wifi will not be configured, so you lose ssh access via wireless connection.
92+
So make sure you use a wired connection or perform the following steps in a local terminal with a connected monitor and keyboard.
93+
94+
Change network config
95+
* run `sudo raspi-config`
96+
* select `6 - Advanced Options`
97+
* select `AA - Network Config`
98+
* select `dhcpcd`
99+
100+
If you need Wifi, add the information now
101+
* select `1 - System Options`
102+
* select `1 - Wireless LAN`
103+
* enter Wifi information
104+
</details>
105+
106+
#### Workaround for 64-bit Kernels (Pi 4 and newer)
107+
<details>
108+
109+
The installation process checks if a 32-bit OS is running, as 64-bit is currently not supported.
110+
This check also fails if the kernel is running in 64-bit mode. This is the default for Raspberry Pi models 4 and newer.
111+
112+
To be able to run the installation, you have to switch to the 32-bit mode by modifying the `config.txt` and add/change the line `arm_64bit=0`.
113+
Up to Bullseye, the `config.txt` file is located at `/boot/`. Since Bookworm, the location changed to `/boot/firmware/` ([see here](https://www.raspberrypi.com/documentation/computers/config_txt.html)).
114+
115+
Reboot before you proceed.
116+
</details>
117+
80118
## Install Phoniebox software
81119
82120
Choose a version, run the corresponding install command in your SSH terminal and follow the instructions.

documentation/builders/samba.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Samba
2+
3+
To conveniently copy files to your Phoniebox via network `samba` can be configured during the installation. The folder `./shared/` will be exposed as network share `phoniebox`, giving you access to the audio and config folders.
4+
5+
## Connect
6+
7+
To access the share open your OS network environment and select your Phoniebox device.
8+
Alternatively directly access it via url with the file explorer (e.g. Windows `\\<ip-address-of-your-phoniebox>`, MacOS `smb://<ip-address-of-your-phoniebox>`).
9+
10+
See also
11+
* [MacOS](https://support.apple.com/lt-lt/guide/mac-help/mchlp1140/mac)
12+
13+
## User name / Password
14+
15+
As login credentials use the same username you used to run the installation with. The password is `raspberry`.
16+
You can change the password anytime using the command `sudo smbpasswd -a "<your-username>"`.
17+
18+

documentation/builders/update.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ $ ./run_rebuild.sh -u
3535
## Migration Path from Version 2
3636

3737
There is no update path coming from Version 2.x of the Jukebox.
38-
You need to do a fresh install of Version 3 on a fresh Raspian Bullseye image.
38+
You need to do a fresh install of Version 3 on a fresh Raspberry Pi OS image.
39+
See [Installing Phoniebox future3](./installation.md).
3940

4041
> [!IMPORTANT]
4142
> Do start with a fresh SD card image!

documentation/developers/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
* [Jukebox Apps](./coreapps.md)
1111
* [Web App](./webapp.md)
12-
* [RFID Readers](./rfid)
12+
* [RFID Readers](./rfid/README.md)
1313
* [Docstring API Docs (from py files)](./docstring/README.md)
1414
* [Plugin Reference](./docstring/README.md#jukeboxplugs)
1515
* [Feature Status](./status.md)

documentation/developers/docstring/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ This means must also run as user process, as described in
12451245
## Misc
12461246

12471247
PulseAudio may switch the sink automatically to a connecting bluetooth device depending on the loaded module
1248-
with name module-switch-on-connect. On RaspianOS Bullseye, this module is not part of the default configuration
1248+
with name module-switch-on-connect. On Raspberry Pi OS Bullseye, this module is not part of the default configuration
12491249
in ``/usr/pulse/default.pa``. So, we don't need to worry about it.
12501250
If the module gets loaded it conflicts with the toggle on connect and the selected primary / secondary outputs
12511251
from the Jukebox. Remove it from the configuration!

installation/includes/02_helpers.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ get_architecture() {
7575
echo $arch
7676
}
7777

78-
is_raspian() {
78+
is_raspbian() {
7979
if [[ $( . /etc/os-release; printf '%s\n' "$ID"; ) == *"raspbian"* ]]; then
8080
echo true
8181
else
@@ -89,7 +89,7 @@ get_debian_version_number() {
8989
}
9090

9191
get_boot_config_path() {
92-
if [ "$(is_raspian)" = true ]; then
92+
if [ "$(is_raspbian)" = true ]; then
9393
local debian_version_number=$(get_debian_version_number)
9494

9595
# Bullseye and lower

installation/install-jukebox.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ Check install log for details:"
8686
exit 1
8787
}
8888

89-
# Check if current distro is a 32 bit version
90-
# Support for 64 bit Distros has not been checked (or precisely: is known not to work)
91-
# All RaspianOS versions report as machine "armv6l" or "armv7l", if 32 bit (even the ARMv8 cores!)
89+
# Check if current distro is a 32-bit version
90+
# Support for 64-bit Distros has not been checked (or precisely: is known not to work)
91+
# All Raspberry Pi OS versions report as machine "armv6l" or "armv7l", if 32-bit (even the ARMv8 cores!)
9292
_check_os_type() {
9393
local os_type=$(uname -m)
9494

@@ -97,8 +97,8 @@ _check_os_type() {
9797
if [[ $os_type == "armv7l" || $os_type == "armv6l" ]]; then
9898
print_lc " ... OK!\n"
9999
else
100-
print_lc "ERROR: Only 32 bit operating systems supported. Please use a 32bit version of RaspianOS!"
101-
print_lc "You can fix this problem for 64bit kernels: https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/2041"
100+
print_lc "ERROR: Only 32-bit operating systems are supported. Please use a 32-bit version of Raspberry Pi OS!"
101+
print_lc "For Pi 4 models or newer running a 64-bit kernels, also see this: https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/2041"
102102
exit 1
103103
fi
104104
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GUI-based mock reader also requires: tkinter
22
# tkinter is a standard Python package and needs not be installed separately
3-
# It is available on most Unix systems (but not on headless Raspbian RPi where running a GUI is difficult anyway)
3+
# It is available on most Unix systems (but not on headless Raspberry Pi OS where running a GUI is difficult anyway)
44
# You need to install these with `python -m pip install --upgrade --force-reinstall -q -r requirements.txt`
55

66
ttkthemes

src/jukebox/components/volume/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
## Misc
3434
3535
PulseAudio may switch the sink automatically to a connecting bluetooth device depending on the loaded module
36-
with name module-switch-on-connect. On RaspianOS Bullseye, this module is not part of the default configuration
36+
with name module-switch-on-connect. On Raspberry Pi OS Bullseye, this module is not part of the default configuration
3737
in ``/usr/pulse/default.pa``. So, we don't need to worry about it.
3838
If the module gets loaded it conflicts with the toggle on connect and the selected primary / secondary outputs
3939
from the Jukebox. Remove it from the configuration!
@@ -635,7 +635,7 @@ def finalize():
635635
global pulse_control
636636
# Set default output and start-up volume
637637
# Note: PulseAudio may switch the sink automatically to a connecting bluetooth device depending on the loaded module
638-
# with name module-switch-on-connect. On RaspianOS Bullseye, this module is not part of the default configuration.
638+
# with name module-switch-on-connect. On Raspberry Pi OS Bullseye, this module is not part of the default configuration.
639639
# So, we shouldn't need to worry about it. Still, set output and startup volume close to each other
640640
# to minimize bluetooth connection in between
641641
global pulse_control

0 commit comments

Comments
 (0)