Changes between Version 15 and Version 16 of WARPnet1/BuildClientScripts

Timestamp:

Jun 25, 2010, 2:16:20 PM (14 years ago)

Author:

sgupta

Comment:

--

WARPnet1/BuildClientScripts

@@ -26 +26 @@
         int pktGen_period;
         int pktGen_length;
-        int pktGen_numPackets;
 } warpnetControl;
 
@@ -51 +50 @@
         packetGeneratorPeriod = 0
         packetGeneratorLength = 0
-        packetGeneratorNumPackets = 0
         
         def __init__(self, logger=None):
@@ -63 +61 @@
                 self.packetGeneratorPeriod = 10
                 self.packetGeneratorLength = 1300
-                self.packetGeneratorNumPackets = 1000
         
         def prepToSend(self, nodeID):
                 self.updateDone = False
-                return struct.pack('!6BH3I', self.structID, nodeID, self.txPower, self.channel, self.modOrderHeader, \
-                                self.modOrderPayload, self.reserved, self.packetGeneratorPeriod, self.packetGeneratorLength, self.packetGeneratorNumPackets)
+                return struct.pack('!6BH2I', self.structID, nodeID, self.txPower, self.channel, self.modOrderHeader, \
+                                self.modOrderPayload, self.reserved, self.packetGeneratorPeriod, self.packetGeneratorLength)
                 
         def updateFromNode(self, rawData, pcapts):
@@ -75 +72 @@
 }}}
 
-The `prepToSend` function creates the raw data that is seen by `warpnet.c` in the FPGA. It creates a byte packed data of 6 bytes (6B), 1 short (H) and 3 ints (3I). This is exactly what the node is expecting. A appropriate response from the node is a `warpnetACK` which `updateFromNode` parses in the python file.
+The `prepToSend` function creates the raw data that is seen by `warpnet.c` in the FPGA. It creates a byte packed data of 6 bytes (6B), 1 short (H) and 2 ints (2I). This is exactly what the node is expecting. A appropriate response from the node is a `warpnetACK` which `updateFromNode` parses in the python file.
 
 For a struct that is requesting data the raw data sent would be a `warpnetRequest` struct and expect a response of the appropriate type.