Changeset 7540


Ignore:
Timestamp:
07/06/18 12:49:38 (2 weeks ago)
Author:
baker
Message:

fix bug introduced in r7203 that left out the last two fields in struct STREAM_RO_PARMS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kwhdrs_ew.h

    r7208 r7540  
    99 *     Revision 1.3  2005/10/11 20:15:53  luetgert 
    1010 *     Added network and location codes. 
    11  *     . 
    1211 * 
    1312 *     Revision 1.2  2002/11/03 00:11:53  lombard 
     
    340339   ---------------- 
    341340 
    342  
    343  
    344341   Bottom Of Header Comments 
    345342****************************************************************************/ 
     
    349346 
    350347#include <stdint.h>             /* int32_t, uint32_t */ 
    351  
    352 #include "platform.h" 
    353348 
    354349/* Type Definitions: 
     
    359354 *   All structures are 16-bit aligned 
    360355*/ 
    361  
    362 #if 0 
    363 #define FIX_8BYTES_K2RW 1         /* 8-byte fix for K2_HEADER -- see below */ 
    364 #endif 
    365356 
    366357#define MAX_ETNA_CHANNELS 4 
     
    526517   float alarmTriggerThreshold; /* fraction of fullscale */ 
    527518 
    528 /* Added for EpiSensor */ 
    529    float calCoil;                       /* g/Volt for EpiSensor */ 
    530    unsigned char range;         /* Range code for sensor: from EEPROM 
    531                                                                 1=4g 
    532                                                                 2=2g 
    533                                                                 3=1g 
    534                                                                 4=1/2g 
    535                                                                 5=1/4g, etc 
    536                                                         */ 
    537    unsigned char sensorgain;    /* Same, but as determined by MCU */ 
    538 /* End of EpiSensor addition */ 
    539  
    540 /* Added network and location codes */ 
    541    char networkcode[NETWORK_CODE_LENGTH];                       /* Network code  */ 
    542    char locationcode[LOCATION_CODE_LENGTH];                 /* Location code */ 
     519/* EpiSensor addition 3/24/05 */ 
     520   float calCoil;               /* g/Volt for EpiSensor */ 
     521   unsigned char range;         /* Range code for sensor: from EEPROM 
     522                                      1=4g 
     523                                      2=2g 
     524                                      3=1g 
     525                                      4=1/2g 
     526                                      5=1/4g, etc */ 
     527   unsigned char sensorgain;    /* Same, but as determined by MCU */ 
     528/* End of EpiSensor addition 3/24/05 */ 
     529 
     530/* Network and location code additions 3/24/05 */ 
     531   char networkcode[NETWORK_CODE_LENGTH];     /* Network code  */ 
     532   char locationcode[LOCATION_CODE_LENGTH];   /* Location code */ 
    543533   char bytepad2[4]; 
    544 /* End of network and location code additions */ 
    545  
     534/* End of network and location code additions 3/24/05 */ 
    546535}; 
    547536 
     
    648637   uint32_t triggerTime; 
    649638   uint32_t duration; /* in # of frames; note: frames may have different sizes */ 
    650 #if 0 
    651    unsigned int errors; 
    652    unsigned int flags; /* Bit 0 = 1 if functional test */ 
    653                        /* bit 1 = 1 if Sensor Response Test, SRT (& 0x03 = 0x03) */ 
    654                        /* bit 2 = 1 if recorded data = trigger data (& 0x04 = 0x04) */ 
    655    unsigned int startTimeMsec; 
    656    unsigned int triggerTimeMsec; 
    657 #endif 
    658639   unsigned short errors; 
    659640   unsigned short flags; /* Bit 0 = 1 if functional test */ 
    660                        /* bit 1 = 1 if Sensor Response Test, SRT (& 0x03 = 0x03) */ 
    661                        /* bit 2 = 1 if recorded data = trigger data (& 0x04 = 0x04) */ 
     641                         /* bit 1 = 1 if Sensor Response Test, SRT (& 0x03 = 0x03) */ 
     642                         /* bit 2 = 1 if recorded data = trigger data (& 0x04 = 0x04) */ 
    662643   unsigned short startTimeMsec; 
    663644   unsigned short triggerTimeMsec; 
    664645   uint32_t nscans; /* # of scans in the event */ 
    665 #if 0 
    666646 
    667647  /* start of RW_K2_PARMS is 8 bytes too far along--don't know where */ 
     
    673653  /* -- 11/3/00 -- [JL] */ 
    674654 
    675 #if !FIX_8BYTES_K2RW 
    676655   uint32_t triggerBitMap; /* indicates first channel to trigger 5/96 */ 
    677656   uint32_t pad; /* for expansion */ 
    678 #endif 
    679  
    680 #endif /* 0 */ 
    681657}; 
    682658 
Note: See TracChangeset for help on using the changeset viewer.