From 5082aac17edbef6a911509b5f9ad820d141dec78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Werner=20Sch=C3=A4ffer?= Date: Fri, 7 Apr 2023 20:07:47 +0200 Subject: [PATCH] Update OpenScan.py fixed invalid libcamera-stil options --- update/mini/OpenScan.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/update/mini/OpenScan.py b/update/mini/OpenScan.py index 5837204..1569093 100644 --- a/update/mini/OpenScan.py +++ b/update/mini/OpenScan.py @@ -132,14 +132,19 @@ def take_photo(file): AF = load_bool('cam_AFmode') camera = load_str('camera') - - if camera == 'imx519' and AF == True: - autofocus = ' --autofocus ' + if camera == 'imx519': + if AF == True: + autofocus = ' --autofocus-mode auto ' + else: + autofocus = ' --autofocus-mode manual ' else: autofocus = '' - cmd = 'libcamera-still -n --denoise off --sharpness 0 -o ' + filepath2 + ' -t ' + timeout +' --shutter ' + shutter + ' --saturation ' + saturation + ' --contrast ' + contrast + ' --awbgains '+awbg_red + "," + awbg_blue + ' --gain ' + gain + ' -q ' + str(quality) + autofocus + ' >/dev/null 2>&1' -# cmd = 'libcamera-still -n --denoise off --sharpness 0 -o ' + filepath2 + ' -t ' + timeout +' --shutter ' + shutter + ' --saturation ' + saturation + ' --contrast ' + contrast + ' --awbgains '+awbg_red + "," + awbg_blue + ' --gain ' + gain + ' -q ' + str(quality) + autofocus + if camera == "usb_webcam": + cmd = 'fswebcam -i 0 -r "1280x720" -F 5 --no-banner --jpeg 95 --save ' + filepath2 + else: + cmd = 'libcamera-still -n --denoise off --sharpness 0 -o ' + filepath2 + ' --shutter ' + shutter + ' --saturation ' + saturation + ' --contrast ' + contrast + ' --awbgains '+awbg_red + "," + awbg_blue + ' --gain ' + gain + ' -q ' +str(quality) + autofocus + ' >/dev/null 2>&1' + system(cmd) return cmd