Skip to content

Commit

Permalink
Merge branch 'main' into TMWZ-bb-sensor-swap
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Benson authored Apr 11, 2024
2 parents b310a3f + f509923 commit 6b2f2b8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions assets/sensors.csv
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ Lennartz Electronic,LE-3DliteMkIII,J-0937,,
Lennartz Electronic,LE-3DliteMkIII,J-0940,,
Lennartz Electronic,LE-3DliteMkIII,J-0941,,
Lennartz Electronic,LE-3DliteMkIII,J-0942,,
Lennartz Electronic,LE-3DliteMkIII,J-0943,,
Lennartz Electronic,LE-3DliteMkIII,J-0945,,
Lennartz Electronic,LE-3DliteMkIII,J-0946,,
Licor,Li-850 CO2/H2O Gas Analyzer,HGA-06812,,
Expand Down Expand Up @@ -778,6 +779,7 @@ Nanometrics,Trillium Horizon TH120-2,2745,,
Nanometrics,Trillium Horizon TH120-2,2836,,
Nanometrics,Trillium Horizon TH120-2,2837,,
Nanometrics,Trillium Horizon TH120-2,2838,,
Nanometrics,Trillium Horizon TH120-2,3356,,
OTT Hydromet,Compact Bubbler Sensor USGS model,002,,
OTT Hydromet,Compact Bubbler Sensor USGS model,407895,16026,
OTT Hydromet,Compact Bubbler Sensor USGS model,422837,,
Expand Down
6 changes: 4 additions & 2 deletions install/sensors.csv
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ Guralp,CMG-3ESPC,T36911,RATZ,10,0,,0,0,0,0,0,0,2011-11-02T03:00:00Z,9999-01-01T0
Guralp,CMG-3ESPC,T36912,RTZ,10,0,,0,0,0,0,0,0,2011-08-04T00:00:10Z,2016-09-01T21:30:00Z
Guralp,CMG-3ESPC,T36912,TSZ,10,0,,0,0,0,0,0,0,2018-08-30T23:45:00Z,9999-01-01T00:00:00Z
Guralp,CMG-3ESPC,T36913,INZ,10,0,,0,0,0,0,0,0,2011-08-02T00:00:12Z,2012-05-21T11:00:00Z
Guralp,CMG-3ESPC,T36913,GVZ,10,0,,0,0,0,0,0,0,2012-12-04T05:00:00Z,9999-01-01T00:00:00Z
Guralp,CMG-3ESPC,T36913,GVZ,10,0,,0,0,0,0,0,0,2012-12-04T05:00:00Z,2024-04-02T01:32:00Z
Guralp,CMG-3ESPC,T36914,OTVZ,10,0,,0,0,0,0,0,0,2011-11-11T02:00:00Z,9999-01-01T00:00:00Z
Guralp,CMG-3ESPC,T36915,KHEZ,10,0,,0,0,0,0,0,0,2012-06-13T01:30:00Z,9999-01-01T00:00:00Z
Guralp,CMG-3ESPC,T38497,ETVZ,10,0,,0,0,0,0,0,0,2014-08-26T22:30:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -794,6 +794,7 @@ Lennartz Electronic,LE-3DliteMkIII,J-0937,POWZ,10,0,,0,0,0,0,0,0,2023-12-12T22:3
Lennartz Electronic,LE-3DliteMkIII,J-0940,NMHZ,10,0,,0,0,0,0,0,0,2023-09-14T04:09:00Z,9999-01-01T00:00:00Z
Lennartz Electronic,LE-3DliteMkIII,J-0941,GRRZ,10,0,,0,0,0,0,0,0,2023-09-12T03:04:00Z,9999-01-01T00:00:00Z
Lennartz Electronic,LE-3DliteMkIII,J-0942,TRWZ,10,0,,0,0,0,0,0,0,2023-11-23T21:52:00Z,9999-01-01T00:00:00Z
Lennartz Electronic,LE-3DliteMkIII,J-0943,PLWZ,10,0,,0,0,0,0,0,0,2024-04-03T00:19:00Z,9999-01-01T00:00:00Z
Lennartz Electronic,LE-3DliteMkIII,J-0945,TMWZ,10,0,,0,0,0,0,0,0,2024-04-08T22:27:00Z,9999-01-01T00:00:00Z
Lennartz Electronic,LE-3DliteMkIII,J-0946,HOWZ,10,0,,0,0,0,0,0,0,2023-12-20T00:07:00Z,9999-01-01T00:00:00Z
Licor,Li-850 CO2/H2O Gas Analyzer,HGA-06812,NA002,04,0,,0,0,0,0,0,0,2024-03-21T02:10:00Z,9999-01-01T00:00:00Z
Expand Down Expand Up @@ -908,6 +909,7 @@ Nanometrics,Trillium Horizon TH120-2,2745,TLZ,10,0,,0,0,0,0,0,0,2022-10-06T22:37
Nanometrics,Trillium Horizon TH120-2,2836,TOZ,10,0,,0,0,0,0,0,0,2023-05-14T21:37:00Z,9999-01-01T00:00:00Z
Nanometrics,Trillium Horizon TH120-2,2837,MSZ,10,0,,0,0,0,0,0,0,2024-02-29T01:22:00Z,9999-01-01T00:00:00Z
Nanometrics,Trillium Horizon TH120-2,2838,NNZ,10,0,,0,0,0,0,0,0,2023-03-29T18:00:00Z,9999-01-01T00:00:00Z
Nanometrics,Trillium Horizon TH120-2,3356,GVZ,10,0,,0,0,0,0,0,0,2024-04-02T03:10:00Z,9999-01-01T00:00:00Z
OTT Hydromet,Compact Bubbler Sensor USGS model,002,RU001,01,0,,0,0,0,0,0,0,2018-05-03T03:50:00Z,9999-01-01T00:00:00Z
OTT Hydromet,Compact Bubbler Sensor USGS model,407895,OT013,02,0,,0,0,0,0,0,0,2021-03-17T22:20:00Z,9999-01-01T00:00:00Z
OTT Hydromet,Compact Bubbler Sensor USGS model,422837,OT001,03,0,,0,0,0,0,0,0,2017-12-06T00:30:00Z,2021-10-12T23:50:00Z
Expand Down Expand Up @@ -1207,7 +1209,7 @@ Sercel,L4C-3D,2986,TMWZ,10,0,,0,0,0,0,0,0,2007-09-11T12:30:00Z,2024-04-08T22:15:
Sercel,L4C-3D,2987,LIRZ,10,0,,0,0,0,0,0,0,2006-02-15T12:00:00Z,9999-01-01T00:00:00Z
Sercel,L4C-3D,2988,OMRZ,10,0,,0,0,0,0,0,0,2007-04-04T01:00:00Z,9999-01-01T00:00:00Z
Sercel,L4C-3D,2989,ARAZ,10,0,,0,0,0,0,0,0,2007-05-20T23:00:00Z,2023-08-09T00:03:00Z
Sercel,L4C-3D,2990,PLWZ,10,0,,0,0,0,0,0,0,2007-04-18T00:00:02Z,9999-01-01T00:00:00Z
Sercel,L4C-3D,2990,PLWZ,10,0,,0,0,0,0,0,0,2007-04-18T00:00:02Z,2024-04-02T22:49:00Z
Sercel,L4C-3D,2991,PRGZ,10,0,,0,0,0,0,0,0,2007-08-02T00:01:00Z,2023-06-26T07:59:00Z
Sercel,L4C-3D,2992,TUWZ,10,0,,0,0,0,0,0,0,2006-11-21T03:00:00Z,2022-09-01T02:50:00Z
Sercel,L4C-3D,2993,CNGZ,10,44,,0,4,0,0,0,0,2007-08-04T00:01:00Z,2007-08-21T00:35:00Z
Expand Down

0 comments on commit 6b2f2b8

Please sign in to comment.