From 49a59d2e0715e14f25e1f17e224b5e3b7144329d Mon Sep 17 00:00:00 2001 From: Thomas Benson Date: Mon, 2 Dec 2024 13:51:53 +1300 Subject: [PATCH 1/5] PYZ Datalogger swap + SM recorder --- assets/dataloggers.csv | 1 + assets/recorders.csv | 1 + install/connections.csv | 2 +- install/dataloggers.csv | 5 +++-- install/firmware.csv | 2 ++ install/recorders.csv | 1 + install/sensors.csv | 2 +- install/streams.csv | 3 ++- network/sites.csv | 3 ++- 9 files changed, 14 insertions(+), 6 deletions(-) diff --git a/assets/dataloggers.csv b/assets/dataloggers.csv index ad57eac89..9cc540497 100644 --- a/assets/dataloggers.csv +++ b/assets/dataloggers.csv @@ -706,6 +706,7 @@ Nanometrics,Centaur CTR4-6S,11443,, Nanometrics,Centaur CTR4-6S,11444,, Nanometrics,Centaur CTR4-6S,11447,, Nanometrics,Centaur CTR4-6S,11448,, +Nanometrics,Centaur CTR4-6S,11465,, Nanometrics,Centaur CTR4-6S,11466,, Nanometrics,Centaur CTR4-6S,11462,, Nanometrics,ORION,0144,, diff --git a/assets/recorders.csv b/assets/recorders.csv index b18a7433d..e9c2b2dfe 100644 --- a/assets/recorders.csv +++ b/assets/recorders.csv @@ -1207,6 +1207,7 @@ Nanometrics,TitanSMA,002213,, Nanometrics,TitanSMA,002214,, Nanometrics,TitanSMA,002215,, Nanometrics,TitanSMA,002217,, +Nanometrics,TitanSMA,002337,, Nanometrics,TitanSMA,002340,, Nanometrics,TitanSMA,002341,, Nanometrics,TitanSMA,002342,, diff --git a/install/connections.csv b/install/connections.csv index 33b09941e..ac887d10a 100644 --- a/install/connections.csv +++ b/install/connections.csv @@ -756,7 +756,7 @@ PXZ,10,Pawanui,,0,2005-08-22T00:00:00Z,9999-01-01T00:00:00Z PXZ,20,Pawanui,,3,2005-08-22T00:00:00Z,2018-03-28T02:00:00Z PYZ,10,Puysegur Point,,0,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z PYZ,20,Puysegur Point,,3,2007-05-01T01:00:00Z,2017-01-19T21:20:00Z -PYZ,20,Puysegur Point,Strong Motion,,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z +PYZ,20,Puysegur Point,Strong Motion,,2017-01-19T21:20:01Z,2024-11-30T20:37:00Z QRZ,10,Quartz Range,,0,2003-08-06T00:00:00Z,9999-01-01T00:00:00Z QRZ,10,Quartz Range,Short Period,,1990-04-26T04:39:00Z,2002-02-18T05:58:00Z QRZ,20,Quartz Range,,3,2003-08-06T00:00:00Z,2015-11-11T01:00:00Z diff --git a/install/dataloggers.csv b/install/dataloggers.csv index 68e170743..f46c8b65e 100644 --- a/install/dataloggers.csv +++ b/install/dataloggers.csv @@ -415,7 +415,7 @@ Kinemetrics,Obsidian 4X Datalogger,373,Wharekauri,Strong Motion,2021-11-24T19:37 Kinemetrics,Obsidian 4X Datalogger,656,Raoul Island Met Station,Strong Motion,2016-09-17T13:00:01Z,2023-01-28T21:16:00Z Kinemetrics,Obsidian 4X Datalogger,695,Milford Sound,Strong Motion,2017-05-23T04:15:01Z,2023-06-13T23:17:00Z Kinemetrics,Obsidian 4X Datalogger,709,Deep Cove,Strong Motion,2020-06-23T01:09:00Z,2021-08-09T21:08:00Z -Kinemetrics,Obsidian 4X Datalogger,710,Puysegur Point,Strong Motion,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z +Kinemetrics,Obsidian 4X Datalogger,710,Puysegur Point,Strong Motion,2017-01-19T21:20:01Z,2024-11-30T20:37:00Z Kinemetrics,Obsidian 4X Datalogger,713,Glynn Wye,Strong Motion,2019-10-23T19:45:00Z,2020-07-23T20:19:00Z Kinemetrics,Obsidian 4X Datalogger,715,Wakarara,Strong Motion,2019-09-10T02:50:00Z,2021-05-25T20:54:00Z Kinemetrics,Obsidian 4X Datalogger,716,The Sugar Loaf Quarry,Strong Motion,2017-03-16T00:00:01Z,9999-01-01T00:00:00Z @@ -798,7 +798,7 @@ Kinemetrics,Q330S/6,5860,Sanderson Farm,,2017-05-30T17:00:01Z,2021-03-24T03:05:0 Kinemetrics,Q330S/6,5861,Palmer Road,,2016-08-10T03:00:02Z,2022-01-24T08:00:00Z Kinemetrics,Q330S/6,5862,Wellington Dominion Observatory,,2017-05-31T03:25:01Z,2023-12-04T03:26:00Z Kinemetrics,Q330S/6,5863,Far West,,2017-04-20T00:00:02Z,9999-01-01T00:00:00Z -Kinemetrics,Q330S/6,6048,Puysegur Point,,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z +Kinemetrics,Q330S/6,6048,Puysegur Point,,2017-01-19T21:20:01Z,2024-11-30T20:37:00Z Kinemetrics,Q330S/6,6049,Denniston North,,2016-11-09T23:15:00Z,9999-01-01T00:00:00Z Kinemetrics,Q330S/6,6050,Matarangi,,2017-04-20T22:00:02Z,2024-05-10T01:10:00Z Kinemetrics,Q330S/6,6051,Tuamarina,,2016-12-07T00:00:01Z,2022-09-01T02:50:00Z @@ -919,6 +919,7 @@ Nanometrics,Centaur CTR4-6S,11444,Milford Sound,,2024-09-24T23:48:00Z,9999-01-01 Nanometrics,Centaur CTR4-6S,11447,Centreport,,2024-09-23T00:00:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11448,Double Hill,,2024-11-07T01:13:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11462,Kapiti Island,,2024-07-23T02:52:00Z,9999-01-01T00:00:00Z +Nanometrics,Centaur CTR4-6S,11465,Pusegur Point,,2024-12-01T20:16:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11466,Oturere,,2024-08-15T00:35:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,7810,Mount Tarawera,,2023-03-06T23:19:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,7931,Kaipara Flats,,2023-03-17T03:00:00Z,9999-01-01T00:00:00Z diff --git a/install/firmware.csv b/install/firmware.csv index 84417abd4..4780856f9 100644 --- a/install/firmware.csv +++ b/install/firmware.csv @@ -531,6 +531,7 @@ Nanometrics,Centaur CTR4-6S,11444,4.8.5,2024-09-24T23:48:00Z,9999-01-01T00:00:00 Nanometrics,Centaur CTR4-6S,11447,4.8.5,2024-09-23T00:00:00Z,9999-01-01T00:00:00Z, Nanometrics,Centaur CTR4-6S,11448,4.8.5,2024-11-07T01:13:00Z,9999-01-01T00:00:00Z, Nanometrics,Centaur CTR4-6S,11462,4.8.5,2024-07-23T02:52:00Z,9999-01-01T00:00:00Z, +Nanometrics,Centaur CTR4-6S,11465,4.8.5,2024-12-01T20:16:00Z,9999-01-01T00:00:00Z, Nanometrics,Centaur CTR4-6S,11466,4.8.5,2024-08-15T00:35:00Z,9999-01-01T00:00:00Z, Nanometrics,Centaur CTR4-6S,7810,4.5.20,2023-03-06T23:19:00Z,2023-08-11T00:56:11Z, Nanometrics,Centaur CTR4-6S,7810,4.8.5,2023-08-11T00:56:11Z,9999-01-01T00:00:00Z, @@ -867,6 +868,7 @@ Nanometrics,TitanSMA,002213,4.5.22,2024-05-30T04:07:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002214,4.5.22,2024-04-29T04:40:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002215,4.5.22,2024-05-09T23:23:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002217,4.5.22,2024-04-18T03:04:00Z,9999-01-01T00:00:00Z, +Nanometrics,TitanSMA,002337,4.5.22,2024-11-30T20:37:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002340,4.5.22,2024-08-19T23:12:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002341,4.5.22,2024-09-26T03:13:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002342,4.5.22,2024-06-12T23:06:00Z,9999-01-01T00:00:00Z, diff --git a/install/recorders.csv b/install/recorders.csv index 67f6d6e86..2fe18d26c 100644 --- a/install/recorders.csv +++ b/install/recorders.csv @@ -1560,6 +1560,7 @@ Nanometrics,Titan,TitanSMA,002213,WTAZ,20,0,,0,0,2024-05-30T04:07:00Z,9999-01-01 Nanometrics,Titan,TitanSMA,002214,GKBS,20,305,,0,0,2024-04-29T04:40:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002215,WRRZ,20,0,,0,0,2024-05-09T23:23:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002217,INHS,21,200,,0,0,2024-04-18T03:04:00Z,9999-01-01T00:00:00Z +Nanometrics,Titan,TitanSMA,002337,PYZ,21,0,,0,0,2024-12-01T02:49:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002340,OXZ,21,0,,0,0.6,2024-08-19T23:12:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002341,BWRS,20,152,,0,0,2024-09-26T03:13:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002342,DUNS,20,292,,0,0,2024-06-12T23:06:00Z,9999-01-01T00:00:00Z diff --git a/install/sensors.csv b/install/sensors.csv index de8bd56c4..efe7d2d88 100644 --- a/install/sensors.csv +++ b/install/sensors.csv @@ -558,7 +558,7 @@ Kinemetrics,FBA-ES-T,1758,DSZ,20,0,,0,0,0,0,0,0,2004-07-20T21:40:01Z,2005-07-04T Kinemetrics,FBA-ES-T,1758,LBZ,20,0,,0,0,0,0,0,0,2008-03-20T00:00:01Z,2014-10-02T00:00:00Z Kinemetrics,FBA-ES-T,1758,EAZ,20,0,,0,0,0,0,0,0,2014-11-04T00:02:00Z,2022-03-03T21:37:00Z Kinemetrics,FBA-ES-T,2260,SYZ,20,0,,0,0,0,0,0,0,2006-05-05T00:20:00Z,2023-03-19T07:03:00Z -Kinemetrics,FBA-ES-T,2261,PYZ,20,0,,0,0,0,0,0,0,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z +Kinemetrics,FBA-ES-T,2261,PYZ,20,0,,0,0,0,0,0,0,2007-05-01T01:00:00Z,2024-11-30T20:37:00Z Kinemetrics,FBA-ES-T,2262,WCZ,20,0,,0,0,0,0,0,0,2009-10-16T00:00:12Z,2017-02-22T03:00:00Z Kinemetrics,FBA-ES-T,2263,RIZ,20,0,,0,0,0,0,0,0,2009-05-18T01:00:00Z,2019-09-21T03:50:00Z Kinemetrics,FBA-ES-T,2264,WHZ,20,0,,0,0,0,0,0,0,2006-05-06T02:30:34Z,2014-06-05T05:00:00Z diff --git a/install/streams.csv b/install/streams.csv index 376c82797..121efee15 100644 --- a/install/streams.csv +++ b/install/streams.csv @@ -2001,7 +2001,8 @@ PYZ,10,L,H,1,false,false,false,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z PYZ,10,H,H,100,false,false,false,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z PYZ,20,B,N,50,false,false,false,2007-05-01T01:00:00Z,2020-06-16T00:00:00Z PYZ,20,H,N,200,false,false,true,2007-05-01T01:00:00Z,2020-02-08T23:59:59Z -PYZ,20,H,N,200,false,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z +PYZ,20,H,N,200,false,false,false,2020-02-09T00:00:00Z,2024-11-30T20:37:00Z +PYZ,21,H,N,200,false,false,false,2024-12-01T02:49:00Z,9999-01-01T00:00:00Z QCCS,20,B,N,50,true,false,false,2015-04-23T00:00:05Z,2020-06-16T00:00:00Z QCCS,20,H,N,200,true,false,true,2002-02-21T23:00:00Z,2023-09-22T03:47:00Z QRZ,10,V,H,0.1,false,false,false,2003-08-06T00:00:00Z,2009-08-12T23:00:00Z diff --git a/network/sites.csv b/network/sites.csv index 2b453e039..3804ab6c3 100644 --- a/network/sites.csv +++ b/network/sites.csv @@ -1734,7 +1734,8 @@ PWZ,21,-40.029679,176.862007,59,,WGS84,Internal GPS Clock,2018-01-17T21:00:00Z,9 PXZ,10,-40.030644463,176.862145221,103,,WGS84,Internal GPS Clock,2005-08-22T00:00:00Z,9999-01-01T00:00:00Z PXZ,20,-40.030644463,176.862145221,103,,WGS84,Internal GPS Clock,2005-08-22T00:00:00Z,2018-03-28T02:00:00Z PYZ,10,-46.166251683,166.680692489,277,,WGS84,Internal GPS Clock,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z -PYZ,20,-46.166251683,166.680692489,277,,WGS84,Internal GPS Clock,2007-05-01T01:00:00Z,9999-01-01T00:00:00Z +PYZ,20,-46.166251683,166.680692489,277,,WGS84,Internal GPS Clock,2007-05-01T01:00:00Z,2024-11-30T20:37:00Z +PYZ,21,-46.166251683,166.680692489,277,,WGS84,Internal GPS Clock,2024-12-01T02:49:00Z,9999-01-01T00:00:00Z QCCS,20,-41.279625689,174.023144608,27,,WGS84,Internal GPS Clock,2002-02-21T23:00:00Z,2023-09-22T03:47:00Z QHW,10,-41.25028662,174.690663179,190,,WGS84,Unknown,1986-09-22T00:00:00Z,1988-09-27T15:00:00Z QRZ,10,-40.825521618,172.529147829,263,,WGS84,Internal GPS Clock,1990-04-26T04:39:00Z,9999-01-01T00:00:00Z From a0b2e0f7b2669321a4a1950c1bc1eda4b74ef2ca Mon Sep 17 00:00:00 2001 From: Evan Carter Date: Wed, 11 Dec 2024 10:41:48 +1300 Subject: [PATCH 2/5] KOKO receiver swap - NetR9 to Alloy Changes to: assets/receivers.csv install/firmware.csv install/receivers.csv install/sessions.csv --- assets/receivers.csv | 1 + install/firmware.csv | 1 + install/receivers.csv | 3 ++- install/sessions.csv | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/receivers.csv b/assets/receivers.csv index ff6933ea1..346c8fcc6 100644 --- a/assets/receivers.csv +++ b/assets/receivers.csv @@ -194,6 +194,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,, +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40046,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,, diff --git a/install/firmware.csv b/install/firmware.csv index 84417abd4..bf90aab83 100644 --- a/install/firmware.csv +++ b/install/firmware.csv @@ -1260,6 +1260,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,5.45,2024-10-16T19:58:38Z,9999- Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,6.14,2024-07-25T03:32:32Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,6.14,2024-11-07T00:08:20Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,6.14,2024-10-22T21:38:14Z,9999-01-01T00:00:00Z, +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40046,6.14,2024-12-08T23:37:02Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,6.14,2024-10-09T21:41:50Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,6.14,2024-10-23T22:56:26Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,6.14,2024-10-29T22:05:59Z,9999-01-01T00:00:00Z, diff --git a/install/receivers.csv b/install/receivers.csv index ca4d4b250..46ad7ec14 100644 --- a/install/receivers.csv +++ b/install/receivers.csv @@ -221,6 +221,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,SSFT,2024-10-16T19:58:38Z,9999- Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,KORO,2024-07-25T03:32:32Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,VGOB,2024-11-07T00:08:20Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,PRTU,2024-10-22T21:38:14Z,9999-01-01T00:00:00Z +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40046,KOKO,2024-12-08T23:37:02Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,WIAH,2024-10-09T21:41:50Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,AKTO,2024-10-23T22:56:26Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,RAWI,2024-10-29T22:05:59Z,9999-01-01T00:00:00Z @@ -474,7 +475,7 @@ Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50161,TEN2,2016-11-17T23:45:56Z,2017- Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50161,TENN,2017-11-14T22:08:22Z,2022-11-15T22:09:01Z Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50162,PORA,2015-09-30T22:55:00Z,2024-10-23T20:36:01Z Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50168,CORM,2016-11-15T20:47:32Z,2019-10-22T23:00:31Z -Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50170,KOKO,2015-12-08T04:24:00Z,9999-01-01T00:00:00Z +Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50170,KOKO,2015-12-08T04:24:00Z,2024-12-08T23:37:01Z Trimble Navigation Ltd.,TRIMBLE NETR9,5505R50175,RGTA,2018-05-27T23:35:02Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE NETR9,5506R50082,WITH,2017-04-07T01:55:02Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE NETR9,5508R50018,VGWH,2018-05-04T01:35:02Z,9999-01-01T00:00:00Z diff --git a/install/sessions.csv b/install/sessions.csv index 022fcb0eb..f894981af 100644 --- a/install/sessions.csv +++ b/install/sessions.csv @@ -211,7 +211,8 @@ KAWK,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2022-01-18T0 KERE,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2006-05-17T03:00:00Z,2016-08-18T00:55:30Z KERE,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2016-08-18T00:55:32Z,9999-01-01T00:00:00Z KOKO,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2004-11-03T00:00:00Z,2015-12-08T04:23:58Z -KOKO,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2015-12-08T04:24:00Z,9999-01-01T00:00:00Z +KOKO,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2015-12-08T04:24:00Z,2024-12-08T23:37:01Z +KOKO,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2024-12-08T23:37:02Z,9999-01-01T00:00:00Z KORO,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2007-06-14T23:55:00Z,2015-09-10T00:00:00Z KORO,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2015-09-10T00:00:01Z,2024-07-25T03:32:31Z KORO,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2024-07-25T03:32:32Z,9999-01-01T00:00:00Z From 14a2010a41eadee522bc81b8e23eebbbe61efeb4 Mon Sep 17 00:00:00 2001 From: Thomas Benson Date: Thu, 12 Dec 2024 08:04:48 +1300 Subject: [PATCH 3/5] PYZ fix typo --- install/dataloggers.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/dataloggers.csv b/install/dataloggers.csv index f46c8b65e..fcda42103 100644 --- a/install/dataloggers.csv +++ b/install/dataloggers.csv @@ -919,7 +919,7 @@ Nanometrics,Centaur CTR4-6S,11444,Milford Sound,,2024-09-24T23:48:00Z,9999-01-01 Nanometrics,Centaur CTR4-6S,11447,Centreport,,2024-09-23T00:00:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11448,Double Hill,,2024-11-07T01:13:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11462,Kapiti Island,,2024-07-23T02:52:00Z,9999-01-01T00:00:00Z -Nanometrics,Centaur CTR4-6S,11465,Pusegur Point,,2024-12-01T20:16:00Z,9999-01-01T00:00:00Z +Nanometrics,Centaur CTR4-6S,11465,Puysegur Point,,2024-12-01T20:16:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,11466,Oturere,,2024-08-15T00:35:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,7810,Mount Tarawera,,2023-03-06T23:19:00Z,9999-01-01T00:00:00Z Nanometrics,Centaur CTR4-6S,7931,Kaipara Flats,,2023-03-17T03:00:00Z,9999-01-01T00:00:00Z From afc0467d76f2863b2f92c0db6c19911917b1a43b Mon Sep 17 00:00:00 2001 From: Evan Carter Date: Wed, 11 Dec 2024 09:17:34 +1300 Subject: [PATCH 4/5] Site setup with Alloy receiver and Zephyr 3 antenna. New antenna was already in assets/antennas.csv. Changes made to: assets/receivers.csv environment/visibility.csv install/antennas.csv install/firmware.csv install/receivers.csv install/sessions.csv network/marks.csv network/monuments.csv --- assets/receivers.csv | 1 + environment/visibility.csv | 1 + install/antennas.csv | 1 + install/firmware.csv | 1 + install/receivers.csv | 1 + install/sessions.csv | 1 + network/marks.csv | 1 + network/monuments.csv | 1 + 8 files changed, 8 insertions(+) diff --git a/assets/receivers.csv b/assets/receivers.csv index 8521a5993..73869ec10 100644 --- a/assets/receivers.csv +++ b/assets/receivers.csv @@ -194,6 +194,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,, +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40044,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,, diff --git a/environment/visibility.csv b/environment/visibility.csv index 270a95f90..1b4f47df1 100644 --- a/environment/visibility.csv +++ b/environment/visibility.csv @@ -123,6 +123,7 @@ OHIN,"Excellent, no obstructions",2008-09-03T00:00:00Z,9999-01-01T00:00:00Z OKOH,ok,2009-11-16T00:00:00Z,9999-01-01T00:00:00Z OPTK,suitable visibility Inc. Dec. 7 137 tree 4 160-140 5 125-110 trees 4 355 tree,2009-08-20T00:00:00Z,9999-01-01T00:00:00Z OROA,excellent,2010-11-08T00:00:00Z,9999-01-01T00:00:00Z +ORRG,"Bushes to the West, North West, North, and North East at a distance of 7-15 meters.",2024-12-05T00:00:00Z,9999-01-01T00:00:00Z OTAK,"Good; Otaki and Kapiti Island are in clear line of sight, Levin also through gap in hills. Hills to the north east create 4?-6? obstructions between 005? and 140? from true north.",2007-03-07T00:00:00Z,9999-01-01T00:00:00Z OUSD,Good,1995-01-16T00:00:00Z,9999-01-01T00:00:00Z PAEK,unknown,2003-03-22T00:00:00Z,9999-01-01T00:00:00Z diff --git a/install/antennas.csv b/install/antennas.csv index ce59bde18..b0030cdf9 100644 --- a/install/antennas.csv +++ b/install/antennas.csv @@ -448,4 +448,5 @@ Trimble Navigation Ltd.,TRM115000.00,2612758673,DBHI,0.002,0,0,0,2024-11-06T02:0 Trimble Navigation Ltd.,TRM115000.00,2612758712,ALS1,0,0,0,0,2023-02-24T01:08:38Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRM115000.00,2612758717,TGK1,0,0,0,0,2022-12-19T21:53:26Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRM115000.00,2612758740,NLS4,0,0,0,0,2022-08-24T01:22:38Z,9999-01-01T00:00:00Z +Trimble Navigation Ltd.,TRM115000.00,62143G0068,ORRG,0.002,0,0,0,2024-12-05T00:05:38Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRM115000.00,64043G0090,WIAH,0.002,0,0,0,2024-10-09T21:41:50Z,9999-01-01T00:00:00Z diff --git a/install/firmware.csv b/install/firmware.csv index 1563f1e74..e312fe19d 100644 --- a/install/firmware.csv +++ b/install/firmware.csv @@ -1262,6 +1262,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,5.45,2024-10-16T19:58:38Z,9999- Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,6.14,2024-07-25T03:32:32Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,6.14,2024-11-07T00:08:20Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,6.14,2024-10-22T21:38:14Z,9999-01-01T00:00:00Z, +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40044,6.14,2024-12-05T00:05:38Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,6.14,2024-10-09T21:41:50Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,6.14,2024-10-23T22:56:26Z,9999-01-01T00:00:00Z, Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,6.14,2024-10-29T22:05:59Z,9999-01-01T00:00:00Z, diff --git a/install/receivers.csv b/install/receivers.csv index 5d5fa7d33..835a874c9 100644 --- a/install/receivers.csv +++ b/install/receivers.csv @@ -221,6 +221,7 @@ Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40082,SSFT,2024-10-16T19:58:38Z,9999- Trimble Navigation Ltd.,TRIMBLE ALLOY,6411R40085,KORO,2024-07-25T03:32:32Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40036,VGOB,2024-11-07T00:08:20Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40043,PRTU,2024-10-22T21:38:14Z,9999-01-01T00:00:00Z +Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40044,ORRG,2024-12-05T00:05:38Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6427R40048,WIAH,2024-10-09T21:41:50Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40003,AKTO,2024-10-23T22:56:26Z,9999-01-01T00:00:00Z Trimble Navigation Ltd.,TRIMBLE ALLOY,6428R40004,RAWI,2024-10-29T22:05:59Z,9999-01-01T00:00:00Z diff --git a/install/sessions.csv b/install/sessions.csv index fc93185e8..701853247 100644 --- a/install/sessions.csv +++ b/install/sessions.csv @@ -360,6 +360,7 @@ OPTK,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2024-11-05T0 OROA,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,3,geonet,trimble_netr9 x4,2010-11-08T00:10:01Z,2015-12-10T23:00:58Z OROA,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2015-12-10T23:00:59Z,2020-12-20T22:13:58Z OROA,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2020-12-20T22:13:59Z,9999-01-01T00:00:00Z +ORRG,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2024-12-05T00:05:38Z,9999-01-01T00:00:00Z OTAK,GeoNet,GNS,TRIMBLE NETRS,GPS,30s,4,geonet,trimble_5700 x4,2007-10-06T07:59:00Z,2015-12-15T00:53:27Z OTAK,GeoNet,GNS,TRIMBLE NETR9,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2015-12-15T00:53:28Z,2024-07-25T00:19:31Z OTAK,GeoNet,GNS,TRIMBLE ALLOY,GPS+GLO,30s,0,geonet,trimble_netr9 x4,2024-07-25T00:19:32Z,9999-01-01T00:00:00Z diff --git a/network/marks.csv b/network/marks.csv index 7c18d3f9e..d65860cc1 100644 --- a/network/marks.csv +++ b/network/marks.csv @@ -116,6 +116,7 @@ OHIN,CG,no,Ohingaiti,-39.918289832,175.790675494,530.658,NZGD2000,2008-09-03T00: OKOH,CG,no,Okoha,-41.019262,174.060283,334,NZGD2000,2009-11-16T00:00:00Z,9999-01-01T00:00:00Z OPTK,CG,no,Opotiki,-38.046521999,177.307578963,127.477,NZGD2000,2009-08-20T00:00:00Z,9999-01-01T00:00:00Z OROA,CG,no,Oueroa,-40.10435506,176.68067166,279,WGS84,2010-11-08T00:00:00Z,9999-01-01T00:00:00Z +ORRG,CG,no,Mangere,-36.9726410056,174.770495275,47.245,WGS84,2024-12-05T00:00:00Z,9999-01-01T00:00:00Z OTAK,CG,no,Tuapaka Z,-40.816546002,175.170413249,245.0853,NZGD2000,2007-03-07T00:00:00Z,9999-01-01T00:00:00Z OUSD,GN,no,Otago University Survey Department,-45.86950159423,170.51092025742,26.1568,NZGD2000,1995-01-16T00:00:00Z,9999-01-01T00:00:00Z PAEK,CG,no,Paekakariki Hill,-41.021766126,174.952081389,443.2484,NZGD2000,2003-03-22T00:00:00Z,9999-01-01T00:00:00Z diff --git a/network/monuments.csv b/network/monuments.csv index bd167ac47..baf4d3521 100644 --- a/network/monuments.csv +++ b/network/monuments.csv @@ -116,6 +116,7 @@ OHIN,,Forced Centering,Wyatt/Agnew Drilled-Braced,-1.6,Stainless Steel Rods,10,2 OKOH,,Forced Centering,Wyatt/Agnew Drilled-Braced,-1.56,Stainless Steel Rods,10,2009-11-16T00:00:00Z,9999-01-01T00:00:00Z,Greywacke, OPTK,,Forced Centering,Wyatt/Agnew Drilled-Braced,-1.46,Stainless Steel Rods,10,2009-08-20T00:00:00Z,9999-01-01T00:00:00Z,, OROA,,Forced Centering,Wyatt/Agnew Drilled-Braced,0,Stainless Steel Rods,10,2010-11-08T00:00:00Z,9999-01-01T00:00:00Z,Sandstone, +ORRG,,Forced Centering,Wyatt/Agnew Drilled-Braced,-1.5,Stainless Steel Rods,10,2024-12-05T00:00:00Z,9999-01-01T00:00:00Z,Tuff,"Lithic tuff, comprising comminuted pre-volcanic materials with basaltic fragments, and unconsolidated ash and lapilli deposits of well-sorted basalt and basanite fragments." OTAK,,Forced Centering,Wyatt/Agnew Drilled-Braced,-1.5,Stainless Steel Rods,10,2007-03-07T00:00:00Z,9999-01-01T00:00:00Z,Greywacke, OUSD,50212M001,Forced Centering,Steel Mast,-1.5,Stainless Steel Rod,0,1995-01-16T00:00:00Z,9999-01-01T00:00:00Z,Sandstone, PAEK,50215M001,Forced Centering,Pillar,-1.315,Reinforced Concrete,2,2002-03-22T00:00:00Z,9999-01-01T00:00:00Z,Greywacke, From f48617a67e8b2736f2d48c3f524ff1203bc0e1f0 Mon Sep 17 00:00:00 2001 From: Thomas Benson Date: Thu, 12 Dec 2024 10:14:47 +1300 Subject: [PATCH 5/5] TBAS Basalt to TitanSMA SM recorder swap --- assets/recorders.csv | 1 + install/firmware.csv | 1 + install/recorders.csv | 3 ++- install/streams.csv | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/recorders.csv b/assets/recorders.csv index e9c2b2dfe..519842447 100644 --- a/assets/recorders.csv +++ b/assets/recorders.csv @@ -1191,6 +1191,7 @@ Nanometrics,TitanSMA,002184,, Nanometrics,TitanSMA,002185,, Nanometrics,TitanSMA,002197,, Nanometrics,TitanSMA,002199,, +Nanometrics,TitanSMA,002200,, Nanometrics,TitanSMA,002201,, Nanometrics,TitanSMA,002202,, Nanometrics,TitanSMA,002203,, diff --git a/install/firmware.csv b/install/firmware.csv index 1563f1e74..5130b7c81 100644 --- a/install/firmware.csv +++ b/install/firmware.csv @@ -852,6 +852,7 @@ Nanometrics,TitanSMA,002184,4.5.22,2023-12-12T23:31:00Z,2024-09-24T22:22:00Z, Nanometrics,TitanSMA,002185,4.5.22,2023-12-13T20:45:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002197,4.5.22,2024-05-02T00:27:00Z,9999-01-01T00:00:00Z, Nanometrics,TitanSMA,002199,4.5.22,2024-02-15T01:00:00Z,9999-01-01T00:00:00Z, +Nanometrics,TitanSMA,002200,4.9.2,2024-12-11T04:03: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, diff --git a/install/recorders.csv b/install/recorders.csv index 2fe18d26c..e0ccc0ef3 100644 --- a/install/recorders.csv +++ b/install/recorders.csv @@ -1037,7 +1037,7 @@ Kinemetrics,FBA-ES-T-BASALT,BASALT,2141,MXZ,21,0,,0,0,2014-07-21T22:00:00Z,2015- Kinemetrics,FBA-ES-T-BASALT,BASALT,2141,OXZ,21,0,,0,0.6,2016-02-25T01:02:00Z,2024-08-19T22:41:00Z Kinemetrics,FBA-ES-T-BASALT,BASALT,2142,WHAS,20,0,,0,0,2014-07-16T21:35:00Z,2020-02-19T12:02:00Z Kinemetrics,FBA-ES-T-BASALT,BASALT,2143,NSBS,21,13,,0,0,2014-07-15T03:35:00Z,9999-01-01T00:00:00Z -Kinemetrics,FBA-ES-T-BASALT,BASALT,2144,TBAS,20,1,,0,0,2014-07-22T00:00:05Z,9999-01-01T00:00:00Z +Kinemetrics,FBA-ES-T-BASALT,BASALT,2144,TBAS,20,1,,0,0,2014-07-22T00:00:05Z,2024-12-10T22:41:00Z Kinemetrics,FBA-ES-T-BASALT,BASALT,2145,WFSS,20,8,,0,0,2014-07-24T00:00:05Z,2024-09-10T04:11:00Z Kinemetrics,FBA-ES-T-BASALT,BASALT,2146,WCDS,20,0,,0,0,2014-08-06T23:30:10Z,2014-08-06T23:31:10Z Kinemetrics,FBA-ES-T-BASALT,BASALT,2146,WCDS,20,314,,0,0,2014-08-06T23:32:10Z,9999-01-01T00:00:00Z @@ -1544,6 +1544,7 @@ Nanometrics,Titan,TitanSMA,002184,KHLS,20,225,,0,0,2023-12-12T23:31:00Z,2024-09- Nanometrics,Titan,TitanSMA,002185,SEDS,20,127,,0,0,2023-12-13T20:45:00Z,9999-01-01T00:00:00Z Nanometrics,Titan,TitanSMA,002197,WKHS,20,1,,0,0,2024-05-02T00:27: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,002200,TBAS,20,183,,0,0,2024-12-11T04:03: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 diff --git a/install/streams.csv b/install/streams.csv index 121efee15..8fefba2bb 100644 --- a/install/streams.csv +++ b/install/streams.csv @@ -2309,7 +2309,8 @@ TAUT,41,L,T,1,false,false,false,2008-05-21T00:00:00Z,9999-01-01T00:00:00Z TAUT,41,B,T,10,false,false,false,2008-05-21T00:00:00Z,9999-01-01T00:00:00Z TAZ,10,E,H,100,false,false,false,2007-11-21T21:00:01Z,2007-12-17T06:00:00Z TBAS,20,B,N,50,true,false,false,2014-07-22T00:00:05Z,2020-06-16T00:00:00Z -TBAS,20,H,N,200,true,false,true,2002-04-16T00:00:00Z,9999-01-01T00:00:00Z +TBAS,20,H,N,200,true,false,true,2002-04-16T00:00:00Z,2020-02-08T23:59:59Z +TBAS,20,H,N,200,true,false,false,2020-02-09T00:00:00Z,9999-01-01T00:00:00Z TBCS,20,B,N,50,true,false,false,2014-11-04T23:02:00Z,2020-06-16T00:00:00Z TBCS,20,H,N,200,true,false,true,2001-12-06T00:00:00Z,9999-01-01T00:00:00Z TCW,10,E,H,100,false,false,false,2005-04-20T14:49:00Z,9999-01-01T00:00:00Z