add port to serial output

Author: umbynos

bufferflow_timed.go

@@ -34,7 +34,7 @@ func (b *BufferflowTimed) Init() {
 				bufferedOutput = bufferedOutput + data
 			case <-b.ticker.C:
 				if bufferedOutput != "" {
-					m := SpPortMessage{bufferedOutput}
+					m := SpPortMessage{b.Port, bufferedOutput}
 					buf, _ := json.Marshal(m)
 					// data is now encoded in base64 format
 					// need a decoder on the other side

bufferflow_timedraw.go

@@ -32,7 +32,7 @@ func (b *BufferflowTimedRaw) Init() {
 		b.ticker = time.NewTicker(16 * time.Millisecond)
 		for _ = range b.ticker.C {
 			if len(bufferedOutputRaw) != 0 {
-				m := SpPortMessageRaw{bufferedOutputRaw}
+				m := SpPortMessageRaw{b.Port, bufferedOutputRaw}
 				buf, _ := json.Marshal(m)
 				// data is now encoded in base64 format
 				// need a decoder on the other side

serialport.go

@@ -83,12 +83,12 @@ type qwReport struct {
 }
 
 type SpPortMessage struct {
-	// P string // the port, i.e. com22
+	P string // the port, i.e. com22
 	D string // the data, i.e. G0 X0 Y0
 }
 
 type SpPortMessageRaw struct {
-	// P string // the port, i.e. com22
+	P string // the port, i.e. com22
 	D []byte // the data, i.e. G0 X0 Y0
 }
 
@@ -157,7 +157,7 @@ func (p *serport) reader() {
 
 			if p.bufferwatcher.IsBufferGloballySendingBackIncomingData() == false {
 				//m := SpPortMessage{"Alice", "Hello"}
-				m := SpPortMessage{data}
+				m := SpPortMessage{p.portConf.Name, data}
 				//log.Print("The m obj struct is:")
 				//log.Print(m)