Merge branch 'master' into dev

A320-main.xml

@@ -451,10 +451,10 @@
 	
 	<payload>
 		<weight n="0">
-			<name>Crew</name>
+			<name>Cockpit Crew</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
-			<min-lb type="double">280</min-lb>
-			<max-lb type="double">840</max-lb>
+			<min-lb type="double">200</min-lb>
+			<max-lb type="double">440</max-lb>
 		</weight>
 		<weight n="1">
 			<name>Passengers</name>

Nasal/rmp.nas

@@ -161,21 +161,29 @@ var update_stby_vhf = func(rmp_no, vhf) {
 			var stby = sprintf("%3.3f", stby_rmp1_vhf1.getValue());
 		} else if (vhf == 2) {
 			var stby = sprintf("%3.3f", stby_rmp1_vhf2.getValue());
-		} else {
+		} else if (vhf == 3) {
 			var stby = sprintf("%3.3f", stby_rmp1_vhf3.getValue());
 		}
 
-		stby_display_rmp1.setValue(stby);
+		if (stby == 0) {
+			stby_display_rmp1.setValue("data");
+		} else {
+			stby_display_rmp1.setValue(stby);
+		}
 	} else {
 		if (vhf == 1) {
 			var stby = sprintf("%3.3f", stby_rmp2_vhf1.getValue());
 		} else if (vhf == 2) {
 			var stby = sprintf("%3.3f", stby_rmp2_vhf2.getValue());
-		} else {
+		} else if (vhf == 3) {
 			var stby = sprintf("%3.3f", stby_rmp2_vhf3.getValue());
 		}
 
-		stby_display_rmp2.setValue(stby);
+		if (stby == 0) {
+			stby_display_rmp2.setValue("data");
+		} else {
+			stby_display_rmp2.setValue(stby);
+		}
 	}
 }
 
@@ -229,7 +237,6 @@ var transfer = func(rmp_no) {
 	}
 }
 
-
 setlistener("/systems/radio/rmp[0]/vhf1-standby", func {
 	update_stby_vhf(0, 1);
 });

Systems/a320-mass-balance.xml

@@ -23,7 +23,6 @@
 		<z> 0.19249 </z>
 	</location>
 	
-	<!-- average human weight 145 lbs, max 44000 lb -->
 	<pointmass name="Crew">
 		<weight unit="LBS">380</weight>
 		<location name="POINTMASS" unit="M">

revision.txt

@@ -1 +1 @@
-4687
+4689