diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b5b064b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mjpeg-relay"] + path = mjpeg-relay + url = https://github.com/OliverF/mjpeg-relay diff --git a/README.org b/README.org index 4afddaf..348a12c 100644 --- a/README.org +++ b/README.org @@ -7,3 +7,13 @@ ESP32-CAM mikrokrmilnik, ki ga je možno upravljati po galeriji. Pelje ga [[https://tasmota.github.io/docs/][Tasmota firmware]], s pomočjo katerega dobimo sliko kamere in poganjamo motorčke. Z [[https://ffmpeg.org/][FFMPEG]] orodjem sliko kamere pretvorimo MJPEG videopretok v VP8 RTP obliko, ki jo [[https://janus.conf.meetecho.com/][Janus WebRTC strežnik]] z nizko zakasnitvijo pripelje v brskalnike. Sliko kamere spreljajo gumbi za navigacijo in poseben vmesnik za nastavljanje parametrov premikanja. + +* Problemi + +Aruba ruter si ne zapomni IP naslovov povezujočih naprav. Lahko se zgodi, da se IP naslov mikrokrmilnika zamenja. V tem primeru si pomagamo s skripto cat debug_ruter_tunel.sh. + +* MJPEG relay + +Tole: https://github.com/OliverF/mjpeg-relay + +Teče na rockpi strežniku. diff --git a/check-conn.sh b/check-conn.sh new file mode 100755 index 0000000..c1f9a89 --- /dev/null +++ b/check-conn.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source .env + +# Je treba inicializirat kamero? +curl "galbot:81" + +if [[ $? ]]; then + echo "Inicializiram..." + curl "galbot/cm?cmnd=WcInit" +fi diff --git a/mjpeg-relay b/mjpeg-relay new file mode 160000 index 0000000..b87d1c2 --- /dev/null +++ b/mjpeg-relay @@ -0,0 +1 @@ +Subproject commit b87d1c25d0876b067de68fe51a418d559f67beb4 diff --git a/www/js/streaming.js b/www/js/streaming.js index 651b913..0ef34ad 100644 --- a/www/js/streaming.js +++ b/www/js/streaming.js @@ -46,4 +46,4 @@ window.addEventListener('DOMContentLoaded', function () { onemogociGumbe(); omogociGumbe(DOLZINA + PAVZA); }); -} +});