Curtis L. Olson | 1 Aug 02:22 2003

CVS: source/src/Instrumentation annunciator.cxx, 1.1, 1.2 annunciator.hxx, 1.1, 1.2

Update of /var/cvs/FlightGear-0.9/source/src/Instrumentation
In directory baron:/tmp/cvs-serv15814

Modified Files:
	annunciator.cxx annunciator.hxx 
Log Message:
Annunciators cannot work if electrical system is not serviceable.

Index: annunciator.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Instrumentation/annunciator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** annunciator.cxx	27 May 2003 19:12:33 -0000	1.1
--- annunciator.cxx	1 Aug 2003 00:22:14 -0000	1.2
***************
*** 34,37 ****
--- 34,38 ----
      _fuel_r = fgGetNode( "/consumables/fuel/tank[1]/level-gal_us", true );
      _oil_px = fgGetNode( "/engines/engine[0]/oil-pressure-psi", true );
+     _elec_serv = fgGetNode( "/systems/electrical/serviceable", true );

      _ann_volts = fgGetNode( "/instrumentation/annunciator/volts", true );
***************
*** 53,57 ****
      timer4 += dt;

!     if ( _volts->getDoubleValue() < 5.0 ) {
          // Not enough juice to illuminate the display
(Continue reading)

Curtis L. Olson | 1 Aug 02:22 2003

CVS: source/src/Network native_ctrls.cxx, 1.12, 1.13 net_ctrls.hxx, 1.3, 1.4

Update of /var/cvs/FlightGear-0.9/source/src/Network
In directory baron:/tmp/cvs-serv15830

Modified Files:
	native_ctrls.cxx net_ctrls.hxx 
Log Message:
Add several common engine faults to the net_ctrls structure.

Index: native_ctrls.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/native_ctrls.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** native_ctrls.cxx	17 Jul 2003 18:24:17 -0000	1.12
--- native_ctrls.cxx	1 Aug 2003 00:22:57 -0000	1.13
***************
*** 103,108 ****
  {
      int i;
!     SGPropertyNode * node;
!     SGPropertyNode * tempnode;

      // fill in values
--- 103,108 ----
  {
      int i;
!     SGPropertyNode *node;
!     SGPropertyNode *tempnode;

(Continue reading)

Curtis L. Olson | 1 Aug 02:25 2003

CVS: source/src/Replay replay.cxx,1.9,1.10

Update of /var/cvs/FlightGear-0.9/source/src/Replay
In directory baron:/tmp/cvs-serv15849

Modified Files:
	replay.cxx 
Log Message:
Interpolate failure conditions since they are part of the struct (more 
of a formality for consistancies sake than a useful thing.)

Index: replay.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Replay/replay.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** replay.cxx	23 Jul 2003 17:50:45 -0000	1.9
--- replay.cxx	1 Aug 2003 00:25:10 -0000	1.10
***************
*** 330,333 ****
--- 330,339 ----
          result.ctrls.prop_advance[i]
              = weight( ctrls1.prop_advance[i], ctrls2.prop_advance[i], ratio );
+         result.ctrls.engine_ok[i] = ctrls1.engine_ok[i];
+         result.ctrls.mag_left_ok[i] = ctrls1.mag_left_ok[i];
+         result.ctrls.mag_right_ok[i] = ctrls1.mag_right_ok[i];
+         result.ctrls.spark_plugs_ok[i] = ctrls1.spark_plugs_ok[i];
+         result.ctrls.oil_press_status[i] = ctrls1.oil_press_status[i];
+         result.ctrls.fuel_pump_ok[i] = ctrls1.fuel_pump_ok[i];
      }
(Continue reading)

Curtis L. Olson | 1 Aug 02:28 2003

CVS: data preferences.xml,1.121,1.122

Update of /var/cvs/FlightGear-0.9/data
In directory baron:/tmp/cvs-serv15901

Modified Files:
	preferences.xml 
Log Message:
Add initial defaults for engine failure parameters

Index: preferences.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/preferences.xml,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** preferences.xml	24 Jul 2003 14:49:12 -0000	1.121
--- preferences.xml	1 Aug 2003 00:28:33 -0000	1.122
***************
*** 403,406 ****
--- 403,414 ----
      <mixture type="double">1.0</mixture>
      <propeller-pitch type="double">1.0</propeller-pitch>
+     <faults>
+      <serviceable>true</serviceable>
+      <left-magneto-serviceable>true</left-magneto-serviceable>
+      <right-magneto-serviceable>true</right-magneto-serviceable>
+      <spark-plugs-serviceable>true</spark-plugs-serviceable>
+      <oil-pressure-status>0</oil-pressure-status>
+      <fuel-pump-serviceable>true</fuel-pump-serviceable>
+     </faults>
     </engine>
(Continue reading)

Curtis L. Olson | 1 Aug 02:29 2003

CVS: data/Aircraft/c172/Panels c172-610x-panel.xml, 1.13, 1.14

Update of /var/cvs/FlightGear-0.9/data/Aircraft/c172/Panels
In directory baron:/tmp/cvs-serv15919

Modified Files:
	c172-610x-panel.xml 
Log Message:
Minor instrument adjustment.

Index: c172-610x-panel.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/c172/Panels/c172-610x-panel.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** c172-610x-panel.xml	27 May 2003 20:31:44 -0000	1.13
--- c172-610x-panel.xml	1 Aug 2003 00:29:40 -0000	1.14
***************
*** 162,168 ****
     <!-- <h>246</h> -->
     <x>572</x>
!    <y>362</y>
     <w>226</w>
!    <h>226</h>
    </instrument>

--- 162,168 ----
     <!-- <h>246</h> -->
     <x>572</x>
!    <y>372</y>
     <w>226</w>
(Continue reading)

Curtis L. Olson | 1 Aug 19:06 2003

CVS: source/src/FDM/ExternalPipe ExternalPipe.cxx, 1.7, 1.8

Update of /var/cvs/FlightGear-0.9/source/src/FDM/ExternalPipe
In directory baron:/tmp/cvs-serv30046

Modified Files:
	ExternalPipe.cxx 
Log Message:
Ooops, I added another item to what I write to the buffer, but 
forgot to make it big enough to hold the new item.  This was manifesting 
itself as a crash on reset (if the ExternalPipe FDM was being used.)

Index: ExternalPipe.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/FDM/ExternalPipe/ExternalPipe.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ExternalPipe.cxx	17 Jul 2003 18:24:17 -0000	1.7
--- ExternalPipe.cxx	1 Aug 2003 17:06:11 -0000	1.8
***************
*** 45,49 ****
      valid = true;

!     buf = new char[sizeof(ctrls) + 1];

  #ifdef HAVE_MKFIFO
--- 45,49 ----
      valid = true;

!     buf = new char[sizeof(char) + sizeof(int) + sizeof(ctrls)];

(Continue reading)

Curtis L. Olson | 1 Aug 21:37 2003

CVS: source/src/Network native_ctrls.cxx, 1.13, 1.14 net_ctrls.hxx, 1.4, 1.5

Update of /var/cvs/FlightGear-0.9/source/src/Network
In directory baron:/tmp/cvs-serv30926/Network

Modified Files:
	native_ctrls.cxx net_ctrls.hxx 
Log Message:
Add support for communicating a flap motor failure.

Index: native_ctrls.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/native_ctrls.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** native_ctrls.cxx	1 Aug 2003 00:22:57 -0000	1.13
--- native_ctrls.cxx	1 Aug 2003 19:37:20 -0000	1.14
***************
*** 114,121 ****
      net->rudder = node->getDoubleValue( "rudder" );
      net->flaps = node->getDoubleValue( "flaps" );
-     node = fgGetNode("/controls", true); 
      net->flaps_power
!             = node->getDoubleValue( "/systems/electrical/outputs/flaps",
!                                     1.0 ) >= 1.0;
      net->num_engines = FGNetCtrls::FG_MAX_ENGINES;
      for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
--- 114,121 ----
      net->rudder = node->getDoubleValue( "rudder" );
      net->flaps = node->getDoubleValue( "flaps" );
      net->flaps_power
(Continue reading)

Curtis L. Olson | 1 Aug 21:37 2003

CVS: source/src/Replay replay.cxx,1.10,1.11

Update of /var/cvs/FlightGear-0.9/source/src/Replay
In directory baron:/tmp/cvs-serv30926/Replay

Modified Files:
	replay.cxx 
Log Message:
Add support for communicating a flap motor failure.

Index: replay.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Replay/replay.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** replay.cxx	1 Aug 2003 00:25:10 -0000	1.10
--- replay.cxx	1 Aug 2003 19:37:21 -0000	1.11
***************
*** 316,321 ****
      result.ctrls.rudder = weight( ctrls1.rudder, ctrls2.rudder, ratio );
      result.ctrls.flaps = weight( ctrls1.flaps, ctrls2.flaps, ratio );
!     result.ctrls.flaps_power
!         = weight( ctrls1.flaps_power, ctrls2.flaps_power, ratio );

      // Engine controls
--- 316,321 ----
      result.ctrls.rudder = weight( ctrls1.rudder, ctrls2.rudder, ratio );
      result.ctrls.flaps = weight( ctrls1.flaps, ctrls2.flaps, ratio );
!     result.ctrls.flaps_power = ctrls1.flaps_power;
!     result.ctrls.flap_motor_ok = ctrls1.flap_motor_ok;

(Continue reading)

Curtis L. Olson | 1 Aug 21:42 2003

CVS: data preferences.xml,1.122,1.123

Update of /var/cvs/FlightGear-0.9/data
In directory baron:/tmp/cvs-serv30995

Modified Files:
	preferences.xml 
Log Message:
Add a default value for the flaps-servicable flag.

Index: preferences.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/preferences.xml,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** preferences.xml	1 Aug 2003 00:28:33 -0000	1.122
--- preferences.xml	1 Aug 2003 19:42:42 -0000	1.123
***************
*** 394,397 ****
--- 394,398 ----
     <rudder-trim type="double">0.0</rudder-trim>
     <flaps type="double">0.0</flaps>
+    <flaps-serviceable type="bool">true</flaps-serviceable>
    </flight>
Erik Hofman | 2 Aug 14:45 2003

CVS: FlightGear/src/Time light.cxx,1.25,1.26

Update of /var/cvs/FlightGear-0.9/FlightGear/src/Time
In directory baron:/tmp/cvs-serv5019

Modified Files:
	light.cxx 
Log Message:
Update scene lighting

Index: light.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Time/light.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** light.cxx	27 Jun 2003 21:29:48 -0000	1.25
--- light.cxx	2 Aug 2003 12:45:15 -0000	1.26
***************
*** 135,153 ****
      // if ( sky_brightness < 0.1 ) { sky_brightness = 0.1; }

-     scene_ambient[0] = white[0] * ambient;
-     scene_ambient[1] = white[1] * ambient;
-     scene_ambient[2] = white[2] * ambient;
-     scene_ambient[3] = 1.0;
- 
-     scene_diffuse[0] = white[0] * diffuse;
-     scene_diffuse[1] = white[1] * diffuse;
-     scene_diffuse[2] = white[2] * diffuse;
-     scene_diffuse[3] = 1.0;
- 
(Continue reading)


Gmane