Minor changes

Author: roleoroleo

src/busybox/compile.busybox

@@ -9,4 +9,3 @@ cd "${BUILD_FOLDER}"
 
 make -j$(nproc) ARCH=arm || exit 1
 make install || exit 1
-

src/ipc_cmd/ipc_cmd/ptz.c

@@ -26,7 +26,6 @@ int is_ptz(char *model) {
     } else if ((strcmp("r30gb", model) == 0) ||
             (strcmp("r35gb", model) == 0) ||
             (strcmp("r40ga", model) == 0) ||
-            (strcmp("h60ga", model) == 0) ||
             (strcmp("q321br_lsx", model) == 0) ||
             (strcmp("qg311r", model) == 0) ||
             (strcmp("b091qp", model) == 0)) {
@@ -35,7 +34,8 @@ int is_ptz(char *model) {
 
     } else if ((strcmp("h30ga", model) == 0) ||
             (strcmp("h51ga", model) == 0) ||
-            (strcmp("h52ga", model) == 0)) {
+            (strcmp("h52ga", model) == 0) ||
+            (strcmp("h60ga", model) == 0)) {
 
         return ALLWINNER_V2_ALT;
     } else {

src/rRTSPServer/src/OnDemandServerMediaSubsession_BC.cpp

@@ -344,11 +344,11 @@ char* OnDemandServerMediaSubsession_BC::getRtpMapLine(RTPSource* rtpSource) cons
         }
         char const* const rtpmapFmt = "a=rtpmap:%d %s/%d%s\r\n";
         unsigned rtpmapFmtSize = strlen(rtpmapFmt)
-          + 3 /* max char len */ + strlen("MPEG4-GENERIC")
+          + 3 /* max char len */ + strlen("mpeg4-generic")
           + 20 /* max int len */ + strlen(encodingParamsPart);
         char* rtpmapLine = new char[rtpmapFmtSize];
         sprintf(rtpmapLine, rtpmapFmt,
-            rtpSource->rtpPayloadFormat(), "MPEG4-GENERIC",
+            rtpSource->rtpPayloadFormat(), "mpeg4-generic",
             rtpSource->timestampFrequency(), encodingParamsPart);
         delete[] encodingParamsPart;
 

src/set_tz_offset/set_tz_offset/set_tz_offset.c

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include "set_tz_offset.h"
 
-int tz_offset_osd_addr[34][2] = {
+int tz_offset_osd_addr[35][2] = {
     { 0x4f4, 1 },    // Y203C
     { 0x4a0, 1 },    // Y23
     { 0x4f4, 1 },    // Y25
@@ -36,7 +36,8 @@ int tz_offset_osd_addr[34][2] = {
     { 0x56c, 1 },    // H30GA_11
     { 0x4e0, 1 },    // H51GA
     { 0x4e0, 1 },    // H52GA
-    { 0x560, 1 },    // H60GA
+    { 0x560, 1 },    // H60GA_9
+    { 0x564, 1 },    // H60GA_12
     { 0x4e0, 1 },    // Q321BR_LSX
     { 0x4e0, 1 },    // Q705BR
     { 0x4e0, 1 },    // QG311R

src/set_tz_offset/set_tz_offset/set_tz_offset.h

@@ -62,7 +62,8 @@ typedef enum {
     H30GA_11,
     H51GA,
     H52GA,
-    H60GA,
+    H60GA,        // 9
+    H60GA_12,
     Q321BR_LSX,
     Q705BR,
     QG311R,

src/static/static/home/yi-hack/script/configure_wifi.sh

@@ -44,6 +44,7 @@ CONNECTED_BIT=$(hexdump -s 24 -n 4 -v /dev/mtdblock6 | awk 'FNR <=1' | awk '{pri
 
 echo $SSID ${#SSID} - $CURRENT_SSID ${#CURRENT_SSID}
 echo $KEY ${#KEY} - $CURRENT_KEY ${#CURRENT_KEY}
+echo $CONNECTED_BIT
 
 if [ "$SSID" == "$CURRENT_SSID" ] && [ "$KEY" == "$CURRENT_KEY" ] && [ "$CONNECTED_BIT" == "00000000" ]; then
     echo "ssid and key already configured"