Skip to content

treehouses camera on & off refactor (fixes #1300) #1385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 1, 2020
Merged

treehouses camera on & off refactor (fixes #1300) #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb7ed0
use raspi-config to enable/disable camera
ComputerOnFire May 30, 2020
71a4ec5
Update package.json
dogi Jun 1, 2020
6ccfee6
Merge branch 'master' into camera-revolutionize
dogi Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions modules/camera.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ function camera {

"on")
if ! grep -q "start_x=1" ${config} ; then
cat ${config} > ${configtemp}
echo "start_x=1" >> ${configtemp}
cat ${configtemp} > ${config}
echo "Camera settings have been enabled. A reboot is needed in order to use the camera."
raspi-config nonint do_camera 0
echo "Camera settings have been enabled."
elif grep -q "start_x=1" ${config} ; then
echo "Camera is already enabled. Use \"$BASENAME camera capture\" to take a photo."
echo "If you are having issues using the camera, try rebooting."
Expand All @@ -33,8 +31,8 @@ function camera {

"off")
if grep -q "start_x=1" ${config} ; then
sed -i '/start_x=1/d' ${config}
echo "Camera has been disabled. Reboot needed for settings to take effect."
raspi-config nonint do_camera 1
echo "Camera has been disabled."
elif ! grep -q "start_x=1" ${config} ; then
echo "Camera is already disabled. If camera is still enabled, try rebooting."
else
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@treehouses/cli",
"version": "1.21.19",
"version": "1.21.20",
"remote": "2346",
"description": "Thin command-line interface for Raspberry Pi low level configuration.",
"main": "cli.sh",
Expand Down