Skip to content

Commit

Permalink
update model name Kinemetrics Basalt and Obsidian
Browse files Browse the repository at this point in the history
  • Loading branch information
@elidana
elidana committed Jun 7, 2023
1 parent cfc8d07 commit 0c7959c
Show file tree
Hide file tree
Showing 16 changed files with 722 additions and 63 deletions.
32 changes: 16 additions & 16 deletions assets/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,23 @@ GNS Science,SNARE/16,203,,
Johnson-Matheson,JOHNSON-MATHESON,API_1,,
Jones,JONES,TON_1,,
Jones,JONES,WEL_1,,
Kinemetrics,BASALT 8X DATALOGGER,1625,15109,
Kinemetrics,BASALT 8X DATALOGGER,1626,15110,
Kinemetrics,BASALT 8X DATALOGGER,1627,15111,
Kinemetrics,Basalt/8X,1625,15109,
Kinemetrics,Basalt/8X,1626,15110,
Kinemetrics,Basalt/8X,1627,15111,
Kinemetrics,KINEMETRICS PORTABLE RECORDER,PPZ_1,,
Kinemetrics,Obsidian 4X Datalogger,139,16126,
Kinemetrics,Obsidian 4X Datalogger,372,16403,
Kinemetrics,Obsidian 4X Datalogger,373,16404,
Kinemetrics,Obsidian 4X Datalogger,656,16653,
Kinemetrics,Obsidian 4X Datalogger,695,16675,
Kinemetrics,Obsidian 4X Datalogger,709,16670,
Kinemetrics,Obsidian 4X Datalogger,710,16669,
Kinemetrics,Obsidian 4X Datalogger,711,16673,
Kinemetrics,Obsidian 4X Datalogger,712,16677,
Kinemetrics,Obsidian 4X Datalogger,713,16671,
Kinemetrics,Obsidian 4X Datalogger,714,16674,
Kinemetrics,Obsidian 4X Datalogger,715,16676,
Kinemetrics,Obsidian 4X Datalogger,716,16672,
Kinemetrics,Obsidian/4X,139,16126,
Kinemetrics,Obsidian/4X,372,16403,
Kinemetrics,Obsidian/4X,373,16404,
Kinemetrics,Obsidian/4X,656,16653,
Kinemetrics,Obsidian/4X,695,16675,
Kinemetrics,Obsidian/4X,709,16670,
Kinemetrics,Obsidian/4X,710,16669,
Kinemetrics,Obsidian/4X,711,16673,
Kinemetrics,Obsidian/4X,712,16677,
Kinemetrics,Obsidian/4X,713,16671,
Kinemetrics,Obsidian/4X,714,16674,
Kinemetrics,Obsidian/4X,715,16676,
Kinemetrics,Obsidian/4X,716,16672,
Kinemetrics,Q330/3,1177,10127,
Kinemetrics,Q330/3,1178,10128,
Kinemetrics,Q330/3,1179,10121,
Expand Down
8 changes: 4 additions & 4 deletions install/channels.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ GNS Science,EARSS/3,Datalogger,,50,datalogger_GNS-Science_Earss_22bits_50sps
GNS Science,EARSS/3,Datalogger,,100,datalogger_GNS-Science_Earss_22bits_100sps
Kinemetrics,BASALT,Strong Motion Recorder,,50,datalogger_Kinemetrics_Basalt_26bits_50sps
Kinemetrics,BASALT,Strong Motion Recorder,,200,datalogger_Kinemetrics_Basalt_26bits_200sps
Kinemetrics,BASALT 8X DATALOGGER,Strong Motion Recorder,,50,datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_50sps
Kinemetrics,BASALT 8X DATALOGGER,Strong Motion Recorder,,200,datalogger_Kinemetrics_BASALT8XDATALOGGER_26bits_200sps
Kinemetrics,Basalt/8X,Strong Motion Recorder,,50,datalogger_Kinemetrics_Basalt8X_26bits_50sps
Kinemetrics,Basalt/8X,Strong Motion Recorder,,200,datalogger_Kinemetrics_Basalt8X_26bits_200sps
Kinemetrics,ETNA,Strong Motion Recorder,,200,datalogger_Kinemetrics_Etna_27bits_200sps
Kinemetrics,ETNA 2,Strong Motion Recorder,,200,datalogger_Kinemetrics_ETNA2_27bits_200sps
Kinemetrics,K2,Strong Motion Recorder,,200,datalogger_Kinemetrics_K2_27bits_200sps
Kinemetrics,OBSIDIAN,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian_26bits_50sps
Kinemetrics,OBSIDIAN,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian_26bits_200sps
Kinemetrics,Obsidian 4X Datalogger,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_50sps
Kinemetrics,Obsidian 4X Datalogger,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian4XDatalogger_24bits_200sps
Kinemetrics,Obsidian/4X,Strong Motion Recorder,,50,datalogger_Kinemetrics_Obsidian4X_24bits_50sps
Kinemetrics,Obsidian/4X,Strong Motion Recorder,,200,datalogger_Kinemetrics_Obsidian4X_24bits_200sps
Kinemetrics,Q330/3,Datalogger,,-10,datalogger_Kinemetrics_Q330_24bits_10s
Kinemetrics,Q330/3,Datalogger,,1,datalogger_Kinemetrics_Q330_24bits_1s
Kinemetrics,Q330/3,Datalogger,,10,datalogger_Kinemetrics_Q330_24bits_10sps
Expand Down
34 changes: 17 additions & 17 deletions install/dataloggers.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,23 +400,23 @@ GNS Science,SNARE/16,200,Havelock North HortResearch,SNARE Network,1989-08-05T06
GNS Science,SNARE/16,202,Wellington Dominion Observatory,SNARE Network,1986-09-22T00:00:00Z,1998-03-02T02:00:00Z
Guralp,GURALP-SAM-RECORDER,S0125,Tongariro River,,2001-01-16T08:00:00Z,2001-06-20T03:05:00Z
Guralp,GURALP-SAM-RECORDER,S0143,Wharepipi,,2001-01-27T14:01:00Z,2001-06-17T07:30:00Z
Kinemetrics,BASALT 8X DATALOGGER,1625,Richmond Hill Borehole,,2013-07-03T00:00:03Z,2014-07-22T03:00:00Z
Kinemetrics,BASALT 8X DATALOGGER,1625,Richmond Hill Borehole,,2014-10-30T00:30:01Z,2015-09-22T00:30:05Z
Kinemetrics,BASALT 8X DATALOGGER,1626,Richmond Hill Borehole,,2013-01-28T00:00:01Z,2013-06-04T01:00:00Z
Kinemetrics,BASALT 8X DATALOGGER,1626,Redcliffs Borehole,,2013-09-03T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,BASALT 8X DATALOGGER,1627,Redcliffs Borehole,,2013-01-28T00:00:01Z,2013-09-03T00:00:00Z
Kinemetrics,BASALT 8X DATALOGGER,1627,Richmond Hill Borehole,,2014-07-22T03:00:01Z,2014-10-30T00:30:00Z
Kinemetrics,Obsidian 4X Datalogger,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,2020-06-23T00:48:00Z
Kinemetrics,Obsidian 4X Datalogger,372,Waikawa Valley,Strong Motion,2017-05-22T06:17:01Z,9999-01-01T00:00:00Z
Kinemetrics,Obsidian 4X Datalogger,373,Kokohu,Strong Motion,2017-05-30T02:45:01Z,2021-06-02T21:56:00Z
Kinemetrics,Obsidian 4X Datalogger,373,Wharekauri,Strong Motion,2021-11-24T19:37:00Z,9999-01-01T00:00:00Z
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,9999-01-01T00:00: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,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
Kinemetrics,Basalt/8X,1625,Richmond Hill Borehole,,2013-07-03T00:00:03Z,2014-07-22T03:00:00Z
Kinemetrics,Basalt/8X,1625,Richmond Hill Borehole,,2014-10-30T00:30:01Z,2015-09-22T00:30:05Z
Kinemetrics,Basalt/8X,1626,Richmond Hill Borehole,,2013-01-28T00:00:01Z,2013-06-04T01:00:00Z
Kinemetrics,Basalt/8X,1626,Redcliffs Borehole,,2013-09-03T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Basalt/8X,1627,Redcliffs Borehole,,2013-01-28T00:00:01Z,2013-09-03T00:00:00Z
Kinemetrics,Basalt/8X,1627,Richmond Hill Borehole,,2014-07-22T03:00:01Z,2014-10-30T00:30:00Z
Kinemetrics,Obsidian/4X,139,Deep Cove,Strong Motion,2015-10-22T05:00:01Z,2020-06-23T00:48:00Z
Kinemetrics,Obsidian/4X,372,Waikawa Valley,Strong Motion,2017-05-22T06:17:01Z,9999-01-01T00:00:00Z
Kinemetrics,Obsidian/4X,373,Kokohu,Strong Motion,2017-05-30T02:45:01Z,2021-06-02T21:56:00Z
Kinemetrics,Obsidian/4X,373,Wharekauri,Strong Motion,2021-11-24T19:37:00Z,9999-01-01T00:00:00Z
Kinemetrics,Obsidian/4X,656,Raoul Island Met Station,Strong Motion,2016-09-17T13:00:01Z,2023-01-28T21:16:00Z
Kinemetrics,Obsidian/4X,695,Milford Sound,Strong Motion,2017-05-23T04:15:01Z,9999-01-01T00:00:00Z
Kinemetrics,Obsidian/4X,709,Deep Cove,Strong Motion,2020-06-23T01:09:00Z,2021-08-09T21:08:00Z
Kinemetrics,Obsidian/4X,710,Puysegur Point,Strong Motion,2017-01-19T21:20:01Z,9999-01-01T00:00:00Z
Kinemetrics,Obsidian/4X,713,Glynn Wye,Strong Motion,2019-10-23T19:45:00Z,2020-07-23T20:19:00Z
Kinemetrics,Obsidian/4X,715,Wakarara,Strong Motion,2019-09-10T02:50:00Z,2021-05-25T20:54:00Z
Kinemetrics,Obsidian/4X,716,The Sugar Loaf Quarry,Strong Motion,2017-03-16T00:00:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,1177,Mount Edgecumbe,,2007-05-31T03:00:01Z,2008-06-30T23:50:00Z
Kinemetrics,Q330/3,1177,Rawiri Station,,2009-06-10T03:30:01Z,9999-01-01T00:00:00Z
Kinemetrics,Q330/3,1178,Blackbirch Station,,2006-01-18T20:30:01Z,2016-12-08T00:00:00Z
Expand Down
2 changes: 1 addition & 1 deletion meta/testdata/models.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Make,Model,Type
General Electric,Druck PTX-1830,Pressure Sensor
Kinemetrics,BASALT 8X DATALOGGER,Datalogger
Kinemetrics,Basalt/8X,Datalogger
26 changes: 13 additions & 13 deletions resp/auto.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ var DataloggerModels map[string]DataloggerModel = map[string]DataloggerModel{
Manufacturer: "Kinemetrics",
Vendor: "",
},
"BASALT 8X DATALOGGER": {
Name: "BASALT 8X DATALOGGER",
Type: "Strong Motion Recorder",
Description: "Kinemetrics BASALT Strong Motion Recorder",
Manufacturer: "Kinemetrics",
Vendor: "",
},
"BPR Subsystem": {
Name: "BPR Subsystem",
Type: "Bottom Pressure Recorder",
Description: "SAIC BPR Bottom Pressure Recorder",
Manufacturer: "SAIC",
Vendor: "",
},
"Basalt/8X": {
Name: "Basalt/8X",
Type: "Strong Motion Recorder",
Description: "Kinemetrics Basalt Strong Motion Recorder",
Manufacturer: "Kinemetrics",
Vendor: "",
},
"CUSP-Me": {
Name: "CUSP-Me",
Type: "Strong Motion Recorder",
Expand Down Expand Up @@ -145,8 +145,8 @@ var DataloggerModels map[string]DataloggerModel = map[string]DataloggerModel{
Manufacturer: "Nanometrics",
Vendor: "",
},
"Obsidian 4X Datalogger": {
Name: "Obsidian 4X Datalogger",
"Obsidian/4X": {
Name: "Obsidian/4X",
Type: "Strong Motion Recorder",
Description: "Kinemetrics Obsidian Strong Motion Recorder",
Manufacturer: "Kinemetrics",
Expand Down Expand Up @@ -1807,7 +1807,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
DataloggerList: []string{"Obsidian 4X Datalogger"},
DataloggerList: []string{"Obsidian/4X"},
Type: "TG",
Label: "HN",
SampleRate: 200,
Expand Down Expand Up @@ -1921,7 +1921,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
DataloggerList: []string{"Obsidian 4X Datalogger"},
DataloggerList: []string{"Obsidian/4X"},
Type: "CG",
Label: "BN",
SampleRate: 50,
Expand Down Expand Up @@ -2056,7 +2056,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
DataloggerList: []string{"BASALT", "BASALT 8X DATALOGGER"},
DataloggerList: []string{"BASALT", "Basalt/8X"},
Type: "TG",
Label: "HN",
SampleRate: 200,
Expand Down Expand Up @@ -2170,7 +2170,7 @@ var Responses []Response = []Response{
},
Reversed: false,
}, {
DataloggerList: []string{"BASALT", "BASALT 8X DATALOGGER"},
DataloggerList: []string{"BASALT", "Basalt/8X"},
Type: "CG",
Label: "BN",
SampleRate: 50,
Expand Down
0 ...rics_BASALT8XDATALOGGER_26bits_200sps.xml → ...er_Kinemetrics_Basalt8X_26bits_200sps.xml
View file
File renamed without changes.
0 ...trics_BASALT8XDATALOGGER_26bits_50sps.xml → ...ger_Kinemetrics_Basalt8X_26bits_50sps.xml
View file
File renamed without changes.
0 ...cs_Obsidian4XDatalogger_24bits_200sps.xml → ..._Kinemetrics_Obsidian4X_24bits_200sps.xml
View file
File renamed without changes.
0 ...ics_Obsidian4XDatalogger_24bits_50sps.xml → ...r_Kinemetrics_Obsidian4X_24bits_50sps.xml
View file
File renamed without changes.
Loading

0 comments on commit 0c7959c

Please sign in to comment.