Ticket #1749: usals.diff

libs/libmythtv/dvbdiseqc.cpp

@@ -720 +720 @@
     if (prev_tuning.diseqc_pos != tuning.diseqc_pos)
         VERBOSE(VB_CHANNEL, LOC + "DiSEqC Motor Moving");
 
-    int CMD1=0x00 , CMD2=0x00;        // Bytes sent to motor
-    double USALS=0.0;
-    int DecimalLookup[10] =
-        { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
+    unsigned char CMD1=0x00 , CMD2=0x00;        // Bytes sent to motor
 
     // Equation lifted from VDR rotor plugin by
     // Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
@@ -744 +741 @@
     else 
         CMD1=0xD0;      // West
 
-    USALS = fabs(Azimuth);
- 
-    while (USALS > 16) 
-    {
-        CMD1++;
-        USALS -=16;
-    }
-
-    while (USALS >= 1.0) 
-    {
-        CMD2+=0x10;
-        USALS--;
-    }
-
-    CMD2 += DecimalLookup[(int)round(USALS*10)];
+    // CMD1 low nibble is angle / 16
+    // CMD2 high nibble is angle % 16
+    // CMD2 low nibble is (angle * 16) % 16
+    unsigned int USALS = (unsigned int)(fabs(Azimuth) * 16.0);
+    CMD1 |= (USALS >> 8) & 0x0f;
+    CMD2 = USALS & 0xff;
   
     if (!DiseqcReset()) 
     {