From eb3125d570e822d6c19c661610d27ecd33d69850 Mon Sep 17 00:00:00 2001 From: Keroi Date: Sun, 3 May 2020 14:23:17 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d58045c..9fd1689 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ This firmware will add the following features: - **RTSP server** - which will allow a RTSP stream of the video while keeping the cloud features enabled (available to the supporters of the project). - viewd - a daemon to check the `/tmp/view` buffer heads/tails location (needed by the RTSP). - **MQTT** - detect motion directly from your home server! + - PTZ - WebServer - user-friendly stats and configurations. - SSH server - _Enabled by default._ - Telnet server - _Disabled by default._ @@ -59,15 +60,6 @@ This firmware will add the following features: - Web server - _Enabled by default._ - Proxychains-ng - _Disabled by default. Useful if the camera is region locked._ - The possibility to disable all the cloud features while keeping the RTSP stream. -- In development: - - ONVIF - - A static image snapshot from the web interface. - -This firmware _might_ add: -- Alarm functionality via Telegram (@frekel's [PR #177 in yi-hack-v3](https://github.com/shadow-1/yi-hack-v3/pull/117)) -- Auto upload of the recorded footage to the cloud (eg. Google Drive, Dropbox, etc.) -- Rotation control (on Yi Dome versions of the camera) without need for the app. -- **You decide**, just open an issue with the request. ## Supported cameras @@ -134,6 +126,7 @@ Special thanks to the following people and projects, without them `yi-hack-v4` w - @xmflsct - [https://github.com/xmflsct/yi-hack-1080p](https://github.com/xmflsct/yi-hack-1080p) - @dvv - [Ideas for the RSTP stream](https://github.com/shadow-1/yi-hack-v3/issues/126) - @andy2301 - [Ideas for the RSTP rtsp and rtsp2301](https://github.com/xmflsct/yi-hack-1080p/issues/5#issuecomment-294326131) +- @roleoroleo - [PTZ Implementation](https://github.com/roleoroleo/yi-hack-MStar) --- ### DISCLAIMER From eec830af6e0f6dbd3ac658e324a512499bce2add Mon Sep 17 00:00:00 2001 From: Keroi Date: Sun, 3 May 2020 14:53:42 +0200 Subject: [PATCH 2/5] [Version] 0.2.1 : - Added PTZ support - Added Camera Settings via ipc_cmd --- VERSION | 2 +- src/ipc_cmd/.gitignore | 3 + src/ipc_cmd/compile.ipc_cmd | 31 ++ src/ipc_cmd/init.ipc_cmd | 10 + src/ipc_cmd/install.ipc_cmd | 8 + src/ipc_cmd/ipc_cmd/Makefile | 17 + src/ipc_cmd/ipc_cmd/ipc_cmd | Bin 0 -> 9216 bytes src/ipc_cmd/ipc_cmd/ipc_cmd.c | 342 ++++++++++++++++++ src/ipc_cmd/ipc_cmd/ipc_cmd.h | 89 +++++ src/ipc_cmd/ipc_cmd/ipc_cmd.o | Bin 0 -> 9932 bytes .../static/home/yi-hack-v4/etc/camera.conf | 6 + src/www/httpd/cgi-bin/camera_settings.sh | 56 +++ src/www/httpd/cgi-bin/get_configs.sh | 17 +- src/www/httpd/cgi-bin/ptz.sh | 27 ++ src/www/httpd/cgi-bin/set_configs.sh | 48 ++- .../images/arrow-down-bold-box-outline.png | Bin 0 -> 368 bytes .../images/arrow-left-bold-box-outline.png | Bin 0 -> 373 bytes .../images/arrow-right-bold-box-outline.png | Bin 0 -> 370 bytes .../images/arrow-up-bold-box-outline.png | Bin 0 -> 368 bytes src/www/httpd/htdocs/index.html | 9 +- .../htdocs/js/modules/camera_settings.js | 90 +++++ src/www/httpd/htdocs/js/modules/ptz.js | 63 ++++ .../httpd/htdocs/pages/camera_settings.html | 121 +++++++ src/www/httpd/htdocs/pages/ptz.html | 64 ++++ 24 files changed, 976 insertions(+), 27 deletions(-) create mode 100644 src/ipc_cmd/.gitignore create mode 100755 src/ipc_cmd/compile.ipc_cmd create mode 100755 src/ipc_cmd/init.ipc_cmd create mode 100755 src/ipc_cmd/install.ipc_cmd create mode 100644 src/ipc_cmd/ipc_cmd/Makefile create mode 100755 src/ipc_cmd/ipc_cmd/ipc_cmd create mode 100644 src/ipc_cmd/ipc_cmd/ipc_cmd.c create mode 100644 src/ipc_cmd/ipc_cmd/ipc_cmd.h create mode 100644 src/ipc_cmd/ipc_cmd/ipc_cmd.o create mode 100644 src/static/static/home/yi-hack-v4/etc/camera.conf create mode 100755 src/www/httpd/cgi-bin/camera_settings.sh create mode 100755 src/www/httpd/cgi-bin/ptz.sh create mode 100644 src/www/httpd/htdocs/images/arrow-down-bold-box-outline.png create mode 100644 src/www/httpd/htdocs/images/arrow-left-bold-box-outline.png create mode 100644 src/www/httpd/htdocs/images/arrow-right-bold-box-outline.png create mode 100644 src/www/httpd/htdocs/images/arrow-up-bold-box-outline.png create mode 100644 src/www/httpd/htdocs/js/modules/camera_settings.js create mode 100644 src/www/httpd/htdocs/js/modules/ptz.js create mode 100644 src/www/httpd/htdocs/pages/camera_settings.html create mode 100644 src/www/httpd/htdocs/pages/ptz.html diff --git a/VERSION b/VERSION index 0ea3a94..0c62199 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 +0.2.1 diff --git a/src/ipc_cmd/.gitignore b/src/ipc_cmd/.gitignore new file mode 100644 index 0000000..e014e8e --- /dev/null +++ b/src/ipc_cmd/.gitignore @@ -0,0 +1,3 @@ +# Ignore the install dir +_install/ + diff --git a/src/ipc_cmd/compile.ipc_cmd b/src/ipc_cmd/compile.ipc_cmd new file mode 100755 index 0000000..1e5cef8 --- /dev/null +++ b/src/ipc_cmd/compile.ipc_cmd @@ -0,0 +1,31 @@ +#!/bin/bash + +export CROSSPATH=/opt/hisi-linux/x86-arm/arm-hisiv300-linux/target/bin +export PATH=${PATH}:${CROSSPATH} + +export TARGET=arm-hisiv300-linux +export CROSS=arm-hisiv300-linux +export BUILD=x86_64-pc-linux-gnu + +export CROSSPREFIX=${CROSS}- + +export STRIP=${CROSSPREFIX}strip +export CXX=${CROSSPREFIX}g++ +export CC=${CROSSPREFIX}gcc +export LD=${CROSSPREFIX}ld +export AS=${CROSSPREFIX}as +export AR=${CROSSPREFIX}ar + +SCRIPT_DIR=$(cd `dirname $0` && pwd) +cd $SCRIPT_DIR + +cd ipc_cmd || exit 1 + +make clean +make || exit 1 + +mkdir -p ../_install/bin || exit 1 + +cp ./ipc_cmd ../_install/bin || exit 1 + +arm-hisiv300-linux-strip ../_install/bin/* || exit 1 diff --git a/src/ipc_cmd/init.ipc_cmd b/src/ipc_cmd/init.ipc_cmd new file mode 100755 index 0000000..1039ae8 --- /dev/null +++ b/src/ipc_cmd/init.ipc_cmd @@ -0,0 +1,10 @@ +#!/bin/bash + +SCRIPT_DIR=$(cd `dirname $0` && pwd) +cd $SCRIPT_DIR + +rm -rf ./_install + +cd ipc_cmd + +make clean diff --git a/src/ipc_cmd/install.ipc_cmd b/src/ipc_cmd/install.ipc_cmd new file mode 100755 index 0000000..e2b2235 --- /dev/null +++ b/src/ipc_cmd/install.ipc_cmd @@ -0,0 +1,8 @@ +#!/bin/bash + +SCRIPT_DIR=$(cd `dirname $0` && pwd) +cd $SCRIPT_DIR + +mkdir -p ../../build/home/yi-hack-v4/bin/ || exit 1 + +rsync -av ./_install/* ../../build/home/yi-hack-v4/ || exit 1 diff --git a/src/ipc_cmd/ipc_cmd/Makefile b/src/ipc_cmd/ipc_cmd/Makefile new file mode 100644 index 0000000..a694f30 --- /dev/null +++ b/src/ipc_cmd/ipc_cmd/Makefile @@ -0,0 +1,17 @@ +OBJECTS = ipc_cmd.o +LIBS = -lpthread -lrt + +all: ipc_cmd + +ipc_cmd.o: ipc_cmd.c $(HEADERS) + $(CC) -c $< -fPIC -O2 -o $@ + +ipc_cmd: $(OBJECTS) + $(CC) $(OBJECTS) $(LIBS) -fPIC -O2 -o $@ + $(STRIP) $@ + +.PHONY: clean + +clean: + rm -f ipc_cmd + rm -f $(OBJECTS) diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd b/src/ipc_cmd/ipc_cmd/ipc_cmd new file mode 100755 index 0000000000000000000000000000000000000000..8acf1ea7a5c1c36fd5dfb39b78d0d4d130f0eff2 GIT binary patch literal 9216 zcmb`N4Qy0bcE|7d3)^v$2^jDuPV$mC!KC)^z)s>gS*;N^5Y>iRFbfH!X6$*kXEWm& zW}d-p)2@?{>?Xo%7D&o|q@HwBm95a0N>PhcvO?OZind8ZSEx$W?C#jZYhZ#ZszqwF zV&neK`+ysVm0GD69pCfuzvte2-nr+!d5>@Q^sWzuLMmuws#%F-9#*QIe$-H^tV~t5 zD??RbTdtPTd$#sTdgu(YP$g6Wl|xsACOxW$7ZRKJzBbz=g3z5F$#{`nyQ_n{Go;Ki zrJ|6`D|T2_hrJG)Pyty;>@vq!9Xn3sM7VUs5NyxHYG|L41i9WQx0S?>VUt;zGq(Yw9XhVd?Q zMK$~1AqP!tqtGtRei_-+#!JjbHTx#y`fKtc^)|A7O;+k<r|-Cd>7ISCh{p>-#y2d``1BAr~~cmi6lES%ut7 zJmh-aMm!&(zxo<~Xp2>?dfsE*zY@=Xg)V9Seu;d2{>5tX0{>se{;7ul1LTTt@rNeY z*M!2FoI!5XKZ!Xzju$nY z$tK3^VKrje>5Prbu@RYUD3-H^QW>W5PVYb}mKakYVp-R2r;}oNZ+XhO@Dh#ny(?Dv=o) zNbSLVBV+GfA+?l4-7h@_XP2z{7Zk2QX8eG zxZQjvKYRJttrsg!_Rd}Yn>#L66k45%!i;lEVY*O#`KQjQKV$9xI6YVM^MiAz{`<5O z@Fz9?xW?x-{+Pxe()e#{{G`TDXnaQFM>T%8#_!PhsK#&9_%4m_(0Ehhn>F6h_y&0M z!5QcB=GKcZ{;F@T;%whsnK4~xGNznH^o`%2aYSxLu18kULQ!NBxmsj1@5=4S9mdq0 z%H(H5yYsV#Ips7&83To(I;iqwezsBie15hXe9w2L=A!2NPR*g|!kLvb&Y4H?H#y~~ zu6%Kk%FkAX^RqHnxj9{kc27C4&d+}mQkh~yNY#Etb0#(0s2ys9)PBf56oFcy7KqwXdJtL(HA5?)2cY{Q>R^fcXNmMFkxC`fszi#F zNVn3R5ckv)DOlndl(>hMxG$8JL!@VkR4s8Yb^VdXu8s6Aalb2_g-H1l>0dex9f7!4 zmN+J*y%5Ky6oa}USv$wdosSGHabGPd^_ug~W$F{9^2GxZ58^Me{t5d(&@tnbo8S9b zbscdkh~GD{+oDs^*>R;_2^o`f6~r{Ersg(cdxJ4Mus5mK-EpCCzNpM2PK}W-j$r>D zb`yI?weMF=7hK=?=)=yPp;)J;DyQe?Ya76bZv|#OwmRc=N9-XZUtY(xehFXaADMBk zEc&9aPTyB3pD%wFU+2ICzS?}7!ZwbNJU&j{z{g4-SH^se##H6k@pDx3b5AgbiQSy4 z9K=4M*}sIn(e&0#P7B6)Qufb${WqBJX5U{u``?VOcFk86wt8*<_3WRRl$N3|JV1_1 zoWqlxE4fzr*%s_d9d@e2uRFEGzVsQfHIF*?s;xy8&Ch;Kabtzw&SPAQ_%#o6*0^SB z%d9y+PYS-~JV8!`$ccHzKKt;D)2zH}8eFeg@yYdQV7>RTUK6{-_}_iKT&D)&)+l@N zZRdPj8S!W!W~{$9T6O)}yyx4?{jtQPwq3KogT29zX@%#*sUQv?Jv8Hl!MVAr<Z)raA*uwsLI5*{C zu5kfhRja$^%2lp-Vt)P=rM4CSl9>LOb%xaTVh6RR7~;H{(Ydyex;>|%EoIe$D#?JV*aPEyV-EGd{%l58%U$SB$rX z_w^scd%3iw_`LAG{(blcAKx#$ug8I_FT>9zUtf;@-}w3p^wciaGG3$})gF6i#yQqK zNxFPrrS^Y@cz=dheQr!qbJpyPtFYg?)by;O|4? z9tIQLJvCQF4HMjBa!tFUbN_~4IXj&3;)Cd<#yui7bmZ@>oE6dChpw8w5}njEa&NXt zaBAD^Kd?^0v>@l(W;k>CS;-;6%HCvO71;iXbxdOa_7c|1IhA#IxqR4J&$=5}!*72# z{|Px$+5s-E;cj9+InSB!b91t{%ix{^XM*d}a9%DRcFus4nEnU27r<46Yt(R(BjWFv z@9!gUIdFwFGtQ@rudh#XLvWXU+%LdM%{&F}oQA9Q*H`c3-UZhS?hv?>8qUk%!_E$W zeLn^Fhu}uR9TXgKlenb(>loz4Tj2f_To<@e4cCkxJ%9ch+#}!`?wxVE!AU(7f3gRO z+h1UR0Q;w_sb`v>t_6OMfx92vS#T8^?u3sE^6NW3?l`!@ZP(Yoc0nE<0Jj2vli*Hk zxC0CPeFNN0;C6sJrr|zZu)Yj9YGcU+XKT1Ve_qKY$-7~24dAN5MK#>gyS%ssxLx3G z0aq|*oE8nYbAi7t;H2K#;HrIGm3t;6#z&m3*yWy)rI&liDW%*qHHO^9m=D8VjPx<< z{V^7O0}ndqdC)OmQ|cr7b5Ij>0C_hLET5Hozo*~hA?PF&hq|F=r~C)Ny2``UIp_p* z0NMq$Lv_&ZoA@09ajz+=0%tz_`uUrQO@+a41J&w;&yY)JTAeyYZ6p@Uf5-iRJ1p;^6~3d=VyQPl@|&> z3!j`7Y}k--TikJr87E_capA7ki!EK)&2z5r@Z{SKzjmKjytzWu#d`eCUG<&^mHCbX z=0Y(3>JRxXhK~+^ZDrt1@Md_%xyqOpcx4`PeRIib4If8zYTH;#b=TV$J|K^fmH29B zZPondlh%RX9Z}9Mb+$4(U8tnCp2z1#d~7r%Hq(VN_=jt)FEn0VM#T(2Ig!C=ER>{ z&w1t{zW?&_RnE)Ho{#t%>a|-ZrVA3=P}h-HYmzs6tB zR`jN(5Ac2H8#R5z$8SJit?2{&TJ%@keD$u2;o~1eU(oco`uc~^zo+SgIIlu~O4Hxw z<5!}8Q_}~2?n8e_(+Baq6aBNkUh+e7Wih_OoS9|h+$nNSa`sdOex=#@bL{z7p%XktEx-h z=gOrC+Cm%k@LF4F3*sbzg*K6c7T6YbUDpP>GITP(yr-5XdXe|=Pud%|eE*N6UnOtm z;)z@)W)Dd|t&5GVunl?DXr%UxTjQ2-e~zN6YPaQLBUUGpvC}p-Z(6l^{rabkovk@z zYtN>w!X=H~o^E0G8rwJaY!WVEJh4Uktg&Tt|Jwc@;ZsK6=C8S2#@Mv2PgL=zYh?;m z(;9egFT+ews-s5C%4MT?wZG!+cDen zqpFSd^b3~BSTE=@GL>dkas~W#j>U~=|5L_LI+cozvB51wp}&QFujg;~=IxtWjBQa_ z`PTl;QFq<$WfNDKtR*q!B7WZ2NZPQ|hHt&*7?|;8W2YI3Jo2>bXV_T(L~oBc8crlF zS8)Bv>u6&zF&4}250+&NXVa+wA+eiiF{HJ&PE1UA*N1(;8!0O%c`Da29$@0u;P?ox ziLW&l8)PnDQ`0&cU`DNEMj&9^_vs{7B4_woyEE6B?A+U#=*)JeIy0TaofC06E4;W@ z>EU6OOz%@EE1nonQIiuRVp6f>zS#a8_0zJgAzP^|dODS~hNV;S^gc!_HJ(wtu21t< zuq@O_kI6!^P){~X;N>hP#zqV`O73Cw^b)7f>%G%~zw24fd~uZ{6UBc5r(T9AC3zq^ z?=mSR-bE&e-a6oA`=XQ9zzfB5hdo|uNkIKRKS9sCNB5f*?;+i9H}VZozDvqCK&d_Q zt*`=__XMsiy6We=?|I<^-nYC0vh2T?3FI-F$92We0k=ubyu^5^kH?{Uh(~<)n_}`s zkKaYlPXKq^68dWB|JvkRY0#Qp;(q%7OyXO@8)@0s` zsCP6uf&8u}OD>(&WYSc9sL67X3z|HPd;vLVa&0eZavb@JCc6nAfc<{Mx^FtA54|ywOC%FR>9K*mZKk=>XpeM6 z+8DUHZS@*+jnS-+So;7I#jMz1LWLS(DnBb5k8Yy*^G*e#&V-765l_T+n@4!JF6nBMRXpMN!o(vn_R@UCiv@qwu@xb?su_> zHR^ra@-PFjY&N#v!vy@-hj59zSSm53A|q*BctiQ3rXo@ltub_KxAa9~ww+B3j@y=8 z=Kpn*vmyB+XW_~uL@(zdXhAN?8K{KZXPDAB@g7LV3Qo>!7=WDBpatwo6g80GTjqy#F^sF2DzKOE1@hOLfhk)Z|O}le!c%!3n(r z1@rFUyXg)-bV>dNE%18?h4__uy>}E!8Sp_1aIc~ef2MCR`FOV5=cN;y(4Ry2%Fwy( Z5V#eAKra|+(#xDd`+IOd2?Y88_dlk!7Qp}j literal 0 HcmV?d00001 diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd.c b/src/ipc_cmd/ipc_cmd/ipc_cmd.c new file mode 100644 index 0000000..5a29e62 --- /dev/null +++ b/src/ipc_cmd/ipc_cmd/ipc_cmd.c @@ -0,0 +1,342 @@ +/* + * This file is part of libipc (https://github.com/TheCrypt0/libipc). + * Copyright (c) 2019 roleo. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * Send message to a IPC queue. + */ + +#include "ipc_cmd.h" +#include "getopt.h" + +mqd_t ipc_mq; + +int open_queue() +{ + ipc_mq = mq_open(IPC_QUEUE_NAME, O_RDWR); + if(ipc_mq == -1) { + fprintf(stderr, "Can't open mqueue %s\n", IPC_QUEUE_NAME); + return -1; + } + return 0; +} + +int ipc_start() +{ + int ret = -1; + + ret = open_queue(); + if(ret != 0) { + return -1; + } + + return 0; +} + +void ipc_stop() +{ + if(ipc_mq > 0) { + mq_close(ipc_mq); + } +} + +void print_usage(char *progname) +{ + fprintf(stderr, "\nUsage: %s [t ON/OFF] [-s SENS] [-l LED] [-v WHEN] [-i IR] [-r ROTATE] [-m MOVE] [-p NUM] [-d]\n\n", progname); + fprintf(stderr, "\t-t ON/OFF, --switch ON/OFF\n"); + fprintf(stderr, "\t\tswitch ON or OFF the cam\n"); + fprintf(stderr, "\t-s SENS, --sensitivity SENS\n"); + fprintf(stderr, "\t\tset sensitivity: LOW, MEDIUM or HIGH\n"); + fprintf(stderr, "\t-l LED, --led LED\n"); + fprintf(stderr, "\t\tset led: ON or OFF\n"); + fprintf(stderr, "\t-v WHEN, --save WHEN\n"); + fprintf(stderr, "\t\tset save mode: ALWAYS or DETECT\n"); + fprintf(stderr, "\t-i IR, --ir IR\n"); + fprintf(stderr, "\t\tset ir led: ON or OFF\n"); + fprintf(stderr, "\t-r ROTATE, --rotate ROTATE\n"); + fprintf(stderr, "\t\tset rotate: ON or OFF\n"); + fprintf(stderr, "\t-m MOVE, --move MOVE\n"); + fprintf(stderr, "\t\tsend PTZ command: RIGHT, LEFT, DOWN, UP or STOP\n"); + fprintf(stderr, "\t-p NUM, --preset NUM\n"); + fprintf(stderr, "\t\tsend PTZ go to preset command: NUM = [0..7]\n"); + fprintf(stderr, "\t-f FILE, --file FILE\n"); + fprintf(stderr, "\t\tread binary command from FILE\n"); + fprintf(stderr, "\t-x, --xxx\n"); + fprintf(stderr, "\t\tsend xxx message\n"); + fprintf(stderr, "\t-d, --debug\n"); + fprintf(stderr, "\t\tenable debug\n"); + fprintf(stderr, "\t-h, --help\n"); + fprintf(stderr, "\t\tprint this help\n"); +} + +int main(int argc, char ** argv) +{ + int errno; + char *endptr; + int c, ret; + int switch_on = NONE; + int sensitivity = NONE; + int led = NONE; + int save = NONE; + int ir = NONE; + int rotate = NONE; + int move = NONE; + int preset = NONE; + int debug = 0; + unsigned char preset_msg[20]; + char file[1024]; + unsigned char msg_file[1024]; + FILE *fIn; + int nread = 0; + int xxx = 0; + + file[0] = '\0'; + + while (1) { + static struct option long_options[] = + { + {"switch", required_argument, 0, 't'}, + {"sensitivity", required_argument, 0, 's'}, + {"led", required_argument, 0, 'l'}, + {"save", required_argument, 0, 'v'}, + {"ir", required_argument, 0, 'i'}, + {"rotate", required_argument, 0, 'r'}, + {"move", required_argument, 0, 'm'}, + {"preset", required_argument, 0, 'p'}, + {"file", required_argument, 0, 'f'}, + {"xxx", no_argument, 0, 'x'}, + {"debug", no_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + /* getopt_long stores the option index here. */ + int option_index = 0; + + c = getopt_long (argc, argv, "t:s:l:v:i:r:m:p:f:xdh", + long_options, &option_index); + + /* Detect the end of the options. */ + if (c == -1) + break; + + switch (c) { + case 't': + if (strcasecmp("on", optarg) == 0) { + switch_on = SWITCH_ON; + } else if (strcasecmp("off", optarg) == 0) { + switch_on = SWITCH_OFF; + } + break; + + case 's': + if (strcasecmp("low", optarg) == 0) { + sensitivity = SENSITIVITY_LOW; + } else if (strcasecmp("medium", optarg) == 0) { + sensitivity = SENSITIVITY_MEDIUM; + } else if (strcasecmp("high", optarg) == 0) { + sensitivity = SENSITIVITY_HIGH; + } + break; + + case 'l': + if (strcasecmp("off", optarg) == 0) { + led = LED_OFF; + } else if (strcasecmp("on", optarg) == 0) { + led = LED_ON; + } + break; + + case 'v': + if (strcasecmp("always", optarg) == 0) { + save = SAVE_ALWAYS; + } else if (strcasecmp("detect", optarg) == 0) { + save = SAVE_DETECT; + } + break; + + case 'i': + if (strcasecmp("off", optarg) == 0) { + ir = IR_OFF; + } else if (strcasecmp("on", optarg) == 0) { + ir = IR_ON; + } + break; + + case 'r': + if (strcasecmp("off", optarg) == 0) { + rotate = ROTATE_OFF; + } else if (strcasecmp("on", optarg) == 0) { + rotate = ROTATE_ON; + } + break; + + case 'm': + if (strcasecmp("right", optarg) == 0) { + move = MOVE_RIGHT; + } else if (strcasecmp("left", optarg) == 0) { + move = MOVE_LEFT; + } else if (strcasecmp("down", optarg) == 0) { + move = MOVE_DOWN; + } else if (strcasecmp("up", optarg) == 0) { + move = MOVE_UP; + } else if (strcasecmp("stop", optarg) == 0) { + move = MOVE_STOP; + } + break; + + case 'p': + errno = 0; /* To distinguish success/failure after call */ + preset = strtol(optarg, &endptr, 10); + + /* Check for various possible errors */ + if ((errno == ERANGE && (preset == LONG_MAX || preset == LONG_MIN)) || (errno != 0 && preset == 0)) { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + if (endptr == optarg) { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; + + case 'f': + /* Check for various possible errors */ + if (strlen(optarg) < 1023) { + strcpy(file, optarg); + } else { + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; + + case 'd': + fprintf (stderr, "debug on\n"); + debug = 1; + break; + + case 'x': + xxx = 1; + break; + + case 'h': + print_usage(argv[0]); + exit(EXIT_SUCCESS); + break; + + case '?': + /* getopt_long already printed an error message. */ + break; + + default: + print_usage(argv[0]); + exit(EXIT_SUCCESS); + } + } + + if (argc == 1) { + print_usage(argv[0]); + exit(EXIT_SUCCESS); + } + + ret=ipc_start(); + if(ret != 0) { + exit(EXIT_FAILURE); + } + + if (switch_on == SWITCH_ON) { + mq_send(ipc_mq, IPC_SWITCH_ON, sizeof(IPC_SWITCH_ON) - 1, 0); + } else if (switch_on == SWITCH_OFF) { + mq_send(ipc_mq, IPC_SWITCH_OFF, sizeof(IPC_SWITCH_OFF) - 1, 0); + } + + if (sensitivity == SENSITIVITY_LOW) { + mq_send(ipc_mq, IPC_SENS_LOW, sizeof(IPC_SENS_LOW) - 1, 0); + } else if (sensitivity == SENSITIVITY_MEDIUM) { + mq_send(ipc_mq, IPC_SENS_MEDIUM, sizeof(IPC_SENS_MEDIUM) - 1, 0); + } else if (sensitivity == SENSITIVITY_HIGH) { + mq_send(ipc_mq, IPC_SENS_HIGH, sizeof(IPC_SENS_HIGH) - 1, 0); + } + + if (led == LED_OFF) { + mq_send(ipc_mq, IPC_LED_OFF, sizeof(IPC_LED_OFF) - 1, 0); + } else if (led == LED_ON) { + mq_send(ipc_mq, IPC_LED_ON, sizeof(IPC_LED_ON) - 1, 0); + } + + if (save == SAVE_ALWAYS) { + mq_send(ipc_mq, IPC_SAVE_ALWAYS, sizeof(IPC_SAVE_ALWAYS) - 1, 0); + } else if (save == SAVE_DETECT) { + mq_send(ipc_mq, IPC_SAVE_DETECT, sizeof(IPC_SAVE_DETECT) - 1, 0); + } + + if (ir == IR_OFF) { + mq_send(ipc_mq, IPC_IR_OFF, sizeof(IPC_IR_OFF) - 1, 0); + } else if (ir == IR_ON) { + mq_send(ipc_mq, IPC_IR_ON, sizeof(IPC_IR_ON) - 1, 0); + } + + if (rotate == ROTATE_OFF) { + mq_send(ipc_mq, IPC_ROTATE_OFF, sizeof(IPC_ROTATE_OFF) - 1, 0); + } else if (rotate == ROTATE_ON) { + mq_send(ipc_mq, IPC_ROTATE_ON, sizeof(IPC_ROTATE_ON) - 1, 0); + } + + if (move == MOVE_RIGHT) { + mq_send(ipc_mq, IPC_MOVE_RIGHT, sizeof(IPC_MOVE_RIGHT) - 1, 0); + } else if (move == MOVE_LEFT) { + mq_send(ipc_mq, IPC_MOVE_LEFT, sizeof(IPC_MOVE_LEFT) - 1, 0); + } else if (move == MOVE_DOWN) { + mq_send(ipc_mq, IPC_MOVE_DOWN, sizeof(IPC_MOVE_DOWN) - 1, 0); + } else if (move == MOVE_UP) { + mq_send(ipc_mq, IPC_MOVE_UP, sizeof(IPC_MOVE_UP) - 1, 0); + } else if (move == MOVE_STOP) { + mq_send(ipc_mq, IPC_MOVE_STOP, sizeof(IPC_MOVE_STOP) - 1, 0); + } + + if (preset != NONE) { + memcpy(preset_msg, IPC_GOTO_PRESET, sizeof(IPC_GOTO_PRESET) - 1); + preset_msg[16] = preset & 0xff; + mq_send(ipc_mq, preset_msg, sizeof(IPC_GOTO_PRESET) - 1, 0); + } + + if (file[0] != '\0') { + fIn = fopen(file, "r"); + if (fIn == NULL) { + fprintf(stderr, "Error opening file %s\n", file); + exit(EXIT_FAILURE); + } + + // Tell size + fseek(fIn, 0L, SEEK_END); + nread = ftell(fIn); + fseek(fIn, 0L, SEEK_SET); + + if (fread(msg_file, 1, nread, fIn) != nread) { + fprintf(stderr, "Error reading file %s\n", file); + exit(EXIT_FAILURE); + } + fclose(fIn); + mq_send(ipc_mq, msg_file, nread, 0); + } + + if (xxx == 1) { + mq_send(ipc_mq, IPC_XXX_0, sizeof(IPC_XXX_0) - 1, 0); + } + + ipc_stop(); + + return 0; +} diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd.h b/src/ipc_cmd/ipc_cmd/ipc_cmd.h new file mode 100644 index 0000000..66273ca --- /dev/null +++ b/src/ipc_cmd/ipc_cmd/ipc_cmd.h @@ -0,0 +1,89 @@ +/* + * This file is part of libipc (https://github.com/TheCrypt0/libipc). + * Copyright (c) 2019 roleo. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define IPC_QUEUE_NAME "/ipc_dispatch" +#define IPC_MESSAGE_MAX_SIZE 512 + +#define NONE -1 + +#define IPC_SWITCH_OFF "\x02\x00\x00\x00\x08\x00\x00\x00\x75\x00\x01\x00\x00\x00\x00\x00" +#define IPC_SWITCH_ON "\x02\x00\x00\x00\x08\x00\x00\x00\x74\x00\x01\x00\x00\x00\x00\x00" + +#define SWITCH_OFF 0 +#define SWITCH_ON 1 + +#define IPC_SENS_HIGH "\x01\x00\x00\x00\x08\x00\x00\x00\x27\x10\x01\x00\x04\x00\x00\x00\x00\x00\x00\x00" +#define IPC_SENS_MEDIUM "\x01\x00\x00\x00\x08\x00\x00\x00\x27\x10\x01\x00\x04\x00\x00\x00\x01\x00\x00\x00" +#define IPC_SENS_LOW "\x01\x00\x00\x00\x08\x00\x00\x00\x27\x10\x01\x00\x04\x00\x00\x00\x02\x00\x00\x00" + +#define SENSITIVITY_HIGH 0 +#define SENSITIVITY_MEDIUM 1 +#define SENSITIVITY_LOW 2 + +#define IPC_LED_OFF "\x02\x00\x00\x00\x08\x00\x00\x00\x77\x00\x01\x00\x00\x00\x00\x00" +#define IPC_LED_ON "\x02\x00\x00\x00\x08\x00\x00\x00\x76\x00\x01\x00\x00\x00\x00\x00" + +#define LED_OFF 0 +#define LED_ON 1 + +#define IPC_SAVE_ALWAYS "\x02\x00\x00\x00\x08\x00\x00\x00\x79\x00\x01\x00\x00\x00\x00\x00" +#define IPC_SAVE_DETECT "\x02\x00\x00\x00\x08\x00\x00\x00\x78\x00\x01\x00\x00\x00\x00\x00" + +#define SAVE_ALWAYS 0 +#define SAVE_DETECT 1 + +#define IPC_IR_OFF "\x02\x00\x00\x00\x08\x00\x00\x00\x24\x10\x01\x00\x04\x00\x00\x00\x02\x00\x00\x00" +#define IPC_IR_ON "\x02\x00\x00\x00\x08\x00\x00\x00\x24\x10\x01\x00\x04\x00\x00\x00\x01\x00\x00\x00" + +#define IR_OFF 0 +#define IR_ON 1 + +#define IPC_ROTATE_OFF "\x02\x00\x00\x00\x08\x00\x00\x00\x7b\x00\x01\x00\x00\x00\x00\x00" +#define IPC_ROTATE_ON "\x02\x00\x00\x00\x08\x00\x00\x00\x7a\x00\x01\x00\x00\x00\x00\x00" + +#define ROTATE_OFF 0 +#define ROTATE_ON 1 + +#define IPC_MOVE_RIGHT "\x01\x00\x00\x00\x08\x00\x00\x00\x06\x40\x06\x40\x18\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00" +#define IPC_MOVE_LEFT "\x01\x00\x00\x00\x08\x00\x00\x00\x06\x40\x06\x40\x18\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00" +#define IPC_MOVE_DOWN "\x01\x00\x00\x00\x08\x00\x00\x00\x06\x40\x06\x40\x18\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00" +#define IPC_MOVE_UP "\x01\x00\x00\x00\x08\x00\x00\x00\x06\x40\x06\x40\x18\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00" +#define IPC_MOVE_STOP "\x01\x00\x00\x00\x08\x00\x00\x00\x07\x40\x01\x00\x00\x00\x00\x00" + +#define MOVE_RIGHT 0 +#define MOVE_LEFT 1 +#define MOVE_DOWN 2 +#define MOVE_UP 3 +#define MOVE_STOP 4 + +#define IPC_GOTO_PRESET "\x01\x00\x00\x00\x08\x00\x00\x00\x02\x40\x01\x00\x04\x00\x00\x00\xff\x00\x00\x00" + +#define GOTO_PRESET 0 + +#define IPC_XXX_0 "\x01\x00\x00\x00\x04\x00\x00\x00\x71\x00\x71\x00\x00\x00\x00\x00\xa1\x0e\x9a\x5e" diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd.o b/src/ipc_cmd/ipc_cmd/ipc_cmd.o new file mode 100644 index 0000000000000000000000000000000000000000..34a064685d6b76f4ea5652c6b0141f72793374e6 GIT binary patch literal 9932 zcma)C4Qy1`mA>P#&3NLFftb{xPWnQeU{ZUSu?-lD-44M9(;7T$o8Sbp_TYK8r=7pd zjKS=pt<#bUb@AE-)Vft7PqnE;B($}(tc0|ra@9zUv_xTd(aO8(W^E6nI4)X|E!ssZ z8t?brcb|QkIMqIM=6l~c=bn4tz32YCXTIIqzTe?+2>Wt~8nMcRNIoGgC5;kl#0Ifm zGzIED=?PBdi#*v}NpO6wL}cebTVDQcn{O)LW=!RszVW#t!*7Sy^e@fGrYx=F4{=Q>1{^Oedwx-{t>2GTKCp7(aO}|Cc zU)J;Ajl2OVjKA_rz+y8Jho` zrhiP+-_Z1WKVQ@I8#Mp7HN75ZLeuO0c}D4(AIz1Fh~){qyU3h7USuU*5ZDB%hIk+k zFbNhRw;(f+E09UZSx6Fc9MT49gcy)=$bE#m4Y>)q4!I1u1Q~^7Aifu-@^?GxK6&G# zLkq<>4=ofK<8#%dDTt zF0KW^mN7ZExE@qGg!^kEu&^6*RD3!^r>-Mgx{JnKw9Ltf-I?o{1E%@lMSdV~h7%{SlaqSPpC_;Tz##qTW5$DnxanN7R zD&JVi3D`#p>{ULi&B$r`F zC|d#@*EHmwTCa}G|2^7i`(zuYFz2%K%pv;9bDwI*KcF3>u%CMz?ZrH0JFHy3kl&AX z^E|`nN6swuz%Q)%J%ai;pOc=~7x--SdmVm0_ysgSD;F>1XW+*^rQdhq=Yn6A=Eodi zyh$xy8h&#)kKX5bRJD(}LBG42AJ@!l@Vlk?xmEirG{1KEO~7wj^RsgJLcT|9-#6el z1i$n2L%*?KVrm@qy!Z?F1>iTN`PCp!VgBrbU*(pmd<*=z9x@)E!S1)`VZZOkdZxt* ztP$rq_}zqGvF3M0`RVyZzsvBO+pyaHy=&y*R``v=@4Du9c8z$Cz^?~>lbYY`8tuc{ zxa5OhM)NzQ>Xm0>m3Ni!bHOjD`E7dI>NnkQJ^beI-cqai9a|$F*V_#IT*|Lh&I$JM zMRlIC^3L8v?70y@nOTq3M_*LNa0^iZxrPHwIgoE>mvK+w^%)K z&&soqtB?su6vDG{HRJ)p-hjYOplLV~MsrQcSML$FEo;Z>-&qZH~b@74NF zX|e74POhOly@qaN4PA9XyX=^@-fowz|MN9s{F$b++g}UH_9mCEh?o?9$jn#Vw7e!RIs{1;4Fv z>{;TD#v|Z&HJ$>$ukjc-8)4U%1a)bA0Nleys%r#Tq46+ymBxo`M-8_}lKs8mNIDtH z^wYjC6yKUL5=k>|#9kXVhfU+Tw48QF(xE}K8O%7AF**)!@7TZpRpVG)+UROM+{L@7 z(cap^o0G=Tw${VEix>wxi7BJAqkC_6EAL~*p^lg2UD7yw@GN)zhSh%b#ZDx%0s-@Xz z?>Jg(9BOSjc;pbnwH-Xr#yIjh7$$0l`AE>ovY^dqjjCD3RF5j_44pLPbHkwOq9&FI zqto`bAKm+M7fZIZcDL^9rjP6#mW-s(OAM#Vfq%X#_}iVxGO0u+lrdGWYGo~bK{HX- z>U5TjCD1C4fNEzvYy`VsG5Qm+SSXGM>_jhg*W$VNb=;2!9NRTb>>h1{2cFSR7 zsAS4ypJEUnjy0GtG6_RjR|3P$_#@+(&+Faws*E#W>_6Dv%0L5=s40nzlQKhL<3uDL zN}aZwWelVeG24TEH&Scxs;e6r8L`F(&w+a*W~P~^9LKQj6E;r_4Oo z!;xW3*rCXvoMxfusnBUG2w^j0_G6()LC^IfY7P)YIB^Q4g&4-9PG=IF+VDj~jYOOc z;abp|N}=O97bEdOL-vxKjFz7L^swHV9f-G@<)|+#(#S-{k07X(Awn<@sI!Ji2u3GI zCtB^mJs+PsabVxRW}~Jpl8!_p{fT(*$p)Wqo6+cP@-`UtK7WJ1-dAtbAXLhXnxVA0 zP3(OE#X@H2L_|0Y+?MRrHVQBE(TpQt zJdrWI2M!;pLzMn+3Gd#{L*7s(lZu=e&X`=u|9=<0*U0r5M+$j0;`cn(aQm{CUwp?A z>c}EZ4-BmJSlID?B+Jv!1$j2I6A$dBz|8M}S-dmu9%N?dmP ze7M)!cW(=F0lsWsiSlFnUW727z2{zEk3G?Dl=1_J!w{uL!T`9QeD6e!0aH zplq*oxn+5tL#)dxf5oPV$M{z@&iKa4gE|D~NzIDgEezbB*Er|LYCN~#I`h6}-;Vo5 zjWhpoY*m+A;5)87n_CLE_+#Ac(d_%cyET3gd_?0N;O8}d1pKnbkAc6h@eufJjSqtJ zox!@?GGBcwu0*BJmVxA-M~t2O(t z!Fx20Z&IR9%#ypzs}ue8u>ZE3l6%&OK}+^6^rEJzKzkR=}?m@V_nKzbN1z7Vv*5;2#z6 z)wyo<&r*T?ZUO)A0{;5~F8F@d9}9c?MRiD2hlRI&pN~I&{?zlQfj>CfwC~%&pPl^K z#h)hr?BR(-N;y)0WV%ht=X^|EZE z^lXrt2B~R~(dy-IgDllxm6Gx6W&8%Kl#JhCJ&?3ENb62%-6{1u{WxmJ2YVCAOe7Ic zdw2Sqngox>z4A>}#9o8RjEezzgdY&S2iiMc+}qxZ7samD?%wXbFSfV#$_|aahC_GQ zOr<1~=SX#jlQ_ckM-yoiXJfnx^bYfdLJXWrMKY#{g(7h=XyU-0>1A7lITFbrRw{~m zV`i*Bd77*rhv5ELQuOwsj(7sD{UNrQwoD?*DsV^-ivg>>Y190c7|58>s2Jd}UJO_b zKrNxvps2unsA|PJNZfDj$4)FAL*P#yz&izSbDMQY*^CV<1MYO;>_h(+>`%a_+O2() z{?p2TmUhIuOFWG87IKehD8%0-Bo8VaQaGw`QsJ~h?t3ghr;z7ca{f)3SfenYut#B1 z;W>p_h1V3`RJf=R3z>{p1$>I_1@gJLZ}9nRfX+wpt&g}KXF(zkl#N6zVogLGWVmlQ zH(L9J^KomRaH6xhKR9uIYbWA>!~MaDKfHDmE3N&=iF4a=a{OhikBEayn20}oaKCfn z54cex&TZW9oOn^l5Dja;b3TLdA>U%{H_m6Rea2ZW#5wA5(BZgM1u!P5cI)U-2vvNq?32GX7ry z@fEyBD1MuW1J^y`apW211miR*>{ED7A-@UJKC6)1DS3^;pu!P_lL}`PE-Lhtsd^Ol zDLkieTH&n1`^5biOzc_gKNk`G=~29v2z#UAJWn~dAwP*PAU}c3Z+wap&aWariM7a2 zVjaetxCi|Q-25u?l6Vk#Nxc_&NyNc;i0DIJ68*?aB3`I6#0KOgu@QNx?4v~ZpC#_V zxDa<@|5o-1Wxu5Oq~dQ9n}x^%xh}n}_+{cQtV4=VE4-@kn!@V}XB57t@O_0h6y8*L zOW~}--zc0@cw6D3!aEA@D!fN*!aEjmH^vE9(buf~n`kJGu8{hGLQGA``xGV>jw+l` Km{mBf@c#hUxOzVT literal 0 HcmV?d00001 diff --git a/src/static/static/home/yi-hack-v4/etc/camera.conf b/src/static/static/home/yi-hack-v4/etc/camera.conf new file mode 100644 index 0000000..4c14dd1 --- /dev/null +++ b/src/static/static/home/yi-hack-v4/etc/camera.conf @@ -0,0 +1,6 @@ +SWITCH_ON=yes +SAVE_VIDEO_ON_MOTION=yes +SENSITIVITY=low +LED=no +ROTATE=no +IR=yes diff --git a/src/www/httpd/cgi-bin/camera_settings.sh b/src/www/httpd/cgi-bin/camera_settings.sh new file mode 100755 index 0000000..70f4496 --- /dev/null +++ b/src/www/httpd/cgi-bin/camera_settings.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +YI_HACK_PREFIX="/home/yi-hack-v4" + +CONF_LAST="CONF_LAST" + +for I in 1 2 3 4 5 6 +do + CONF="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f1)" + VAL="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f2)" + + if [ $CONF == $CONF_LAST ]; then + continue + fi + CONF_LAST=$CONF + + if [ "$CONF" == "switch_on" ] ; then + if [ "$VAL" == "no" ] ; then + ipc_cmd -t off + else + ipc_cmd -t on + fi + elif [ "$CONF" == "save_video_on_motion" ] ; then + if [ "$VAL" == "no" ] ; then + ipc_cmd -v always + else + ipc_cmd -v detect + fi + elif [ "$CONF" == "sensitivity" ] ; then + ipc_cmd -s $VAL + elif [ "$CONF" == "led" ] ; then + if [ "$VAL" == "no" ] ; then + ipc_cmd -l off + else + ipc_cmd -l on + fi + elif [ "$CONF" == "ir" ] ; then + if [ "$VAL" == "no" ] ; then + ipc_cmd -i off + else + ipc_cmd -i on + fi + elif [ "$CONF" == "rotate" ] ; then + if [ "$VAL" == "no" ] ; then + ipc_cmd -r off + else + ipc_cmd -r on + fi + fi + sleep 1 +done + +printf "Content-type: application/json\r\n\r\n" + +printf "{\n" +printf "}" diff --git a/src/www/httpd/cgi-bin/get_configs.sh b/src/www/httpd/cgi-bin/get_configs.sh index 747783b..9019763 100755 --- a/src/www/httpd/cgi-bin/get_configs.sh +++ b/src/www/httpd/cgi-bin/get_configs.sh @@ -1,17 +1,13 @@ #!/bin/sh -if [ -d "/usr/yi-hack-v4" ]; then - YI_HACK_PREFIX="/usr/yi-hack-v4" -elif [ -d "/home/yi-hack-v4" ]; then - YI_HACK_PREFIX="/home/yi-hack-v4" -fi +YI_HACK_PREFIX="/home/yi-hack-v4" get_conf_type() -{ +{ CONF="$(echo $QUERY_STRING | cut -d'=' -f1)" VAL="$(echo $QUERY_STRING | cut -d'=' -f2)" - - if [ $CONF == "conf" ] ; then + + if [ "$CONF" == "conf" ] ; then echo $VAL fi } @@ -21,7 +17,7 @@ printf "Content-type: application/json\r\n\r\n" CONF_TYPE="$(get_conf_type)" CONF_FILE="" -if [ $CONF_TYPE == "mqtt" ] ; then +if [ "$CONF_TYPE" == "mqtt" ] ; then CONF_FILE="$YI_HACK_PREFIX/etc/mqttv4.conf" else CONF_FILE="$YI_HACK_PREFIX/etc/$CONF_TYPE.conf" @@ -37,8 +33,9 @@ while IFS= read -r LINE ; do fi done < "$CONF_FILE" -if [ $CONF_TYPE == "system" ] ; then +if [ "$CONF_TYPE" == "system" ] ; then printf "\"%s\":\"%s\",\n" "HOSTNAME" "$(cat /etc/hostname)" + printf "\"%s\":\"%s\",\n" "TIMEZONE" "$(cat /etc/TZ)" fi # Empty values to "close" the json diff --git a/src/www/httpd/cgi-bin/ptz.sh b/src/www/httpd/cgi-bin/ptz.sh new file mode 100755 index 0000000..fcebf21 --- /dev/null +++ b/src/www/httpd/cgi-bin/ptz.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +DIR="none" +TIME="0.1" + +for I in 1 2 +do + CONF="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f1)" + VAL="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f2)" + + if [ "$CONF" == "dir" ] ; then + DIR="-m $VAL" + elif [ "$CONF" == "time" ] ; then + TIME="$VAL" + fi +done + +if [ "$DIR" != "none" ] ; then + ipc_cmd $DIR + sleep $TIME + ipc_cmd -m stop +fi + +printf "Content-type: application/json\r\n\r\n" + +printf "{\n" +printf "}" diff --git a/src/www/httpd/cgi-bin/set_configs.sh b/src/www/httpd/cgi-bin/set_configs.sh index 010de31..1d3acca 100755 --- a/src/www/httpd/cgi-bin/set_configs.sh +++ b/src/www/httpd/cgi-bin/set_configs.sh @@ -1,16 +1,22 @@ #!/bin/sh -if [ -d "/usr/yi-hack-v4" ]; then - YI_HACK_PREFIX="/usr/yi-hack-v4" -elif [ -d "/home/yi-hack-v4" ]; then - YI_HACK_PREFIX="/home/yi-hack-v4" -fi +YI_HACK_PREFIX="/home/yi-hack-v4" + +#urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } + +urldecode(){ + echo -e "$(sed 's/+/ /g;s/%\(..\)/\\x\1/g;')" +} + +sedencode(){ + echo -e "$(sed 's/\\/\\\\\\/g;s/\&/\\\&/g;s/\//\\\//g;')" +} get_conf_type() -{ +{ CONF="$(echo $QUERY_STRING | cut -d'=' -f1)" VAL="$(echo $QUERY_STRING | cut -d'=' -f2)" - + if [ $CONF == "conf" ] ; then echo $VAL fi @@ -19,7 +25,7 @@ get_conf_type() CONF_TYPE="$(get_conf_type)" CONF_FILE="" -if [ $CONF_TYPE == "mqtt" ] ; then +if [ "$CONF_TYPE" == "mqtt" ] ; then CONF_FILE="$YI_HACK_PREFIX/etc/mqttv4.conf" else CONF_FILE="$YI_HACK_PREFIX/etc/$CONF_TYPE.conf" @@ -33,22 +39,38 @@ for S in $PARAMS ; do PARAM=$(echo "$S" | tr "=" " ") KEY="" VALUE="" - + for SP in $PARAM ; do if [ -z $KEY ]; then KEY=$SP else VALUE=$SP + VALUE=$(echo "$SP" | urldecode) fi done - - if [ $KEY == "HOSTNAME" ] ; then - if [ ! -z $VALUE ] ; then + + if [ "$KEY" == "HOSTNAME" ] ; then + if [ -z $VALUE ] ; then + + # Use 2 last MAC address numbers to set a different hostname + MAC=$(cat /sys/class/net/wlan0/address|cut -d ':' -f 5,6|sed 's/://g') + if [ "$MAC" != "" ]; then + hostname yi-$MAC + else + hostname yi-hack + fi + hostname > /etc/hostname + else + hostname $VALUE echo "$VALUE" > /etc/hostname fi + elif [ "$KEY" == "TIMEZONE" ] ; then + echo $VALUE > /etc/TZ else + VALUE=$(echo "$VALUE" | sedencode) sed -i "s/^\(${KEY}\s*=\s*\).*$/\1${VALUE}/" $CONF_FILE - fi + fi + done # Yeah, it's pretty ugly. diff --git a/src/www/httpd/htdocs/images/arrow-down-bold-box-outline.png b/src/www/httpd/htdocs/images/arrow-down-bold-box-outline.png new file mode 100644 index 0000000000000000000000000000000000000000..27fb229af2cc2dd56424434f7ad6a7ca8eceff2b GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3-2k5uS0GJ1IJiK=4yc;1B*-tA zp}u_bXYD@L%X_X~Vc%CM^yd#y=830^V@Sl|x7QW9oE$}3A3ipX;92)1Y4c3hgGv&) zVS;y>UKenxl|Qg!adbVs#WaeF_!-fBmrdc-B>9>)k&yxO~GiO1u^cuJ{+( z_`J=*{A3%;G^slrJ*GQ^EiyhR7+ikfrLdQIdM&@e0=Xsrj7)#bKTIjrWIBCt0mp-% z4w4aO3JiNJ7c`i%sWg0UU^~Vvb)eFL`7tB!1Dgen9~;;TL!G1S3!b{y`ce)1!fi|TS9`5D-4Q;Y`M#{o-rA?0&1>yuN$HlYypYnWk+oCY XW!llXPgiqTgTl?z)z4*}Q$iB}c$<8+ literal 0 HcmV?d00001 diff --git a/src/www/httpd/htdocs/images/arrow-left-bold-box-outline.png b/src/www/httpd/htdocs/images/arrow-left-bold-box-outline.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbb344f1ddc2d2d3abb2e5235abbe34c2c9b11f GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3tpJ}8S0GI!;1WL90aVIc666=m z&`>`4v-Xuf);(9*_mv+t3lFzi8%b`^lDzGKoOUV=8i#!zcd_4DAX|N6Z>G& zvWQP+zQQu`FO^M`=T1m?x6L?Ps<-a$zZv?u{-6Jw`o8`Zf6wZJo%jZi+p8L!`Q=!1 zsy=8vxYV4^xLfWHx5uQ+Yc=u@_#H$fm{^&d7dRwvh;Z;UGBqj&C>XGKtz>U=XgnaG zApnvM{*bw!FPDL(L87Z}Rm8H-2E1LCH$*#C>=gvUt1CZE+9q~{Da%o30hIdoIEitq zf>;1If=c)qFDy}TKlEa4_|o$5Yky@vG$-3WUGi|kV$N;LBh6;k%;BzionCtWk$OHT O@H}1pT-G@yGywolV0z{N literal 0 HcmV?d00001 diff --git a/src/www/httpd/htdocs/images/arrow-right-bold-box-outline.png b/src/www/httpd/htdocs/images/arrow-right-bold-box-outline.png new file mode 100644 index 0000000000000000000000000000000000000000..c7009a5fa940c5ce90448eed6185b4f0fda81910 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3-2k5uS0GJ1IJiK=4yc;1B*-tA zp`(8CXYDI}tb4Aq?`wE?>c=^t%rj3H$B>A_Z?EfeH8~2je`M@Vn5le5ut#n2#iR{0 z_cVpFyniUDbI*CtA)dN~nZ_A+&3D*+Xlko{^{Jct^YpOQ@5NsKxsang*Do?t$#rot zuT43tM9S7e#<0=??E_o*@2Z*iGk7%yPr$_WjGH_(3%G)i za1&Fr0t*7mYanqD5>2Q7$1?Gj-2b`owEs(8>uWz{9yBLcG)#8;R$$Vplf8M()mJ;k Xzw?~)3Fz5t1`0V(S3j3^P6CnJB?H}E$cTp|!sDk<^AMw2P@+*TGd zheNC^9u*A?oQxb33K$rLm;@9aGBBx_tYFy6z~aH-(9punF+l(*&o7{$2$Yvo0PEP% z5O2dN@L>PJ@_l8@f7mqsUeNtN@1XdsqMf literal 0 HcmV?d00001 diff --git a/src/www/httpd/htdocs/index.html b/src/www/httpd/htdocs/index.html index 29c612f..3b81078 100755 --- a/src/www/httpd/htdocs/index.html +++ b/src/www/httpd/htdocs/index.html @@ -57,18 +57,21 @@
    • -
  • - Status -
  • Configurations
  • MQTT
    • +
  • + Camera Settings +
  • RTSP
    • +
  • + PTZ +
  • Update
    • diff --git a/src/www/httpd/htdocs/js/modules/camera_settings.js b/src/www/httpd/htdocs/js/modules/camera_settings.js new file mode 100644 index 0000000..8e237b5 --- /dev/null +++ b/src/www/httpd/htdocs/js/modules/camera_settings.js @@ -0,0 +1,90 @@ +var APP = APP || {}; + +APP.camera_settings = (function ($) { + + function init() { + registerEventHandler(); + fetchConfigs(); + } + + function registerEventHandler() { + $(document).on("click", '#button-save', function (e) { + saveConfigs(); + }); + } + + function fetchConfigs() { + loadingStatusElem = $('#loading-status'); + loadingStatusElem.text("Loading..."); + + $.ajax({ + type: "GET", + url: 'cgi-bin/get_configs.sh?conf=camera', + dataType: "json", + success: function(response) { + loadingStatusElem.fadeOut(500); + + $.each(response, function (key, state) { + if(key=="SENSITIVITY") + $('select[data-key="' + key +'"]').prop('value', state); + else + $('input[type="checkbox"][data-key="' + key +'"]').prop('checked', state === 'yes'); + }); + }, + error: function(response) { + console.log('error', response); + } + }); + } + + function saveConfigs() { + var saveStatusElem; + let configs = {}; + + saveStatusElem = $('#save-status'); + + saveStatusElem.text("Saving..."); + + $('.configs-switch input[type="checkbox"]').each(function () { + configs[$(this).attr('data-key')] = $(this).prop('checked') ? 'yes' : 'no'; + }); + + configs["SENSITIVITY"] = $('select[data-key="SENSITIVITY"]').prop('value'); + + $.ajax({ + type: "POST", + url: 'cgi-bin/set_configs.sh?conf=camera', + data: configs, + dataType: "json", + success: function(response) { + saveStatusElem.text("Saved"); + }, + error: function(response) { + saveStatusElem.text("Error while saving"); + console.log('error', response); + } + }); + $.ajax({ + type: "GET", + url: 'cgi-bin/camera_settings.sh?' + + 'save_video_on_motion=' + configs["SAVE_VIDEO_ON_MOTION"] + + '&sensitivity=' + configs["SENSITIVITY"] + + '&led=' + configs["LED"] + + '&ir=' + configs["IR"] + + '&rotate=' + configs["ROTATE"] + + '&switch_on=' + configs["SWITCH_ON"], + dataType: "json", + success: function(response) { + + }, + error: function(response) { + console.log('error', response); + } + }); + } + + return { + init: init + }; + +})(jQuery); diff --git a/src/www/httpd/htdocs/js/modules/ptz.js b/src/www/httpd/htdocs/js/modules/ptz.js new file mode 100644 index 0000000..706cdfa --- /dev/null +++ b/src/www/httpd/htdocs/js/modules/ptz.js @@ -0,0 +1,63 @@ +var APP = APP || {}; + +APP.ptz = (function ($) { + + function init() { + registerEventHandler(); + } + + function registerEventHandler() { + $(document).on("click", '#img-au', function (e) { + move('#img-au', 'up'); + }); + $(document).on("click", '#img-al', function (e) { + move('#img-al', 'left'); + }); + $(document).on("click", '#img-ar', function (e) { + move('#img-ar', 'right'); + }); + $(document).on("click", '#img-ad', function (e) { + move('#img-ad', 'down'); + }); + $(document).on("click", '#button-goto', function (e) { + gotoPreset('#button-goto', '#select-goto'); + }); + } + + function move(button, dir) { + $(button).attr("disabled", true); + $.ajax({ + type: "GET", + url: 'cgi-bin/ptz.sh?dir='+dir, + dataType: "json", + error: function(response) { + console.log('error', response); + $(button).attr("disabled", false); + }, + success: function(data) { + $(button).attr("disabled", false); + } + }); + } + + function gotoPreset(button, select) { + $(button).attr("disabled", true); + $.ajax({ + type: "GET", + url: 'cgi-bin/preset.sh?num='+$(select + " option:selected").text(), + dataType: "json", + error: function(response) { + console.log('error', response); + $(button).attr("disabled", false); + }, + success: function(data) { + $(button).attr("disabled", false); + } + }); + } + + return { + init: init + }; + +})(jQuery); diff --git a/src/www/httpd/htdocs/pages/camera_settings.html b/src/www/httpd/htdocs/pages/camera_settings.html new file mode 100644 index 0000000..dab6230 --- /dev/null +++ b/src/www/httpd/htdocs/pages/camera_settings.html @@ -0,0 +1,121 @@ +
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    + On this page you can change some camera settings. +

    +
    +

    General

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Switch on/off the camera + + + Switch on/off the video on the camera. + +
    Save video when a motion is detected + + + If enabled, video will be saved only when a motion is detected. + +
    + + If disabled, video will be always saved. + +
    + + (It takes effect only if recording is enabled) + +
    Detection sensitivity +
    + +
    +
    Status led + + + Set status led on or off. + +
    IR led + + + Enable IR led for night vision. + +
    Rotate + + + Enable image rotation for ceiling mount. + +
    +
    +
    +
    + Any change will take effect immediately. +
    + Note that these settings are not synchronized with the settings made with the app. +
    +
    +
    +
    + +
    +
    +
    diff --git a/src/www/httpd/htdocs/pages/ptz.html b/src/www/httpd/htdocs/pages/ptz.html new file mode 100644 index 0000000..6b68859 --- /dev/null +++ b/src/www/httpd/htdocs/pages/ptz.html @@ -0,0 +1,64 @@ +
    +
    + +
    +
    +

    + In this page you can move your cam. +

    +
    + + +
    +

    Move pad

    +
    + + + + + + + + + + + + + + + + + + +
    + +

    Presets

    +
    + + + + + + + +
    + + + +
    +
    +
    +
    From c958e065621cb094d4b0125bae4af5059f9080a0 Mon Sep 17 00:00:00 2001 From: Keroi Date: Sun, 3 May 2020 23:00:22 +0200 Subject: [PATCH 3/5] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fd1689..f11a638 100644 --- a/README.md +++ b/README.md @@ -52,12 +52,19 @@ This firmware will add the following features: - **RTSP server** - which will allow a RTSP stream of the video while keeping the cloud features enabled (available to the supporters of the project). - viewd - a daemon to check the `/tmp/view` buffer heads/tails location (needed by the RTSP). - **MQTT** - detect motion directly from your home server! - - PTZ - WebServer - user-friendly stats and configurations. - SSH server - _Enabled by default._ - Telnet server - _Disabled by default._ - FTP server - _Enabled by default._ - Web server - _Enabled by default._ + - The possibility to change some camera settings (copied from official app): + - camera on/off + - video saving mode + - detection sensitivity + - status led + - ir led + - rotate + - PTZ support through a web page. - Proxychains-ng - _Disabled by default. Useful if the camera is region locked._ - The possibility to disable all the cloud features while keeping the RTSP stream. From 5ee83f184dfd8a9e0fbf6a624c6eddd9b51e38fa Mon Sep 17 00:00:00 2001 From: Keroi Date: Tue, 5 May 2020 17:06:46 +0200 Subject: [PATCH 4/5] Fix preset.sh file missing --- src/www/httpd/cgi-bin/get_configs.sh | 6 +++++- src/www/httpd/cgi-bin/preset.sh | 19 +++++++++++++++++++ src/www/httpd/cgi-bin/set_configs.sh | 6 +++++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 src/www/httpd/cgi-bin/preset.sh diff --git a/src/www/httpd/cgi-bin/get_configs.sh b/src/www/httpd/cgi-bin/get_configs.sh index 9019763..f0ee90c 100755 --- a/src/www/httpd/cgi-bin/get_configs.sh +++ b/src/www/httpd/cgi-bin/get_configs.sh @@ -1,6 +1,10 @@ #!/bin/sh -YI_HACK_PREFIX="/home/yi-hack-v4" +if [ -d "/usr/yi-hack-v4" ]; then + YI_HACK_PREFIX="/usr/yi-hack-v4" +elif [ -d "/home/yi-hack-v4" ]; then + YI_HACK_PREFIX="/home/yi-hack-v4" +fi get_conf_type() { diff --git a/src/www/httpd/cgi-bin/preset.sh b/src/www/httpd/cgi-bin/preset.sh new file mode 100755 index 0000000..3bfc5b7 --- /dev/null +++ b/src/www/httpd/cgi-bin/preset.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +NUM=-1 + +CONF="$(echo $QUERY_STRING | cut -d'=' -f1)" +VAL="$(echo $QUERY_STRING | cut -d'=' -f2)" + +if [ "$CONF" == "num" ] ; then + NUM=$VAL +fi + +if [ $NUM -ne -1 ] ; then + ipc_cmd -p $NUM +fi + +printf "Content-type: application/json\r\n\r\n" + +printf "{\n" +printf "}" diff --git a/src/www/httpd/cgi-bin/set_configs.sh b/src/www/httpd/cgi-bin/set_configs.sh index 1d3acca..26ef901 100755 --- a/src/www/httpd/cgi-bin/set_configs.sh +++ b/src/www/httpd/cgi-bin/set_configs.sh @@ -1,6 +1,10 @@ #!/bin/sh -YI_HACK_PREFIX="/home/yi-hack-v4" +if [ -d "/usr/yi-hack-v4" ]; then + YI_HACK_PREFIX="/usr/yi-hack-v4" +elif [ -d "/home/yi-hack-v4" ]; then + YI_HACK_PREFIX="/home/yi-hack-v4" +fi #urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } From dd48af38fc25892231b0e10c25fef16cd87199ba Mon Sep 17 00:00:00 2001 From: Keroi Date: Tue, 5 May 2020 19:26:37 +0200 Subject: [PATCH 5/5] Cleanup --- src/www/httpd/cgi-bin/get_configs.sh | 11 ++++---- src/www/httpd/cgi-bin/set_configs.sh | 42 ++++++---------------------- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/src/www/httpd/cgi-bin/get_configs.sh b/src/www/httpd/cgi-bin/get_configs.sh index f0ee90c..747783b 100755 --- a/src/www/httpd/cgi-bin/get_configs.sh +++ b/src/www/httpd/cgi-bin/get_configs.sh @@ -7,11 +7,11 @@ elif [ -d "/home/yi-hack-v4" ]; then fi get_conf_type() -{ +{ CONF="$(echo $QUERY_STRING | cut -d'=' -f1)" VAL="$(echo $QUERY_STRING | cut -d'=' -f2)" - - if [ "$CONF" == "conf" ] ; then + + if [ $CONF == "conf" ] ; then echo $VAL fi } @@ -21,7 +21,7 @@ printf "Content-type: application/json\r\n\r\n" CONF_TYPE="$(get_conf_type)" CONF_FILE="" -if [ "$CONF_TYPE" == "mqtt" ] ; then +if [ $CONF_TYPE == "mqtt" ] ; then CONF_FILE="$YI_HACK_PREFIX/etc/mqttv4.conf" else CONF_FILE="$YI_HACK_PREFIX/etc/$CONF_TYPE.conf" @@ -37,9 +37,8 @@ while IFS= read -r LINE ; do fi done < "$CONF_FILE" -if [ "$CONF_TYPE" == "system" ] ; then +if [ $CONF_TYPE == "system" ] ; then printf "\"%s\":\"%s\",\n" "HOSTNAME" "$(cat /etc/hostname)" - printf "\"%s\":\"%s\",\n" "TIMEZONE" "$(cat /etc/TZ)" fi # Empty values to "close" the json diff --git a/src/www/httpd/cgi-bin/set_configs.sh b/src/www/httpd/cgi-bin/set_configs.sh index 26ef901..010de31 100755 --- a/src/www/httpd/cgi-bin/set_configs.sh +++ b/src/www/httpd/cgi-bin/set_configs.sh @@ -6,21 +6,11 @@ elif [ -d "/home/yi-hack-v4" ]; then YI_HACK_PREFIX="/home/yi-hack-v4" fi -#urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } - -urldecode(){ - echo -e "$(sed 's/+/ /g;s/%\(..\)/\\x\1/g;')" -} - -sedencode(){ - echo -e "$(sed 's/\\/\\\\\\/g;s/\&/\\\&/g;s/\//\\\//g;')" -} - get_conf_type() -{ +{ CONF="$(echo $QUERY_STRING | cut -d'=' -f1)" VAL="$(echo $QUERY_STRING | cut -d'=' -f2)" - + if [ $CONF == "conf" ] ; then echo $VAL fi @@ -29,7 +19,7 @@ get_conf_type() CONF_TYPE="$(get_conf_type)" CONF_FILE="" -if [ "$CONF_TYPE" == "mqtt" ] ; then +if [ $CONF_TYPE == "mqtt" ] ; then CONF_FILE="$YI_HACK_PREFIX/etc/mqttv4.conf" else CONF_FILE="$YI_HACK_PREFIX/etc/$CONF_TYPE.conf" @@ -43,38 +33,22 @@ for S in $PARAMS ; do PARAM=$(echo "$S" | tr "=" " ") KEY="" VALUE="" - + for SP in $PARAM ; do if [ -z $KEY ]; then KEY=$SP else VALUE=$SP - VALUE=$(echo "$SP" | urldecode) fi done - - if [ "$KEY" == "HOSTNAME" ] ; then - if [ -z $VALUE ] ; then - - # Use 2 last MAC address numbers to set a different hostname - MAC=$(cat /sys/class/net/wlan0/address|cut -d ':' -f 5,6|sed 's/://g') - if [ "$MAC" != "" ]; then - hostname yi-$MAC - else - hostname yi-hack - fi - hostname > /etc/hostname - else - hostname $VALUE + + if [ $KEY == "HOSTNAME" ] ; then + if [ ! -z $VALUE ] ; then echo "$VALUE" > /etc/hostname fi - elif [ "$KEY" == "TIMEZONE" ] ; then - echo $VALUE > /etc/TZ else - VALUE=$(echo "$VALUE" | sedencode) sed -i "s/^\(${KEY}\s*=\s*\).*$/\1${VALUE}/" $CONF_FILE - fi - + fi done # Yeah, it's pretty ugly.