Merge pull request #102 from mikevanis/main

Remove redundant calls to enable camera, add legacy call
interactionresearchstudio · Feb 21, 2022 · 4c0b023 · 4c0b023
2 parents aaf4382 + f89c40b
commit 4c0b023
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -35,7 +35,7 @@ If applicable, add screenshots to help explain your problem.
  - Version [e.g. 22]
 
 **Hardware**
-- Device: [e.g. Pi Zero W]
+- Device: [e.g. Pi Zero 2 W]
 - Camera: [e.g. ZeroCam v1.0]
 - Naturewatch Camera software version: [e.g. v1.4.1]
 - Power supply used: [e.g. Official Pi Adapter]

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -18,6 +18,7 @@ Please also list any relevant details for your test configuration.
 
 **Tested on the following devices**:
 - [ ] Development environment (Linux, Windows, or MacOS)
+- [ ] Pi Zero 2 W
 - [ ] Pi Zero W
 - [ ] Pi 3A+
 - [ ] Pi 3B+

diff --git a/os/modules/naturewatchcamera/start_chroot_script b/os/modules/naturewatchcamera/start_chroot_script
@@ -40,8 +40,7 @@ echo "$NATUREWATCHCAMERA_VAR"
  apt-get install -y gpac
 
 echo "Enabling legacy camera support for Pi Zero W 2"
-raspi-config nonint do_camera 1
-echo "start_x=1" >> /boot/config.txt
+raspi-config nonint do_legacy 0
 
 echo "Installing OpenCV"
 pip3 install -U pip numpy opencv-python-headless