Merge branch 'main' into TAUT-tide-gauge-swap

GeoNet · Mar 26, 2024 · 5f7fb36 · 5f7fb36
2 parents 080a120 + 451bd82
commit 5f7fb36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/install/firmware.csv b/install/firmware.csv
@@ -28,7 +28,8 @@ Campbell Scientific,CR6,11770,CR6.Std.12.01,2023-02-23T03:59:00Z,9999-01-01T00:0
 Campbell Scientific,CR6,15365,CR6.Std.10.02,2021-03-18T00:00:00Z,9999-01-01T00:00:00Z,
 Campbell Scientific,CR6,15366,CR6.Std.10.02,2021-05-05T00:00:00Z,9999-01-01T00:00:00Z,
 Campbell Scientific,CR6,15367,CR6.Std.10.02,2021-05-06T00:00:00Z,2022-01-18T23:59:00Z,
-Campbell Scientific,CR6,15367,CR6.Std.11.01,2022-01-19T00:00:00Z,9999-01-01T00:00:00Z,
+Campbell Scientific,CR6,15367,CR6.Std.11.01,2022-01-19T00:00:00Z,2024-03-21T02:59:00Z,
+Campbell Scientific,CR6,15367,CR6.Std.12.02,2024-03-21T03:00:00Z,9999-01-01T00:00:00Z,
 Campbell Scientific,CR6,15368,CR6.Std.10.02,2021-05-21T00:00:00Z,2022-01-18T23:59:00Z,
 Campbell Scientific,CR6,15368,CR6.Std.11.01,2022-01-19T00:00:00Z,9999-01-01T00:00:00Z,
 Campbell Scientific,CR6,15369,CR6.Std.10.02,2021-05-07T00:00:00Z,2022-03-30T23:59:00Z,

diff --git a/network/marks.csv b/network/marks.csv
@@ -79,7 +79,7 @@ LYTT,GN,no,Lyttelton Tide Gauge,-43.60584,172.72222,18.5,NZGD2000,1999-11-15T00:
 MAHA,CG,no,Mahakipawa Hill,-41.291387,173.793817,442,NZGD2000,2009-11-16T00:00:00Z,9999-01-01T00:00:00Z
 MAHI,CG,no,Mahia Peninsula,-39.152563727,177.90700192,322.4398,NZGD2000,2007-02-20T00:00:00Z,9999-01-01T00:00:00Z
 MAHO,LI,no,Mahoenui,-38.51300918779,174.85408746923,302.4836,NZGD2000,2004-02-29T00:00:00Z,9999-01-01T00:00:00Z
-MAKO,CG,no,Makorori,-38.6437598,178.1291161,231,NZGD2000,2010-11-09T00:00:00Z,9999-01-01T00:00:00Z
+MAKO,CG,no,Makorori,-38.6437954694,178.1291345694,255.030,NZGD2000,2010-11-09T00:00:00Z,9999-01-01T00:00:00Z
 MANG,CG,no,Mangatainoka River,-40.66869722,175.57486925,418.01,NZGD2000,2005-02-03T00:00:00Z,9999-01-01T00:00:00Z
 MAST,LI,no,Masterton,-41.06199062338,175.58457782885,207.197,NZGD2000,2002-12-19T00:00:00Z,2016-04-07T00:00:00Z
 MATW,CG,no,Matawai,-38.33384691,177.5262032,646.269,NZGD2000,2004-04-09T00:00:00Z,9999-01-01T00:00:00Z