diff --git a/content.zh/docs/Installation/lomo-frame/_index.md b/content.zh/docs/Installation/lomo-frame/_index.md index 5f0804d..d272948 100644 --- a/content.zh/docs/Installation/lomo-frame/_index.md +++ b/content.zh/docs/Installation/lomo-frame/_index.md @@ -32,7 +32,32 @@ sudo apt install lomo-frame 如果您已经安装了Lomo-frame程序，它会在开机后自动启动。 -如果树莓派没有连上网络，您需要先将其连上网络，如果您使用WiFi，先连上HDMI和键盘，然后重启设备，按照屏幕上的提示进入命令行并登陆，接下来可以使用命令`wifi_switch client [wifi-ssid] [wifi-password]`, 用您自己的配置替换"[wifi-ssid]"和"[wifi-password]"。 +如果树莓派没有连上网络，您需要先将其连上网络，如果您使用WiFi，先连上HDMI和键盘，然后重启设备，按照屏幕上的提示进入命令行并登陆，接下来可以使用命令`wifi_switch.sh client [wifi-ssid] [wifi-password]`, 用您自己的配置替换"[wifi-ssid]"和"[wifi-password]"。 + +{{< hint warning >}} +您有可能会碰到"Wi-Fi is currently blocked by rfkill"的问题，可以执行下面的命令检查一下WiFi是否被禁用: + +``` +pi@raspberrypi:~ $ sudo rfkill list all +0: phy0: Wireless LAN + Soft blocked: no + Hard blocked: no +1: hci0: Bluetooth + Soft blocked: yes + Hard blocked: no +``` + +您可以使用下面的命令来启用WiFi: + +``` +sudo rfkill unblock 0 +``` + +这里“0”是上面Wireless LAN的序号。 + +启用之后您可以再尝试`wifi_switch.sh`。 + +{{< /hint >}} 网络设置完成后，重启，会显示QRCode，您可以到Lomorage iOS APP的设置页面，注册相框，然后您就可以使用手机应用程序来分享照片给数码相框。 @@ -145,7 +170,7 @@ sudo sed -i "s/media_type =.*/media_type = all/" /opt/lomorage/var/video_looper. - 2. 设置WiFi连接 -键盘连接到Raspberry Pi zero W并登陆, 如果您是Lomorage的树莓派镜像，可以使用命令`wifi_switch client [wifi-ssid] [wifi-password]`, 用您自己的配置替换"[wifi-ssid]"和"[wifi-password]"。如果使用其他系统，您可以参考网上其他资料来设置WiFi连接。 +键盘连接到Raspberry Pi zero W并登陆, 如果您是Lomorage的树莓派镜像，可以使用命令`wifi_switch.sh client [wifi-ssid] [wifi-password]`, 用您自己的配置替换"[wifi-ssid]"和"[wifi-password]"。如果使用其他系统，您可以参考网上其他资料来设置WiFi连接。 - 3. 检查主树莓派的IP地址 diff --git a/content.zh/docs/Installation/lomorage-service/installation-raspbian.md b/content.zh/docs/Installation/lomorage-service/installation-raspbian.md index 67d6e25..7bc6399 100644 --- a/content.zh/docs/Installation/lomorage-service/installation-raspbian.md +++ b/content.zh/docs/Installation/lomorage-service/installation-raspbian.md @@ -143,7 +143,7 @@ sudo apt install lomo-base lomo-vips lomo-backend lomo-web lomo-frame -y ExecStart=/opt/lomorage/bin/lomod -b /opt/lomorage/var --mount-dir /media/pi --max-upload 1 --max-fetch-preview 3 ``` -**请确保您的用户有上面设置的"mount-dir"的读写权限** +**请确保您的用户有上面设置的"mount-dir"的读写权限, 另外改参数必须是mount的父目录，比如mount到"/media/pi/disk0"下面，就必须指定为"/media/pi"** ### 4. 运行 diff --git a/content/docs/Installation/lomo-frame/_index.md b/content/docs/Installation/lomo-frame/_index.md index 12a2730..c801aaf 100644 --- a/content/docs/Installation/lomo-frame/_index.md +++ b/content/docs/Installation/lomo-frame/_index.md @@ -36,7 +36,32 @@ Once you have Lomo-frame running, it will show a QRCode on the screen, and you c If you have Lomo-frame installed, it will launch on boot. -If the Raspberry Pi is not connected to the network, you need to connect it first, if you prefer to use WiFi, connect HDMI and keyboard with Raspberry Pi and reboot, follow the instruction on screen to enter in terminal and login Raspberry Pi, then you can use the command `wifi_switch client [wifi-ssid] [wifi-password]`, replace "[wifi-ssid]" and "[wifi-password]" with those of your wifi network. +If the Raspberry Pi is not connected to the network, you need to connect it first, if you prefer to use WiFi, connect HDMI and keyboard with Raspberry Pi and reboot, follow the instruction on screen to enter in terminal and login Raspberry Pi, then you can use the command `wifi_switch.sh client [wifi-ssid] [wifi-password]`, replace "[wifi-ssid]" and "[wifi-password]" with those of your wifi network. + +{{< hint warning >}} +You probably will have the problem that "Wi-Fi is currently blocked by rfkill". You can confirm this by running: + +``` +pi@raspberrypi:~ $ sudo rfkill list all +0: phy0: Wireless LAN + Soft blocked: no + Hard blocked: no +1: hci0: Bluetooth + Soft blocked: yes + Hard blocked: no +``` + +And you can enable WiFi by running: + +``` +sudo rfkill unblock 0 +``` + +assuming 0 is the index of Wireless LAN. + +After this, you can try `wifi_switch.sh` again. + +{{< /hint >}} Once setup network, reboot and it will show a QRCode, you can go to "Settings" Tab in Lomorage iOS APP to register the frame, then you can use either Lomorage iOS APP or Lomorage Android APP to share photos with the digital frame. @@ -149,7 +174,7 @@ You can follow the instructions on the top of the page. - 2. Setup WiFi connection -Connect keyboard with Raspberry Pi zero W and login, if you installed Lomorage Raspberry Pi OS image, the default user name is "lomoware" and password is "lomorage", you can use the command `wifi_switch client [wifi-ssid] [wifi-password]`, replace "[wifi-ssid]" and "[wifi-password]" with those of your wifi network; otherwise, you can refer to other docs online to set the WiFi connection. +Connect keyboard with Raspberry Pi zero W and login, if you installed Lomorage Raspberry Pi OS image, the default user name is "lomoware" and password is "lomorage", you can use the command `wifi_switch.sh client [wifi-ssid] [wifi-password]`, replace "[wifi-ssid]" and "[wifi-password]" with those of your wifi network; otherwise, you can refer to other docs online to set the WiFi connection. - 3. Check IP address of primary Raspberry Pi diff --git a/content/docs/Installation/lomorage-service/installation-raspbian.md b/content/docs/Installation/lomorage-service/installation-raspbian.md index 2c90569..b894450 100644 --- a/content/docs/Installation/lomorage-service/installation-raspbian.md +++ b/content/docs/Installation/lomorage-service/installation-raspbian.md @@ -137,13 +137,13 @@ sudo apt install lomo-base lomo-vips lomo-backend lomo-web lomo-frame -y You may need to specify the mount directory if the USB drive is not mounted in "/media" directory. -For example if you are using PCManFM, then the mount directory will be "/media/pi". To specify the mount directory to be "/media/pi", modify `ExecStart` in "/lib/systemd/system/lomod.service", and add parameter "--mount-dir" as below +For example if you are using PCManFM, then the mount directory will be "/media/pi". To specify the mount directory to be "/media/pi", modify `ExecStart` in "/lib/systemd/system/lomod.service", and add parameter "--mount-dir" as below, **this parameter should be the directory mount, not the sub-directory** ```bash ExecStart=/opt/lomorage/bin/lomod -b /opt/lomorage/var --mount-dir /media/pi --max-upload 1 --max-fetch-preview 3 ``` -**Make sure the user has the r/w permission for the "mount-dir" set above** +**Make sure the user has the r/w permission for the "mount-dir" set above, this parameter should be the parent directory mounted, for example if it's mounted as "/media/pi/disk0", then you should use "/media/pi/".** ### 4. Run diff --git a/public b/public index 58f3462..f83415f 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 58f34624bc85339d34f135186b0430c6ac01f1c2 +Subproject commit f83415f3961b86bde416bb574f72819fc6ce6e58