Diff: power_source_monitoring.cpp

Revision:

132:05cd37f7e007

Parent:

128:3ae1c74773a8

--- a/power_source_monitoring.cpp	Tue Jul 21 20:03:35 2015 +0000
+++ b/power_source_monitoring.cpp	Tue Sep 01 17:21:11 2015 +0000
@@ -1,52 +1,50 @@
 #include "power_source_monitoring.h"
 
-Timer pwr_src_timer;
-DigitalIn pwr_src_in(p25, PullDown);
-UDPSocket pwr_src_client;
+Timer power_source_timer;
+
+DigitalIn pwr_src_in ( p25, PullDown );
+//DigitalIn pwr_src_in ( p25, PullUp );
+
+UDPSocket power_source_client;
+
 Endpoint pwr_src_server;
-uint8_t pwr_src_status = 0;
-//extern const char SERVER_IP[]; // definido em vz_protocol.h
+
+uint8_t power_source_status = 0;
 
 /* Inicializacao da comunicacao UDP com o servidor para monitoramento de fonte de alimentacao */
-int init_pwr_src() {
-    FILE * fpwr = NULL;
-    char server_ip[16];
+int init_power_source () {
+    char server_ip [ 16 ];
     
     /* Inicializacao do timer de leitura de fonte de alimentacao */
-    pwr_src_timer.stop();
-    pwr_src_timer.reset();
+    power_source_timer.stop ();
+    power_source_timer.reset ();
     
     /* Inicializacao do comunicacao UDP */
-    pwr_src_client.set_blocking( false, 0 );
-    pwr_src_client.bind( PWR_SRC_PORT );
-        
-    fpwr = fopen( "/qspi/serverip.txt", "r");
-    if( fpwr == NULL) {
-        if( debug_pwr_src ) debug_msg("Failed to open /qspi/serverip.txt");
-        strncpy( server_ip, SERVER_IP, 20 );    
-    } else {
-        char tmp[ 16 ] = "\0";
-        int read = fread( tmp, 1, 15, fpwr );
-        if( read > 0 ){
-            for( int i = 0; i < read; i++ ) 
-                if( tmp[ i ] == '\n' || tmp[ i ] == '\r' ){
-                    tmp[ i ] = '\0';
-                    break;
-                }
-            strcpy( server_ip, tmp );
-            if( debug_pwr_src ) debug_msg("ip server%s( read %d chars ), valid %d", server_ip, read, strlen( server_ip )  );
-        }else{
-            if( debug_pwr_src ) debug_msg("Failed to read /qspi/serverip.txt");
-            strncpy( server_ip, SERVER_IP, 20 );
-        }
-    }
-    fclose( fpwr );
-    server_ip[ 15 ] = '\0';
-   
+    power_source_client.set_blocking( false, 0 );
+    power_source_client.bind ( u16_POWER_SOURCE_PORT );
+    
     // Criar depois, se quiser, arquivo para PWR_SRC_PORT
+    cm -> get_server_ip ( server_ip );
+    pwr_src_server.set_address ( server_ip , u16_POWER_SOURCE_PORT );
     
-    //strncpy( server_ip, "192.168.120.205\0", 16 );
-    pwr_src_server.set_address( server_ip , PWR_SRC_PORT );
+    power_source_timer.start ();
+    
+    return ( 0 );
+}
+
+int 
+end_power_source ( void )
+{
+    power_source_client.close ();
+    
+    return ( 0 );
+}
+
+int 
+reconnect_power_source ( void )
+{
+    end_power_source ();
+    init_power_source ();
     
     return ( 0 );
 }
\ No newline at end of file