Skip to content
Snippets Groups Projects
Commit eee530ad authored by Kien Le's avatar Kien Le
Browse files

Merge branch 'i245_convert_factor' into 'develop'

modify database to be consistent with manuals and qpeek, logpeek

Closes #245

See merge request !287
parents eafa4985 952d9a0c
No related branches found
No related tags found
1 merge request!287modify database to be consistent with manuals and qpeek, logpeek
Pipeline #3927 passed with stage
in 7 minutes and 49 seconds
No preview for this file type
...@@ -38,9 +38,9 @@ LOG,,Logging,1,,,Q330 ...@@ -38,9 +38,9 @@ LOG,,Logging,1,,,Q330
LCE,PhaseError,Clock phase error,1,us,,Centaur LCE,PhaseError,Clock phase error,1,us,,Centaur
LCQ,ClockQual,Clock Quality,1,%,,Centaur LCQ,ClockQual,Clock Quality,1,%,,Centaur
SEISMIC,SeismicData,Seismic data,1,,,Centaur SEISMIC,SeismicData,Seismic data,1,,,Centaur
VM?,MassPos,Mass position,0.001,V,1,Centaur VM?,MassPos,Mass position,0.000001,V,1,Centaur
VCO,VoltControllOsci,Oscillator value,1,,,Centaur VCO,VoltControllOsci,Oscillator value,1,,,Centaur
VEC,AntAmps,Input power supply current,1,,,Centaur VEC,AntAmps,Input power supply current,1,mA,,Centaur
VEI,SupplyVolts,Input power supply voltage,0.001,V,,Centaur VEI,SupplyVolts,Input power supply voltage,0.001,V,,Centaur
VDT,SysTemp,Internal temperature,0.001,C,,Centaur VDT,SysTemp,Internal temperature,0.001,C,,Centaur
VPB,BufferUsed,Buffer usage,1,%,,Centaur VPB,BufferUsed,Buffer usage,1,%,,Centaur
...@@ -60,11 +60,11 @@ LWS,WindSpeed,Wind speed,1,cm/s,,Centaur ...@@ -60,11 +60,11 @@ LWS,WindSpeed,Wind speed,1,cm/s,,Centaur
VCE,AbsPhaseErr,Clock phase error,1,us,,Pegasus VCE,AbsPhaseErr,Clock phase error,1,us,,Pegasus
VCQ,ClockQual,Clock Quality,1,%,,Pegasus VCQ,ClockQual,Clock Quality,1,%,,Pegasus
SEISMIC,SeismicData,Seismic data,1,,,Pegasus SEISMIC,SeismicData,Seismic data,1,,,Pegasus
VM?,MassPos,Mass position,0.000001,V,1,Pegasus VM?,MassPos,Mass position,0.001,V,1,Pegasus
VCO,VoltControllOsci,Oscillator value,1,,,Pegasus VCO,VoltControllOsci,Oscillator value,1,,,Pegasus
VE1,AntAmps,Input power supply current,0.001,mA,,Pegasus VE1,AntAmps,Input power supply current,0.001,mA,,Pegasus
VEI,SupplyVolts,Input power supply voltage,0.000001,V,,Pegasus VEI,SupplyVolts,Input power supply voltage,0.001,V,,Pegasus
VDT,SysTemp,Internal temperature,0.000001,C,,Pegasus VDT,SysTemp,Internal temperature,0.01,C,,Pegasus
VAN,AntStatus,GNSS antenna status,1,,1,Pegasus VAN,AntStatus,GNSS antenna status,1,,1,Pegasus
VEL,Elev,GNSS elevation,1,,,Pegasus VEL,Elev,GNSS elevation,1,,,Pegasus
VLA,Lat,GNSS latitude,1,,,Pegasus VLA,Lat,GNSS latitude,1,,,Pegasus
...@@ -72,5 +72,6 @@ VLO,Lon,GNSS longitude,1,,,Pegasus ...@@ -72,5 +72,6 @@ VLO,Lon,GNSS longitude,1,,,Pegasus
VNS,SatsUsed,GNSS number of satellites used,1,,,Pegasus VNS,SatsUsed,GNSS number of satellites used,1,,,Pegasus
VPL,PhaseLock,GNSS PPL status,1,,,Pegasus VPL,PhaseLock,GNSS PPL status,1,,,Pegasus
VST,GPS Off/Un/Lk,GNSS status,1,,,Pegasus VST,GPS Off/Un/Lk,GNSS status,1,,,Pegasus
VE2,SensorCurrent,Sensor current,1,,,Pegasus VE2,SensorCurrent,Sensor current,0.001,mA,,Pegasus
ATU,TimeUncert,Time uncertainty,1,,,Pegasus ATU,TimeUncert,Time uncertainty,1,us,,Pegasus
\ No newline at end of file VDP,SysPress,System pressure,1,passcals,,Pegasus
\ No newline at end of file
Q330: https://www.passcal.nmt.edu/webfm_send/1853
Centaur: https://dms.passcal.nmt.edu/index.php/apps/files/files/76191?dir=/PASSCAL_Documents/Instrumentation/Recording_Systems/DAS/Nanometrics/Centaur/Manuals_and_Documentation
Pegasus: https://dms.passcal.nmt.edu/index.php/apps/files/files/642234?dir=/PASSCAL_Documents/Instrumentation/Recording_Systems/DAS/Nanometrics/Pegasus/Manuals_and_Documentation
\ No newline at end of file
...@@ -17,7 +17,7 @@ GNSS longitude,lines,2 ...@@ -17,7 +17,7 @@ GNSS longitude,lines,2
GNSS number of satellites used,lines,2 GNSS number of satellites used,lines,2
GNSS PPL status,dotsRYGM,2 GNSS PPL status,dotsRYGM,2
GNSS status,dotsRM,2 GNSS status,dotsRM,2
Barometric pressure,,0 Barometric pressure,lines,2
Outdoor relative humdity,,0 Outdoor relative humdity,,0
Outdoor temperature,,0 Outdoor temperature,,0
Wind direction,,0 Wind direction,,0
...@@ -37,4 +37,5 @@ SOH data definitions,dotZeroOneWC,2 ...@@ -37,4 +37,5 @@ SOH data definitions,dotZeroOneWC,2
Net Up/down,dotZeroOneRG,2 Net Up/down,dotZeroOneRG,2
Event DS1/DS2 etc,linesDots,2 Event DS1/DS2 etc,linesDots,2
Mass re-center,dotForTime,2 Mass re-center,dotForTime,2
Logging,,0 Logging,,0
\ No newline at end of file System pressure,lines,2
\ No newline at end of file
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment