solve conflicts
This commit is contained in:
jr-k
commit
7dd0ff09fb
@ -34,7 +34,7 @@ Use a RaspberryPi (Lite OS) to show a fullscreen slideshow (Kiosk-mode)
|
||||
[<img src="https://github.com/jr-k/obscreen/blob/master/docs/img/discord.png" width="64">](https://discord.obscreen.io)
|
||||
|
||||
### Open an Issue or a Pull Request on Github
|
||||
[<img src="https://github.com/jr-k/obscreen/blob/master/docs/img/github.png" width="64">](https://github.com/jr-k/obscreen/issues)
|
||||
[<img src="https://github.com/jr-k/obscreen/blob/master/docs/img/github.png" width="64">](https://github.com/jr-k/obscreen/issues/new/choose)
|
||||
|
||||
# Troubleshoot
|
||||
|
||||
|
||||
@ -96,22 +96,15 @@ sudo journalctl -u obscreen-studio -f
|
||||
|
||||
---
|
||||
## 📺 Run the player instance
|
||||
### Manually on any device capable of running chromium
|
||||
When you run the browser yourself don't forget to use these flags for chromium browser:
|
||||
```bash
|
||||
# chromium or chromium-browser or even chrome
|
||||
# replace http://localhost:5000 with your playlist url
|
||||
chromium --disable-features=Translate --ignore-certificate-errors --disable-web-security --disable-restore-session-state --autoplay-policy=no-user-gesture-required --start-maximized --allow-running-insecure-content --remember-cert-error-decisions --noerrdialogs --kiosk --incognito --window-position=0,0 --window-size=1920,1080 --display=:0 http://localhost:5000
|
||||
```
|
||||
|
||||
### Automatically on a raspberry pi with chromium and x11
|
||||
- Install x11 and obscreen-player systemd service
|
||||
### Autorun for a RaspberryPi
|
||||
- Install player autorun by executing following script (will install chromium, x11 and obscreen-player systemd service)
|
||||
```bash
|
||||
curl -fsSL https://raw.githubusercontent.com/jr-k/obscreen/master/system/install-autorun-rpi.sh | sudo bash -s -- $USER $HOME
|
||||
mkdir -p $HOME/obscreen/var/run
|
||||
nano $HOME/obscreen/var/run/play
|
||||
mkdir -p ~/obscreen/var/run
|
||||
nano ~/obscreen/var/run/play
|
||||
```
|
||||
- Copy this script in `$HOME/obscreen/var/run/play` file to autorun chromium with correct url (edit `http://localhost:5000` by anything you want)
|
||||
- Copy following script in `~/obscreen/var/run/play` file to enable chromium autorun (replace `http://localhost:5000` by your own `obscreen-studio` instance url)
|
||||
```
|
||||
#!/bin/bash
|
||||
|
||||
@ -140,12 +133,19 @@ chromium-browser --disable-features=Translate --ignore-certificate-errors --disa
|
||||
sudo systemctl restart obscreen-player.service
|
||||
```
|
||||
|
||||
### Manually on any device capable of running chromium
|
||||
When you run the browser yourself, don't forget to use these flags for chromium browser:
|
||||
```bash
|
||||
# chromium or chromium-browser or even chrome
|
||||
# replace http://localhost:5000 with your obscreen-studio instance url
|
||||
chromium --disable-features=Translate --ignore-certificate-errors --disable-web-security --disable-restore-session-state --autoplay-policy=no-user-gesture-required --start-maximized --allow-running-insecure-content --remember-cert-error-decisions --noerrdialogs --kiosk --incognito --window-position=0,0 --window-size=1920,1080 --display=:0 http://localhost:5000
|
||||
```
|
||||
---
|
||||
|
||||
## 📎 Additional
|
||||
|
||||
|
||||
### How to upgrade
|
||||
### How to upgrade `obscreen-studio`
|
||||
>#### with docker run
|
||||
- Just add `--pull=always` to your `docker run ...` command, you'll get latest version automatically.
|
||||
>#### or with docker compose
|
||||
|
||||
@ -11,13 +11,6 @@
|
||||
1. Download RaspberryPi Imager and setup an sdcard with `Raspberry Pi OS Lite` (🚨without desktop, only `Lite` version!). You'll find it under category `Raspberry PI OS (other)`
|
||||
2. Log into your RaspberryPi locally or via ssh (by default it's `ssh pi@raspberrypi.local`)
|
||||
|
||||
---
|
||||
|
||||
## 📺 Run the player instance
|
||||
Install player autorun by executing following script
|
||||
```bash
|
||||
curl -fsSL https://raw.githubusercontent.com/jr-k/obscreen/master/system/install-autorun-rpi.sh | sudo bash -s -- $USER $HOME
|
||||
```
|
||||
|
||||
---
|
||||
## 📡 Run the studio instance
|
||||
@ -112,7 +105,55 @@ sudo journalctl -u obscreen-studio -f
|
||||
## 👌 Usage
|
||||
- Page which plays slideshow is reachable at `http://raspberrypi.local:5000`
|
||||
- Slideshow manager is reachable at `http://raspberrypi.local:5000/manage`
|
||||
|
||||
|
||||
---
|
||||
## 📺 Run the player instance
|
||||
|
||||
### Autorun for a RaspberryPi
|
||||
- Install player autorun by executing following script (will install chromium, x11 and obscreen-player systemd service)
|
||||
```bash
|
||||
curl -fsSL https://raw.githubusercontent.com/jr-k/obscreen/master/system/install-autorun-rpi.sh | sudo bash -s -- $USER $HOME
|
||||
mkdir -p ~/obscreen/var/run
|
||||
nano ~/obscreen/var/run/play
|
||||
```
|
||||
- Copy following script in `~/obscreen/var/run/play` file to enable chromium autorun (replace `http://localhost:5000` by your own `obscreen-studio` instance url)
|
||||
```
|
||||
#!/bin/bash
|
||||
|
||||
# Disable screensaver and DPMS
|
||||
xset s off
|
||||
xset -dpms
|
||||
xset s noblank
|
||||
|
||||
# Start unclutter to hide the mouse cursor
|
||||
unclutter -display :0 -noevents -grab &
|
||||
|
||||
# Modify Chromium preferences to avoid restore messages
|
||||
mkdir -p /home/pi/.config/chromium/Default 2>/dev/null
|
||||
touch /home/pi/.config/chromium/Default/Preferences
|
||||
sed -i 's/"exited_cleanly": false/"exited_cleanly": true/' /home/pi/.config/chromium/Default/Preferences
|
||||
|
||||
RESOLUTION=$(DISPLAY=:0 xrandr | grep '*' | awk '{print $1}')
|
||||
WIDTH=$(echo $RESOLUTION | cut -d 'x' -f 1)
|
||||
HEIGHT=$(echo $RESOLUTION | cut -d 'x' -f 2)
|
||||
|
||||
# Start Chromium in kiosk mode
|
||||
chromium-browser --disable-features=Translate --ignore-certificate-errors --disable-web-security --disable-restore-session-state --autoplay-policy=no-user-gesture-required --start-maximized --allow-running-insecure-content --remember-cert-error-decisions --noerrdialogs --kiosk --incognito --window-position=0,0 --window-size=${WIDTH},${HEIGHT} --display=:0 http://localhost:5000
|
||||
```
|
||||
- Restart
|
||||
```bash
|
||||
sudo systemctl restart obscreen-player.service
|
||||
```
|
||||
|
||||
### Manually on any device capable of running chromium
|
||||
When you run the browser yourself, don't forget to use these flags for chromium browser:
|
||||
```bash
|
||||
# chromium or chromium-browser or even chrome
|
||||
# replace http://localhost:5000 with your obscreen-studio instance url
|
||||
chromium --disable-features=Translate --ignore-certificate-errors --disable-web-security --disable-restore-session-state --autoplay-policy=no-user-gesture-required --start-maximized --allow-running-insecure-content --remember-cert-error-decisions --noerrdialogs --kiosk --incognito --window-position=0,0 --window-size=1920,1080 --display=:0 http://localhost:5000
|
||||
```
|
||||
---
|
||||
|
||||
## ✨ You are done now :)
|
||||
- If everything is set up correctly, the RaspberryPi shall start chromium in fullscreen directly after boot screen and after some seconds of showing the date & time (`views/player/default.jinja.html`) your slideshow shall start and loop endlessly.
|
||||
- Make sure that `PLAYER_AUTOSTART_FILE` exists and is writeable !
|
||||
@ -130,7 +171,7 @@ https://www.raspberrypi.org/documentation/configuration/config-txt/video.md
|
||||
|
||||
However, I used this one: `(2,82) = 1920x1080 60Hz 1080p`
|
||||
|
||||
### How to upgrade
|
||||
### How to upgrade `obscreen-studio`
|
||||
>#### with docker run
|
||||
- Just add `--pull=always` to your `docker run ...` command, you'll get latest version automatically.
|
||||
>#### or with docker compose
|
||||
|
||||
Loading…
Reference in New Issue
Block a user