Convert register data to string based on data type. #21
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Welcome @zongke! It looks like this is your first PR to kubeedge/mappers-go 🎉 |
kubeedge-bot
added
the
size/L
Signed-off-by: zongke <zongk@shangyuantech.com>
pkg/modbus/device/device.go
Outdated
| Topic: fmt.Sprintf(common.TopicDataUpdate, dev.Instance.ID)} | ||
| collectCycle := time.Duration(dev.Instance.Datas.Properties[i].PVisitor.CollectCycle) | ||
| collectCycle := time.Duration(dev.Instance.Datas.Properties[i].PVisitor.CollectCycle * 1e6) |
There was a problem hiding this comment.
The unit is a microsecond.
There was a problem hiding this comment.
Time.Duration unit is Nanosecond,so if collectCycle unit is microsecond,we must multi 1e6.
There was a problem hiding this comment.
Sorry, I'm wrong with the unit and I checked the history, the unit of the collect cycle is nano-second.
As I talked with the original author before, the reason why use nano-second is that golang could only deal with second and nano-second in JSON.
pkg/modbus/device/twindata.go
Outdated
| klog.V(2).Infof("Update value: %s, topic: %s", sData, td.Topic) | ||
| } | ||
|
|
||
| func TransferBytes(isRegisterSwap bool, isSwap bool, value []byte) []byte { |
There was a problem hiding this comment.
It's better to new a file to add these converting functions.
You could also split this function into two:
swapRegister & swapByte. And the details could refer to the original implement:
https://github.com/kubeedge/kubeedge/blob/dfcdab01d4538ebefc2284a1b82a407d649e8f94/mappers/modbus_mapper/src/common.js#L70
There was a problem hiding this comment.
The following is my understanding, and my code can achieve it：
AB CD : isRegisterSwap:false isSwap:false
CD AB : isRegisterSwap:true isSwap:false
BA DC : isRegisterSwap:false isSwap:trur
DC BA : isRegisterSwap:true isSwap:true
But according to the code logic，when isRegister is true ，it will be DC BA！
I'm a little confused, can you explain these two parameters for me?
There was a problem hiding this comment.
Your implement is right.
However, it's more clear to split into two functions: swapRegister and swapByte.
pkg/modbus/device/twindata.go
Outdated
| switch len(value) { | ||
| case 1: | ||
| var tmp int8 | ||
| err := binary.Read(byteBuff, binary.BigEndian, &tmp) |
There was a problem hiding this comment.
Not clear about the big-endian impact.
There was a problem hiding this comment.
Please skip this comment.
Signed-off-by: zongke <zongk@shangyuantech.com> # Conflicts: # pkg/modbus/device/twindata.go
| @@ -0,0 +1,122 @@ | |||
| /* | |||
| Copyright 2020 The KubeEdge Authors. | |||
| "strconv" | ||
| ) | ||
|
|
||
| func SwitchRegister(value []byte) []byte { |
There was a problem hiding this comment.
Annotation for public function.
|
new pull request! |
In the current version, after modbus collects data, it is reported to the cloud without data conversion.