Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 852f4eb

Browse filesBrowse files
committed
Reuse onRegister callback
1 parent 1598ee1 commit 852f4eb
Copy full SHA for 852f4eb

File tree

3 files changed

+6
-6
lines changed
Filter options

3 files changed

+6
-6
lines changed

‎hub.go

Copy file name to clipboardExpand all lines: hub.go
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ type hub struct {
6666
func newHub(tools *tools.Tools, systray *systray.Systray) *hub {
6767
broadcastSys := make(chan []byte, 1000)
6868

69-
onRegister := func(port *serport) {
70-
broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"Got register/open on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + ",\"BufferType\":\"" + port.BufferType + "\"}")
69+
onRegister := func(port *serport, msg string) {
70+
broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"" + msg + "\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + ",\"BufferType\":\"" + port.BufferType + "\"}")
7171
}
7272
onUnregister := func(port *serport) {
7373
broadcastSys <- []byte("{\"Cmd\":\"Close\",\"Desc\":\"Got unregister/close on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + "}")

‎serial.go

Copy file name to clipboardExpand all lines: serial.go
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ type serialhub struct {
3535

3636
mu sync.Mutex
3737

38-
onRegister func(port *serport)
38+
onRegister func(port *serport, msg string)
3939
onUnregister func(port *serport)
4040
}
4141

42-
func newSerialHub(onRegister func(port *serport), onUnregister func(port *serport)) *serialhub {
42+
func newSerialHub(onRegister func(port *serport, msg string), onUnregister func(port *serport)) *serialhub {
4343
return &serialhub{
4444
ports: make(map[string]*serport),
4545
onRegister: onRegister,
@@ -74,7 +74,7 @@ type SpPortItem struct {
7474
// Register serial ports from the connections.
7575
func (sh *serialhub) Register(port *serport) {
7676
sh.mu.Lock()
77-
sh.onRegister(port)
77+
sh.onRegister(port, "Got register/open on port.")
7878
sh.ports[port.portName] = port
7979
sh.mu.Unlock()
8080
}

‎serialport.go

Copy file name to clipboardExpand all lines: serialport.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func (h *hub) spHandlerOpen(portname string, baud int, buftype string) {
310310
existingPort, ok := h.serialHub.FindPortByName(portname)
311311
if ok && existingPort.portConf.Baud == baud && existingPort.BufferType == buftype {
312312
log.Print("Port already opened")
313-
h.broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"Port already opened.\",\"Port\":\"" + existingPort.portConf.Name + "\",\"Baud\":" + strconv.Itoa(existingPort.portConf.Baud) + ",\"BufferType\":\"" + existingPort.BufferType + "\"}")
313+
h.serialHub.onRegister(existingPort, "Port already opened")
314314
} else {
315315
log.Print("Error opening port " + err.Error())
316316
h.broadcastSys <- []byte("{\"Cmd\":\"OpenFail\",\"Desc\":\"Error opening port. " + err.Error() + "\",\"Port\":\"" + conf.Name + "\",\"Baud\":" + strconv.Itoa(conf.Baud) + "}")

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.