From efe8e5db8477dde81b9b29d564c54cd95dfa2bdb Mon Sep 17 00:00:00 2001 From: AGG2017 Date: Sun, 18 Feb 2024 21:45:14 -0500 Subject: [PATCH] Support for camera auto run --- .../{webcam/webcam.sh => camera/camera.sh} | 16 ++++++++++++++-- .../webcam.zip => camera/default/camera.zip} | Bin 15327 -> 16519 bytes options.cfg | 14 ++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) rename RESOURCES/OPTIONS/{webcam/webcam.sh => camera/camera.sh} (89%) rename RESOURCES/OPTIONS/{webcam/default/webcam.zip => camera/default/camera.zip} (77%) diff --git a/RESOURCES/OPTIONS/webcam/webcam.sh b/RESOURCES/OPTIONS/camera/camera.sh similarity index 89% rename from RESOURCES/OPTIONS/webcam/webcam.sh rename to RESOURCES/OPTIONS/camera/camera.sh index a5f660c..eb74596 100755 --- a/RESOURCES/OPTIONS/webcam/webcam.sh +++ b/RESOURCES/OPTIONS/camera/camera.sh @@ -13,6 +13,12 @@ fi project_root="$1" webcam_package="$2" +auto_start="N" +if [ "$webcam_package" == "default.run" ]; then + webcam_package="default" + auto_start="Y" +fi + # check the required tools app_version_tool=$(which app_version.sh) app_model_tool=$(which app_model.sh) @@ -43,14 +49,14 @@ if [ ! -d "$project_root" ]; then fi # check the webcam package folder -webcam_package_folder="${project_root}/RESOURCES/OPTIONS/webcam/${webcam_package}" +webcam_package_folder="${project_root}/RESOURCES/OPTIONS/camera/${webcam_package}" if [ ! -d "$webcam_package_folder" ]; then echo -e "${RED}ERROR: Cannot find the folder '$webcam_package_folder' ${NC}" exit 4 fi # check the webcam package file -webcam_package_file="${webcam_package_folder}/webcam.zip" +webcam_package_file="${webcam_package_folder}/camera.zip" if [ ! -f "$webcam_package_file" ]; then echo -e "${RED}ERROR: Cannot find the file '$webcam_package_file' ${NC}" exit 5 @@ -69,6 +75,11 @@ cd "$target_folder" || exit 7 unzip -o "$webcam_package_file" cd "$current_folder" || exit 8 +if [ "$auto_start" == "N" ]; then + # auto start not requested, remove the auto start + rm -f "$project_root/unpacked/squashfs-root/opt/etc/init.d/S55camera" +fi + # try to find out the app version (like app_ver="309") def_target="$project_root/unpacked/squashfs-root/app/app" app_ver=$("$app_version_tool" "$def_target") @@ -87,6 +98,7 @@ fi # patch the app based on the model and the version if [ "$app_ver" == "3.0.9" ]; then + # stop the app for looking for inserted webcam sed -i 's/video4linux/videoXlinux/g' "$def_target" if [ "$app_model" == "K2Pro" ]; then diff --git a/RESOURCES/OPTIONS/webcam/default/webcam.zip b/RESOURCES/OPTIONS/camera/default/camera.zip similarity index 77% rename from RESOURCES/OPTIONS/webcam/default/webcam.zip rename to RESOURCES/OPTIONS/camera/default/camera.zip index 4abbb261ad9acb9b75d8a4544a2a2899aaa266e8..14941fd4459459a718fe97ab686508786f772912 100644 GIT binary patch delta 3144 zcmb7{3p|tiAIImC`(n%@Y9g1DOR)%Zn@d7i7;>Nc-4HExdUDoQN<-7)pIaqbl3N{@ zMX|`#h9L@}6LoTQ$R!f}w=ReCI_G~n|LwMA2k{BM765@hAJ%eN++1f_AQ_vm6XOO32}^Tt z60ZCHO`e};`g)K6DS_f}hj#KP2}!a42TA&x3y+lLx>@|f+RRyaCjsuNtC*V*;IA2< zXJS#N5L*CVB5(Z7a}hnpTm}uLRtrl9NV#nVD#=AYc0b@4D6bqsOE#|2X%GwbCS#(R z>dcdmS&hq69m#Dw+aPiTD5 zP|1$B6H3KZT91knmit^$fv{t+sv$dNj254HT`1ozKfv;_jC-iTqF8&^fqYlVD9YWaY^*Qd0vuHa&ATStINGd0RP=>`?b* z{t_**YuYsGdk7v;pz-*$&b4CGOYhWT?5*0g`g4r#Rrg!F5_PaN`*XD~ZR{cu`GmYQ<56dF^u>Qpnh=@@huCD0|7Y@Ju_P&I2wro(n+WXP$6&J(YyT}HkLU&_! zB*2(}JyMwUuMz|G!%s3?$m>-ohd_VT4JxY~+SUUpX8YKF7^)WiHO z_WF6cH-Ra$;m-2z1vaCCUQwt^7j0|1aa&lsOr2tGK9pC8g!F%q&l)+i*nY#udO+x6 zW?6#?ea2UMaf-Twn6sgJ0nKcL}*U>Y|G#RljgkNZ8tEm z_akIP?oF}>_UUdDCOn$h)1e5Q#$)MbSm*H9?eJ-$o?q$4kGGOF#Ztr@8qCS5VI=dQ z*XqzC)GZmDD*ZQSUXNQTMwj{Cl-rp_BW>CrG+S{AQ}KaFtcmn%?k&G7#v;VVFV3eb zg(~{TnAmRML~m|*ny7j-eb{pxLj)pM58E{&TMejK+Fp5tkPfwUAi>A zL{wIMbr2glPfXk6za_L0pJf7X5H=< zofm_7dA?;)VMludKD9E(XXa-61luRZ%vK(F__8HG_$Al=0 z1@eJVB5QH1{=P(>5y{8<fO6Bojh&bD7HUK^lZw#%Zra*D}3aSJ$Fyl|GubR z?=15Tl=gNh?o%s>9o|+KmfOD&Ci8RUFUxW78P6tHD#d;*c`-g_R{z5b!s@epv(b6s zGIfY2DL1};myS55JAm5K@e|{>Oew7xJw?fn`ex3W4clO2#H-}yrJKRP!A)J&7AcD; zM_(-}>2Zv-N#LB2PoRwJ&c+B==XEtG<2^HYOwi`&svSSl*cVE4Cc%=)l+|XZC7E zwxUWxJscXhQPN6X0%|?IozZIGOYoIGzh7f;m2RgHb(ljiI{ETQVa3bE(?Fv`Yh4+r zVB+xm*;7x!A6dd_C2Z zSU;(WA<^Qesy4I}x1R?oSp!sjmw`o-bSmm}yJkMAJxUYb9k2*f?c0%VGi4oo$7u}R zQR%4G?RCjNPbDNkSK|D}3k!t2)VM=S7ukTAV4%$>M_N@GaTk7rc_*3Wq;hq>cqh5y zfqv+wx)^!7#*pe&UysAi$b6iM@FG8NHUB{K)iyZ9l(72P=P-T83kvo0sNyQ zTTAD9vOn1?5$?W->-&~%Jr(#fmgm~O#R}^5I_$smaBJxG9*sv_zu+kp z=PNl-CgQ6#TxaztUPwiXEOINq93Mp=sm!x|yh{KNxxTv~>ld3Ey8BBF0=dL5n^*^T zh1I(SIoMb|klXcs2faExd;PyC&upgcnn&NaPyzJ1tEKL_%>q+WI}k jYvOM)m0J5(+P`jTw8IAOuNDX-%Khka{}fo5^3MJX%Z&2J delta 1934 zcmZvdc{J1u8^>oXgBUxLtxJ+JW+Z!djisimF_;iBxnq!Fke&HO_C{TIED2+$JEXA` z8A2UmEOWCYBx_V|$`W}k?;YNA?t9;J-sha>dCqy3@ALfkNr?wfM?f)XUOs8ift`26 zWJ2YI?@>5}U%AfBG&f^;UR_5FP1{&T`nq4Bma`KSBoM}JMsl5-X@X#TUIK;F;0lK6 zKntxdxg08SgBLAMR|zmyU=tAH{RHj^AuLiD1m^q53j!U6B-|`^(olTAsOoKUUN>De zyx9GM-wUXKA71o`rgrlfnYQttLr0_jw! ziWneezI^f_Qj5aVO0-JAv3c$s52Q{yZBOwe>gH6O&I)Xg*0`UqR%ERi`kUPcc!yZ6 z>#b@aSA5+Fj#Y@|eB!HVm}!LGE72+@zKD?seUf{`)g)`Vo&CL3K&3DAUt(IG39h}V z6uqL7$H*)N)rC^Ii{<4D5)huGJm=@PPOrK9p&4CqeDA3o86Ol3J4F9EvQWQ5g^+Wj zzrb^%y6p7%TqZWD`)Ylw@{>Fq`lV8`U`Y?Kqj^`)hxvFhZs^Y?H#;YjqoNSrrB(IH zPeZq5-87blKs1aUQnihZSWKq!Y(sJQ`VG?vdO8)+EHon`S!XvSW7E_DMbk@eH^&FZ zGx;PIC3Wy&_@3g09AAkJ;t2Jd{vg#NZbOcG!Lq*)+UqdJC?1x`W6>3b3V2)I17|f_ z=AX7z^}D(ChdffGF_iLs2d`6O+EmUy$6Y=G$1>8S%wY8*Io5wnxt!^p`_}><4TAEy&7Vc=@_35tXV{*D#r9 zkE{(W>Ip<}*08g`tgU=pjCK2L2vqCkD`-9*@KpNwvV(1&GEraXIb5af33`(G>{ZaU zUGu7A&pw*7@As)mPR143S6#u(hK6kir~4@JulBI4Y;elinK&1ui)@m{rHk45lU8FQ z%U&+u-;kbt*cMQ#;X&~Yi#U3GTg%@kbq0qira33XZ)V08Soox>;u~<&7~q6OOSEUp zx#hs~P3B*p&XrSR*MV3@p!rIGCu5(A-@CE(X@5l|eCrrx3fQBLlg{Yll9UW;=$H0) z$)S`Ll>0IfMNyqotv)M(S8%tiWUK|eLK~4;m$aHmRUMy4PsSn7T@e81tsOJE>X`h7 zvMerx^}-H@292p#nQ1!!Ltd~|+gR_16CP=Vsc$C$rkeeY&|Q_eXQZ7((~?S6paaH^ ze01*HZ?p)`Z`$MyWlR4-ft^8n5i5=t(lM<;Moew~U9X#ZaeQ2m~O>e?P*q&A3xP=lbt9 zr*$AmT-DnU^PKu&?1Ekk`BtbUJ*55*9Al=KoiX}lr*}lhq|m^^%Fyo>_{hBW#*1sl ztGY@fS_7Xp=H7(~B1xn7hMn{4e(592P0y9(!u^_?j3cu)Gwc)6IxM1JRrEgh_|Vz} zHNE2`B9&j!MzjY4MX&EfXDOMEI37EGN|V2At<9`p4B@nHWJ5Rf z;G_U6c{ctC@m&{d>tqK=Pu2yt-}cUD&CTbV*v9t}1;F;i`gCcy*UdzAhO^h2lgr2s zw96ARJp&`(*v*a=Qt!cV)TBKJ=4ptW_7ux>($rhGrv#f^MlNird+a4W?WxXl?(uT8U#oPFp` zHiNqW6OhK9%wrUc1ME)4$xs^Ky`ydXxh@iSL3bOW&K6WD>jsg92h&n_RAtq4lXepe z9(L}a93ElQp+CvgT*>&<&m`~ordAxck(LjL^IyE!VBO7Fzq!mARTndQldH04=~&0M zV+pb)-dm&B6~i_L8l6lH3Bc8$2xgkC5G4>;Osj{f)aI~M*flZU-r*g1VFiAY4Ph+$ z9kZa-2nrdVho>}dwj#s*<;`}#5U)PCtXuq4HkaJuI=(#Qm!9ToFf^iHkUorL%^*zu zZ)Qwyi($|Lg4Q}TUrh)XGEfi*g9h_R^Zre+zX5arBAUCY!vFA$ZmxL9GY2yTMJw(= z5c#Io|K%Fp{3xy1>^N^KS40o2a=0%74