From 99cf12c2b519a479301cc3309d6c450ca9743b04 Mon Sep 17 00:00:00 2001 From: legop3 Date: Thu, 27 Nov 2025 17:57:37 -0500 Subject: [PATCH] ohhhhh..duh --- pi/install_roverd.sh | 8 ++++---- pi/roverd/config.go | 2 +- pi/roverd/roverd.sample.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh index f222d46e..fde61fea 100755 --- a/pi/install_roverd.sh +++ b/pi/install_roverd.sh @@ -112,7 +112,7 @@ ensure_pwm_overlay() { log "WARNING: unable to locate /boot config.txt; please ensure dtoverlay=pwm-2chan is added manually for servo support" return fi - if grep -Eq '^\s*dtoverlay=pwm(-2chan)?\b' "$boot_config"; then + if grep -Eq '^\s*dtoverlay=pwm(-2chan)?' "$boot_config"; then log "PWM overlay already present in $boot_config" return fi @@ -120,10 +120,10 @@ ensure_pwm_overlay() { cp "$boot_config" "$backup" { echo "" - echo "# Added by roverd installer to expose PWM hardware for camera servo control" - echo "dtoverlay=pwm-2chan" + echo "# Added by roverd installer to expose PWM hardware for camera servo control on GPIO12/13 (leaves GPIO18/19 free for I2S)" + echo "dtoverlay=pwm-2chan,pin=12,func=4,pin2=13,func2=4" } >> "$boot_config" - log "Enabled dtoverlay=pwm-2chan in $boot_config (backup at $backup). Reboot required for changes to apply." + log "Enabled dtoverlay=pwm-2chan on GPIO12/13 in $boot_config (backup at $backup). Reboot required for changes to apply." } ensure_user roverd "dialout,gpio,video,render" diff --git a/pi/roverd/config.go b/pi/roverd/config.go index 16d6dd55..6f552df8 100644 --- a/pi/roverd/config.go +++ b/pi/roverd/config.go @@ -130,7 +130,7 @@ func LoadConfig(path string) (*Config, error) { VideoBitrate: 3000000, }, CameraServo: CameraServoConfig{ - Pin: 19, + Pin: 12, FreqHz: 50, CycleLen: 20000, MinPulseUs: 900, diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml index a92c59ec..98df36fc 100644 --- a/pi/roverd/roverd.sample.yaml +++ b/pi/roverd/roverd.sample.yaml @@ -27,7 +27,7 @@ media: healthInterval: 30s cameraServo: enabled: false - pin: 19 + pin: 12 freqHz: 50 cycleLen: 20000 minPulseUs: 900