Skip to content

Commit

Permalink
chore: chore update
Browse files Browse the repository at this point in the history
  • Loading branch information
yonwoo9 committed Jul 15, 2024
1 parent d5f9868 commit a842411
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 28 deletions.
2 changes: 2 additions & 0 deletions ascii_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ func ParseComtradeCfg(filePath string) (*ComtradeCfg, error) {
if err != nil {
return nil, err
}
defer cfgFile.Close()

comtradeCfg := &ComtradeCfg{}
var tempList [][]byte
content, err := io.ReadAll(cfgFile)
Expand Down
2 changes: 1 addition & 1 deletion comtrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (c *Comtrade) parseComtradeData(datafilePath string) (*Data, error) {
return nil, ErrUnknownTypeOfData
}
parser := creator()
comtradeData, err := parser.Parse(datafilePath, c.Conf.GetAnalogNum(), c.Conf.GetDigtalNum(), c.Conf.GetEndSamp()[len(c.Conf.GetEndSamp())-1])
comtradeData, err := parser.Parse(datafilePath, c.Conf.GetAnalogNum(), c.Conf.GetDigitalNum(), c.Conf.GetEndSamp()[len(c.Conf.GetEndSamp())-1])
if err != nil {
return nil, err
}
Expand Down
42 changes: 21 additions & 21 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ import (
)

type ComtradeCfg struct {
StationName string //厂站名称 station_name
RecDevID string //记录设备ID rec_dev_id
RevYear uint16 //COMTRADE版本年份 rev_year 1991、1999、2013
Total uint32 //总通道数 total
AnalogNum uint32 //模拟通道数 analog_num
DigitalNum uint32 //数字/状态通道数 digital_num
Analog []AnalogChan //模拟通道 analog
Digital []DigitalChan //数字/状态通道 digital
Lf float32 //标称频率 lf
Nrates uint16 //采样率个数 nrates
Samp []float32 //采样率 samp
EndSamp []uint32 //最末采样序号 end_samp
FirstDataTime time.Time //第一条数据时间 first_data_time
TriggerTime time.Time //采样触发时间 trigger_time
Ft string //数据文件类型,ASCII、BINARY、BINARY32、FLOAT32 ft
StationName string `json:"station_name"` //厂站名称
RecDevID string `json:"rec_dev_id"` //记录设备ID
RevYear uint16 `json:"rev_year"` //COMTRADE版本年份 1991、1999、2013
Total uint32 `json:"total"` //总通道数
AnalogNum uint32 `json:"analog_num"` //模拟通道数
DigitalNum uint32 `json:"digital_num"` //数字/状态通道数
Analog []AnalogChan `json:"analog"` //模拟通道
Digital []DigitalChan `json:"digital"` //数字/状态通道
Lf float32 `json:"lf"` //标称频率
Nrates uint16 `json:"nrates"` //采样率个数
Samp []float32 `json:"samp"` //采样率
EndSamp []uint32 `json:"end_samp"` //最末采样序号
FirstDataTime time.Time `json:"first_data_time"` //第一条数据时间
TriggerTime time.Time `json:"trigger_time"` //采样触发时间
Ft string `json:"ft"` //数据文件类型,ASCII、BINARY、BINARY32、FLOAT32

// 2017
TimeMult float32 //时间倍率因子 time_mult
TimeCode string //时间编码 time_code
LocalCode string //本地编码 local_code
TmqCode uint8 //采样时间品质 tmq_code
Leapsec uint8 //闰秒标识符 leapsec
TimeMult float32 `json:"time_mult"` //时间倍率因子
TimeCode string `json:"time_code"` //时间编码
LocalCode string `json:"local_code"` //本地编码
TmqCode uint8 `json:"tmq_code"` //采样时间品质
Leapsec uint8 `json:"leapsec"` //闰秒标识符
}

func (cc *ComtradeCfg) GetStationName() string {
Expand All @@ -49,7 +49,7 @@ func (cc *ComtradeCfg) GetAnalogNum() uint32 {
return cc.AnalogNum
}

func (cc *ComtradeCfg) GetDigtalNum() uint32 {
func (cc *ComtradeCfg) GetDigitalNum() uint32 {
return cc.DigitalNum
}

Expand Down
2 changes: 1 addition & 1 deletion errors.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package comtrade

import "github.com/pkg/errors"
import "errors"

var (
ErrUnknownTypeOfData = errors.New("unknown type of data")
Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module github.com/yonwoo9/go-comtrade

go 1.20

require github.com/pkg/errors v0.9.1
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package comtrade

const Release = "v0.0.2"
const Release = "v0.0.3"

0 comments on commit a842411

Please sign in to comment.