[dvblast-devel] wishlist

[Zoran Turalija]

On Mon, Nov 09, 2015 at 10:08:53PM +0200, Dan Lita wrote:
> Small note:
> 
> dvblast -a 1 -n 0  -c gcm  -f 12608000 -s 19279000  -v 18 -u -U -t 1 -S 1 -k
> 10
> does not work.
> 
> instead:
> dvblast -a 1 -n 0  -c gcm  -f 12608000 -s 19279000  -v 18 -u -U -t 1 -S 1 -k
> A
> works.
> 
> So -k must be put/used as hex not a decimal one.

That was not intended. It happens because strtol is using base 16 for
conversion of -k parameter. You can try attached patch and see if it
works for you (apply it on clean git).

-- 
Kind regards,
Zoran Turalija
-------------- next part --------------
diff --git a/dvb.c b/dvb.c
index d1c8409..b711670 100644
--- a/dvb.c
+++ b/dvb.c
@@ -548,12 +548,10 @@ static int FrontendDoDiseqc(void)
                           | (fe_voltage == SEC_VOLTAGE_13 ? 0 : 2)
                           | (fe_tone == SEC_TONE_ON ? 1 : 0);
 
-        if ( i_uncommitted > 0 && i_uncommitted < 5 )
+        if ( i_uncommitted > 0 && i_uncommitted < 17 )
         {
            uncmd.msg[3] = 0xf0 /* reset bits */
-                             | ((i_uncommitted - 1) << 2)
-                             | (fe_voltage == SEC_VOLTAGE_13 ? 0 : 2)
-                             | (fe_tone == SEC_TONE_ON ? 1 : 0);
+                             | (i_uncommitted - 1);
            if( ioctl( i_frontend, FE_DISEQC_SEND_MASTER_CMD, &uncmd ) < 0 )
            {
                msg_Err( NULL, "ioctl FE_SEND_MASTER_CMD failed (%s)",
diff --git a/dvblast.1 b/dvblast.1
index 6dbb0f7..58e514e 100644
--- a/dvblast.1
+++ b/dvblast.1
@@ -102,7 +102,7 @@ Character set used for printing messages (default UTF-8)
 Character set used in output DVB tables (default ISO-8859-1)
 .TP
 \fB\-k\fR, \fB\-\-uncommitted\fR <uncommitted port>
-Port number for uncommitted diseqc (0: no uncommitted diseqc, 1\-4)
+Port number for uncommitted diseqc (0: no uncommitted diseqc, 1\-16)
 .TP
 \fB\-K\fR, \fB\-\-fec-lp\fR
 DVB-T low priority FEC (default auto)
diff --git a/dvblast.c b/dvblast.c
index 70828c1..1a9eaee 100644
--- a/dvblast.c
+++ b/dvblast.c
@@ -635,7 +635,7 @@ void usage()
     msg_Raw( NULL, "  -X --transmission     DVB-T transmission (2, 4, 8 or -1 auto, default)" );
     msg_Raw( NULL, "  -s --symbol-rate" );
     msg_Raw( NULL, "  -S --diseqc           satellite number for diseqc (0: no diseqc, 1-4, A or B)" );
-    msg_Raw( NULL, "  -k --uncommitted      port number for uncommitted diseqc (0: no uncommitted diseqc, 1-4)" );
+    msg_Raw( NULL, "  -k --uncommitted      port number for uncommitted diseqc (0: no uncommitted diseqc, 1-16)" );
     msg_Raw( NULL, "  -u --budget-mode      turn on budget mode (no hardware PID filtering)" );
     msg_Raw( NULL, "  -v --voltage          voltage to apply to the LNB (QPSK)" );
     msg_Raw( NULL, "  -w --select-pmts      set a PID filter on all PMTs (auto on, when config file is used)" );
@@ -874,7 +874,7 @@ int main( int i_argc, char **pp_argv )
             break;
 
         case 'k':
-            i_uncommitted = strtol( optarg, NULL, 16 );
+            i_uncommitted = strtol( optarg, NULL, 10 );
             break;
 
         case 'v':