Ernesto Palacios / Mbed 2 deprecated DeslizadorUTN

Proyecto de Tesis en Mecatrónica. Universidad Técnica del Norte. Ernesto Palacios <mecatronica.mid@gmail.com>

Dependencies:   EthernetNetIf HTTPServer QEI_hw RPCInterface mbed

Files at this revision

API Documentation at this revision

Revision 16:d50665706f21, committed 2012-04-26

Comitter:
Yo_Robot
Date:
Thu Apr 26 04:35:21 2012 +0000
Parent:
15:a1ffa32ce9d1
Child:
17:a4f380bc2516
Commit message:
Version 1.3 Se cambio los pines de ALM, HTTP, baudios

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
setup.cpp Show annotated file Show diff for this revision Revisions of this file
setup.h Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Sun Apr 22 19:22:19 2012 +0000
+++ b/main.cpp	Thu Apr 26 04:35:21 2012 +0000
@@ -12,11 +12,11 @@
 
 DigitalOut      pin_son( p26 );   // SON
 DigitalOut      pin_dir( p25 );   // SIGN+
-InterruptIn     pin_alm( p14 );   // ALM 
+InterruptIn     pin_alm( p8 );   // ALM 
 AnalogOut       aout( p18 );      // 0.0 a 1.0 float
 
-DigitalIn       isHTTP( p21 );   // Modo Ethernet/Serial
-DigitalIn       isFast( p22 );   // Serial Alta velocidad/Baja Velocidad
+DigitalIn       isHTTP( p15 );   // Modo Ethernet/Serial
+DigitalIn       isFast( p16 );   // Serial Alta velocidad/Baja Velocidad
 
 LocalFileSystem fs("webfs");
 
@@ -28,9 +28,9 @@
 RPCFunction SetAOUT(&setAout_eth, "AOUT");
 RPCFunction SetDIR (&setDir_eth,  "DIR");
 RPCFunction SetSON (&setSON_eth,  "SON");
-RPCFuncrion SetANG (&setANG_eth,  "ANG"); 
-RPCFuncrion SetSpd (&setSPD_eth,  "VAN"); 
-RPCFuncrion ReadSpd(&getENC_eth,  "VLC");
+RPCFunction SetANG (&setANG_eth,  "ANG"); 
+RPCFunction SetSpd (&setSPD_eth,  "VAN"); 
+RPCFunction ReadSpd(&getENC_eth,  "VLC");
 
 
 int main() {

--- a/setup.cpp	Sun Apr 22 19:22:19 2012 +0000
+++ b/setup.cpp	Thu Apr 26 04:35:21 2012 +0000
@@ -179,8 +179,9 @@
     stopTimer2();
     aout =  0.5 ;
  
-    pc.printf( "ERROR_ALARMA" );
-    
+    pc.printf( "AL" ); //ALARMA! solo es AL para que 
+                      //sea conciso con el modo ETH y funcione
+                     //bien en LabVIEW.
 }
 
 int getMRvalue( int fout  )

--- a/setup.h	Sun Apr 22 19:22:19 2012 +0000
+++ b/setup.h	Thu Apr 26 04:35:21 2012 +0000
@@ -86,12 +86,12 @@
 
 /** @brief: Cambiar Direccion @ PTO
  */
-void setSPD_eth( char * input, char * output )
+void setSPD_eth( char * input, char * output );
 
 
 /** @brief: Cambiar Direccion @ PTO
  */
-void getENC_eth( char * input, char * output )
+void getENC_eth( char * input, char * output );
 
 
 // Legacy