Roy Vegard Ovesen:

I've added two new debug log types for the instrumentation and systems. They
used to use the autopilot debug log, because I couldn't figure out how to
make new log types. Well, now I have figured it out.  ;-)

src/FDM/JSBSim/FGEngine.cpp

@@ -107,6 +107,9 @@ FGEngine::FGEngine(FGFDMExec* exec, int engine_number) : EngineNumber(engine_num
 
 FGEngine::~FGEngine()
 {
+  if (Thruster)
+    delete Thruster;
+
   Debug(1);
 }
 

src/Instrumentation/adf.cxx

@@ -75,9 +75,9 @@ ADF::ADF (SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in adf config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in adf config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/airspeed_indicator.cxx

@@ -36,9 +36,9 @@ AirspeedIndicator::AirspeedIndicator ( SGPropertyNode *node )
         } else if ( cname == "static-port" ) {
             static_port = cval;
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in aispeed-indicator config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in aispeed-indicator config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/altimeter.cxx

@@ -66,9 +66,9 @@ Altimeter::Altimeter ( SGPropertyNode *node )
         } else if ( cname == "static-port" ) {
             static_port = cval;
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in altimeter config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in altimeter config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/attitude_indicator.cxx

@@ -31,9 +31,9 @@ AttitudeIndicator::AttitudeIndicator ( SGPropertyNode *node )
         } else if ( cname == "vacuum-system" ) {
             vacuum_system = cval;
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in attitude-indicator config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in attitude-indicator config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/clock.cxx

@@ -33,9 +33,9 @@ Clock::Clock ( SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in clock config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in clock config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/dme.cxx

@@ -57,9 +57,9 @@ DME::DME ( SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in dme config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in dme config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/gps.cxx

@@ -44,9 +44,9 @@ GPS::GPS ( SGPropertyNode *node)
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in gps config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in gps config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/heading_indicator.cxx

@@ -26,9 +26,9 @@ HeadingIndicator::HeadingIndicator ( SGPropertyNode *node )
         } else if ( cname == "vacuum-system" ) {
             vacuum_system = cval;
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in heading-indicator config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in heading-indicator config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/mag_compass.cxx

@@ -33,9 +33,9 @@ MagCompass::MagCompass ( SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in magnetic-compass config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in magnetic-compass config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/slip_skid_ball.cxx

@@ -23,9 +23,9 @@ SlipSkidBall::SlipSkidBall ( SGPropertyNode *node)
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in slip-skid-ball config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in slip-skid-ball config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/turn_indicator.cxx

@@ -28,9 +28,9 @@ TurnIndicator::TurnIndicator ( SGPropertyNode *node) :
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in turn-indicator config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in turn-indicator config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Instrumentation/vertical_speed_indicator.cxx

@@ -28,9 +28,9 @@ VerticalSpeedIndicator::VerticalSpeedIndicator ( SGPropertyNode *node )
         } else if ( cname == "static-port" ) {
             static_port = cval;
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in vertical-speed-indicator config logic" );
+            SG_LOG( SG_INSTR, SG_WARN, "Error in vertical-speed-indicator config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
             }
         }
     }

src/Main/fg_props.cxx

@@ -82,6 +82,8 @@ LogClassMapping log_class_mappings [] = {
   LogClassMapping(SG_IO, "io"),
   LogClassMapping(SG_CLIPPER, "clipper"),
   LogClassMapping(SG_NETWORK, "network"),
+  LogClassMapping(SG_INSTR, "instrumentation"),
+  LogClassMapping(SG_SYSTEMS, "systems"),
   LogClassMapping(SG_UNDEFD, "")
 };
 

src/Systems/pitot.cxx

@@ -24,9 +24,9 @@ PitotSystem::PitotSystem ( SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in systems config logic" );
+            SG_LOG( SG_SYSTEMS, SG_WARN, "Error in systems config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_SYSTEMS, SG_WARN, "Section = " << name );
             }
         }
     }

src/Systems/static.cxx

@@ -23,9 +23,9 @@ StaticSystem::StaticSystem ( SGPropertyNode *node )
         } else if ( cname == "number" ) {
             num = child->getIntValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in systems config logic" );
+            SG_LOG( SG_SYSTEMS, SG_WARN, "Error in systems config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_SYSTEMS, SG_WARN, "Section = " << name );
             }
         }
     }

src/Systems/vacuum.cxx

@@ -29,9 +29,9 @@ VacuumSystem::VacuumSystem ( SGPropertyNode *node )
         } else if ( cname == "scale" ) {
             scale = child->getDoubleValue();
         } else {
-            SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in vacuum config logic" );
+            SG_LOG( SG_SYSTEMS, SG_WARN, "Error in vacuum config logic" );
             if ( name.length() ) {
-                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+                SG_LOG( SG_SYSTEMS, SG_WARN, "Section = " << name );
             }
         }
     }