diff --git a/aman/sys/Worker.py b/aman/sys/Worker.py index c238f3b..b11a8c4 100644 --- a/aman/sys/Worker.py +++ b/aman/sys/Worker.py @@ -7,6 +7,7 @@ import time from aman.com import Weather from aman.com.Euroscope import Euroscope from aman.config.Airport import Airport +from aman.config.AirportSequencing import AirportSequencing from aman.sys.aco.Colony import Colony from aman.sys.aco.Configuration import Configuration from aman.sys.aco.Node import Node @@ -72,11 +73,6 @@ class Worker(Thread): if 0 != (counter % 10): continue - # request the current configuration from the server and update it, if useful - newConfig = self.WebUi.requestConfiguration(self.Icao, self.Configuration.GngData) - if None != newConfig: - self.sequencingConfiguration = newConfig - self.acquireLock() # perform some book-keeping @@ -133,3 +129,14 @@ class Worker(Thread): self.Euroscope.sendSequence(self.Icao, sequence, self.WeatherModel) self.releaseLock() + + def inboundSequence(self): + self.acquireLock() + sequence = self.RecedingHorizonControl.sequence() + self.releaseLock() + return sequence + + def configure(self, configuration : AirportSequencing): + self.acquireLock() + self.SequencingConfiguration = configuration + self.releaseLock()