Diff: setup.cpp

Revision:

14:039d070732d5

Parent:

12:c02b08dacc45

Child:

15:a1ffa32ce9d1

--- a/setup.cpp	Wed Apr 11 02:15:24 2012 +0000
+++ b/setup.cpp	Sat Apr 21 14:50:06 2012 +0000
@@ -58,7 +58,7 @@
     char command;     // Comando al que aplicar el nuevo valor
 
     pc.scanf( "%d-%c", &value, &command ) ;
-    pc.printf("\n %d-%c \n", value, command );
+    //pc.printf("\n %d-%c \n", value, command );
 
     // Establecer nueva frecuencia
     if( command == 'H')
@@ -71,13 +71,18 @@
     // Alguna formula para calcular el Vout necesario
     // -100% a +100%
     else if( command == 'A')
-        aout = (float)( value + 100.0 ) / 200.0;
+        aout = (float)( value + 10000.0 ) / 20000.0;
         
         
     // Cambiar la direccion
     else if( command == 'D')
+    {
+        stopTimer2();
         pin_dir = value;
-        
+        wait_us( 2 );
+        startTimer2();
+    }
+       
         
     //Encender el Servo
     else if( command == 'S')
@@ -112,12 +117,17 @@
         LPC_TIM2->TC = 0x00;            // Resetear Timer
         setMR2( getMRvalue( freq ) );  // Cambiar frefuencia
         startTimer2();                // Iniciar Timer
-        sprintf( output, "Ok, Freq = %d", freq );
-    
+        if( pin_alm == 0 )
+            sprintf( output,"Ok" );
+        else
+            sprintf( output,"AL" );    
     }else{
         stopTimer2();
         LPC_TIM2->TC = 0x00;  // Resetear Timer
-        sprintf( output, "Ok, ALTO" );
+        if( pin_alm == 0 )
+            sprintf( output,"Ok" );
+        else
+            sprintf( output,"AL" );
     }           
 }
 
@@ -128,7 +138,7 @@
     stopTimer2();
     aout =  0.5 ;
  
-    pc.printf( "\n\n ERROR: ALARMA \n\n " );
+    pc.printf( "ERROR_ALARMA" );
  
 }
 
@@ -167,8 +177,11 @@
 void setAout_eth( char * input, char * output )
 {
     int    vout = atoi( input );
-    aout = (float)( vout + 100 ) / 200;   
-    sprintf( output, " Ok, Aout = %f ", aout.read() );    
+    aout = (float)( vout + 10000 ) / 20000;   
+    if( pin_alm == 0 )
+        sprintf( output,"Ok" );
+    else
+        sprintf( output,"AL" );
 }
 
 
@@ -179,10 +192,10 @@
     
     pin_dir = value;
     
-    if( value == 0 )
-        sprintf( output,"Derecha" );
+    if( pin_alm == 0 )
+        sprintf( output,"Ok" );
     else
-        sprintf( output,"Izquierda" );
+        sprintf( output,"AL" );
 }
 
 
@@ -193,10 +206,10 @@
     
     pin_son = value;
     
-    if( value == 0 )
-        sprintf( output,"Servo OFF" );
+    if( pin_alm == 0 )
+        sprintf( output,"Ok" );
     else
-        sprintf( output,"Servo ON" );
+        sprintf( output,"AL" );
         
 }