PROJECT V1.0 -- Data collection ready, experiment setup ready, control schemes ready

This commit is contained in:
cs-powell
2025-04-05 18:29:29 -04:00
parent 6245ecddcc
commit 35365e0a01
2 changed files with 5 additions and 5 deletions

View File

@@ -109,7 +109,7 @@ class AircraftLandingModel(pyactr.ACTRModel):
self.target_Long = -104.696032
self.target_descent_rate = 500
self.target_altitude = -998
self.target_pitch = 20
self.target_pitch = 25
self.targets = [self.target_airspeed,self.target_roll,self.target_heading,self.target_Lat,self.target_Long,self.target_descent_rate,self.target_altitude,self.target_pitch]
@@ -221,7 +221,7 @@ class AircraftLandingModel(pyactr.ACTRModel):
0,
0]
current = [str(round(self.dictionaryAccess(self.destinations,"pitch"),3)),
current = [str(round(self.dictionaryAccess(self.destinations,"airspeed"),3)),
str(round(self.dictionaryAccess(self.destinations,"roll"),3)),
str(round(self.dictionaryAccess(self.destinations,"heading"),3)),
str(round(self.dictionaryAccess(self.destinations,"longitude"),6)),
@@ -312,7 +312,7 @@ class AircraftLandingModel(pyactr.ACTRModel):
scaleFactor.SCALEYOKEPULL)
if(self.dictionaryAccess(self.phaseFlags,"flare") == False):
self.target_pitch = 10
self.target_pitch = 20
yoke_pull, self.integral_airspeed = self.proportionalIntegralControl(1,self.dictionaryAccess(self.destinations,"pitch"),
self.target_pitch,
self.integral_pitch,

View File

@@ -52,7 +52,7 @@ def experimentSetUp(client,currentConditions,newExperiment):
altitudeMETERS = altitudeFEET/3.281
altitude = altitudeMETERS
print(str(altitude))
location1 = [20, -998, 39.96239, -104.69713, altitude, -998, -998, -998, -998]
location1 = [20, -998, 39.96239, -104.696032, altitude, -998, -998, -998, -998]
# testLocation = [20, -998, 27.20579, -80.08621, altitude, -998, -998, -998, -998] # 27.20579°N/80.08621°W
data = [
location1\
@@ -127,7 +127,7 @@ def experimentSetUp(client,currentConditions,newExperiment):
client.pauseSim(False)
print("Setting initial velocity")
zInit = "sim/flightmodel/position/local_vz"
client.sendDREF(zInit, 80)
client.sendDREF(zInit, 50)
print("setup complete")