Merge branch 'main' into INHS-SM-recorder-swap

GeoNet · Apr 18, 2024 · 4b051fd · 4b051fd
2 parents 8d3e0aa + 74a5f0e
commit 4b051fd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 1 deletion.
diff --git a/assets/dataloggers.csv b/assets/dataloggers.csv
@@ -677,6 +677,7 @@ Nanometrics,Centaur CTR4-6S,10234,,
 Nanometrics,Centaur CTR4-6S,10235,,
 Nanometrics,Centaur CTR4-6S,10236,,
 Nanometrics,Centaur CTR4-6S,10840,,
+Nanometrics,Centaur CTR4-6S,10922,,
 Nanometrics,Centaur CTR4-6S,10956,,
 Nanometrics,Centaur CTR4-6S,10961,,
 Nanometrics,ORION,0144,,

diff --git a/install/connections.csv b/install/connections.csv
@@ -196,6 +196,7 @@ ETVZ,10,East Tongariro,,0,2014-03-12T00:00:00Z,9999-01-01T00:00:00Z
 ETVZ,30,East Tongariro,,3,2014-03-11T00:01:00Z,9999-01-01T00:00:00Z
 EWZ,10,Erewhon,Short Period,,1991-03-21T03:43:00Z,2001-07-02T14:38:00Z
 EXPV,10,Express,Short Period,,1995-10-25T03:58:00Z,1995-11-24T06:22:00Z
+EY2M,50,West Melton 2 Geomagnetic Observatory,,,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
 EYCZ,10,Eyrewell,,,2012-03-20T21:00:01Z,2013-12-02T22:00:00Z
 EYWM,50,West Melton Geomagnetic Observatory,,,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
 FABM,10,Fabian's Valley,Short Period,,1993-10-18T22:25:00Z,1994-03-11T20:54:00Z

diff --git a/install/dataloggers.csv b/install/dataloggers.csv
@@ -898,6 +898,7 @@ Nanometrics,Centaur CTR4-6S,10234,Waipu Caves,,2023-05-30T22:13:00Z,9999-01-01T0
 Nanometrics,Centaur CTR4-6S,10235,Horomatangi Reefs,,2023-05-25T16:19:00Z,9999-01-01T00:00:00Z
 Nanometrics,Centaur CTR4-6S,10236,Tauhara South,,2023-09-20T03:08:00Z,9999-01-01T00:00:00Z
 Nanometrics,Centaur CTR4-6S,10840,Waikawa Valley,,2024-03-03T20:30:00Z,9999-01-01T00:00:00Z
+Nanometrics,Centaur CTR4-6S,10922,West Melton 2 Geomagnetic Observatory,,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
 Nanometrics,Centaur CTR4-6S,10956,Maungataniwha,,2024-03-06T04:27:00Z,9999-01-01T00:00:00Z
 Nanometrics,Centaur CTR4-6S,10961,Port of Tauranga,,2024-03-20T23:16:00Z,9999-01-01T00:00:00Z
 Nanometrics,Centaur CTR4-6S,7810,Mount Tarawera,,2023-03-06T23:19:00Z,9999-01-01T00:00:00Z

diff --git a/install/gains.csv b/install/gains.csv
@@ -17,6 +17,9 @@ CPXB,27,,,0.1,,,2010-05-01T00:00:00Z,2015-05-07T02:00:00Z
 CPXB,28,,,0.1,,,2010-05-01T00:00:00Z,2015-05-07T02:00:00Z
 CPXB,29,,,0.1,,,2010-05-01T00:00:00Z,2015-05-07T02:00:00Z
 CPXB,2A,,,0.1,,,2010-05-01T00:00:00Z,2015-05-07T02:00:00Z
+EY2M,50,,X,,0x67,,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
+EY2M,50,,Y,,0x00,,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
+EY2M,50,,Z,,0x8c,,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
 EYWM,50,,X,,0x8f,,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
 EYWM,50,,Y,,0x00,,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
 EYWM,50,,Z,,0x6d,,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z

diff --git a/install/sensors.csv b/install/sensors.csv
@@ -39,6 +39,7 @@ City Technology,T3H H2S sensor,01.44865262 112,NA002,06,0,,0,0,0,0,0,0,2024-03-2
 City Technology,T3STF SO2 sensor,01.45929880 013,TO003,13,0,,0,0,0,0,0,0,2024-03-01T00:20:00Z,9999-01-01T00:00:00Z
 City Technology,T3STF SO2 sensor,01.45929894 013,NA002,05,0,,0,0,0,0,0,0,2024-03-21T02:10:00Z,9999-01-01T00:00:00Z
 Danish Meteorological Institute,FGE,S0257-E0299,SBAM,50,0,,0,0,0,0,0,0,2009-03-02T00:00:00Z,2023-10-22T23:59:00Z
+Danish Meteorological Institute,FGE,S0257-E0299,EY2M,50,0,,0,0,0,0,0,0,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
 Danish Meteorological Institute,FGE,S0263-S0308,EYWM,50,0,,0,0,0,0,0,0,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
 Danish Meteorological Institute,FGE,S0330-E0397,APIM,50,0,,0,0,0,0,0,0,2011-07-25T00:00:00Z,9999-01-01T00:00:00Z
 Danish Meteorological Institute,FGE,S0437-E0564,AHAM,50,0,,0,0,0,0,0,0,2022-03-19T00:00:00Z,9999-01-01T00:00:00Z

diff --git a/install/streams.csv b/install/streams.csv
@@ -637,6 +637,7 @@ ETVZ,30,L,D,1,false,false,false,2014-03-11T00:01:00Z,9999-01-01T00:00:00Z
 ETVZ,30,H,D,100,false,false,false,2014-03-11T00:01:00Z,9999-01-01T00:00:00Z
 EWZ,10,S,H,50,false,false,true,1991-03-21T03:43:00Z,2001-07-02T14:38:00Z
 EXPV,10,S,H,50,false,false,true,1995-10-25T03:58:00Z,1995-11-24T06:22:00Z
+EY2M,50,L,F,1,true,false,false,2024-04-09T02:00:00Z,9999-01-01T00:00:00Z
 EYCZ,10,E,H,100,false,false,false,2012-03-20T21:00:01Z,2013-12-02T22:00:00Z
 EYRS,20,B,N,50,true,false,false,2011-03-25T05:00:00Z,2012-10-15T10:45:00Z
 EYRS,20,H,N,200,true,false,true,2011-03-25T05:00:00Z,2012-10-15T10:45:00Z

diff --git a/network/sites.csv b/network/sites.csv
@@ -860,6 +860,7 @@ ETVZ,10,-39.1357,175.7106,1236,,WGS84,External GPS Device,2014-03-12T00:00:00Z,9
 ETVZ,30,-39.1357,175.7106,1236,,WGS84,Unknown,2014-03-11T00:01:00Z,9999-01-01T00:00:00Z
 EWZ,10,-43.510031722,170.852603355,650,,WGS84,Unknown,1991-03-21T03:43:00Z,2001-07-02T14:38:00Z
 EXPV,10,-39.253545373,175.564881983,2030,,WGS84,Unknown,1995-10-25T03:58:00Z,1995-11-24T06:22:00Z
+EY2M,50,-43.47384,172.39266,88,,WGS84,Unknown,2024-04-04T16:00:00Z,9999-01-01T00:00:00Z
 EYCZ,10,-43.42136,172.35544,149.7,,WGS84,External GPS Device,2012-03-20T21:00:01Z,2013-12-02T22:00:00Z
 EYRS,20,-43.42138,172.35544,119,,WGS84,External GPS Device,2011-03-25T05:00:00Z,2012-10-15T10:45:00Z
 EYWM,50,-43.28262,172.23339,88,,WGS84,Unknown,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z

diff --git a/network/stations.csv b/network/stations.csv
@@ -937,10 +937,11 @@ ETVZ,CH,East Tongariro,-39.1357,175.7106,1236,,WGS84,2014-03-11T00:01:00Z,9999-0
 EWZ,NZ,Erewhon,-43.510031722,170.852603355,650,,WGS84,1991-03-21T00:00:00Z,2001-07-03T00:00:00Z
 EWZA,XX,Erewhon,-43.51,170.8526,625,,WGS84,1995-11-12T00:00:00Z,1996-04-06T00:00:00Z
 EXPV,XX,Express,-39.253545373,175.564881983,2030,,WGS84,1995-10-25T03:58:00Z,1995-11-24T06:22:00Z
+EY2M,GM,West Melton 2 Geomagnetic Observatory,-43.47384,172.39266,88,,WGS84,2024-04-04T16:00:00Z,9999-01-01T00:00:00Z
 EYCZ,CB,Eyrewell,-43.42136,172.35544,149.7,,WGS84,2012-03-20T00:00:00Z,2013-12-03T00:00:00Z
 EYRM,GM,Eyrewell Geomagnetic Observatory,-43.42134,172.35544,115,,WGS84,1978-01-01T00:00:00Z,2013-12-15T23:59:59Z
 EYRS,SM,Eyrewell Observatory,-43.42138,172.35544,119,,WGS84,2011-03-25T00:00:00Z,2012-10-15T10:45:00Z
-EYWM,GM,West Melton Geomagnetic Observatory,-43.474,172.393,102,,WGS84,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
+EYWM,GM,West Melton Geomagnetic Observatory,-43.474,172.393,88,,WGS84,2013-12-15T00:00:00Z,9999-01-01T00:00:00Z
 FABM,XX,Fabian's Valley,-41.502789743,173.575647973,170,,WGS84,1993-10-18T22:25:00Z,1994-03-11T20:54:00Z
 FAHS,SM,Feilding Agricultural High School,-40.213535565,175.57304843,85,,WGS84,2002-07-24T00:00:00Z,9999-01-01T00:00:00Z
 FAIS,SM,Fairfield,-41.2074,174.9401,61,,WGS84,2011-07-12T00:00:00Z,2022-04-27T06:00:00Z