Initial revision.

[flightgear.git] / src / Network / atlas.cxx

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index 7f3321be47b6457f9e92ccd2eab1f749cd908643..d2bb4033db2ccaec80b374f6aca8506cb642cced 100644 (file)
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -76,7 +76,7 @@ bool FGAtlas::gen_message() {
             t->getGmt()->tm_hour, t->getGmt()->tm_min, t->getGmt()->tm_sec );
 
     char lat[20];
-    double latd = cur_fdm_state->get_Latitude() * RAD_TO_DEG;
+    double latd = cur_fdm_state->get_Latitude() * SGD_RADIANS_TO_DEGREES;
     if ( latd < 0.0 ) {
        latd *= -1.0;
        dir = 'S';
@@ -88,7 +88,7 @@ bool FGAtlas::gen_message() {
     sprintf( lat, "%02d%06.3f,%c", abs(deg), min, dir);
 
     char lon[20];
-    double lond = cur_fdm_state->get_Longitude() * RAD_TO_DEG;
+    double lond = cur_fdm_state->get_Longitude() * SGD_RADIANS_TO_DEGREES;
     if ( lond < 0.0 ) {
        lond *= -1.0;
        dir = 'W';
@@ -103,11 +103,11 @@ bool FGAtlas::gen_message() {
     sprintf( speed, "%05.1f", cur_fdm_state->get_V_equiv_kts() );
 
     char heading[10];
-    sprintf( heading, "%05.1f", cur_fdm_state->get_Psi() * RAD_TO_DEG );
+    sprintf( heading, "%05.1f", cur_fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES );
 
     char altitude_m[10];
     sprintf( altitude_m, "%02d", 
-            (int)(cur_fdm_state->get_Altitude() * FEET_TO_METER) );
+            (int)(cur_fdm_state->get_Altitude() * SG_FEET_TO_METER) );
 
     char altitude_ft[10];
     sprintf( altitude_ft, "%02d", (int)cur_fdm_state->get_Altitude() );
@@ -133,9 +133,9 @@ bool FGAtlas::gen_message() {
             current_radiostack->get_adf_freq() );
     sprintf( patla_sum, "%02X", calc_atlas_cksum(patla) );
 
-    FG_LOG( FG_IO, FG_DEBUG, rmc );
-    FG_LOG( FG_IO, FG_DEBUG, gga );
-    FG_LOG( FG_IO, FG_DEBUG, patla );
+    SG_LOG( SG_IO, SG_DEBUG, rmc );
+    SG_LOG( SG_IO, SG_DEBUG, gga );
+    SG_LOG( SG_IO, SG_DEBUG, patla );
 
     string atlas_sentence;
 
@@ -176,11 +176,11 @@ bool FGAtlas::gen_message() {
 // $GPGGA,163227,3321.173,N,11039.855,W,1,,,3333,F,,,,*0F
 
 bool FGAtlas::parse_message() {
-    FG_LOG( FG_IO, FG_INFO, "parse atlas message" );
+    SG_LOG( SG_IO, SG_INFO, "parse atlas message" );
 
     string msg = buf;
     msg = msg.substr( 0, length );
-    FG_LOG( FG_IO, FG_INFO, "entire message = " << msg );
+    SG_LOG( SG_IO, SG_INFO, "entire message = " << msg );
 
     string::size_type begin_line, end_line, begin, end;
     begin_line = begin = 0;
@@ -190,12 +190,12 @@ bool FGAtlas::parse_message() {
     while ( end_line != string::npos ) {
        string line = msg.substr(begin_line, end_line - begin_line);
        begin_line = end_line + 1;
-       FG_LOG( FG_IO, FG_INFO, "  input line = " << line );
+       SG_LOG( SG_IO, SG_INFO, "  input line = " << line );
 
        // leading character
        string start = msg.substr(begin, 1);
        ++begin;
-       FG_LOG( FG_IO, FG_INFO, "  start = " << start );
+       SG_LOG( SG_IO, SG_INFO, "  start = " << start );
 
        // sentence
        end = msg.find(",", begin);
@@ -205,7 +205,7 @@ bool FGAtlas::parse_message() {
     
        string sentence = msg.substr(begin, end - begin);
        begin = end + 1;
-       FG_LOG( FG_IO, FG_INFO, "  sentence = " << sentence );
+       SG_LOG( SG_IO, SG_INFO, "  sentence = " << sentence );
 
        double lon_deg, lon_min, lat_deg, lat_min;
        double lon, lat, speed, heading, altitude;
@@ -219,7 +219,7 @@ bool FGAtlas::parse_message() {
     
            string utc = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  utc = " << utc );
+           SG_LOG( SG_IO, SG_INFO, "  utc = " << utc );
 
            // junk
            end = msg.find(",", begin);
@@ -229,7 +229,7 @@ bool FGAtlas::parse_message() {
     
            string junk = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  junk = " << junk );
+           SG_LOG( SG_IO, SG_INFO, "  junk = " << junk );
 
            // lat val
            end = msg.find(",", begin);
@@ -257,8 +257,8 @@ bool FGAtlas::parse_message() {
                lat *= -1;
            }
 
-           cur_fdm_state->set_Latitude( lat * DEG_TO_RAD );
-           FG_LOG( FG_IO, FG_INFO, "  lat = " << lat );
+           cur_fdm_state->set_Latitude( lat * SGD_DEGREES_TO_RADIANS );
+           SG_LOG( SG_IO, SG_INFO, "  lat = " << lat );
 
            // lon val
            end = msg.find(",", begin);
@@ -286,8 +286,8 @@ bool FGAtlas::parse_message() {
                lon *= -1;
            }
 
-           cur_fdm_state->set_Longitude( lon * DEG_TO_RAD );
-           FG_LOG( FG_IO, FG_INFO, "  lon = " << lon );
+           cur_fdm_state->set_Longitude( lon * SGD_DEGREES_TO_RADIANS );
+           SG_LOG( SG_IO, SG_INFO, "  lon = " << lon );
 
 #if 0
            double sl_radius, lat_geoc;
@@ -310,7 +310,7 @@ bool FGAtlas::parse_message() {
            speed = atof( speed_str.c_str() );
            cur_fdm_state->set_V_calibrated_kts( speed );
            // cur_fdm_state->set_V_ground_speed( speed );
-           FG_LOG( FG_IO, FG_INFO, "  speed = " << speed );
+           SG_LOG( SG_IO, SG_INFO, "  speed = " << speed );
 
            // heading
            end = msg.find(",", begin);
@@ -323,8 +323,8 @@ bool FGAtlas::parse_message() {
            heading = atof( hdg_str.c_str() );
            cur_fdm_state->set_Euler_Angles( cur_fdm_state->get_Phi(), 
                                             cur_fdm_state->get_Theta(), 
-                                            heading * DEG_TO_RAD );
-           FG_LOG( FG_IO, FG_INFO, "  heading = " << heading );
+                                            heading * SGD_DEGREES_TO_RADIANS );
+           SG_LOG( SG_IO, SG_INFO, "  heading = " << heading );
        } else if ( sentence == "GPGGA" ) {
            // time
            end = msg.find(",", begin);
@@ -334,7 +334,7 @@ bool FGAtlas::parse_message() {
     
            string utc = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  utc = " << utc );
+           SG_LOG( SG_IO, SG_INFO, "  utc = " << utc );
 
            // lat val
            end = msg.find(",", begin);
@@ -362,8 +362,8 @@ bool FGAtlas::parse_message() {
                lat *= -1;
            }
 
-           // cur_fdm_state->set_Latitude( lat * DEG_TO_RAD );
-           FG_LOG( FG_IO, FG_INFO, "  lat = " << lat );
+           // cur_fdm_state->set_Latitude( lat * SGD_DEGREES_TO_RADIANS );
+           SG_LOG( SG_IO, SG_INFO, "  lat = " << lat );
 
            // lon val
            end = msg.find(",", begin);
@@ -391,8 +391,8 @@ bool FGAtlas::parse_message() {
                lon *= -1;
            }
 
-           // cur_fdm_state->set_Longitude( lon * DEG_TO_RAD );
-           FG_LOG( FG_IO, FG_INFO, "  lon = " << lon );
+           // cur_fdm_state->set_Longitude( lon * SGD_DEGREES_TO_RADIANS );
+           SG_LOG( SG_IO, SG_INFO, "  lon = " << lon );
 
            // junk
            end = msg.find(",", begin);
@@ -402,7 +402,7 @@ bool FGAtlas::parse_message() {
     
            string junk = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  junk = " << junk );
+           SG_LOG( SG_IO, SG_INFO, "  junk = " << junk );
 
            // junk
            end = msg.find(",", begin);
@@ -412,7 +412,7 @@ bool FGAtlas::parse_message() {
     
            junk = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  junk = " << junk );
+           SG_LOG( SG_IO, SG_INFO, "  junk = " << junk );
 
            // junk
            end = msg.find(",", begin);
@@ -422,7 +422,7 @@ bool FGAtlas::parse_message() {
     
            junk = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  junk = " << junk );
+           SG_LOG( SG_IO, SG_INFO, "  junk = " << junk );
 
            // altitude
            end = msg.find(",", begin);
@@ -443,13 +443,13 @@ bool FGAtlas::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" ) {
-               altitude *= METER_TO_FEET;
+           if ( alt_units != (string)"F" ) {
+               altitude *= SG_METER_TO_FEET;
            }
 
            cur_fdm_state->set_Altitude( altitude );
     
-           FG_LOG( FG_IO, FG_INFO, " altitude  = " << altitude );
+           SG_LOG( SG_IO, SG_INFO, " altitude  = " << altitude );
 
        } else if ( sentence == "PATLA" ) {
            // nav1 freq
@@ -460,7 +460,7 @@ bool FGAtlas::parse_message() {
     
            string nav1_freq = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  nav1_freq = " << nav1_freq );
+           SG_LOG( SG_IO, SG_INFO, "  nav1_freq = " << nav1_freq );
 
            // nav1 selected radial
            end = msg.find(",", begin);
@@ -470,7 +470,7 @@ bool FGAtlas::parse_message() {
     
            string nav1_rad = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  nav1_rad = " << nav1_rad );
+           SG_LOG( SG_IO, SG_INFO, "  nav1_rad = " << nav1_rad );
 
            // nav2 freq
            end = msg.find(",", begin);
@@ -480,7 +480,7 @@ bool FGAtlas::parse_message() {
     
            string nav2_freq = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  nav2_freq = " << nav2_freq );
+           SG_LOG( SG_IO, SG_INFO, "  nav2_freq = " << nav2_freq );
 
            // nav2 selected radial
            end = msg.find(",", begin);
@@ -490,7 +490,7 @@ bool FGAtlas::parse_message() {
     
            string nav2_rad = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  nav2_rad = " << nav2_rad );
+           SG_LOG( SG_IO, SG_INFO, "  nav2_rad = " << nav2_rad );
 
            // adf freq
            end = msg.find("*", begin);
@@ -500,7 +500,7 @@ bool FGAtlas::parse_message() {
     
            string adf_freq = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  adf_freq = " << adf_freq );
+           SG_LOG( SG_IO, SG_INFO, "  adf_freq = " << adf_freq );
        }
 
        // printf("%.8f %.8f\n", lon, lat);
@@ -516,7 +516,7 @@ bool FGAtlas::parse_message() {
 // open hailing frequencies
 bool FGAtlas::open() {
     if ( is_enabled() ) {
-       FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " 
+       SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " 
                << "is already in use, ignoring" );
        return false;
     }
@@ -524,7 +524,7 @@ bool FGAtlas::open() {
     SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
        return false;
     }
 
@@ -541,20 +541,20 @@ bool FGAtlas::process() {
     if ( get_direction() == SG_IO_OUT ) {
        gen_message();
        if ( ! io->write( buf, length ) ) {
-           FG_LOG( FG_IO, FG_ALERT, "Error writing data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
            return false;
        }
     } else if ( get_direction() == SG_IO_IN ) {
        if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
            parse_message();
        } else {
-           FG_LOG( FG_IO, FG_ALERT, "Error reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
            return false;
        }
        if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
            parse_message();
        } else {
-           FG_LOG( FG_IO, FG_ALERT, "Error reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
            return false;
        }
     }