Skip to content

Commit d27eea6

Browse files
Thomas-BensonThomas-Benson
authored
Merge branch 'main' into ERWZ-update-start-time
2 parents 82c0c5f + 4adf6d1 commit d27eea6

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎assets/recorders.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,6 +1246,7 @@ Nanometrics,TitanSMA,002425,,
12461246
Nanometrics,TitanSMA,002426,,
12471247
Nanometrics,TitanSMA,002437,,
12481248
Nanometrics,TitanSMA,002438,,
1249+
Nanometrics,TitanSMA,002440,,
12491250
Nanometrics,TitanSMA,002441,,
12501251
Nanometrics,TitanSMA,002453,,
12511252
Nanometrics,TitanSMA,002454,,

‎install/firmware.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ Canterbury Seismic Instruments,CUSP3D,42289,Cusp3D+r 400.74.1 (GPS18X4.40),2021-
289289
Canterbury Seismic Instruments,CUSP3D,42290,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-06-27T22:29:59Z,Fix GPS timing 1 sec
290290
Canterbury Seismic Instruments,CUSP3D,42290,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-27T22:30:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
291291
Canterbury Seismic Instruments,CUSP3D,42291,Cusp3D+r 400.74.1,2019-08-30T00:00:00Z,2021-03-30T19:59:59Z,Fix GPS timing 1 sec
292-
Canterbury Seismic Instruments,CUSP3D,42291,Cusp3D+r 400.74.1 (GPS18X4.40),2021-03-30T20:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
292+
Canterbury Seismic Instruments,CUSP3D,42291,Cusp3D+r 400.74.1 (GPS18X4.40),2021-03-30T20:00:00Z,2025-07-28T23:47:00Z,Fix GPS week number rollover
293293
Canterbury Seismic Instruments,CUSP3D,42292,Cusp3D+r 400.74.1,2019-08-30T00:00:00Z,2022-07-12T05:23:00Z,Fix GPS timing 1 sec
294294
Canterbury Seismic Instruments,CUSP3D,42293,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-05-12T23:14:59Z,Fix GPS timing 1 sec
295295
Canterbury Seismic Instruments,CUSP3D,42293,Cusp3D+r 400.74.1 (GPS18X4.40),2021-05-12T23:15:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
@@ -944,6 +944,7 @@ Nanometrics,TitanSMA,002425,4.9.2,2025-07-24T02:54:00Z,9999-01-01T00:00:00Z,
944944
Nanometrics,TitanSMA,002426,4.9.2,2025-05-19T05:36:00Z,9999-01-01T00:00:00Z,
945945
Nanometrics,TitanSMA,002437,4.9.2,2025-06-19T00:14:00Z,9999-01-01T00:00:00Z,
946946
Nanometrics,TitanSMA,002438,4.9.2,2025-02-11T04:31:00Z,9999-01-01T00:00:00Z,
947+
Nanometrics,TitanSMA,002440,4.9.2,2025-07-29T01:05:00Z,9999-01-01T00:00:00Z,
947948
Nanometrics,TitanSMA,002441,4.9.2,2025-03-12T20:34:00Z,9999-01-01T00:00:00Z,
948949
Nanometrics,TitanSMA,002453,4.9.2,2025-06-06T04:09:00Z,9999-01-01T00:00:00Z,
949950
Nanometrics,TitanSMA,002454,4.9.2,2025-03-12T21:44:00Z,9999-01-01T00:00:00Z,

‎install/recorders.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ Canterbury Seismic Instruments,CUSP3D,CUSP3D,42287,POKS,20,45,,0,0,2015-08-05T00
580580
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42288,PNRS,20,84.4,,0,0,2015-08-06T00:14:09Z,9999-01-01T00:00:00Z
581581
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42289,ORCS,20,286,,0,0,2015-09-17T23:41:08Z,9999-01-01T00:00:00Z
582582
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42290,GHHS,20,355,,0,0,2016-08-08T22:00:23Z,9999-01-01T00:00:00Z
583-
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42291,HUKS,20,120,,0,0,2016-08-17T03:15:00Z,9999-01-01T00:00:00Z
583+
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42291,HUKS,20,120,,0,0,2016-08-17T03:15:00Z,2025-07-28T23:47:00Z
584584
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42292,KIRS,20,347,,0,0,2015-08-05T02:36:21Z,2017-05-11T21:00:00Z
585585
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42292,HCDS,20,230,,0,0,2017-08-22T22:40:00Z,2018-05-21T03:00:00Z
586586
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42292,PPHS,20,213,,0,0,2019-02-07T21:00:00Z,2022-07-12T05:23:00Z
@@ -1618,6 +1618,7 @@ Nanometrics,Titan,TitanSMA,002425,APZ,21,0,,0,0,2025-07-24T02:54:00Z,9999-01-01T
16181618
Nanometrics,Titan,TitanSMA,002426,ASBS,20,230,,0,0,2025-05-19T05:36:00Z,9999-01-01T00:00:00Z
16191619
Nanometrics,Titan,TitanSMA,002437,APPS,20,81,,0,0,2025-06-19T00:14:00Z,9999-01-01T00:00:00Z
16201620
Nanometrics,Titan,TitanSMA,002438,MNZS,20,218,,0,0,2025-02-11T04:31:00Z,9999-01-01T00:00:00Z
1621+
Nanometrics,Titan,TitanSMA,002440,HUKS,20,120,,0,0,2025-07-29T01:05:00Z,9999-01-01T00:00:00Z
16211622
Nanometrics,Titan,TitanSMA,002441,WDAS,20,3,,0,0,2025-03-12T20:34:00Z,9999-01-01T00:00:00Z
16221623
Nanometrics,Titan,TitanSMA,002453,WMVZ,20,0,,0,0,2025-06-06T04:09:00Z,9999-01-01T00:00:00Z
16231624
Nanometrics,Titan,TitanSMA,002454,INSS,20,76,,0,0,2025-03-12T21:44:00Z,9999-01-01T00:00:00Z

‎install/streams.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,8 @@ HSSS,20,H,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
10741074
HTPZ,10,L,H,1,false,false,false,2022-12-19T02:31:00Z,9999-01-01T00:00:00Z
10751075
HTPZ,10,H,H,100,false,false,false,2022-12-19T02:31:00Z,9999-01-01T00:00:00Z
10761076
HUKS,20,B,N,50,true,false,false,2016-09-15T01:40:00Z,2020-06-16T00:00:00Z
1077-
HUKS,20,H,N,200,true,false,true,2002-11-21T22:00:00Z,9999-01-01T00:00:00Z
1077+
HUKS,20,H,N,200,true,false,true,2002-11-21T22:00:00Z,2020-02-08T23:59:59Z
1078+
HUKS,20,h,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
10781079
HUNS,20,B,N,50,true,false,false,2012-04-18T00:15:00Z,2020-06-16T00:00:00Z
10791080
HUNS,20,H,N,200,true,false,true,2012-04-18T00:15:00Z,9999-01-01T00:00:00Z
10801081
HVSC,20,B,N,50,true,false,false,2016-06-15T22:53:00Z,2020-06-16T00:00:00Z

0 commit comments

Comments
 (0)