projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
--bugs but cgo and zmq together still suck
[svn42.git]
/
go
/
door_daemon_zmq
/
handle_commands.go
diff --git
a/go/door_daemon_zmq/handle_commands.go
b/go/door_daemon_zmq/handle_commands.go
index
2ac73ac
..
5e5d6e1
100644
(file)
--- a/
go/door_daemon_zmq/handle_commands.go
+++ b/
go/door_daemon_zmq/handle_commands.go
@@
-46,7
+46,7
@@
func checkCmdStatus(tokens [][]byte) (error) {
return nil
}
return nil
}
-func HandleCommand(tokens [][]byte, topub chan <- [][]byte, serial_wr chan string, serial_rd chan [][]byte) ([][]byte, error){
+func HandleCommand(tokens [][]byte, topub chan <- [][]byte, serial_wr chan string) ([][]byte, error){
if len(tokens) < 1 {
return nil, errors.New("No Command to handle")
}
if len(tokens) < 1 {
return nil, errors.New("No Command to handle")
}
@@
-63,6
+63,6
@@
func HandleCommand(tokens [][]byte, topub chan <- [][]byte, serial_wr chan strin
topub <- tokens
serial_wr <- dch.FirmwareChar
topub <- tokens
serial_wr <- dch.FirmwareChar
- fw_reply := <- serial_rd
+ fw_reply := GetLastSerialLine()
return fw_reply, nil
}
return fw_reply, nil
}