Skip to content

Commit

Permalink
Merge branch 'master' into RBCT_NewSensors
Browse files Browse the repository at this point in the history
  • Loading branch information
@ozym
ozym authored Jul 4, 2018
2 parents 4581990 + 6d4b8de commit e1e30cf
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 10 deletions.
2 changes: 2 additions & 0 deletions assets/sensors.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ General Electric Industrial Sensing,Druck PTX-1730,3632400,15097,
General Electric Industrial Sensing,Druck PTX-1730,3632401,15098,
General Electric Industrial Sensing,Druck PTX-1830,10220190,,
General Electric Industrial Sensing,Druck PTX-1830,10236612,16845,
General Electric Industrial Sensing,Druck PTX-1830,10236613,,
General Electric Industrial Sensing,Druck PTX-1830,10236615,,
General Electric Industrial Sensing,Druck PTX-1830,10236617,,
General Electric Industrial Sensing,Druck PTX-1830,10515689,,
General Electric Industrial Sensing,Druck PTX-1830,10515690,,
General Electric Industrial Sensing,Druck PTX-1830,10837198,,
Expand Down
3 changes: 2 additions & 1 deletion install/antennas.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Leica Geosystems,LEIAT504,332,TAKL,0,0,0,0,2001-07-11T00:00:00Z,2007-07-05T03:44
Leica Geosystems,LEIAT504,333,WGTT,0,0,0,0,2000-06-29T03:00:01Z,2000-08-18T00:00:00Z
Leica Geosystems,LEIAT504,333,WGTT,0.0002,0,0,0,2000-08-18T00:00:05Z,9999-01-01T00:00:00Z
Leica Geosystems,LEIAT504,405,LYTT,0.001,0,0,0,1999-11-15T00:00:03Z,9999-01-01T00:00:00Z
Thales,ASH700936B_M,11753,WGTN,0.0017,0,0,0,1996-05-23T00:00:00Z,2005-03-21T01:59:59Z
Thales,ASH700936B_M,11753,WGTN,0.0017,0,0,0,1996-05-23T00:00:00Z,1999-11-10T05:43:00Z
Thales,ASH700936B_M,11753,WGTN,0.0017,0,0,0,1999-11-10T05:44:00Z,2005-03-21T01:59:59Z
Thales,ASH700936C_M,12413,GRAC,0,0,0,0,1998-07-10T00:00:00Z,1999-12-28T00:00:00Z
Thales,ASH700936C_M,12413,GRAC,0,0,0,0,2001-01-25T00:00:00Z,2001-01-29T00:00:00Z
Thales,ASH700936C_M,12477,NIUC,0,0,0,0,1996-11-13T00:00:00Z,2003-11-01T00:00:01Z
Expand Down
3 changes: 2 additions & 1 deletion install/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ Kinemetrics,Q330/3,533,Taurewa,,2004-05-18T02:00:00Z,2011-06-20T23:00:00Z
Kinemetrics,Q330/3,533,Motutapu Island,Borehole,2012-10-07T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,538,Karewarewa,,2004-12-03T22:00:00Z,2005-03-02T00:00:00Z
Kinemetrics,Q330/3,538,Mount Edgecumbe,,2006-02-16T00:00:01Z,2007-05-31T03:00:00Z
Kinemetrics,Q330/3,538,McNeill Hill,,2008-05-27T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,538,McNeill Hill,,2008-05-27T00:00:01Z,2018-05-21T04:30:00Z
Kinemetrics,Q330/3,540,Pukeiti Hill,,2003-10-28T16:00:00Z,2006-12-06T04:07:00Z
Kinemetrics,Q330/3,540,Namu Road,,2009-04-01T22:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,541,White Island - South Rim,,2006-09-19T00:00:01Z,2007-04-19T03:00:00Z
Expand Down Expand Up @@ -689,6 +689,7 @@ Kinemetrics,Q330S/3,5162,View Hill,,2014-10-30T00:05:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330S/3,5165,Puysegur Welcome Bay,,2014-02-25T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330S/3,5166,White Bluffs strong-motion,,2013-07-23T05:20:01Z,2013-11-21T12:00:00Z
Kinemetrics,Q330S/3,5166,Pakihiroa,,2014-11-25T00:05:01Z,2016-09-04T19:25:00Z
Kinemetrics,Q330S/3,5166,McNeill Hill,,2018-05-21T05:30:00Z,9999-01-01T00:00:00Z
Kinemetrics,Q330S/3,5167,Naumai,,2013-07-30T00:00:01Z,2014-01-10T00:00:00Z
Kinemetrics,Q330S/3,5167,Charleston Constant Bay,,2015-06-25T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330S/3,5169,Kekerengu Valley Road,,2013-07-24T00:00:01Z,2014-07-25T00:00:00Z
Expand Down
4 changes: 2 additions & 2 deletions install/radomes.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Make,Model,Serial,Mark,Start Date,End Date
Leica Geosystems,LEIS,0220148020,MQZG,1999-09-27T00:00:00Z,2001-09-03T00:00:00Z
Leica Geosystems,LEIS,11753,WGTN,1999-11-11T00:00:00Z,2005-03-21T01:59:59Z
Leica Geosystems,LEIS,11753,WGTN,1999-11-10T05:44:00Z,2005-03-21T01:59:59Z
Leica Geosystems,LEIS,324,DUNT,1999-09-23T00:00:00Z,9999-01-01T00:00:00Z
Leica Geosystems,LEIS,332,WGTT,1999-12-14T00:00:00Z,2000-06-29T03:00:00Z
Leica Geosystems,LEIS,332,TAKL,2001-07-11T00:00:00Z,2007-07-05T03:44:00Z
Expand All @@ -18,7 +18,7 @@ Thales,SCIS,0220227659,KARA,2004-12-04T18:31:00Z,2016-03-01T03:15:36Z
Thales,SCIS,CR13573,HOKI,2000-01-20T00:00:01Z,2003-09-05T22:56:00Z
Thales,SCIS,CR519993905,MQZG,2001-09-03T00:00:01Z,2005-02-28T03:00:00Z
Thales,SCIS,CRN120000601,PAEK,2000-04-11T00:00:00Z,2006-09-10T23:35:00Z
Thales,SNOW,11753,WGTN,1996-05-23T00:00:00Z,1999-11-10T23:59:59Z
Thales,SNOW,11753,WGTN,1996-05-23T00:00:00Z,1999-11-10T05:43:00Z
Thales,SNOW,12477,NIUC,1996-11-13T00:00:00Z,2003-11-01T00:00:01Z
Thales,SNOW,12627,FALE,1996-11-13T00:00:00Z,2003-09-17T23:59:59Z
Thales,SNOW,CR16098,HOKI,1998-07-06T00:00:00Z,2000-01-20T00:00:00Z
Expand Down
3 changes: 2 additions & 1 deletion install/receivers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69671,MAST,2010-11-05T01:15:01Z,2016-
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69671,WRA1,2016-11-15T23:43:29Z,2017-05-27T23:59:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69673,SCTB,2010-10-26T00:00:01Z,2016-12-13T04:41:54Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69674,LKTA,2011-02-08T01:23:01Z,2018-05-17T02:16:49Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69674,TGTK,2018-06-26T23:56:38Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69675,HOKI,2011-02-08T20:13:01Z,2017-07-17T23:48:20Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69675,WAHU,2018-05-22T00:40:30Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5034K69678,HIKB,2011-01-13T06:00:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -501,7 +502,7 @@ Trimble Navigation Ltd.,TRIMBLE NETRS,4445240407,CKID,2006-05-23T02:00:00Z,2007-
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240407,TGWH,2007-06-20T01:51:00Z,2016-10-12T03:04:18Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240408,MAHO,2007-01-15T01:16:30Z,2007-02-20T05:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240408,CAST,2007-05-31T03:05:00Z,2009-01-28T20:26:43Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240409,TGTK,2007-06-19T03:10:00Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240409,TGTK,2007-06-19T03:10:00Z,2018-06-26T23:56:37Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240410,AKTO,2006-04-27T00:01:01Z,2007-06-27T00:10:00Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240412,HAMT,2007-06-11T03:45:02Z,2009-08-17T13:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETRS,4445240412,RGRR,2011-01-25T01:40:00Z,2013-04-19T00:00:00Z
Expand Down
3 changes: 2 additions & 1 deletion install/recorders.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ CSI,CUSP3D,CUSP3D,42280,UTKS,20,0,0,999,2015-05-05T01:10:00Z,2016-06-03T18:00:00
CSI,CUSP3D,CUSP3D,42280,NAAS,20,31,1,0,2017-11-15T03:20:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42281,STKS,20,101,0,0,2015-06-09T23:46:03Z,2016-09-07T03:00:00Z
CSI,CUSP3D,CUSP3D,42281,WCFS,20,225,0,0,2016-12-02T01:42:00Z,2018-03-15T22:30:00Z
CSI,CUSP3D,CUSP3D,42281,HCDS,20,230,0,0,2018-05-21T04:00:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42282,SEVS,21,298,0,0,2015-06-25T21:05:00Z,2016-04-05T03:15:00Z
CSI,CUSP3D,CUSP3D,42282,WSFC,20,304,0,0,2017-08-22T02:30:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42283,GODS,21,62,0,0,2015-06-11T00:14:33Z,9999-01-01T00:00:00Z
Expand All @@ -498,7 +499,7 @@ CSI,CUSP3D,CUSP3D,42289,ORCS,20,286,0,0,2015-09-17T23:41:08Z,9999-01-01T00:00:00
CSI,CUSP3D,CUSP3D,42290,GHHS,20,355,0,0,2016-08-08T22:00:23Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42291,HUKS,20,120,0,0,2016-08-17T03:15:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42292,KIRS,20,347,0,0,2015-08-05T02:36:21Z,2017-05-11T21:00:00Z
CSI,CUSP3D,CUSP3D,42292,HCDS,20,230,0,0,2017-08-22T22:40:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42292,HCDS,20,230,0,0,2017-08-22T22:40:00Z,2018-05-21T03:00:00Z
CSI,CUSP3D,CUSP3D,42293,GISS,20,43,0,0,2016-08-09T01:16:05Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42294,GLNS,20,127,0,0,2015-10-22T21:05:00Z,9999-01-01T00:00:00Z
CSI,CUSP3D,CUSP3D,42295,DALS,20,269,0,0,2017-09-12T04:37:00Z,9999-01-01T00:00:00Z
Expand Down
9 changes: 6 additions & 3 deletions install/sensors.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ GNS Science (Wairakei),Temperature sensor (K-type),Inferno1,INFR,81,0,0,0,0,0,0,
GNS Science (Wairakei),Temperature sensor (K-type),TC20121206,INFR,82,0,0,0,0,0,0,0,2013-05-21T00:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PDCR-1830,2427881,WLGT,41,0,90,0,0,0,1.03,0,2007-03-06T00:00:02Z,2007-05-22T23:30:00Z
General Electric Industrial Sensing,Druck PTX-1830,10220190,GBIT,40,0,0,0,0,0,1.03,0,2017-12-12T02:45:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10236613,NAPT,40,0,90,5.969,0,0,1.03,0,2018-04-09T04:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10236615,CPIT,40,0,90,0,0,0,1.03,0,2017-05-10T02:25:21Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10236617,NAPT,41,0,90,5.969,0,0,1.03,0,2018-04-09T04:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10515689,GBIT,41,0,0,0,0,0,1.03,0,2017-12-12T02:45:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10515690,CPIT,41,0,90,0,0,0,1.03,0,2017-05-10T02:25:21Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,10837198,LOTT,40,0,0,0,0,0,1.03,0,2018-03-28T02:20:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -107,8 +109,8 @@ General Electric Industrial Sensing,Druck PTX-1830,3133814,RFRT,41,0,60,0,0,0,1.
General Electric Industrial Sensing,Druck PTX-1830,3133818,MNKT,40,0,0,0,0,0,1.03,0,2010-07-15T03:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3133822,MNKT,41,0,0,0,0,0,1.03,0,2010-07-15T03:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3133827,NCPT,40,0,0,0,0,0,1.03,0,2011-10-06T03:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3136137,NAPT,40,0,90,5.969,0,0,1.03,0,2010-12-15T05:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3136140,NAPT,41,0,90,5.969,0,0,1.03,0,2010-12-15T05:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3136137,NAPT,40,0,90,5.969,0,0,1.03,0,2010-12-15T05:00:00Z,2018-04-09T03:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3136140,NAPT,41,0,90,5.969,0,0,1.03,0,2010-12-15T05:00:00Z,2018-04-09T03:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3140384,KAIT,40,0,90,5.205,0,0,1.03,0,2018-03-07T21:00:00Z,9999-01-01T00:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3150040,RBCT,41,0,90,0,0,0,1.03,0,2010-10-27T03:00:00Z,2018-03-04T22:00:00Z
General Electric Industrial Sensing,Druck PTX-1830,3150041,RBCT,40,0,90,0,0,0,1.03,0,2010-10-27T03:00:00Z,2018-03-04T22:00:00Z
Expand Down Expand Up @@ -717,6 +719,7 @@ Lennartz electronic GmbH,LE-3DliteMkII,N-1298,MTSX,10,0,0,0,0,0,0,0,2015-10-26T0
Lennartz electronic GmbH,LE-3DliteMkII,N-1298,KEKS,10,0,0,0,0,0,0,0,2016-12-01T00:05:00Z,2018-01-14T20:26:00Z
Lennartz electronic GmbH,LE-3DliteMkII,N-1299,WPHZ,10,0,0,0,0,0,0,0,2014-11-26T00:10:00Z,9999-01-01T00:00:00Z
Lennartz electronic GmbH,LE-3DliteMkII,N-1300,CAW,10,0,0,0,0,0,0,0,2014-10-20T00:00:10Z,9999-01-01T00:00:00Z
Lennartz electronic GmbH,LE-3DliteMkIII,F-0479,MCHZ,10,0,0,0,0,0,0,0,2018-05-21T05:30:00Z,9999-01-01T00:00:00Z
Nanometrics Inc.,Trillium 120PA,730,WEL,11,0,0,0,0,0,0,0,2014-11-03T02:10:00Z,2015-03-24T00:00:00Z
Nanometrics Inc.,Trillium 120QA,2188,INZ,10,0,0,0,0,0,0,0,2015-05-28T06:10:00Z,9999-01-01T00:00:00Z
Nanometrics Inc.,Trillium 120QA,2196,RTZ,10,0,0,0,0,0,0,0,2016-09-01T21:45:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -987,7 +990,7 @@ Sercel Inc.,L4C-3D,1119,AXZ,10,0,0,0,0,0,0,0,1996-03-07T02:15:00Z,2000-03-08T02:
Sercel Inc.,L4C-3D,1119,GR4A,10,0,0,0,0,0,0,0,2001-07-30T22:00:00Z,2002-01-21T14:00:00Z
Sercel Inc.,L4C-3D,1119,CAW,10,0,0,0,0,0,0,0,2003-05-20T02:00:00Z,2014-10-20T00:00:00Z
Sercel Inc.,L4C-3D,1120,OHAA,10,0,0,0,0,0,0,0,1995-11-17T00:00:01Z,1996-04-15T23:59:59Z
Sercel Inc.,L4C-3D,1120,MCHZ,10,0,0,0,0,0,0,0,2008-05-27T00:02:00Z,9999-01-01T00:00:00Z
Sercel Inc.,L4C-3D,1120,MCHZ,10,0,0,0,0,0,0,0,2008-05-27T00:02:00Z,2018-05-21T04:30:00Z
Sercel Inc.,L4C-3D,1131,EDRZ,10,0,0,0,0,0,0,0,2006-08-10T00:00:00Z,2008-06-12T02:20:00Z
Sercel Inc.,L4C-3D,1131,TUVZ,10,0,0,0,0,0,0,0,2008-11-26T02:45:00Z,2013-12-04T20:45:00Z
Sercel Inc.,L4C-3D,1132,WATZ,10,0,0,0,0,0,0,0,2003-04-03T05:00:00Z,2012-01-13T00:00:00Z
Expand Down
3 changes: 2 additions & 1 deletion install/sessions.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,8 @@ TGRA,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2006-04-11T00:00:
TGRA,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2018-05-23T23:12:58Z,9999-01-01T00:00:00Z
TGRI,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,3,geonet,trimble_netr9 x4,2011-04-04T02:20:00Z,2016-04-21T22:05:06Z
TGRI,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2016-04-21T22:05:07Z,9999-01-01T00:00:00Z
TGTK,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2006-04-27T01:00:00Z,9999-01-01T00:00:00Z
TGTK,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2006-04-27T01:00:00Z,2018-06-26T23:56:37Z
TGTK,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2018-06-26T23:56:38Z,9999-01-01T00:00:00Z
TGWH,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2007-02-06T22:30:00Z,2016-10-12T03:04:18Z
TGWH,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2016-10-12T03:04:20Z,9999-01-01T00:00:00Z
THAP,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2008-06-13T01:05:00Z,2017-10-02T01:51:06Z
Expand Down

0 comments on commit e1e30cf

Please sign in to comment.