Skip to content

Commit

Permalink
Merge branch 'main' into SM_deployment_conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
@CBurton90
CBurton90 authored May 16, 2024
2 parents 40c2b55 + fbbc566 commit ab30355
Show file tree
Hide file tree
Showing 56 changed files with 8,567 additions and 88 deletions.
20 changes: 10 additions & 10 deletions assets/antennas.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ Trimble Navigation Ltd.,TRM115000.00,1551016653,16982,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016654,16983,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016656,16997,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016658,17025,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016662,8456,
Trimble Navigation Ltd.,TRM115000.00,1551016662,8456,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016666,16985,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016679,16993,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016684,17027,
Trimble Navigation Ltd.,TRM115000.00,1551016684,17027,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016690,16981,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016695,17000,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551016696,17019,calibrated
Expand All @@ -86,8 +86,8 @@ Trimble Navigation Ltd.,TRM115000.00,1551016811,17004,calibrated
Trimble Navigation Ltd.,TRM115000.00,1551017047,16987,calibrated
Trimble Navigation Ltd.,TRM115000.00,2612758627,8475,
Trimble Navigation Ltd.,TRM115000.00,2612758639,8474,
Trimble Navigation Ltd.,TRM115000.00,2612758649,8466,
Trimble Navigation Ltd.,TRM115000.00,2612758651,8471,
Trimble Navigation Ltd.,TRM115000.00,2612758649,8466,calibrated
Trimble Navigation Ltd.,TRM115000.00,2612758651,8471,calibrated
Trimble Navigation Ltd.,TRM115000.00,2612758665,8470,
Trimble Navigation Ltd.,TRM115000.00,2612758673,8467,
Trimble Navigation Ltd.,TRM115000.00,2612758712,8468,
Expand Down Expand Up @@ -239,7 +239,7 @@ Trimble Navigation Ltd.,TRM55971.00,30213984,10786a,
Trimble Navigation Ltd.,TRM55971.00,30260173,10787a,
Trimble Navigation Ltd.,TRM55971.00,30260375,10788a,
Trimble Navigation Ltd.,TRM55971.00,30260401,10789a,calibrated
Trimble Navigation Ltd.,TRM55971.00,30260402,10790a,
Trimble Navigation Ltd.,TRM55971.00,30260402,10790a,calibrated
Trimble Navigation Ltd.,TRM55971.00,30260412,10791a,
Trimble Navigation Ltd.,TRM55971.00,30260436,10792a,
Trimble Navigation Ltd.,TRM55971.00,30260439,10793a,
Expand All @@ -263,7 +263,7 @@ Trimble Navigation Ltd.,TRM55971.00,30477057,12969a,
Trimble Navigation Ltd.,TRM55971.00,30477064,12970a,
Trimble Navigation Ltd.,TRM55971.00,30477068,12971a,
Trimble Navigation Ltd.,TRM55971.00,30477110,12972a,
Trimble Navigation Ltd.,TRM55971.00,30477149,12973a,
Trimble Navigation Ltd.,TRM55971.00,30477149,12973a,calibrated
Trimble Navigation Ltd.,TRM55971.00,30477150,12974a,
Trimble Navigation Ltd.,TRM55971.00,30477195,12975a,
Trimble Navigation Ltd.,TRM57971.00,1112118070,16339,
Expand Down Expand Up @@ -314,9 +314,9 @@ Trimble Navigation Ltd.,TRM57971.00,1441031099,14222,
Trimble Navigation Ltd.,TRM57971.00,1441031121,14213,
Trimble Navigation Ltd.,TRM57971.00,1441031129,14215,calibrated
Trimble Navigation Ltd.,TRM57971.00,1441031131,14085,
Trimble Navigation Ltd.,TRM57971.00,1441031138,14209,
Trimble Navigation Ltd.,TRM57971.00,1441031138,14209,calibrated
Trimble Navigation Ltd.,TRM57971.00,1441031160,14224,
Trimble Navigation Ltd.,TRM57971.00,1441031186,14219,
Trimble Navigation Ltd.,TRM57971.00,1441031186,14219,calibrated
Trimble Navigation Ltd.,TRM57971.00,1441031192,14088,
Trimble Navigation Ltd.,TRM57971.00,1441031200,14097,calibrated
Trimble Navigation Ltd.,TRM57971.00,1441031205,14210,
Expand Down Expand Up @@ -349,7 +349,7 @@ Trimble Navigation Ltd.,TRM57971.00,1441040527,14279,
Trimble Navigation Ltd.,TRM57971.00,1441040531,14280,
Trimble Navigation Ltd.,TRM57971.00,1441040547,14426,
Trimble Navigation Ltd.,TRM57971.00,1441044187,14285,
Trimble Navigation Ltd.,TRM57971.00,1441047132,14286,
Trimble Navigation Ltd.,TRM57971.00,1441047132,14286,calibrated
Trimble Navigation Ltd.,TRM57971.00,1441047151,14287,
Trimble Navigation Ltd.,TRM57971.00,1441047157,14288,
Trimble Navigation Ltd.,TRM57971.00,1441047182,14289,
Expand Down Expand Up @@ -425,7 +425,7 @@ Trimble Navigation Ltd.,TRM57971.00,4127561948,16372,
Trimble Navigation Ltd.,TRM57971.00,4127561952,16364,
Trimble Navigation Ltd.,TRM57971.00,4127561953,16379,
Trimble Navigation Ltd.,TRM57971.00,4127561954,16326,
Trimble Navigation Ltd.,TRM57971.00,4127561961,16356,
Trimble Navigation Ltd.,TRM57971.00,4127561961,16356,calibrated
Trimble Navigation Ltd.,TRM57971.00,4127561972,16325,
Trimble Navigation Ltd.,TRM57971.00,4127561981,16332,
Trimble Navigation Ltd.,TRM57971.00,4127561982,16350,
Expand Down
2 changes: 2 additions & 0 deletions assets/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ Nanometrics,Centaur CTR4-6S,9917,,
Nanometrics,Centaur CTR4-6S,9918,,
Nanometrics,Centaur CTR4-6S,9920,,
Nanometrics,Centaur CTR4-6S,9921,,
Nanometrics,Centaur CTR4-6S,9922,,
Nanometrics,Centaur CTR4-6S,10125,,
Nanometrics,Centaur CTR4-6S,10173,,
Nanometrics,Centaur CTR4-6S,10208,,
Expand All @@ -677,6 +678,7 @@ Nanometrics,Centaur CTR4-6S,10234,,
Nanometrics,Centaur CTR4-6S,10235,,
Nanometrics,Centaur CTR4-6S,10236,,
Nanometrics,Centaur CTR4-6S,10840,,
Nanometrics,Centaur CTR4-6S,10922,,
Nanometrics,Centaur CTR4-6S,10956,,
Nanometrics,Centaur CTR4-6S,10961,,
Nanometrics,ORION,0144,,
Expand Down
8 changes: 8 additions & 0 deletions assets/recorders.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,11 @@ Canterbury Seismic Instruments,EQR120,46658,,
Canterbury Seismic Instruments,EQR120,46660,,
Canterbury Seismic Instruments,EQR120,46661,,
Canterbury Seismic Instruments,EQR120,46662,,
Canterbury Seismic Instruments,EQR120,46663,,
Canterbury Seismic Instruments,EQR120,46664,,
Canterbury Seismic Instruments,EQR120,46668,,
Canterbury Seismic Instruments,EQR120,46669,,
Canterbury Seismic Instruments,EQR120,46675,,
Canterbury Seismic Instruments,EQR120,46701,,
Canterbury Seismic Instruments,EQR120,46702,,
Canterbury Seismic Instruments,EQR120,46703,,
Expand Down Expand Up @@ -1137,13 +1139,19 @@ Nanometrics,TitanSMA,002181,,
Nanometrics,TitanSMA,002183,,
Nanometrics,TitanSMA,002184,,
Nanometrics,TitanSMA,002185,,
Nanometrics,TitanSMA,002197,,
Nanometrics,TitanSMA,002199,,
Nanometrics,TitanSMA,002201,,
Nanometrics,TitanSMA,002202,,
Nanometrics,TitanSMA,002203,,
Nanometrics,TitanSMA,002204,,
Nanometrics,TitanSMA,002205,,
Nanometrics,TitanSMA,002208,,
Nanometrics,TitanSMA,002210,,
Nanometrics,TitanSMA,002211,,
Nanometrics,TitanSMA,002212,,
Nanometrics,TitanSMA,002214,,
Nanometrics,TitanSMA,002217,,
Physics and Engineering Laboratory DSIR,MO1,0001,,
Physics and Engineering Laboratory DSIR,MO1,0002,,
Physics and Engineering Laboratory DSIR,MO1,0003,,
Expand Down
5 changes: 5 additions & 0 deletions assets/sensors.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,13 +663,16 @@ Lennartz Electronic,LE-3DliteMkIII,G-0570,16957,
Lennartz Electronic,LE-3DliteMkIII,G-0571,,
Lennartz Electronic,LE-3DliteMkIII,G-0572,16951,
Lennartz Electronic,LE-3DliteMkIII,J-0928,,
Lennartz Electronic,LE-3DliteMkIII,J-0929,,
Lennartz Electronic,LE-3DliteMkIII,J-0931,,
Lennartz Electronic,LE-3DliteMkIII,J-0934,,
Lennartz Electronic,LE-3DliteMkIII,J-0935,,
Lennartz Electronic,LE-3DliteMkIII,J-0937,,
Lennartz Electronic,LE-3DliteMkIII,J-0940,,
Lennartz Electronic,LE-3DliteMkIII,J-0941,,
Lennartz Electronic,LE-3DliteMkIII,J-0942,,
Lennartz Electronic,LE-3DliteMkIII,J-0943,,
Lennartz Electronic,LE-3DliteMkIII,J-0945,,
Lennartz Electronic,LE-3DliteMkIII,J-0946,,
Licor,Li-850 CO2/H2O Gas Analyzer,HGA-06812,,
Licor,Li-850 CO2/H2O Gas Analyzer,HGA-06920,,
Expand Down Expand Up @@ -722,6 +725,7 @@ Nanometrics,Trillium Compact 120PH-2,8332,,
Nanometrics,Trillium Compact 120PH-2,8723,,
Nanometrics,Trillium Compact 120PH-2,8736,,
Nanometrics,Trillium Compact 120PH-2,8743,,
Nanometrics,Trillium Compact 120PH-2,8783,,
Nanometrics,Trillium Compact 120PH-2,8785,,
Nanometrics,Trillium Compact 120PH-2,9202,,
Nanometrics,Trillium Compact 120PH-2,9203,,
Expand Down Expand Up @@ -777,6 +781,7 @@ Nanometrics,Trillium Horizon TH120-2,2745,,
Nanometrics,Trillium Horizon TH120-2,2836,,
Nanometrics,Trillium Horizon TH120-2,2837,,
Nanometrics,Trillium Horizon TH120-2,2838,,
Nanometrics,Trillium Horizon TH120-2,3356,,
OTT Hydromet,Compact Bubbler Sensor USGS model,002,,
OTT Hydromet,Compact Bubbler Sensor USGS model,407895,16026,
OTT Hydromet,Compact Bubbler Sensor USGS model,422837,,
Expand Down
Empty file modified calibration/antennas/TRM115000.00____NONE_1431180094.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1431180104.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1431180105.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1431180124.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1441025923.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1441052884.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1441052888.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1551016643.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1551016652.atx
100755 → 100644
View file
Empty file.
Empty file modified calibration/antennas/TRM115000.00____NONE_1551016658.atx
100755 → 100644
View file
Empty file.
Loading

0 comments on commit ab30355

Please sign in to comment.