GIT: Merge master

A320-main.xml

@@ -628,6 +628,8 @@
 				<du4 type="double">1</du4>
 				<du5 type="double">1</du5>
 				<du6 type="double">1</du6>
+				<mcdu1 type="double">1</mcdu1>
+				<mcdu2 type="double">1</mcdu2>
 			</DU>
 			<beacon type="bool">0</beacon>
 			<interior type="double">0</interior>

Models/Instruments/Lower-ECAM/Lower-ECAM.nas

@@ -294,7 +294,7 @@ var canvas_lowerECAM_base = {
 			du4_test.setValue(0);
 		}
 		
-		if (ac2.getValue() >= 110 and lighting_du4.getValue() > 0) {
+		if (ac2.getValue() >= 110 and lighting_du4.getValue() > 0.01) {
 			if (du4_test_time.getValue() + du4_test_amount.getValue() >= elapsedtime) {
 				lowerECAM_apu.page.hide();
 				lowerECAM_bleed.page.hide();

Models/Instruments/PFD/PFD.nas

@@ -246,7 +246,7 @@ var canvas_PFD_base = {
 		if (acconfig_mismatch.getValue() == "0x000") {
 			PFD_1_mismatch.page.hide();
 			PFD_2_mismatch.page.hide();
-			if (acess.getValue() >= 110 and du1_lgt.getValue() > 0) {
+			if (acess.getValue() >= 110 and du1_lgt.getValue() > 0.01) {
 				if (du1_test_time.getValue() + du1_test_amount.getValue() >= elapsedtime_act and cpt_du_xfr.getValue() != 1) {
 					PFD_1_test.update();
 					updateL = 0;
@@ -269,7 +269,7 @@ var canvas_PFD_base = {
 				PFD_1_test.page.hide();
 				PFD_1.page.hide();
 			}
-			if (ac2.getValue() >= 110 and du6_lgt.getValue() > 0) {
+			if (ac2.getValue() >= 110 and du6_lgt.getValue() > 0.01) {
 				if (du6_test_time.getValue() + du6_test_amount.getValue() >= elapsedtime_act and fo_du_xfr.getValue() != 1) {
 					PFD_2_test.update();
 					updateR = 0;

Models/Instruments/Upper-ECAM/Upper-ECAM.nas

@@ -138,7 +138,7 @@ var canvas_upperECAM_base = {
 		}
 		
 		cur_eng_option = eng_option.getValue();
-		if (acess.getValue() >= 110 and du3_lgt.getValue() > 0) {
+		if (acess.getValue() >= 110 and du3_lgt.getValue() > 0.01) {
 			if (du3_test_time.getValue() + du3_test_amount.getValue() >= elapsedtime) {
 				upperECAM_cfm_eis2.page.hide();
 				upperECAM_iae_eis2.page.hide();

Nasal/MCDU/MCDU.nas

@@ -5,7 +5,6 @@
 ##############################################
 
 var MCDU_init = func(i) {
-	setprop("/MCDU[" ~ i ~ "]/brightness", "1.0");
 	MCDU_reset(i); # Reset MCDU, clears data
 }
 

Nasal/autopush.nas

@@ -42,6 +42,7 @@ var _loop = func() {
 		var time = getprop("/sim/time/elapsed-sec");
 		var prop = math.min(math.max(_K_p * deltaV, -_F_p), _F_p);
 		var speedup = getprop("/sim/speed-up");
+		var deriv = 0;
 		dt = time - _time;
 		# XXX Sanitising dt. Smaller chance of freakout on lag spike.
 		if(dt > 0.0) {

Nasal/autopush_route.nas

@@ -26,9 +26,13 @@ var _D_min = nil;
 var _add = func(pos) {
 	if (_N) {
 		var (A, S) = courseAndDistance(_user_points.arr[_N - 1], pos);
-		if (S * NM2M < 3 * _D_min) {
+		S *= NM2M;
+		if (S < 3 * _D_min) {
 			gui.popupTip("Too close to the previous point,\ntry again");
 			return;
+		}else if (S  > 10000.0) {
+			gui.popupTip("Too far from the previous point,\ntry again");
+			return;
 		}
 	}
 	_user_points.add(geo.Coord.new(pos));
@@ -126,7 +130,7 @@ var _clear_waypoint_models = func() {
 }
 
 var _set_view = func() {
-	if(!getprop("/sim/current-view/internal")){
+	if (!getprop("/sim/current-view/internal")){
 		_view_changed_or_external = 1;
 		return;
 	}

Nasal/buttons.nas

@@ -48,6 +48,8 @@ var variousReset = func {
 	setprop("/controls/lighting/DU/du4", 1);
 	setprop("/controls/lighting/DU/du5", 1);
 	setprop("/controls/lighting/DU/du6", 1);
+	setprop("/controls/lighting/DU/mcdu1", 1);
+	setprop("/controls/lighting/DU/mcdu2", 1);
 	setprop("/modes/fcu/hdg-time", 0);
 	setprop("/controls/switching/ATTHDG", 0);
 	setprop("/controls/switching/AIRDATA", 0);

Systems/fbw-pitch.xml

@@ -6,7 +6,7 @@
 ##############################################
 -->
 
-<!-- Airbus A320 FBW System -->
+<!-- Airbus A3XX FBW System -->
 <!-- Joshua Davidson (it0uchpods) -->
 <!-- I didn't see an easy way to do this controller in JSBsim, so I keep it here -->
 
@@ -15,17 +15,19 @@
 	<pi-simple-controller>
 		<name>FBW PITCH G PI</name>
 		<debug>false</debug>
-		<input>
+		<input>/fdm/jsbsim/fbw/pitch/g-error</input>
-			<property>/fdm/jsbsim/fbw/pitch/g-error</property>
+		<reference>0</reference>
-		</input>
+		<output>/fdm/jsbsim/fbw/pitch/g-pi</output>
-		<reference>
-			<value>0</value>
-		</reference>
-		<output>
-			<property>/fdm/jsbsim/fbw/pitch/g-pi</property>
-		</output>
 		<config>
-			<Kp>-1.5</Kp>
+			<Kp>
+				<expression>
+					<table>
+						<property>/fdm/jsbsim/velocities/vc-kts</property>
+						<entry><ind>140</ind><dep>-1.5</dep></entry>
+						<entry><ind>350</ind><dep>-0.6</dep></entry>
+					</table>
+				</expression>
+			</Kp>
 			<Ki>
 				<condition>
 					<and>
@@ -45,7 +47,13 @@
 						</or>
 					</and>
 				</condition>
-				<value>-1.5</value>
+				<expression>
+					<table>
+						<property>/fdm/jsbsim/velocities/vc-kts</property>
+						<entry><ind>140</ind><dep>-1.5</dep></entry>
+						<entry><ind>350</ind><dep>-0.6</dep></entry>
+					</table>
+				</expression>
 			</Ki>
 			<Ki>0.0</Ki>
 			<min>

Systems/instrumentation.xml

@@ -6,28 +6,7 @@
 ##############################################
 -->
 
-<!--
+<!-- IDG Custom Instrumentation -->
-**********************************************************************
-generic-instrumentation.xml
-
-Generic instrumentation configuration. This file selects the
-instrumentation modules that should be available.
-
-You can have several instances of the same instrument type.
-The value inside the name tag becomes the node in the property tree.
-If two instruments have the same name you must use the number tag
-to separate them. They become name[number] in the property tree.
-Some instruments have additional configuration tags like static-port
-and pitot-port. The static- and pitot-ports (and any other system that
-an instrument depend on) have to be configured in the systems
-configuration file: generic-systems.xml
-
-The values in this file are the default values. If any configuration
-tags are omitted in an aircraft specific version of this configuration
-file, these values will be used (they are hardcoded).
-
-**********************************************************************
--->
 
 <PropertyList>
 	
@@ -194,8 +173,8 @@ file, these values will be used (they are hardcoded).
 	</tacan>
 	
 	<mk-viii>
-	 <name>mk-viii</name>
+		<name>mk-viii</name>
-	 <number>0</number>
+		<number>0</number>
 	</mk-viii>
 
 </PropertyList>

revision.txt

@@ -1 +1 @@
-4690
+4692