Changeset 159 in tmcsimulator


Ignore:
Timestamp:
10/21/2017 03:59:08 PM (9 years ago)
Author:
jtorres
Message:

network.h: commented data structs, DataPacker?.h moved include to header from source

Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/DataPacker.cpp

    r156 r159  
    11#include "DataPacker.h" 
    2 #include <stdio.h> 
    32 
    43unsigned char * DataPacker::msg; 

  • branches/FEPSimulator/DataPacker.h

    r82 r159  
    1717#include <iostream> 
    1818#include <string.h> 
     19#include <stdio.h> 
    1920 
    2021class DataPacker { 

  • branches/FEPSimulator/network.h

    r80 r159  
    99 
    1010/*** CONSTANTS ***/ 
    11 const int Fixed_Byte_To_Checksum = 25; // the first byte is not considered in the calculation of "BYTE 2" 
     11const int Fixed_Byte_To_Checksum = 25; // the first byte is not considered  
     12                                       //in the calculation of "BYTE 2" 
    1213const int CONTROL_DATA_LEN = 27; 
    1314 
     15// loop detector / lane type arrays 
    1416char * const dp5[8] = { "ML_1", "ML_2", "ML_3", "ML_4", "ML_5", 
    1517                                                "ML_6", "HOV_Lane", "FYW_Conn"}; 
    … …  
    2123                                                "SD_6", "Pass_Vol_Count", "X"}; 
    2224 
    23 // FEP line: has several lds 
     25// FEP line: Represents a serial communication line from field stations to the  
     26// An FEP Line has several Loop Detector Stations (Stations) connected) 
    2427typedef struct fep_line FEP_LINE; 
    2528struct  fep_line 
    … …  
    3740}; 
    3841 
    39 // Loop detector 
     42// Loop Detector: A single sensor that detects the volume, occupancy, and speed 
     43// in a single highway lane 
    4044typedef struct loop LOOP; 
    4145struct loop 
    4246{ 
     47    // meta data 
    4348    long loopID; 
    4449    char *loop_loc; 
    4550     
     51    // dynamic data 
    4652    int vol; 
    4753    float occ; 
    … …  
    4955}; 
    5056 
    51 // Loop detector station: has several loops 
     57// Loop detector station: A single field station that contains multiple loops at 
     58// a location 
    5259typedef struct Station STATION; 
    5360struct  Station 
    … …  
    6875}; 
    6976 
     77// A helper structure used to pack the volume and occupancy at a loop into 
     78// a two byte message 
    7079typedef struct volOcc VOLOCC; 
    7180struct  volOcc 

  • trunk/src/tmcsim/application.properties

    r156 r159  
    1 #Sat, 21 Oct 2017 10:49:14 -0700 
     1#Sat, 21 Oct 2017 11:46:12 -0700 
    22 
    3 Application.revision=143 
     3Application.revision=156 
    44 
    55Application.buildnumber=53 
Note: See TracChangeset for help on using the changeset viewer.