[tuxdroid-svn] r428 - daemon/trunk/libs

[neimad <c2m...@c2...>]

Author: neimad
Date: 2007-06-24 13:49:29 +0200 (Sun, 24 Jun 2007)
New Revision: 428

Modified:
   daemon/trunk/libs/USBDaemon_command_tux.c
Log:
* Simplified tux_req_status(). We should probably eventually use masks
  instead of bitfields, though.


Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-24 11:44:13 UTC (rev 427)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-06-24 11:49:29 UTC (rev 428)
@@ -540,240 +540,80 @@
 static void tux_req_status(unsigned char const data[], unsigned char result[])
 {
     result[0] = data[0];
+
     switch (data[0])
     {
     case DATA_STATUS_WINGS_MOTOR_BACKWARD:
-        if (portb.bits.PB0)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB0;
         break;
     case DATA_STATUS_SPIN_MOTOR_BACKWARD:
-        if (portb.bits.PB1)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB1;
         break;
     case DATA_STATUS_SPIN_MOTOR_FORWARD:
-        if (portb.bits.PB2)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB2;
         break;
     case DATA_STATUS_MOUTH_OPEN_POSITION:
-        if (portb.bits.PB3)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB3;
         break;
     case DATA_STATUS_MOUTH_CLOSED_POSITION:
-        if (portb.bits.PB4)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB4;
         break;
     case DATA_STATUS_HEAD_PUSH_POSITION:
-        if (portb.bits.PB5)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB5;
         break;
     case DATA_STATUS_CHARGER_INHIBIT_SIGNAL:
         result[0] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
-        if (portb.bits.PB6)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portb.bits.PB6;
         break;
     case DATA_STATUS_WINGS_POSITION_SWITCH:
-        if (portc.bits.PB0)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portc.bits.PB0;
         break;
     case DATA_STATUS_MOTOR_FOR_WINGS:
-        if (portc.bits.PB1)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portc.bits.PB1;
         break;
     case DATA_STATUS_LEFT_BLUE_LED:
-        if (portc.bits.PB2)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portc.bits.PB2;
         break;
     case DATA_STATUS_HEAD_MOTOR_FOR_MOUTH:
-        if (portd.bits.PB1)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB1;
         break;
     case DATA_STATUS_HEAD_MOTOR_FOR_EYES:
         result[0] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
-        if (portd.bits.PB0)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB0;
         break;
     case DATA_STATUS_SPIN_POSITION_SWITCH:
-        if (portd.bits.PB3)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB3;
         break;
     case DATA_STATUS_WINGS_MOTOR_FORWARD:
         result[0] = DATA_STATUS_WINGS_MOTOR_FORWARD;
-        if (portd.bits.PB4)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB4;
         break;
     case DATA_STATUS_IR_LED:
-        if (portd.bits.PB5)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB5;
         break;
     case DATA_STATUS_EYES_OPEN_POSITION_SWITCH:
-        if (portd.bits.PB6)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB6;
         break;
     case DATA_STATUS_EYES_CLOSED_POSITION_SWITCH:
-        if (portd.bits.PB7)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = portd.bits.PB7;
         break;
     case DATA_STATUS_LEFT_WING_PUSH:
-        if (sensors1.bits.PB0)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB0;
         break;
     case DATA_STATUS_RIGHT_WING_PUSH:
-        if (sensors1.bits.PB1)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB1;
         break;
     case DATA_STATUS_POWER_PLUG_SWITCH:
-        if (sensors1.bits.PB2)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB2;
         break;
     case DATA_STATUS_HEAD_PUSH_SWITCH:
-        if (sensors1.bits.PB3)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB3;
         break;
     case DATA_STATUS_CHARGER_LED_STATUS:
-        if (sensors1.bits.PB4)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB4;
         break;
     case DATA_STATUS_MUTE_STATUS:
-        if (sensors1.bits.PB7)
-        {
-            result[1] = 1;
-        }
-        else
-        {
-            result[1] = 0;
-        }
+        result[1] = sensors1.bits.PB7;
         break;
     case DATA_STATUS_LIGHT_LEVEL:
         result[1] = sensors2.level_light_high.Byte;