anonfunc/VodaDOCSIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed ranging to bool

Browse Source
This commit is contained in:
Giovanni Harting
2022-11-19 00:41:23 +01:00
parent 6a63fa4b1b
commit cbe5b13e40
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@@ -150,7 +150,7 @@ type SaltResponse struct {
type DOCSISChannelInfo struct { type DOCSISChannelInfo struct {
Type ChannelType Type ChannelType
Power float64 Power float64
RangingStatus *string RangingOK *bool
SNR *float64 SNR *float64
Direction ChannelDirection Direction ChannelDirection
Frequency uint64 Frequency uint64
@@ -227,7 +227,7 @@ func main() {
enc.AddField("power", lineprotocol.MustNewValue(channel.Power)) enc.AddField("power", lineprotocol.MustNewValue(channel.Power))
if channel.Direction == UP { if channel.Direction == UP {
enc.AddField("ranging_status", lineprotocol.MustNewValue(*channel.RangingStatus)) enc.AddField("ranging_ok", lineprotocol.BoolValue(*channel.RangingOK))
} else { } else {
enc.AddField("snr", lineprotocol.MustNewValue(*channel.SNR)) enc.AddField("snr", lineprotocol.MustNewValue(*channel.SNR))
} }
@@ -416,10 +416,11 @@ func transformDOCSIS(rawDOCSIS *DOCSISResponse) (nChannels []*DOCSISChannelInfo)
} }
for _, channel := range rawDOCSIS.OfdmaUpstream { for _, channel := range rawDOCSIS.OfdmaUpstream {
rangingOk := channel.RangingStatus != "Completed"
nChannels = append(nChannels, &DOCSISChannelInfo{ nChannels = append(nChannels, &DOCSISChannelInfo{
Type: ChannelType(channel.ChannelType), Type: ChannelType(channel.ChannelType),
Power: powerStr2Power(channel.Power), Power: powerStr2Power(channel.Power),
RangingStatus: &channel.RangingStatus, RangingOK: &rangingOk,
Direction: UP, Direction: UP,
Frequency: freqStr2Hz(channel.CentralFrequency), Frequency: freqStr2Hz(channel.CentralFrequency),
ID: channel.ChannelIDUp, ID: channel.ChannelIDUp,
@@ -427,10 +428,11 @@ func transformDOCSIS(rawDOCSIS *DOCSISResponse) (nChannels []*DOCSISChannelInfo)
} }
for _, channel := range rawDOCSIS.Upstream { for _, channel := range rawDOCSIS.Upstream {
rangingOk := channel.RangingStatus != "Completed"
nChannels = append(nChannels, &DOCSISChannelInfo{ nChannels = append(nChannels, &DOCSISChannelInfo{
Type: ChannelType(channel.ChannelType), Type: ChannelType(channel.ChannelType),
Power: powerStr2Power(channel.Power), Power: powerStr2Power(channel.Power),
RangingStatus: &channel.RangingStatus, RangingOK: &rangingOk,
Direction: UP, Direction: UP,
Frequency: freqStr2Hz(channel.CentralFrequency), Frequency: freqStr2Hz(channel.CentralFrequency),
ID: channel.ChannelIDUp, ID: channel.ChannelIDUp,