Skip to content

Commit

Permalink
Merge branch 'main' into TDHS-SM-recorder-swap
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thomas-Benson
Thomas-Benson authored May 1, 2024
2 parents 4012454 + 42126ec commit 1c5f4be
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions assets/recorders.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ 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,,
Expand Down Expand Up @@ -1139,6 +1140,7 @@ Nanometrics,TitanSMA,002184,,
Nanometrics,TitanSMA,002185,,
Nanometrics,TitanSMA,002199,,
Nanometrics,TitanSMA,002201,,
Nanometrics,TitanSMA,002202,,
Nanometrics,TitanSMA,002203,,
Nanometrics,TitanSMA,002204,,
Nanometrics,TitanSMA,002205,,
Expand Down
4 changes: 3 additions & 1 deletion install/firmware.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Canterbury Seismic Instruments,CUSP3D,42033,Cusp3D+r 400.74.1,2019-08-30T00:00:0
Canterbury Seismic Instruments,CUSP3D,42034,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-12-11T22:26:00Z,Fix GPS timing 1 sec
Canterbury Seismic Instruments,CUSP3D,42035,Cusp3D+r 400.74.1,2019-08-30T00:00:00Z,2023-10-18T23:51:00Z,Fix GPS timing 1 sec
Canterbury Seismic Instruments,CUSP3D,42036,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-06-27T23:29:59Z,Fix GPS timing 1 sec
Canterbury Seismic Instruments,CUSP3D,42036,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-27T23:30:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
Canterbury Seismic Instruments,CUSP3D,42036,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-27T23:30:00Z,2024-04-28T22:48:00Z,Fix GPS week number rollover
Canterbury Seismic Instruments,CUSP3D,42037,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2023-11-27T21:06:00Z,Fix GPS timing 1 sec
Canterbury Seismic Instruments,CUSP3D,42038,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-07-14T22:59:59Z,Fix GPS timing 1 sec
Canterbury Seismic Instruments,CUSP3D,42038,Cusp3D+r 400.74.1 (GPS18X4.40),2021-07-14T23:00:00Z,2024-04-17T22:57:00Z,Fix GPS week number rollover
Expand Down Expand Up @@ -400,6 +400,7 @@ Canterbury Seismic Instruments,EQR120,46658,2.3.2,2023-06-21T22:32:00Z,9999-01-0
Canterbury Seismic Instruments,EQR120,46660,2.3.2,2023-07-04T21:33:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46661,2.3.2,2023-11-14T21:47:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46662,2.3.2,2023-09-06T00:14:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46663,2.3.2,2024-04-18T01:08:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46664,2.3.2,2023-10-19T22:03:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46668,2.3.2,2023-10-19T06:12:00Z,9999-01-01T00:00:00Z,
Canterbury Seismic Instruments,EQR120,46669,2.3.2,2023-10-19T02:10:00Z,9999-01-01T00:00:00Z,
Expand Down Expand Up @@ -759,6 +760,7 @@ Nanometrics,TitanSMA,002184,4.5.22,2023-12-12T23:31:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002185,4.5.22,2023-12-13T20:45:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002199,4.5.22,2024-02-15T01:00:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002201,4.5.22,2024-05-01T03:56:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002202,4.5.22,2024-04-29T00:35:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002203,4.5.22,2024-02-29T02:18:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002204,4.5.22,2024-02-28T23:26:00Z,9999-01-01T00:00:00Z,
Nanometrics,TitanSMA,002205,4.5.22,2024-02-20T21:06:00Z,9999-01-01T00:00:00Z,
Expand Down
4 changes: 3 additions & 1 deletion install/recorders.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ Canterbury Seismic Instruments,CUSP3D,CUSP3D,42035,GISS,20,43,,0,0,2014-07-23T00
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42035,WFES,20,292,,0,0,2016-12-13T01:20:00Z,2018-02-07T21:09:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42035,HALS,21,272,,0,0,2018-02-20T02:30:00Z,2023-10-18T23:51:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42036,PNMS,20,238,,0,0,2011-12-06T00:00:10Z,2013-10-16T22:45:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42036,GWTS,20,322,,0,0,2014-07-23T00:00:05Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42036,GWTS,20,322,,0,0,2014-07-23T00:00:05Z,2024-04-28T22:48:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42037,DAVS,20,267,,0,0,2012-01-25T02:00:00Z,2012-02-21T23:45:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42037,STAS,20,180,,0,0,2012-05-22T00:10:00Z,2014-04-09T20:30:00Z
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42037,HCDS,20,230,,0,0,2014-08-26T00:00:10Z,2017-08-22T22:30:00Z
Expand Down Expand Up @@ -756,6 +756,7 @@ Canterbury Seismic Instruments,EQR120,EQR120,46658,MAGS,21,311,,0,0,2023-06-21T2
Canterbury Seismic Instruments,EQR120,EQR120,46660,HAFS,21,0,,0,0,2023-07-04T21:33:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46661,PHHS,20,40,,0,0,2023-11-14T21:47:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46662,WANS,20,198,,0,0,2023-09-06T00:14:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46663,HWHS,21,16,,0,0,2024-04-18T01:08:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46664,PRPC,20,180,,0,0,2023-10-19T22:03:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46668,STAS,20,180,,0,0,2023-10-19T06:12:00Z,9999-01-01T00:00:00Z
Canterbury Seismic Instruments,EQR120,EQR120,46669,HALS,21,272,,0,0,2023-10-19T02:10:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -1478,6 +1479,7 @@ Nanometrics,Titan,TitanSMA,002184,KHLS,20,225,,0,0,2023-12-12T23:31:00Z,9999-01-
Nanometrics,Titan,TitanSMA,002185,SEDS,20,127,,0,0,2023-12-13T20:45:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002199,MLZ,21,0,,0,0,2024-02-15T01:00:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002201,TDHS,20,90,,0,0,2024-05-01T03:56:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002202,GWTS,20,322,,0,0,2024-04-29T00:35:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002203,PNMS,21,283,,0,0,2024-02-29T02:18:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002204,FXBS,20,145,,0,0,2024-02-28T23:26:00Z,9999-01-01T00:00:00Z
Nanometrics,Titan,TitanSMA,002205,WKZ,21,0,,0,0,2024-02-20T21:06:00Z,9999-01-01T00:00:00Z
Expand Down
4 changes: 3 additions & 1 deletion install/streams.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,8 @@ GVZ,20,H,N,200,false,false,false,2019-06-18T00:25:00Z,2019-11-13T01:54:00Z
GVZ,20,H,N,200,false,false,true,2019-11-13T01:55:00Z,2020-02-08T23:59:00Z
GVZ,20,H,N,200,false,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
GWTS,20,B,N,50,true,false,false,2014-07-23T00:00:05Z,2020-06-16T00:00:00Z
GWTS,20,H,N,200,true,false,true,2002-04-17T00:00:00Z,9999-01-01T00:00:00Z
GWTS,20,H,N,200,true,false,true,2002-04-17T00:00:00Z,2020-02-08T23:59:59Z
GWTS,20,H,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
HAAA,10,S,H,50,false,false,true,1995-11-16T00:00:01Z,1996-04-19T23:59:59Z
HAFS,20,B,N,50,true,false,false,2014-07-17T01:20:00Z,2020-06-16T00:00:00Z
HAFS,20,H,N,200,true,false,true,2002-04-18T00:00:00Z,2020-02-08T23:59:00Z
Expand Down Expand Up @@ -966,6 +967,7 @@ HVSC,20,H,N,200,true,false,true,2008-05-12T03:01:00Z,2021-03-26T00:27:00Z
HVSC,20,H,N,200,true,false,false,2021-03-29T00:04:00Z,9999-01-01T00:00:00Z
HWHS,20,B,N,50,true,false,false,2014-08-06T04:12:00Z,2019-07-08T01:20:00Z
HWHS,20,H,N,200,true,false,true,2002-03-12T05:30:00Z,2019-07-08T01:20:00Z
HWHS,21,H,N,200,true,false,false,2024-04-18T01:08:00Z,9999-01-01T00:00:00Z
ICCS,20,B,N,50,true,false,false,2014-09-24T05:00:00Z,2020-06-16T00:00:00Z
ICCS,20,H,N,200,true,false,true,2002-06-11T00:00:00Z,9999-01-01T00:00:00Z
IF04,10,E,H,100,false,false,false,2008-11-26T05:11:00Z,2009-02-12T01:30:00Z
Expand Down
1 change: 1 addition & 0 deletions network/sites.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,7 @@ HUNS,20,-43.57937,172.65723,207,,WGS84,External GPS Device,2012-04-18T00:15:00Z,
HUTZ,10,-38.63193412,176.094390765,300,,WGS84,Unknown,1987-03-06T15:41:00Z,1992-06-01T07:55:00Z
HVSC,20,-43.579787,172.709423,25,,WGS84,Internal GPS Clock,2008-05-12T03:01:00Z,9999-01-01T00:00:00Z
HWHS,20,-39.585139189,174.274244785,110,,WGS84,Internal GPS Clock,2002-03-12T05:30:00Z,2019-07-08T01:20:00Z
HWHS,21,-39.585590,174.274039,110,,WGS84,Topographic Map,2024-04-18T01:08:00Z,9999-01-01T00:00:00Z
HWKO,10,-44.87883,169.9688,676,,WGS84,External GPS Device,2014-09-15T22:00:00Z,2015-04-14T02:00:00Z
ICCS,20,-46.411594219,168.34692313,23,,WGS84,Internal GPS Clock,2002-06-11T00:00:00Z,9999-01-01T00:00:00Z
IDAO,10,-45.1111,169.80742,521,,WGS84,External GPS Device,2014-09-16T00:01:00Z,2015-04-14T00:00:00Z
Expand Down
2 changes: 1 addition & 1 deletion network/stations.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ HUKS,SM,Huiakama School,-39.26051,174.5681,171,,WGS84,2002-11-21T00:00:00Z,9999-
HUNS,SM,Huntsbury,-43.57937,172.65723,207,,WGS84,2012-04-18T00:00:00Z,9999-01-01T00:00:00Z
HUTZ,TP,Huka,-38.63193412,176.094390765,300,,WGS84,1985-09-26T00:00:00Z,1992-10-31T00:00:00Z
HVSC,SC,Heathcote Valley Primary School,-43.579787,172.709423,25,,WGS84,2008-05-12T00:00:00Z,9999-01-01T00:00:00Z
HWHS,SM,Hawera High School,-39.585139189,174.274244785,110,,WGS84,2002-03-12T00:00:00Z,2019-07-08T01:20:00Z
HWHS,SM,Hawera High School,-39.585139189,174.274244785,110,,WGS84,2002-03-12T00:00:00Z,9999-01-01T00:00:00Z
HWKO,XX,Hawkdun,-44.87883,169.9688,676,,WGS84,2014-09-15T00:00:00Z,9999-01-01T00:00:00Z
ICCS,SM,Invercargill City Council,-46.411594219,168.34692313,23,,WGS84,2002-06-11T00:00:00Z,9999-01-01T00:00:00Z
IDAO,XX,Ida Valley,-45.1111,169.80742,521,,WGS84,2014-09-16T00:00:00Z,9999-01-01T00:00:00Z
Expand Down

0 comments on commit 1c5f4be

Please sign in to comment.