Skip to content

Commit 5c049dc

Browse files
Thomas-BensonThomas-Benson
authored
Merge branch 'main' into MWOZ-NBEZ-UPKZ-close-surface-sensors
2 parents 6d844aa + 1ab83ec commit 5c049dc

6 files changed

Lines changed: 16 additions & 6 deletions

File tree

‎assets/cameras.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Axis Communications AB,Q1808-LE,B8A44FE4A799,414114,
1010
Axis Communications AB,Q1808-LE,B8A44FE4A100,414113,
1111
Axis Communications AB,Q1808-LE,B8A44FE4A4E3,414117,
1212
Axis Communications AB,Q1808-LE,E82725028B63,414110,
13+
Axis Communications AB,Q1808-LE,E82725028BF1,414111,
1314
Mobotix AG,M12 3MP,0003c5041fc7,13288,
1415
Mobotix AG,M12 3MP,10.3.234.85,13351,
1516
Mobotix AG,M12 3MP,10.4.156.174,13350,

‎assets/recorders.csv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,13 +1316,15 @@ Nanometrics,TitanSMA,002548,,
13161316
Nanometrics,TitanSMA,002549,,
13171317
Nanometrics,TitanSMA,002550,,
13181318
Nanometrics,TitanSMA,002604,,
1319+
Nanometrics,TitanSMA,002613,,
13191320
Nanometrics,TitanSMA,002616,,
13201321
Nanometrics,TitanSMA,002642,,
13211322
Nanometrics,TitanSMA,002643,,
13221323
Nanometrics,TitanSMA,002644,,
13231324
Nanometrics,TitanSMA,002645,,
13241325
Nanometrics,TitanSMA,002646,,
13251326
Nanometrics,TitanSMA,002674,,
1327+
Nanometrics,TitanSMA,002677,,
13261328
Physics and Engineering Laboratory DSIR,MO1,0001,,
13271329
Physics and Engineering Laboratory DSIR,MO1,0002,,
13281330
Physics and Engineering Laboratory DSIR,MO1,0003,,

‎install/cameras.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Axis Communications AB,Q1808-LE,B8A44FE4A100,TOKR,01,0,0,0,0,0,2026-01-28T22:19:
1010
Axis Communications AB,Q1808-LE,B8A44FE4A4E3,RIMK,01,0,270,1.5,0,0,2026-02-22T05:29:59Z,9999-01-01T00:00:00Z,Mt Moumoukai (Raoul Island) looking at Green Lake
1111
Axis Communications AB,Q1808-LE,B8A44FE4A799,KMTP,03,12.2,331,1.9,0,-19.5,2026-04-30T02:29:59Z,9999-01-01T00:00:00Z,Tai Ping looking at South East Ngauruhoe & South East Tongariro
1212
Axis Communications AB,Q1808-LE,E82725028B63,DISC,01,16,148,0,0,0,2026-04-24T01:59:59Z,9999-01-01T00:00:00Z,Discovery Lodge (Whakapapa) looking at North Ruapehu
13+
Axis Communications AB,Q1808-LE,E82725028BF1,TEMO,02,8.1,183,0,3.7,0.8,2026-05-28T20:19:59Z,9999-01-01T00:00:00Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
1314
Mobotix AG,M12 3MP,0003c5041fc7,KMTP,01,0,280,10,0,0,2009-03-03T02:00:00Z,2009-09-18T01:00:00Z,Bearing is magnetic.
1415
Mobotix AG,M12 3MP,10.3.234.85,TEMO,01,0,180,0,0,0,2009-11-24T22:30:00Z,2012-04-02T22:45:00Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
1516
Mobotix AG,M12 3MP,10.3.234.85,TEMO,02,0,180,0,0,0,2012-04-03T00:15:00Z,2020-02-18T00:40:01Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
@@ -54,7 +55,7 @@ Mobotix AG,M16,10.26.194.154,FOXVF,01,-3.1,269,0,0,0,2022-02-23T00:00:00Z,9999-0
5455
Mobotix AG,M16,10.26.196.188,KMTP,01,9.5,290,2.5,0,0,2022-05-05T01:12:50Z,2022-07-31T10:55:00Z,Tai Ping looking at East Ruapehu & South East Ngauruhoe
5556
Mobotix AG,M16,10.26.196.191,KAKA,01,5.6,192,1.5,0,0,2021-08-01T23:35:11Z,2026-02-05T02:30:01Z,Kakaramea looking at Tongariro Massif
5657
Mobotix AG,M16,10.26.201.108,FOXRB,01,17.5,349,0,0,0,2022-02-22T00:00:00Z,9999-01-01T00:00:00Z,Fox Glacier Rapanui Bluff looking at sediment and rock slopes
57-
Mobotix AG,M16,10.26.62.41,TEMO,02,0,187,0,3.7,0.8,2020-08-28T01:13:59Z,9999-01-01T00:00:00Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
58+
Mobotix AG,M16,10.26.62.41,TEMO,02,0,187,0,3.7,0.8,2020-08-28T01:13:59Z,2026-05-27T23:40:01Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
5859
Mobotix AG,M16,10.26.62.43,TEMO,02,0,187,0,3.7,0.8,2020-07-22T01:10:00Z,2020-08-27T23:40:01Z,TEMO (New Plymouth) looking at North side of Taranaki Maunga
5960
Mobotix AG,M16,10.26.62.43,DISC,01,16,148,0,0,0,2021-02-05T04:54:00Z,2026-04-23T21:10:01Z,Discovery Lodge (Whakapapa) looking at North Ruapehu
6061
Mobotix AG,M16,10.28.95.169,WHOH,02,2,19,4,0,0,2023-01-18T00:45:00Z,2025-07-09T06:09:59Z,Whakatane looking at White Island

‎install/firmware.csv‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Canterbury Seismic Instruments,CUSP3D,42154,Cusp3D+r 400.74.1,2019-05-23T12:30:0
156156
Canterbury Seismic Instruments,CUSP3D,42154,Cusp3D+r 400.74.1 (GPS18X4.40),2021-03-11T00:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
157157
Canterbury Seismic Instruments,CUSP3D,42155,Cusp3D+r 400.63,2014-08-06T04:12:00Z,2019-07-08T01:20:00Z,Timing error
158158
Canterbury Seismic Instruments,CUSP3D,42156,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2021-07-14T21:59:59Z,Fix GPS timing 1 sec
159-
Canterbury Seismic Instruments,CUSP3D,42156,Cusp3D+r 400.74.1 (GPS18X4.40),2021-07-14T22:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
159+
Canterbury Seismic Instruments,CUSP3D,42156,Cusp3D+r 400.74.1 (GPS18X4.40),2021-07-14T22:00:00Z,2026-05-28T04:16:00Z,Fix GPS week number rollover
160160
Canterbury Seismic Instruments,CUSP3D,42157,Cusp3D+r 400.74.1,2019-08-16T00:00:00Z,2024-04-05T18:16:00Z,Fix GPS timing 1 sec
161161
Canterbury Seismic Instruments,CUSP3D,42158,Cusp3D+r 400.74.1,2019-08-29T00:00:00Z,2021-07-26T00:59:59Z,Fix GPS timing 1 sec
162162
Canterbury Seismic Instruments,CUSP3D,42158,Cusp3D+r 400.74.1 (GPS18X4.40),2021-07-26T01:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
@@ -1199,13 +1199,15 @@ Nanometrics,TitanSMA,002548,4.9.2,2025-09-16T23:58:00Z,9999-01-01T00:00:00Z,
11991199
Nanometrics,TitanSMA,002549,4.9.2,2025-08-01T00:43:00Z,9999-01-01T00:00:00Z,
12001200
Nanometrics,TitanSMA,002550,4.9.2,2025-09-09T01:37:00Z,9999-01-01T00:00:00Z,
12011201
Nanometrics,TitanSMA,002604,4.9.2,2026-04-29T23:46:00Z,9999-01-01T00:00:00Z,
1202+
Nanometrics,TitanSMA,002613,4.9.2,2026-05-25T23:29:00Z,9999-01-01T00:00:00Z,
12021203
Nanometrics,TitanSMA,002616,4.9.2,2026-03-30T20:55:00Z,9999-01-01T00:00:00Z,
12031204
Nanometrics,TitanSMA,002642,4.9.2,2026-04-29T00:24:00Z,9999-01-01T00:00:00Z,
12041205
Nanometrics,TitanSMA,002643,4.9.2,2026-03-30T00:09:00Z,9999-01-01T00:00:00Z,
12051206
Nanometrics,TitanSMA,002644,4.9.2,2025-12-02T23:17:00Z,9999-01-01T00:00:00Z,
12061207
Nanometrics,TitanSMA,002645,4.9.2,2026-03-31T01:12:00Z,9999-01-01T00:00:00Z,
12071208
Nanometrics,TitanSMA,002646,4.9.2,2026-02-09T20:31:00Z,9999-01-01T00:00:00Z,
12081209
Nanometrics,TitanSMA,002674,4.9.2,2026-05-15T00:56:00Z,9999-01-01T00:00:00Z,
1210+
Nanometrics,TitanSMA,002677,4.9.2,2026-05-28T05:03:00Z,9999-01-01T00:00:00Z,
12091211
SAIC,BPR Subsystem,127035,02.08,2025-06-14T22:15:00Z,9999-01-01T00:00:00Z,
12101212
SAIC,BPR Subsystem,141002,02.07,2019-12-17T00:00:00Z,2020-03-25T00:00:00Z,
12111213
SAIC,BPR Subsystem,141012,02.07,2019-12-22T00:00:00Z,9999-01-01T00:00:00Z,

‎install/recorders.csv‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ Canterbury Seismic Instruments,CUSP3D,CUSP3D,42154,FGPS,20,94,,0,0,2014-07-15T22
479479
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42154,TRTS,20,23,,0,0,2019-11-01T02:00:00Z,9999-01-01T00:00:00Z
480480
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42155,HWHS,20,197,,0,0,2014-08-06T04:12:00Z,2019-07-08T01:20:00Z
481481
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42156,NPCS,20,0,,0,0,2014-08-05T22:10:00Z,2014-08-05T22:11:00Z
482-
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42156,NPCS,20,293,,0,0,2014-08-05T22:12:00Z,9999-01-01T00:00:00Z
482+
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42156,NPCS,20,293,,0,0,2014-08-05T22:12:00Z,2026-05-28T04:16:00Z
483483
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42157,WNPS,20,7,,0,0,2014-07-16T00:00:05Z,2016-05-26T00:10:00Z
484484
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42157,NBLC,20,76,,0,0,2017-09-11T02:32:00Z,2020-06-25T23:20:00Z
485485
Canterbury Seismic Instruments,CUSP3D,CUSP3D,42157,OHSS,20,65,,0,0,2020-07-21T02:22:00Z,2024-04-05T18:16:00Z
@@ -1137,7 +1137,7 @@ Kinemetrics,FBA-ES-T-BASALT,BASALT,2157,WRCS,20,282,,0,0,2014-10-15T02:30:00Z,20
11371137
Kinemetrics,FBA-ES-T-BASALT,BASALT,2157,INSS,20,76,,0,0,2019-11-01T01:30:00Z,2025-03-12T20:56:00Z
11381138
Kinemetrics,FBA-ES-T-BASALT,BASALT,2158,PAPS,20,87,,0,0,2014-10-13T01:15:00Z,2025-09-14T00:01:00Z
11391139
Kinemetrics,FBA-ES-T-BASALT,BASALT,2408,WDFS,20,78,,0,0,2014-12-16T00:00:05Z,9999-01-01T00:00:00Z
1140-
Kinemetrics,FBA-ES-T-BASALT,BASALT,2409,MTHS,20,24,,0,0,2014-12-16T05:15:00Z,9999-01-01T00:00:00Z
1140+
Kinemetrics,FBA-ES-T-BASALT,BASALT,2409,MTHS,20,24,,0,0,2014-12-16T05:15:00Z,2026-05-25T22:43:00Z
11411141
Kinemetrics,FBA-ES-T-BASALT,BASALT,2411,TEPS,20,49,,0,0,2015-03-10T00:00:05Z,9999-01-01T00:00:00Z
11421142
Kinemetrics,FBA-ES-T-BASALT,BASALT,2412,HUNS,20,245,,0,0,2015-01-26T22:10:00Z,9999-01-01T00:00:00Z
11431143
Kinemetrics,FBA-ES-T-BASALT,BASALT,2413,WPWS,20,106,,0,0,2014-11-28T00:00:05Z,2025-07-31T01:03:00Z
@@ -1692,13 +1692,15 @@ Nanometrics,Titan,TitanSMA,002548,PAPS,20,357,,0,0,2025-09-16T23:58:00Z,9999-01-
16921692
Nanometrics,Titan,TitanSMA,002549,PGFS,20,109,,0,0,2025-08-01T00:43:00Z,9999-01-01T00:00:00Z
16931693
Nanometrics,Titan,TitanSMA,002550,IFPS,20,248,,0,0,2025-09-09T01:37:00Z,9999-01-01T00:00:00Z
16941694
Nanometrics,Titan,TitanSMA,002604,KARS,21,13,,0,0,2026-04-29T23:46:00Z,9999-01-01T00:00:00Z
1695+
Nanometrics,Titan,TitanSMA,002613,MTHS,20,114,,0,0,2026-05-25T23:29:00Z,9999-01-01T00:00:00Z
16951696
Nanometrics,Titan,TitanSMA,002616,MOTS,20,271,,0,0,2026-03-30T20:55:00Z,9999-01-01T00:00:00Z
16961697
Nanometrics,Titan,TitanSMA,002642,MATS,20,0,,0,0,2026-04-29T00:24:00Z,9999-01-01T00:00:00Z
16971698
Nanometrics,Titan,TitanSMA,002643,QRZ,21,0,,0,0,2026-03-30T00:09:00Z,9999-01-01T00:00:00Z
16981699
Nanometrics,Titan,TitanSMA,002644,WCZ,21,0,,0,0,2025-12-02T23:17:00Z,9999-01-01T00:00:00Z
16991700
Nanometrics,Titan,TitanSMA,002645,HAVS,20,16,,0,0,2026-03-31T01:12:00Z,9999-01-01T00:00:00Z
17001701
Nanometrics,Titan,TitanSMA,002646,FRNZ,20,0,,0,0,2026-02-09T20:31:00Z,9999-01-01T00:00:00Z
17011702
Nanometrics,Titan,TitanSMA,002674,CECS,20,96,,0,0,2026-05-15T00:56:00Z,9999-01-01T00:00:00Z
1703+
Nanometrics,Titan,TitanSMA,002677,NPCS,20,293,,0,0,2026-05-28T05:03:00Z,9999-01-01T00:00:00Z
17021704
Physics and Engineering Laboratory DSIR,MO1,MO1,0001,027A,20,295,,0,0,1966-01-24T00:00:00Z,1971-09-16T00:00:00Z
17031705
Physics and Engineering Laboratory DSIR,MO1,MO1,0001,027A,20,295,,0,0,1971-09-16T00:00:00Z,1973-03-28T00:00:00Z
17041706
Physics and Engineering Laboratory DSIR,MO1,MO1,0001,027C,20,295,,0,0,1973-03-28T00:00:00Z,1974-11-12T00:00:00Z

‎install/streams.csv‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,8 @@ MTAZ,10,E,H,100,false,false,false,2007-06-25T03:00:01Z,2012-10-09T01:30:00Z
16041604
MTCA,10,S,H,50,false,false,true,1997-09-19T21:37:00Z,1997-10-10T14:54:00Z
16051605
MTDS,20,H,N,200,true,false,true,2002-12-16T02:00:00Z,2015-06-30T23:59:59Z
16061606
MTHS,20,B,N,50,true,false,false,2011-08-27T01:35:00Z,2020-06-16T00:00:00Z
1607-
MTHS,20,H,N,200,true,false,true,2011-08-27T01:35:00Z,9999-01-01T00:00:00Z
1607+
MTHS,20,H,N,200,true,false,true,2011-08-27T01:35:00Z,2020-02-08T23:59:59Z
1608+
MTHS,20,H,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
16081609
MTHZ,10,E,H,100,false,false,false,2011-10-20T00:00:05Z,9999-01-01T00:00:00Z
16091610
MTHZ,20,B,N,50,true,false,false,2011-10-20T00:00:05Z,2020-06-16T00:00:00Z
16101611
MTHZ,20,H,N,200,true,false,true,2011-10-20T00:00:05Z,2020-07-01T22:39:00Z
@@ -1759,7 +1760,8 @@ NOVZ,30,L,D,1,false,false,false,2020-02-25T01:10:00Z,9999-01-01T00:00:00Z
17591760
NOVZ,30,H,D,100,false,false,false,2020-02-25T01:10:00Z,9999-01-01T00:00:00Z
17601761
NOZ,10,S,H,50,false,false,true,1989-04-17T07:59:00Z,2004-04-02T14:14:00Z
17611762
NPCS,20,B,N,50,true,false,false,2014-08-05T22:10:00Z,2020-06-16T00:00:00Z
1762-
NPCS,20,H,N,200,true,false,true,1999-10-17T00:00:01Z,9999-01-01T00:00:00Z
1763+
NPCS,20,H,N,200,true,false,true,1999-10-17T00:00:01Z,2020-02-08T23:59:59Z
1764+
NPCS,20,H,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z
17631765
NRZ,10,S,H,50,false,false,true,1997-03-26T08:06:00Z,2003-12-16T04:24:00Z
17641766
NRZ,11,S,H,50,false,false,true,1997-03-27T15:13:00Z,2003-12-16T04:24:00Z
17651767
NRZ,12,S,H,50,false,false,true,1991-02-21T19:09:00Z,1993-07-26T13:23:00Z

0 commit comments

Comments
 (0)