Changeset 117 in tmcsimulator

Timestamp:

10/14/2017 10:45:16 AM (9 years ago)

Author:

jtorres

Message:

Uncommented dynamic data packing in DataPacker?.cpp -- this resolved the no red dot bug

Location:

branches

Files:

• FEPSimulator/DataPacker.cpp (modified) (2 diffs)
• FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d (modified) (1 diff)
• FEPSimulator/nbproject/Makefile-Debug.mk (modified) (2 diffs)
• FEPSimulator/nbproject/configurations.xml (modified) (1 diff)
• FEPSimulator/nbproject/private/private.xml (modified) (1 diff)
• WorkingFEPSim (deleted)

branches/FEPSimulator/DataPacker.cpp

@@ -8 +8 @@
     DataPacker packer;
     msg = packer.staticDataPack(station);
-/*    pos = packer.dynamicDataPack(station, 5, pos);    
+    pos = packer.dynamicDataPack(station, 5, pos);    
     pos = packer.dynamicDataPack(station, 6, pos);
     pos = packer.dynamicDataPack(station, 7, pos);
@@ -20 +20 @@
     // will need to check if queue override is enabled (Currently, no queue
     // ldsMap[i].dataPack[16-1] = ;
-*/
+
     // byte 23: MAINLINE total volume
     msg[23 - 1] = station->MlTotVol;

branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d

@@ -1 +1 @@
 build/Debug/GNU-MacOSX/Main.o: Main.cpp FEPSim.h fep.h NetworkReader.h \
- network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
+  network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
 
 FEPSim.h:

branches/FEPSimulator/nbproject/Makefile-Debug.mk

@@ -58 +58 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/libosxtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
@@ -64 +64 @@
         "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}

branches/FEPSimulator/nbproject/configurations.xml

@@ -53 +53 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>

branches/FEPSimulator/nbproject/private/private.xml

@@ -8 +8 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
         </group>
     </open-files>