Merge remote-tracking branch 'origin/master'

mbevand · Jul 30, 2018 · e007723 · e007723
2 parents eda540b + 1a9a898
commit e007723
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -36,12 +36,6 @@ If you/we solve your issue, please condense your gained insights into a pull req
 
 Start [here](/hacks/technical.md)
 
-
-## Viewer and control solution:
-
-After install, you can use this [android application](https://play.google.com/store/apps/details?id=io.ext.medinvention.dafangcam) developed by [@medinvention](https://github.com/mmohamed) and join us on [Gitter](https://gitter.im/Dafang-Hacked-Cam-App)
-
-
 ## Integration in Home Automation Systems:
 
 [Domoticz](/integration/domoticz/domoticz.md)

diff --git a/firmware_mod/bin/setconf b/firmware_mod/bin/setconf
diff --git a/firmware_mod/bin/v4l2rtspserver-master b/firmware_mod/bin/v4l2rtspserver-master
diff --git a/firmware_mod/controlscripts/configureOsd b/firmware_mod/controlscripts/configureOsd
@@ -11,6 +11,8 @@ if [ -f /system/sdcard/config/osd.conf ]; then
     [ ! -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
diff --git a/firmware_mod/fonts/CarroisGothicSC-Regular.ttf b/firmware_mod/fonts/CarroisGothicSC-Regular.ttf
diff --git a/firmware_mod/fonts/FromCartoonBlocks.ttf b/firmware_mod/fonts/FromCartoonBlocks.ttf
diff --git a/firmware_mod/fonts/NotoMono-Regular.ttf b/firmware_mod/fonts/NotoMono-Regular.ttf
diff --git a/firmware_mod/fonts/NotoSans-Regular.ttf b/firmware_mod/fonts/NotoSans-Regular.ttf
diff --git a/firmware_mod/fonts/NotoSerif-Regular.ttf b/firmware_mod/fonts/NotoSerif-Regular.ttf
diff --git a/firmware_mod/fonts/README.md b/firmware_mod/fonts/README.md
@@ -0,0 +1,6 @@
+## Fonts folder
+NotoMono-Regular.ttf and NotoSans-Regular.ttf are mandatory
+Some fonts does not be read (to be tested)
+Too high size maybe not work (bigger than 70 pixels)
+
+
diff --git a/firmware_mod/fonts/Roboto-Black.ttf b/firmware_mod/fonts/Roboto-Black.ttf
diff --git a/firmware_mod/www/cgi-bin/action.cgi b/firmware_mod/www/cgi-bin/action.cgi
@@ -277,6 +277,9 @@ if [ -n "$F_cmd" ]; then
       position=$(printf '%b' "${F_Position}")
       osdtext=$(printf '%b' "${F_osdtext//%/\\x}")
       osdtext=$(echo "$osdtext" | sed -e "s/\\+/ /g")
+      fontName=$(printf '%b' "${F_fontName//%/\\x}")
+      fontName=$(echo "$fontName" | sed -e "s/\\+/ /g")
+
 
       if [ ! -z "$axis_enable" ];then
         update_axis
@@ -301,8 +304,8 @@ if [ -n "$F_cmd" ]; then
       echo "COLOR=${F_color}" >> /system/sdcard/config/osd.conf
       /system/sdcard/bin/setconf -k c -v "${F_color}"
 
-      echo "SIZE=${F_size}" >> /system/sdcard/config/osd.conf
-      /system/sdcard/bin/setconf -k s -v "${F_size}"
+      echo "SIZE=${F_OSDSize}" >> /system/sdcard/config/osd.conf
+      /system/sdcard/bin/setconf -k s -v "${F_OSDSize}"
 
       echo "POSY=${F_posy}" >> /system/sdcard/config/osd.conf
       /system/sdcard/bin/setconf -k x -v "${F_posy}"
@@ -312,6 +315,9 @@ if [ -n "$F_cmd" ]; then
 
       echo "SPACE=${F_spacepixels}" >> /system/sdcard/config/osd.conf
       /system/sdcard/bin/setconf -k p -v "${F_spacepixels}"
+
+      echo "FONTNAME=${fontName}" >> /system/sdcard/config/osd.conf
+      /system/sdcard/bin/setconf -k e -v "${fontName}"
       return
     ;;
 

diff --git a/firmware_mod/www/cgi-bin/status.cgi b/firmware_mod/www/cgi-bin/status.cgi
@@ -707,23 +707,57 @@ cat << EOF
                     </div>
                 </div>
             </div>
+
             <div class="field is-horizontal">
                 <div class="field-label is-normal">
-                    <label class="label">OSD Text Size</label>
+                    <label class="label">Font name</label>
                 </div>
                 <div class="field-body">
                     <div class="field">
                         <div class="control">
                             <div class="select">
-                                <select name="size">
-                                <option value="0" $(if [ "$(grep SIZE /system/sdcard/config/osd.conf | sed s/SIZE=//)" -eq 0 ]; then echo selected; fi)>Small</option>
-                                <option value="1" $(if [ "$(grep SIZE /system/sdcard/config/osd.conf | sed s/SIZE=//)" -eq 1 ]; then echo selected; fi)>Bigger</option>
+                                <select name="FontName">
+                                    $(
+                                       fontName="$(/system/sdcard/bin/setconf -g e)"
+                                       echo -n "<option value=\"\""
+                                       if [ -n "${fontName-unset}" ] ; then echo selected; fi
+                                       echo -n ">Default fonts </option>"
+
+                                       for i in `/system/sdcard/bin/busybox find /system/sdcard/fonts -name *.ttf`
+                                       do
+                                            echo -n "<option value=\"$i\" "
+                                            if [ "$fontName" == "$i" ] ; then echo selected; fi
+                                            echo -n ">`/system/sdcard/bin/busybox basename $i` </option>"
+                                       done
+                                    )
                                 </select>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+
+
+            <div class="field is-horizontal">
+                <div class="field-label is-normal">
+                    <label class="label">OSD Text Size</label>
+                </div>
+                <div class="field-body">
+                    <div class="field">
+                        <p class="control">
+                                 <input class="input" id="OSDSize" name="OSDSize" type="number" size="4"
+                                     value="$(
+                                        fontSize=$(/system/sdcard/bin/setconf -g s)
+                                        if [ "$fontSize" == "0" ]; then echo 18
+                                        elif [ "$fontSize" == "1" ]; then echo 40
+                                        else echo "$fontSize"
+                                        fi
+                                     )"/>
+                        </p>
+                         <p class="help">Too high value won't display anything</p>
+                    </div>
+                </div>
+            </div>
             <div class="field is-horizontal">
                 <div class="field-label is-normal">
                     <label class="label">Pixels between chars</label>
@@ -763,9 +797,11 @@ cat << EOF
                                 <option value="1" $(if [ "$(grep FIXEDW /system/sdcard/config/osd.conf | sed s/FIXEDW=//)" -eq 1 ]; then echo selected; fi)>Yes</option>
                                 </select>
                             </div>
+                            <p class="help">Fixed width works only for "default" fonts</p>
                         </div>
                     </div>
                 </div>
+
             </div>
             <div class="field is-horizontal">
                 <div class="field-label is-normal">

diff --git a/firmware_mod/www/scripts/status.cgi.js b/firmware_mod/www/scripts/status.cgi.js
@@ -105,7 +105,8 @@ $(document).ready(function() {
       'AXISenable': axisenable,
       'osdtext': $('input[name=osdtext]').val(),
       'color': $('select[name=color]').val(),
-      'size': $('select[name=size]').val(),
+      'OSDSize': $('input[name=OSDSize]').val(),
+      'fontName': $('select[name=FontName]').val(),
       'spacepixels': $('input[name=spacepixels]').val(),
       'posy': $('input[name=posy]').val(),
       'fixedw': $('select[name=fixedw]').val()