Changeset 2272

Timestamp:

11/09/10 20:38:21 (19 months ago)

Author:

tolteque

Message:

o LoPlug?

• Fix pb of connection with LUA ???

Location:

trunk/loplug/plugins/lockon

Files:

• llf_fc2.py (modified) (1 diff)
• loplug_database.xml (modified) (1 diff)
• lua_server.py (modified) (3 diffs)

trunk/loplug/plugins/lockon/llf_fc2.py

@@ -287 +287 @@
     elif szobj.data_id == self.build_full_itemId( Llf.TOGGLE_LLF_FEATURE):
       if self.featureEnable:
-        print "[LLF] feature disable"
+        # Set feature state and discard LUA data
         self.featureEnable = False
+        for dataId in Llf.REQUESTED_DATAS:
+          destPlug, dataId = cst_split_on_first_part_of_address( dataId)
+          szDataDiscard = SzDataDiscard( self.build_full_itemId(), dataId)
+          self.parentPlug.send_object( [destPlug], PGPluginClient.OPCODE_DATA_DISCARDED, szDataDiscard)
+        
       else:
-        print "[LLF] feature enable"
         self.featureEnable = True
+        
+        # Set feature state and request LUA data
+        for dataId in Llf.REQUESTED_DATAS:
+          destPlug, dataId = cst_split_on_first_part_of_address( dataId)
+          szDataRequest = SzDataRequest( self.build_full_itemId(), dataId, period=self.samplingPeriod)
+          self.parentPlug.send_object( [destPlug], PGPluginClient.OPCODE_DATA_REQUESTED, szDataRequest)
+        
       self.__sendData__( None, Llf.TOGGLE_LLF_FEATURE)  
       

trunk/loplug/plugins/lockon/loplug_database.xml

@@ -74 +74 @@
                 <item desc="Longitude" flags="angle_dgr     , float , %.6f" id="9" name="Req_Longitude"/>
                 <item desc="Altitude" flags="altitude      , int   , %d  " id="10" name="Req_Altitude"/>
-                <item desc="Heading" flags="angle_rad     , float , %.2f" id="11" name="Req_Heading"/>
+                <item desc="Heading" flags="angle_rad     , float , %.3f" id="11" name="Req_Heading"/>
                 <item desc="Indicated air speed" flags="speed         , float , %.2f" id="12" name="Req_IndicAirSpeed"/>
                 <item desc="True air speed" flags="speed         , float , %.2f" id="13" name="Req_TrueAirSpeed"/>
                 <item desc="Altiude above mean sea level" flags="altitude      , float , %.2f" id="14" name="Req_AltitudeAmsl"/>
                 <item desc="Altitude above Surface" flags="altitude      , float , %.2f" id="15" name="Req_AltitudeAsfc"/>
-                <item desc="Angle of attack" flags="angle_rad     , int   , %.2f" id="16" name="Req_Aoa"/>
+                <item desc="Angle of attack" flags="angle_rad     , int   , %.3f" id="16" name="Req_Aoa"/>
                 <item desc="Acceleration expressed in G" flags="              , float , %.2f" id="17" name="Req_Acceleration"/>
                 <item desc="Vertical velicity" flags="vertical_speed,float  , %.2f" id="18" name="Req_VerticalVelocity"/>
                 <item desc="Speed expressed in MACH" flags="              , float , %.2f" id="19" name="Req_MachNumber"/>
-                <item desc="Magnetic yaw" flags="angle_rad     , float , %.2f" id="20" name="Req_MagneticYaw"/>
+                <item desc="Magnetic yaw" flags="angle_rad     , float , %.3f" id="20" name="Req_MagneticYaw"/>
                 <item desc="Glide deviation [-1, 1]" flags="              , float , %.3f" id="21" name="Req_GlideDeviation"/>
                 <item desc="Side deviation [-1, 1]" flags="              , float , %.3f" id="22" name="Req_SideDeviation"/>
                 <item desc="???????????? [-1, 1]" flags="              , float , %.3f" id="23" name="Req_SlipBallPosition"/>
                 <item desc="Basic atmopheric pressure (unit ???)" flags="pressure      , string, %s  " id="24" name="Req_AtmoPressure"/>
-                <item desc="ADF" flags="angle_rad     , float , %.2f" id="25" name="Req_HsiAdf"/>
-                <item desc="RMI" flags="angle_rad     , float , %.2f" id="26" name="Req_HsiRmi"/>
-                <item desc="Compass" flags="angle_rad     , float , %.2f" id="27" name="Req_HsiCompass"/>
-                <item desc="Pitch" flags="angle_rad     , float , %.2f" id="28" name="Req_AdiPitch"/>
-                <item desc="Roll" flags="angle_rad     , float , %.2f" id="29" name="Req_AdiRoll"/>
-                <item desc="Yaw" flags="angle_rad     , float , %.2f" id="30" name="Req_AdiYaw"/>
+                <item desc="ADF" flags="angle_rad     , float , %.3f" id="25" name="Req_HsiAdf"/>
+                <item desc="RMI" flags="angle_rad     , float , %.3f" id="26" name="Req_HsiRmi"/>
+                <item desc="Compass" flags="angle_rad     , float , %.3f" id="27" name="Req_HsiCompass"/>
+                <item desc="Pitch" flags="angle_rad     , float , %.3f" id="28" name="Req_AdiPitch"/>
+                <item desc="Roll" flags="angle_rad     , float , %.3f" id="29" name="Req_AdiRoll"/>
+                <item desc="Yaw" flags="angle_rad     , float , %.3f" id="30" name="Req_AdiYaw"/>
                 <item desc="RPM left engine (per cent)" flags="              , string, %s  " id="31" name="Req_EngRpmLeft"/>
                 <item desc="RPM right engine (per cent)" flags="              , string, %s  " id="32" name="Req_EngRpmRight"/>

trunk/loplug/plugins/lockon/lua_server.py

@@ -78 +78 @@
     self.prevGatheredRequests = {}
 
+    print "\n\n\n LUA state sent \n\n\n"
+
+    
     # Invoke __init__ method of the daughter class
     SocketServer.BaseRequestHandler.__init__(self, request, clientAddress, server)
@@ -486 +489 @@
 
     self.luaRequestHandler = None
-    SocketServer.TCPServer.__init__( self, ( '', CST_LOPLUG_LUA_PORT), LuaRequestHandler)
+    SocketServer.TCPServer.__init__( self, ( 'localhost', CST_LOPLUG_LUA_PORT), LuaRequestHandler)
     self.allow_reuse_address = True
 
@@ -821 +824 @@
   # @param supInfo                   suplementary info
   def _data_requested( self, srcPlugId, itemId, period, supInfo):
-#    print "[LuaServer] itemId %s requested from %s [period:%s, supInfo:%s]" % ( itemId, srcPlugId, period, supInfo)
+    print "[LuaServer] itemId %s requested from %s [period:%s, supInfo:%s]" % ( itemId, srcPlugId, period, supInfo)
     
     # Transcode Name to itemId for lua