FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reconnect wrapper v1 complete

Browse Source
This commit is contained in:
cs-powell
2025-03-29 03:23:26 -04:00
parent 07526ca5a3
commit fc068ef1d0
2 changed files with 231 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Python3/src/cognitiveModel.py
View File

@@ -29,8 +29,19 @@ class AircraftLandingModel(pyactr.ACTRModel):
brakeDREF = "sim/cockpit2/controls/parking_brake_ratio" brakeDREF = "sim/cockpit2/controls/parking_brake_ratio"
wheelSpeedDREF = "sim/flightmodel2/gear/tire_rotation_speed_rad_sec" wheelSpeedDREF = "sim/flightmodel2/gear/tire_rotation_speed_rad_sec"
wheelWeightDREF = "sim/flightmodel/parts/tire_vrt_def_veh" wheelWeightDREF = "sim/flightmodel/parts/tire_vrt_def_veh"
self.sources = [airspeedDREF,rollDREF,magneticHeadingDREF,verticalSpeedDREF,altitudeAGLDREF,pitchDREF,brakeDREF,wheelSpeedDREF,wheelWeightDREF] # self.sources = [airspeedDREF,rollDREF,magneticHeadingDREF,verticalSpeedDREF,altitudeAGLDREF,pitchDREF,brakeDREF,wheelSpeedDREF,wheelWeightDREF]
self.sources = {
"airspeed" : airspeedDREF,
"roll" : rollDREF,
"heading" : magneticHeadingDREF,
"verticalSpeed" : verticalSpeedDREF,
"altitude": altitudeAGLDREF,
"pitch" : pitchDREF,
"brake": brakeDREF,
"wheelSpeed": wheelSpeedDREF,
"wheelWeight": wheelWeightDREF
}
""" """
Initial Initialization of destination Variables and loading into destinations array Initial Initialization of destination Variables and loading into destinations array
""" """
@@ -54,8 +65,19 @@ class AircraftLandingModel(pyactr.ACTRModel):
self.brakes = brake[0] self.brakes = brake[0]
self.wheelSpeed = wheelS[0] self.wheelSpeed = wheelS[0]
self.wheelWeight = wheelW[0] self.wheelWeight = wheelW[0]
self.destinations = [self.airspeed,self.roll,self.heading,self.descent_rate,self.altitude,self.pitch,self.brakes,self.wheelSpeed,self.wheelWeight] # self.destinations = [self.airspeed,self.roll,self.heading,self.descent_rate,self.altitude,self.pitch,self.brakes,self.wheelSpeed,self.wheelWeight]
self.destinations = {
"airspeed" : self.airspeed,
"roll" : self.roll,
"heading" : self.heading,
"verticalSpeed" : self.descent_rate,
"altitude": self.altitude,
"pitch" : self.pitch,
"brake": self.brakes,
"wheelSpeed": self.wheelSpeed,
"wheelWeight": self.wheelWeight
}
""" """
Initial Initialization of target Values Initial Initialization of target Values
""" """
@@ -105,18 +127,26 @@ class AircraftLandingModel(pyactr.ACTRModel):
# while(idx < len(self.sources) - 1): # while(idx < len(self.sources) - 1):
# self.variableAtlas[0] = [self.sources[idx],self.destinations[idx],self.targets[idx]] # self.variableAtlas[0] = [self.sources[idx],self.destinations[idx],self.targets[idx]]
# idx += 1 # idx += 1
def reassignClient(self,newClient):
self.client = newClient
def getAndLoadDREFS(self): def getAndLoadDREFS(self):
results = self.client.getDREFs(self.sources) results = self.client.getDREFs(self.sources.values())
idx = 0 idx = 0
while(idx < len(results) - 2): for key in self.sources:
self.destinations[idx] = results[idx][0] self.destinations[key] = results[idx]
if(idx == 1): idx+=1
print("getDrefs: " + str(results[idx][0])) print("getDrefs: " + str(results[1][0]))
print("current destination: " + str(self.destinations[idx])) print("current destination: " + str(self.destinations["airspeed"]))
print("current main Airspeed: " + str(self.airspeed)) print("current main Airspeed: " + str(self.airspeed))
idx += 1
# while(idx < len(results) - 2):
# self.destinations[idx] = results[idx][0]
# if(idx == 1):
# print("getDrefs: " + str(results[idx][0]))
# print("current destination: " + str(self.destinations[idx]))
# print("current main Airspeed: " + str(self.airspeed))
# idx += 1
def printControls(self,calculated,errors,yokePull,yokeSteer,rudder,throttle): def printControls(self,calculated,errors,yokePull,yokeSteer,rudder,throttle):
@@ -129,7 +159,7 @@ class AircraftLandingModel(pyactr.ACTRModel):
# print("*Parameter,Target,Current,Throttle: " + "Descent Rate, " + str(self.target_descent_rate) + "," + str(self.descent_rate)+ "," + str(throttle)) # print("*Parameter,Target,Current,Throttle: " + "Descent Rate, " + str(self.target_descent_rate) + "," + str(self.descent_rate)+ "," + str(throttle))
parameter = ["Airspeed","Roll","Heading","Descent Rate","Altitude","Flare: Pitch", "Brakes: Wheel Speed", "Brakes: Wheel Weight"] parameter = ["Airspeed","Roll","Heading","Descent Rate","Altitude","Flare: Pitch", "Brakes: Wheel Speed", "Brakes: Wheel Weight"]
target = [str(round(self.target_airspeed)),str(round(self.target_roll)),str(round(self.target_heading,3)),str(round(self.target_descent_rate,3)),str(round(self.altitude,3)),str(round(self.target_pitch,3)),0, 0] target = [str(round(self.target_airspeed)),str(round(self.target_roll)),str(round(self.target_heading,3)),str(round(self.target_descent_rate,3)),str(round(self.altitude,3)),str(round(self.target_pitch,3)),0, 0]
current = [str(round(self.airspeed,3)),str(round(self.roll,3)),str(round(self.heading,3)),str(round(self.descent_rate,3)),str(round(self.altitude,3)),str(round(self.pitch,3)),str(round(self.wheelSpeed,3)),str(round(self.wheelWeight,3))] current = [str(round(self.destinations["airspeed"],3)),str(round(self.roll,3)),str(round(self.heading,3)),str(round(self.descent_rate,3)),str(round(self.altitude,3)),str(round(self.pitch,3)),str(round(self.wheelSpeed,3)),str(round(self.wheelWeight,3))]
controlVal = [str(round(yokePull,3)),str(round(yokeSteer,3)),str(round(rudder,3)),str(round(throttle,3)),str(round(self.altitude,3)),str(self.flare),str(round(self.brakes,3)),str(round(self.brakes,3))] controlVal = [str(round(yokePull,3)),str(round(yokeSteer,3)),str(round(rudder,3)),str(round(throttle,3)),str(round(self.altitude,3)),str(self.flare),str(round(self.brakes,3)),str(round(self.brakes,3))]
header_row = "{:<20} {:<20} {:<20} {:>10}" header_row = "{:<20} {:<20} {:<20} {:>10}"
@@ -307,7 +337,7 @@ class AircraftLandingModel(pyactr.ACTRModel):
self.Ki = 0.01 ## Increase Control Authority to compensate for decreasing airspeed self.Ki = 0.01 ## Increase Control Authority to compensate for decreasing airspeed
print("Altitude < 500; Flare Set True") print("Altitude < 500; Flare Set True")
if(self.wheelWeight > 0.01 and self.wheelSpeed > 1 and self.airspeed < 1 and self.brakes == 1): if(self.wheelWeight > 0.01 and self.wheelSpeed > 1 and self.destinations["airspeed"] < 1 and self.brakes == 1):
self.inProgress = False self.inProgress = False
def simulationStatus(self): def simulationStatus(self):

72
Python3/src/testPlatform.py
View File

@@ -9,18 +9,24 @@ def runExperiment(title):
print("Model Test: Xplane setting up connection") print("Model Test: Xplane setting up connection")
print("Setting up simulation") print("Setting up simulation")
startTime = 0
endTime = 0
difference = endTime - startTime
while(difference < 10):
print("Time Elapsed: -----> " + str(difference))
try:
with xpc.XPlaneConnect() as client: with xpc.XPlaneConnect() as client:
# Verify connection # Verify connection
try: # try:
# If X-Plane does not respond to the request, a timeout error # If X-Plane does not respond to the request, a timeout error
# will beff raised. # will beff raised.
client.getDREF("sim/test/test_float") client.getDREF("sim/test/test_float")
except: # except:
print("Error establishing connection to X-Plane.") # print("Error establishing connection to X-Plane.")
print("Exiting...") # print("Exiting...")
return # return
cogModel = AircraftLandingModel(client) cogModel = AircraftLandingModel(client)
# # Set position of the player aircraft # # Set position of the player aircraft
# print("Setting position") # print("Setting position")
# # Lat Lon Alt Pitch Roll Yaw Gear # # Lat Lon Alt Pitch Roll Yaw Gear
# posi = [37.524, -122.06899, 2500, 0, 0, 0, 1] # posi = [37.524, -122.06899, 2500, 0, 0, 0, 1]
@@ -123,7 +129,8 @@ def runExperiment(title):
innercount = 0 innercount = 0
clockStart = time.time() clockStart = time.time()
#Doing stuff In between Test SECOND INCREMENTS #Doing stuff In between Test SECOND INCREMENTS
while(cogModel.simulationStatus() and runModel): retry = 0
while(cogModel.simulationStatus() and runModel and retry < 50):
clockStart = time.time() #START TIMER clockStart = time.time() #START TIMER
# client.pauseSim(True) # Pause Simulator # client.pauseSim(True) # Pause Simulator
#Run Model #Run Model
@@ -135,6 +142,55 @@ def runExperiment(title):
# print("Clock Time: " + str(clockEnd - clockStart)) ## LOG TIME TAKEN # print("Clock Time: " + str(clockEnd - clockStart)) ## LOG TIME TAKEN
sleep(0.05) # LET Simulator Run 50 Milliseconds sleep(0.05) # LET Simulator Run 50 Milliseconds
##EXCEPTION TEST BED
# try:
# clockStart = time.time() #START TIMER
# # client.pauseSim(True) # Pause Simulator
# #Run Model
# cogModel.update_aircraft_state()
# cogModel.update_controls_simultaneously()
# client.pauseSim(False) #Unpause Simulator
# clockEnd = time.time() # STOP TIMER
# count+=1
# # print("Clock Time: " + str(clockEnd - clockStart)) ## LOG TIME TAKEN
# sleep(0.05) # LET Simulator Run 50 Milliseconds
# except TimeoutError as e:
# clockStart = time.time()
# difference = 0
# print("Outer exception retry: " + str(retry))
# while(difference<10):
# print("Top of while loop")
# try:
# print("Top of TRY")
# with xpc.XPlaneConnect() as client:
# print("Top of reassign")
# cogModel.reassignClient(client)
# print("Bottom of reassign")
# ##Test the connection
# print("TOP: Testing connection")
# cogModel.client.getDREF("sim/test/test_float") ##EXCEPTION OCCURING HERE
# print("CONNECTION SUCCESFUL!!!!!!")
# print("TRY BLOCK, go back to start: " + str(retry))
# except:
# print("Top of EXCEPT")
# print("EXCEPT BLOCK, go back to start: " + str(retry))
# clockEnd = time.time() # STOP TIMER
# difference = clockEnd - clockStart
# retry+=1
# print("Time Elapsed: -----> " + str(difference))
# ##Do Nothing, go back to start of difference loop
# else:
# print("Breaking out of Timeout exception loop")
# break
startTime = time.time()
except:
print("except detected")
endTime = time.time()
difference = endTime - startTime
continue
print("Model has finished running") print("Model has finished running")
#Copy data.txt to the cloudddddd using python magic and accurate filepaths #Copy data.txt to the cloudddddd using python magic and accurate filepaths
now = datetime.datetime now = datetime.datetime
@@ -152,7 +208,7 @@ def ex():
##wind conditions, pilot conditions ##wind conditions, pilot conditions
title = input("Please Enter Experiment Set Title, leave blank for trial runs") title = input("Please Enter Experiment Set Title, leave blank for trial runs")
count = 0 count = 0
while(count<2): while(count<1):
runExperiment(title) runExperiment(title)
count+=1 count+=1
print("Experiment Battery Complete") print("Experiment Battery Complete")