Tweaked FDM interface.

[flightgear.git] / Main / fg_serial.cxx

diff --git a/Main/fg_serial.cxx b/Main/fg_serial.cxx
index 22655a29746468d79e0a06026f106f471871dcc1..1516e85af2776ebaffef3eb16b54dbf92765fa2b 100644 (file)
--- a/Main/fg_serial.cxx
+++ b/Main/fg_serial.cxx
@@ -22,15 +22,20 @@
 // (Log is kept at end of this file)
 
 
-#include <stdlib.h>   // atoi()
+#include <Include/compiler.h>
 
-#include <string>
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <cstdlib>    // atoi()
+#else
+#  include <stdlib.h>   // atoi()
+#endif
+
+#include STL_STRING
+#include STL_IOSTREAM                                           
 #include <vector>                                                               
 #include "Include/fg_stl_config.h"                                              
 
-#ifdef NEEDNAMESPACESTD                                                         
-using namespace std;                                                            
-#endif                                                                          
+FG_USING_NAMESPACE(std);
 
 #include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
@@ -227,7 +232,7 @@ static void send_nmea_out( fgIOCHANNEL& p ) {
     char dir;
     int deg;
     double min;
-    fgFLIGHT *f;
+    FGState *f;
     fgTIME *t;
 
     // run once every two seconds
@@ -239,7 +244,7 @@ static void send_nmea_out( fgIOCHANNEL& p ) {
        return;
     }
 
-    f = current_aircraft.flight;
+    f = current_aircraft.fdm_state;
     t = &cur_time_params;
 
     char utc[10];
@@ -289,11 +294,11 @@ static void send_nmea_out( fgIOCHANNEL& p ) {
     // $GPRMC,HHMMSS,A,DDMM.MMM,N,DDDMM.MMM,W,XXX.X,XXX.X,DDMMYY,XXX.X,E*XX
     sprintf( rmc, "GPRMC,%s,A,%s,%s,%s,%s,%s,0.000,E",
             utc, lat, lon, speed, heading, date );
-    sprintf( rmc_sum, "%02X", 0 /*calc_nmea_cksum(rmc)*/ );
+    sprintf( rmc_sum, "%02X", calc_nmea_cksum(rmc) );
 
     sprintf( gga, "GPGGA,%s,%s,%s,1,,,%s,F,,,,",
             utc, lat, lon, altitude_ft );
-    sprintf( gga_sum, "%02X", 0 /*calc_nmea_cksum(gga)*/ );
+    sprintf( gga_sum, "%02X", calc_nmea_cksum(gga) );
 
 
     FG_LOG( FG_SERIAL, FG_DEBUG, rmc );
@@ -326,7 +331,7 @@ static void send_garmin_out( fgIOCHANNEL& p ) {
     char dir;
     int deg;
     double min;
-    fgFLIGHT *f;
+    FGState *f;
     fgTIME *t;
 
     // run once per second
@@ -338,7 +343,7 @@ static void send_garmin_out( fgIOCHANNEL& p ) {
        return;
     }
     
-    f = current_aircraft.flight;
+    f = current_aircraft.fdm_state;
     t = &cur_time_params;
 
     char utc[10];
@@ -451,6 +456,16 @@ void fgSerialProcess() {
 
 
 // $Log$
+// Revision 1.9  1999/01/20 13:42:26  curt
+// Tweaked FDM interface.
+// Testing check sum support for NMEA serial output.
+//
+// Revision 1.8  1999/01/19 20:57:04  curt
+// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
+//
+// Revision 1.7  1998/12/05 15:54:21  curt
+// Renamed class fgFLIGHT to class FGState as per request by JSB.
+//
 // Revision 1.6  1998/12/03 01:17:18  curt
 // Converted fgFLIGHT to a class.
 //