ninafw: can retrieve list of services

Signed-off-by: deadprogram <[email protected]>
tinygo-org · Dec 28, 2023 · f1cc7b8 · f1cc7b8
1 parent cf57477
commit f1cc7b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/att_ninafw.go b/att_ninafw.go
@@ -199,7 +199,6 @@ func (a *att) handleData(handle uint16, buf []byte) error {
 		a.responded = true
 
 		lengthPerService := int(buf[1])
-		//uuidLen := lengthPerService - 4
 
 		for i := 2; i < len(buf); i += lengthPerService {
 			service := rawService{

diff --git a/hci_ninafw.go b/hci_ninafw.go
@@ -349,6 +349,10 @@ func (h *hci) sendAclPkt(handle uint16, cid uint8, data []byte) error {
 
 	copy(h.buf[9:], data)
 
+	if _debug {
+		println("hci send acl data", handle, cid, hex.EncodeToString(h.buf[:9+len(data)]))
+	}
+
 	if _, err := h.uart.Write(h.buf[:9+len(data)]); err != nil {
 		return err
 	}
@@ -380,10 +384,16 @@ func (h *hci) handleACLData(buf []byte) error {
 	case attCID:
 		if aclFlags == 0x01 {
 			// TODO: use buffered packet
-			h.att.handleData(aclHdr.handle&0x0fff, buf[9:aclHdr.len+9])
+			if _debug {
+				println("WARNING: att.handleACLData needs buffered packet")
+			}
+			h.att.handleData(aclHdr.handle&0x0fff, buf[8:aclHdr.len+8])
 		} else {
-			// use the recv buffer
-			h.att.handleData(aclHdr.handle&0x0fff, buf[9:aclHdr.len+9])
+			h.att.handleData(aclHdr.handle&0x0fff, buf[8:aclHdr.len+8])
+		}
+	default:
+		if _debug {
+			println("unknown acl data cid", aclHdr.cid)
 		}
 	}
 
@@ -453,6 +463,7 @@ func (h *hci) handleEventData(buf []byte) error {
 			if _debug {
 				println("leMetaEventConnComplete")
 			}
+
 			h.connectData.connected = true
 			h.connectData.status = buf[3]
 			h.connectData.handle = binary.LittleEndian.Uint16(buf[4:])