diff --git a/devices/ssc338q_apfpv/br-ext-chip-sigmastar/configs/ssc338q_apfpv_defconfig b/devices/apfpv/br-ext-chip-sigmastar/configs/ssc338q_apfpv_defconfig similarity index 100% rename from devices/ssc338q_apfpv/br-ext-chip-sigmastar/configs/ssc338q_apfpv_defconfig rename to devices/apfpv/br-ext-chip-sigmastar/configs/ssc338q_apfpv_defconfig diff --git a/devices/ssc378qe_apfpv/br-ext-chip-sigmastar/configs/ssc378qe_apfpv_defconfig b/devices/apfpv/br-ext-chip-sigmastar/configs/ssc378qe_apfpv_defconfig similarity index 100% rename from devices/ssc378qe_apfpv/br-ext-chip-sigmastar/configs/ssc378qe_apfpv_defconfig rename to devices/apfpv/br-ext-chip-sigmastar/configs/ssc378qe_apfpv_defconfig diff --git a/devices/ssc338q_apfpv/general/overlay/etc/init.d/S40network b/devices/apfpv/general/overlay/etc/init.d/S40network similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/etc/init.d/S40network rename to devices/apfpv/general/overlay/etc/init.d/S40network diff --git a/devices/ssc338q_apfpv/general/overlay/etc/init.d/S99msposd b/devices/apfpv/general/overlay/etc/init.d/S99msposd similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/etc/init.d/S99msposd rename to devices/apfpv/general/overlay/etc/init.d/S99msposd diff --git a/devices/ssc338q_apfpv/general/overlay/etc/network/interfaces.d/wlan0 b/devices/apfpv/general/overlay/etc/network/interfaces.d/wlan0 similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/etc/network/interfaces.d/wlan0 rename to devices/apfpv/general/overlay/etc/network/interfaces.d/wlan0 diff --git a/devices/ssc338q_apfpv/general/overlay/etc/udhcpd.conf b/devices/apfpv/general/overlay/etc/udhcpd.conf similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/etc/udhcpd.conf rename to devices/apfpv/general/overlay/etc/udhcpd.conf diff --git a/devices/ssc338q_apfpv/general/overlay/usr/bin/adapter b/devices/apfpv/general/overlay/usr/bin/adapter similarity index 95% rename from devices/ssc338q_apfpv/general/overlay/usr/bin/adapter rename to devices/apfpv/general/overlay/usr/bin/adapter index 7543074..08144af 100755 --- a/devices/ssc338q_apfpv/general/overlay/usr/bin/adapter +++ b/devices/apfpv/general/overlay/usr/bin/adapter @@ -4,7 +4,7 @@ set_config() { cat << EOF > /tmp/wpa_supplicant.conf network={ mode=2 - frequency=$(fw_printenv -n wlanfreq || echo 2412) + frequency=$(fw_printenv -n wlanfreq || echo 5200) ssid="$(fw_printenv -n wlanssid || echo OpenIPC)" psk="$(fw_printenv -n wlanpass || echo 12345678)" } diff --git a/devices/ssc338q_apfpv/general/overlay/usr/share/openipc/customizer.sh b/devices/apfpv/general/overlay/usr/share/openipc/customizer.sh similarity index 53% rename from devices/ssc338q_apfpv/general/overlay/usr/share/openipc/customizer.sh rename to devices/apfpv/general/overlay/usr/share/openipc/customizer.sh index 5b6ffc0..4d92ee5 100644 --- a/devices/ssc338q_apfpv/general/overlay/usr/share/openipc/customizer.sh +++ b/devices/apfpv/general/overlay/usr/share/openipc/customizer.sh @@ -1,15 +1,4 @@ #!/bin/sh -# -# Perform basic settings on a known IP camera -# -# -# Set custom upgrade url -# -fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/openipc.ssc338q-nor-apfpv.tgz' -# -# -# Set custom majestic settings -# cli -s .isp.exposure 15 cli -s .video0.fps 60 cli -s .video0.bitrate 12000 diff --git a/devices/ssc338q_apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi b/devices/apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi rename to devices/apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi diff --git a/devices/ssc338q_apfpv/general/overlay/var/www/cgi-bin/p/header.cgi b/devices/apfpv/general/overlay/var/www/cgi-bin/p/header.cgi similarity index 100% rename from devices/ssc338q_apfpv/general/overlay/var/www/cgi-bin/p/header.cgi rename to devices/apfpv/general/overlay/var/www/cgi-bin/p/header.cgi diff --git a/devices/ssc338q_apfpv/general/scripts/excludes/ssc338q_apfpv.list b/devices/apfpv/general/scripts/excludes/ssc338q_apfpv.list similarity index 100% rename from devices/ssc338q_apfpv/general/scripts/excludes/ssc338q_apfpv.list rename to devices/apfpv/general/scripts/excludes/ssc338q_apfpv.list diff --git a/devices/ssc378qe_apfpv/general/scripts/excludes/ssc378qe_apfpv.list b/devices/apfpv/general/scripts/excludes/ssc378qe_apfpv.list similarity index 100% rename from devices/ssc378qe_apfpv/general/scripts/excludes/ssc378qe_apfpv.list rename to devices/apfpv/general/scripts/excludes/ssc378qe_apfpv.list diff --git a/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S40network b/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S40network deleted file mode 100755 index 19f7be1..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S40network +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - echo "Starting network..." - ifup lo - ifup eth0 - ifup wlan0 - ;; - - stop) - echo "Stopping network..." - ifdown lo - ifdown -f eth0 - ifdown -f wlan0 - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; -esac diff --git a/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S99msposd b/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S99msposd deleted file mode 100755 index b143b20..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/etc/init.d/S99msposd +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - echo "Starting msposd..." - devmem 0x1F207890 16 0x8 - sleep 1 - size=$(curl -s localhost/api/v1/config.json | jsonfilter -qe "@.video0.size") - msposd -b 115200 -c 8 -r 20 -m /dev/ttyS2 -z "$size" > /dev/null & - ;; - - stop) - echo "Stopping msposd..." - killall -q msposd - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; -esac diff --git a/devices/ssc378qe_apfpv/general/overlay/etc/network/interfaces.d/wlan0 b/devices/ssc378qe_apfpv/general/overlay/etc/network/interfaces.d/wlan0 deleted file mode 100644 index 72c89c9..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/etc/network/interfaces.d/wlan0 +++ /dev/null @@ -1,7 +0,0 @@ -iface wlan0 inet static - address 192.168.0.1 - gateway 192.168.0.1 - netmask 255.255.255.0 - pre-up adapter setup - post-up adapter start - post-down adapter stop diff --git a/devices/ssc378qe_apfpv/general/overlay/etc/udhcpd.conf b/devices/ssc378qe_apfpv/general/overlay/etc/udhcpd.conf deleted file mode 100644 index 3979705..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/etc/udhcpd.conf +++ /dev/null @@ -1,7 +0,0 @@ -interface wlan0 -start 192.168.0.10 -end 192.168.0.20 -opt dns 192.168.0.1 -opt router 192.168.0.1 -opt subnet 255.255.255.0 -opt lease 10 diff --git a/devices/ssc378qe_apfpv/general/overlay/usr/bin/adapter b/devices/ssc378qe_apfpv/general/overlay/usr/bin/adapter deleted file mode 100755 index 7543074..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/usr/bin/adapter +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -set_config() { -cat << EOF > /tmp/wpa_supplicant.conf -network={ - mode=2 - frequency=$(fw_printenv -n wlanfreq || echo 2412) - ssid="$(fw_printenv -n wlanssid || echo OpenIPC)" - psk="$(fw_printenv -n wlanpass || echo 12345678)" -} -EOF -} - -case "$1" in - setup) - for card in $(lsusb | awk '{print $6}' | uniq); do - case "$card" in - "0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101" | "2604:0012") - driver=8812au - ;; - - "0bda:a81a") - driver=8812eu - ;; - - "0bda:f72b" | "0bda:b733") - driver=8733bu - ;; - esac - done - - if [ -z "$driver" ]; then - echo "Wireless module not detected!" - exit 1 - fi - - echo "Detected driver: $driver" - modprobe "$driver" rtw_tx_pwr_by_rate=0 rtw_tx_pwr_lmt_enable=0 - ;; - - start) - iw wlan0 set txpower fixed $(fw_printenv -n wlanpwr || echo 1500) - set_config - wpa_supplicant -B -i wlan0 -c /tmp/wpa_supplicant.conf - udhcpd -S - ;; - - stop) - killall -q udhcpd wpa_supplicant - ;; - - *) - echo "Usage: $0 {setup|start|stop}" - exit 1 - ;; -esac diff --git a/devices/ssc378qe_apfpv/general/overlay/usr/share/openipc/customizer.sh b/devices/ssc378qe_apfpv/general/overlay/usr/share/openipc/customizer.sh deleted file mode 100644 index 4059307..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/usr/share/openipc/customizer.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# Perform basic settings on a known IP camera -# -# -# Set custom upgrade url -# -fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/openipc.ssc378qe-nor-apfpv.tgz' -# -# -# Set custom majestic settings -# -cli -s .isp.exposure 15 -cli -s .video0.fps 60 -cli -s .video0.bitrate 12000 -cli -s .video0.codec h265 -cli -s .video0.rcMode avbr -cli -s .outgoing.enabled true -cli -s .outgoing.server udp://224.0.0.1:5600 -cli -s .records.split 5 -cli -s .records.notime true diff --git a/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi b/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi deleted file mode 100755 index 9f1f539..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/j/locale.cgi +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -mj_audio=Audio -mj_image=Image -mj_isp=ISP -mj_outgoing=Outgoing -mj_records=Record -mj_system=System -mj_video0=Video0 diff --git a/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/p/header.cgi b/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/p/header.cgi deleted file mode 100755 index 014d00b..0000000 --- a/devices/ssc378qe_apfpv/general/overlay/var/www/cgi-bin/p/header.cgi +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/haserl -Content-type: text/html; charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - - - - - - - <% html_title %> - - - - - - - - - -
-
-
-
-
-
-
- -
- <%= $(signature) %> -
- -
-
-
-
-
-
- -<% if [ -z "$network_gateway" ]; then %> -
-

Internet connection not available, please check your network settings.

-
-<% fi %> - -<% if [ ! -e $(get_config) ]; then %> -
-

Majestic configuration not found, please check your Majestic settings.

-
-<% fi %> - -<% if [ "$(cat /etc/TZ)" != "$TZ" ] || [ -e /tmp/system-reboot ]; then %> -
-

Warning.

-

System settings have been updated, restart to apply pending changes.

- - Restart camera - -
-<% fi %> - -

<%= $page_title %>

-<% log_read %>