mirror/xiaomi-dafang-hacks
1
0
Fork 0
mirror of https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks.git synced 2025-09-08 23:20:48 +02:00
Code Issues Releases Wiki Activity

Fixed OSD display (#1015)

Browse Source
This commit is contained in:
dagrider
2019-05-01 01:17:42 -05:00
committed by jmtatsch
parent 1904a3e4c0
commit 483d7a4c63
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware_mod/config/osd.conf
View File

@@ -1,7 +1,9 @@
DISPLAY_AXIS=true
ENABLE_OSD=true
OSD="%H:%M:%S %d.%m.%Y"
COLOR=0
SIZE=0
POSY=
FIXEDW=0
SPACE=
SPACE=
FONTNAME=

8
firmware_mod/controlscripts/configureOsd
View File

@@ -2,17 +2,17 @@
## Get OSD-Information
if [ -f /system/sdcard/config/osd.conf ]; then
source /system/sdcard/config/osd.conf 2>/dev/null
. /system/sdcard/config/osd.conf > /dev/null 2>/dev/null
AXIS=""
# Call setconf only if we have something to set, to avoid outputing error messages
[ ${DISPLAY_AXIS} ] && AXIS=`/system/sdcard/bin/motor -d u -s 0 | tail +5 | awk '{printf ("%s ",$0)}' | awk '{print "X="$2,"Y="$4}'` && OSD=$(echo ${OSD} | sed -r "s/X=.*$/${AXIS}/")
[ ! -z "${OSD}" ] && /system/sdcard/bin/setconf -k o -v "${OSD}" 2>/dev/null
[ "${DISPLAY_AXIS}" = true ] && AXIS=$(/system/sdcard/bin/motor -d s | sed '3d' | awk '{printf ("%s ",$0)}' | awk '{print " X="$2,"Y="$4}')
[ "${ENABLE_OSD}" = true ] && /system/sdcard/bin/setconf -k o -v "${OSD}${AXIS}" 2>/dev/null
[ ! -z "${COLOR}" ] && /system/sdcard/bin/setconf -k c -v ${COLOR} 2>/dev/null
[ ! -z "${SIZE}" ] && /system/sdcard/bin/setconf -k s -v ${SIZE} 2>/dev/null
[ ! -z "${POSY}" ] && /system/sdcard/bin/setconf -k x -v ${POSY} 2>/dev/null
[ ! -z "${FIXEDW}" ] && /system/sdcard/bin/setconf -k w -v ${FIXEDW} 2>/dev/null
[ ! -z "${SPACE}" ] && /system/sdcard/bin/setconf -k p -v ${SPACE} 2>/dev/null
[ ! -z "${FONTNAME}" ] && /system/sdcard/bin/setconf -k e -v ${FONTNAME} 2>/dev/null
else
/system/sdcard/bin/setconf -k o -v ""
fi

1
firmware_mod/scripts/PTZpresets.sh
View File

@@ -100,5 +100,4 @@ esac
# Update OSD_AXIS
update_axis
logger "Move end motor coordinates:$AXIS"
/system/sdcard/bin/setconf -k o -v "$OSD"
exit_shell 0

12
firmware_mod/scripts/common_functions.sh
View File

@@ -221,7 +221,6 @@ update_motor_pos(){
sleep ${SLEEP_NUM//-/}
# Display AXIS to OSD
update_axis
/system/sdcard/bin/setconf -k o -v "$OSD"
}
# Read the light sensor
@@ -450,9 +449,14 @@ snapshot(){
# Update axis
update_axis(){
. /system/sdcard/config/osd.conf > /dev/null 2>/dev/null
AXIS=$(/system/sdcard/bin/motor -d s | sed '3d' | awk '{printf ("%s ",$0)}' | awk '{print "X="$2,"Y="$4}')
if [ "$DISPLAY_AXIS" == "true" ]; then
OSD="${OSD} ${AXIS}"
AXIS=$(/system/sdcard/bin/motor -d s | sed '3d' | awk '{printf ("%s ",$0)}' | awk '{print " X="$2,"Y="$4}')
if [ "$ENABLE_OSD" = "true" ]; then
if [ "$DISPLAY_AXIS" = "true" ]; then
OSD="${OSD}${AXIS}"
fi
/system/sdcard/bin/setconf -k o -v "$OSD"
fi
}

33
firmware_mod/www/cgi-bin/action.cgi
View File

@@ -240,23 +240,24 @@ if [ -n "$F_cmd" ]; then
fontName=$(echo "$fontName" | sed -e "s/\\+/ /g")
if [ ! -z "$axis_enable" ];then
update_axis
osdtext="${osdtext} ${AXIS}"
echo "DISPLAY_AXIS=true" > /system/sdcard/config/osd.conf
echo DISPLAY_AXIS enable
echo "DISPLAY_AXIS enable<br />"
else
echo "DISPLAY_AXIS=false" > /system/sdcard/config/osd.conf
echo DISPLAY_AXIS disable
echo "DISPLAY_AXIS disable<br />"
fi
echo "OSD=\"${osdtext}\"" | sed -r 's/[ ]X=.*"/"/' >> /system/sdcard/config/osd.conf
echo "OSD set<br />"
if [ ! -z "$enabled" ]; then
/system/sdcard/bin/setconf -k o -v "$osdtext"
echo "OSD=\"${osdtext}\"" | sed -r 's/[ ]X=.*"/"/' >> /system/sdcard/config/osd.conf
echo "OSD set"
echo "ENABLE_OSD=true" >> /system/sdcard/config/osd.conf
update_axis
echo "OSD enabled"
else
echo "OSD removed"
echo "ENABLE_OSD=false" >> /system/sdcard/config/osd.conf
echo "OSD disabled"
/system/sdcard/bin/setconf -k o -v ""
echo "OSD=\"\" " >> /system/sdcard/config/osd.conf
fi
echo "COLOR=${F_color}" >> /system/sdcard/config/osd.conf
@@ -489,13 +490,13 @@ if [ -n "$F_cmd" ]; then
rewrite_config /system/sdcard/config/rtspserver.conf HWVOLUME "$F_audioinVol"
rewrite_config /system/sdcard/config/rtspserver.conf SWVOLUME "-1"
echo "Audio format $audioinFormat <BR>"
echo "In audio bitrate $audioinBR <BR>"
echo "Out audio bitrate $audiooutBR <BR>"
echo "Filter $F_audioinFilter <BR>"
echo "High Pass Filter $F_HFEnabled <BR>"
echo "AEC Filter $F_AECEnabled <BR>"
echo "Volume $F_audioinVol <BR>"
echo "Audio format $audioinFormat <br/>"
echo "In audio bitrate $audioinBR <br/>"
echo "Out audio bitrate $audiooutBR <br/>"
echo "Filter $F_audioinFilter <br/>"
echo "High Pass Filter $F_HFEnabled <br/>"
echo "AEC Filter $F_AECEnabled <br/>"
echo "Volume $F_audioinVol <br/>"
/system/sdcard/bin/setconf -k q -v "$F_audioinFilter" 2>/dev/null
/system/sdcard/bin/setconf -k l -v "$F_HFEnabled" 2>/dev/null
/system/sdcard/bin/setconf -k a -v "$F_AECEnabled" 2>/dev/null

2
firmware_mod/www/cgi-bin/system_osd.cgi
View File

@@ -53,7 +53,7 @@ cat << EOF
<div class="field-body">
<div class="field is-grouped">
<p class="control">
<input type="checkbox" name="OSDenable" value="enabled" $(if [ -f /system/sdcard/config/osd.conf ]; then echo checked; fi) />
<input type="checkbox" name="OSDenable" value="enabled" $(if [ "$(grep ENABLE_OSD /system/sdcard/config/osd.conf | sed s/ENABLE_OSD=//)" == "true" ]; then echo checked; fi) />
</p>
<p class="control">
<input class="input" id="osdtext" name="osdtext" type="text" size="25" value="$(source /system/sdcard/config/osd.conf && echo "$OSD")"/>