diff --git a/general/overlay/etc/init.d/S96telemetry b/general/overlay/etc/init.d/S96telemetry new file mode 100755 index 00000000..7e6984d0 --- /dev/null +++ b/general/overlay/etc/init.d/S96telemetry @@ -0,0 +1,52 @@ +#!/bin/sh + +DAEMON="Telemetry_Transfer" +PIDFILE="/var/run/$DAEMON.pid" +COMMAND="socat UDP-RECV:2002 STDOUT | mcom -s 420000 /dev/ttyAMA0 | socat - udp-sendto:192.168.144.222:2001" + +start() { + echo -n "Starting $DAEMON: " + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x /bin/sh -- -c "$COMMAND" + if [ $? -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi +} + +stop() { + echo -n "Stopping $DAEMON: " + start-stop-daemon -K -q -p "$PIDFILE" + if [ $? -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi +} + +restart() { + stop + sleep 3 + start +} + + +case "$1" in + start) + start + ;; + + stop) + stop + ;; + + restart|reload) + restart + ;; + + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac diff --git a/general/overlay/etc/init.d/S97majestic-config-writer b/general/overlay/etc/init.d/S97majestic-config-writer new file mode 100755 index 00000000..40c464e1 --- /dev/null +++ b/general/overlay/etc/init.d/S97majestic-config-writer @@ -0,0 +1,123 @@ +#!/bin/sh + +DAEMON="MajesticConfigWriter" +PIDFILE="/var/run/$DAEMON.pid" +CONFIG_FILE="/etc/majestic.yaml" +NEW_CONFIG="system: + webPort: 80 + httpsPort: 443 + logLevel: debug +isp: + antiFlicker: disabled + slowShutter: disabled + drc: 350 + sensorConfig: /etc/sensors/imx335_i2c_4M.ini +image: + mirror: false + flip: false + rotate: 0 + contrast: 50 + hue: 50 + saturation: 50 + luminance: 50 +video0: + enabled: true + codec: h264 + fps: 30 + bitrate: 5120 + rcMode: cbr + gopSize: 1.5 + size: 1920x1080 +video1: + enabled: false + codec: h264 + size: 704x576 + fps: 15 +jpeg: + enabled: false + qfactor: 50 + fps: 5 +osd: + enabled: false + font: \"/usr/share/fonts/truetype/UbuntuMono-Regular.ttf\" + template: \"%d.%m.%Y %H:%M:%S\" + posX: 16 + posY: 16 +audio: + enabled: false + volume: 30 + srate: 8000 + codec: opus + outputEnabled: false + outputVolume: 30 +rtsp: + enabled: true + port: 554 +nightMode: + colorToGray: true + irCutSingleInvert: false + lightMonitor: false + lightSensorInvert: false +motionDetect: + enabled: false + visualize: false + debug: false +records: + enabled: false + path: \"/mnt/mmcblk0p1/%F\" + split: 20 + maxUsage: 95 +outgoing: + enabled: true + server: udp://192.168.144.222:8000 +watchdog: + enabled: true + timeout: 300 +hls: + enabled: false +netip: + enabled: false" + +start() { + echo -n "Starting $DAEMON: " + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x /bin/sh -- -c "echo '$NEW_CONFIG' > $CONFIG_FILE" + if [ $? -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi +} + +stop() { + echo -n "Stopping $DAEMON: " + start-stop-daemon -K -q -p "$PIDFILE" + if [ $? -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac + diff --git a/general/overlay/etc/network/interfaces.d/eth0 b/general/overlay/etc/network/interfaces.d/eth0 index d2cd4306..714fa3d2 100644 --- a/general/overlay/etc/network/interfaces.d/eth0 +++ b/general/overlay/etc/network/interfaces.d/eth0 @@ -1,2 +1,5 @@ -iface eth0 inet dhcp - hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66) +auto eth0 + iface eth0 inet static + address 192.168.144.200 + netmask 255.255.255.0 + gateway 192.168.1.1 diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index a36998d2..176aa4d7 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -12,6 +12,7 @@ MAJESTIC_LICENSE_FILES = LICENSE MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY) MAJESTIC_VARIANT = $(OPENIPC_MAJESTIC) + MAJESTIC_DEPENDENCIES += \ libevent-openipc \ libogg-openipc \ diff --git a/general/package/majestic/files/microcomV2 b/general/package/mcom/files/microcomV2 similarity index 100% rename from general/package/majestic/files/microcomV2 rename to general/package/mcom/files/microcomV2 diff --git a/general/package/mcom/files/socat b/general/package/mcom/files/socat new file mode 100755 index 00000000..1a8be5d7 Binary files /dev/null and b/general/package/mcom/files/socat differ diff --git a/general/package/mcom/mcom.mk b/general/package/mcom/mcom.mk index 928ab33c..82ac8875 100644 --- a/general/package/mcom/mcom.mk +++ b/general/package/mcom/mcom.mk @@ -4,9 +4,11 @@ # ################################################################################ +BASE_PATH = /home/pavel define MCOM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 /home/pavel/openipc-firmware/general/package/mcom/microcomV2 $(TARGET_DIR)/usr/bin/mcom + $(INSTALL) -D -m 0755 $(BASE_PATH)/openipc-firmware/general/package/mcom/files/socat $(TARGET_DIR)/usr/bin/socat + $(INSTALL) -D -m 0755 $(BASE_PATH)/openipc-firmware/general/package/mcom/files/microcomV2 $(TARGET_DIR)/usr/bin/mcom endef $(eval $(generic-package)) diff --git a/general/package/mcom/microcomV2 b/general/package/mcom/microcomV2 deleted file mode 100755 index 87115bc9..00000000 Binary files a/general/package/mcom/microcomV2 and /dev/null differ