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
salichon authored Jul 11, 2018
2 parents fd50eb4 + 4969c31 commit 2e31efb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion install/dataloggers.csv
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ Kinemetrics,Q330/3,2558,Whatipu,,2010-07-15T00:00:02Z,2018-04-12T01:45:00Z
Kinemetrics,Q330/3,2559,Ngongotaha,,2011-10-26T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,2563,Dunedin Tsunami,,2010-02-25T01:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,2564,Korotiti Bay,,2010-05-09T00:00:01Z,2017-12-12T02:44:00Z
Kinemetrics,Q330/3,2564,Cape Kidnappers,,2018-02-28T22:00:00Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,2610,Devonport Naval Base,,2009-03-26T14:10:02Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,280,Wellington Dominion Observatory,,2003-04-08T00:00:00Z,2008-12-18T01:00:00Z
Kinemetrics,Q330/3,280,Ohakea,,2011-03-24T00:00:01Z,2016-10-21T02:00:00Z
Expand Down Expand Up @@ -572,7 +573,7 @@ Kinemetrics,Q330/3,550,Tory Channel,,2005-04-20T13:00:00Z,2005-12-14T22:30:00Z
Kinemetrics,Q330/3,550,North Cape,,2011-09-23T01:00:01Z,2014-01-22T22:00:00Z
Kinemetrics,Q330/3,550,Wellington Dominion Observatory,Test 1,2014-07-24T03:30:01Z,2014-11-03T02:05:00Z
Kinemetrics,Q330/3,551,Queen's Wharf Shed 1,,2007-03-06T00:00:01Z,2016-02-04T00:05:00Z
Kinemetrics,Q330/3,552,Cape Kidnappers,,2007-08-29T02:30:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,552,Cape Kidnappers,,2007-08-29T02:30:01Z,2018-02-28T21:59:00Z
Kinemetrics,Q330/3,553,Okepuha Station,,2007-04-03T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,559,Mangateitei,,2005-03-15T21:00:00Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,937,D'Urville Island,,2003-12-10T00:00:00Z,2011-02-24T00:00:00Z
Expand Down
3 changes: 2 additions & 1 deletion install/receivers.csv
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Trimble Navigation Ltd.,TRIMBLE 5700,220280300,HORN,2002-11-20T00:00:00Z,2012-08
Trimble Navigation Ltd.,TRIMBLE NETR5,4737K07041,OUSD,2008-02-29T00:00:00Z,2008-10-15T23:59:59Z
Trimble Navigation Ltd.,TRIMBLE NETR5,4737K07041,OUSD,2017-06-14T00:00:00Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5014K66721,METH,2010-10-12T00:24:01Z,2014-07-27T21:49:59Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5014K66721,PAWA,2015-02-10T21:28:58Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5014K66721,PAWA,2015-02-10T21:28:58Z,2018-07-10T00:09:19Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5014K66722,NRSW,2011-01-18T00:06:57Z,2017-06-21T01:15:55Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5014K66722,HANM,2018-05-17T21:15:38Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5015K66760,HAST,2010-12-15T22:08:30Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -156,6 +156,7 @@ Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72143,MTJO,2011-02-08T00:00:01Z,9999-
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72152,TAUW,2011-04-21T00:12:08Z,2014-01-08T23:58:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72152,YALD,2014-09-16T21:00:01Z,2014-12-16T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72152,HANM,2015-04-13T23:07:38Z,2018-05-17T21:15:37Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72152,PAWA,2018-07-10T00:09:20Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72153,MQZG,2011-02-09T23:48:01Z,2018-02-28T21:23:12Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72153,KAPT,2018-05-08T23:14:08Z,9999-01-01T00:00:00Z
Trimble Navigation Ltd.,TRIMBLE NETR9,5049K72167,CLS3,2011-06-21T04:58:51Z,2015-09-22T00:05:00Z
Expand Down

0 comments on commit 2e31efb

Please sign in to comment.