Compare commits

..

No commits in common. "621723ca8397c0ebbba202422ca934f98c685ef3" and "f5da209d22d619c89cae6cbae80885f34e1e4591" have entirely different histories.

5 changed files with 35 additions and 91 deletions

View File

@ -2,10 +2,7 @@
"permissions": {
"allow": [
"Bash(go build:*)",
"Bash(git:*)",
"Bash(cmd.exe *)",
"Bash(go env *)",
"Bash(go install *)"
"Bash(git:*)"
]
}
}

View File

@ -263,7 +263,6 @@ void setup() {
// BLE — NUS
BLEDevice::init("KVMote");
pServer = BLEDevice::createServer();
pServer->setCallbacks(new ServerCallbacks());

View File

@ -162,12 +162,17 @@
<div class="is-flex is-align-items-center mb-4" style="font-size: 0.85rem; color: #888;">
<span class="status-dot" :style="{ backgroundColor: detected ? '#3498db' : '#555' }"></span>
<span x-text="detected ? 'KVMote (BLE) detectado' : ''"></span>
<span x-text="detected ? 'KVMote (BLE) detectado' : 'Buscando dispositivo...'"></span>
</div>
<div class="mb-2">
<div class="columns is-mobile is-gapless mb-2">
<div class="column pr-1">
<button class="btn-action" @click="detect()">Detectar</button>
</div>
<div class="column pl-1">
<button class="btn-action btn-connect" @click="toggleConnect()" x-text="connected ? 'Desconectar' : 'Conectar'"></button>
</div>
</div>
<div class="field mb-4">
<div class="is-flex is-align-items-center is-justify-content-space-between">

View File

@ -258,8 +258,8 @@ func (e *Engine) shouldReturnToHost() bool {
switch e.clientPos {
case PosLeft: return e.virtualX > 600
case PosRight: return e.virtualX < -500
case PosBelow: return e.virtualY < -300
case PosAbove: return e.virtualY > 300
case PosBelow: return e.virtualY < -150
case PosAbove: return e.virtualY > 150
}
return false
}

View File

@ -4,24 +4,12 @@ import (
"context"
"errors"
"fmt"
"os"
"sync"
"time"
"tinygo.org/x/bluetooth"
)
func bleLog(msg string) {
line := fmt.Sprintf("[BLE] %s | %s\n", time.Now().Format("15:04:05.000"), msg)
fmt.Print(line)
f, err := os.OpenFile("kvmote_debug.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
return
}
defer f.Close()
f.WriteString(line)
}
var (
NusServiceUUID = bluetooth.NewUUID([16]byte{0x6e, 0x40, 0x00, 0x01, 0xb5, 0xa3, 0xf3, 0x93, 0xe0, 0xa9, 0xe5, 0x0e, 0x24, 0xdc, 0xca, 0x9e})
NusRxUUID = bluetooth.NewUUID([16]byte{0x6e, 0x40, 0x00, 0x02, 0xb5, 0xa3, 0xf3, 0x93, 0xe0, 0xa9, 0xe5, 0x0e, 0x24, 0xdc, 0xca, 0x9e})
@ -57,19 +45,15 @@ func (t *RealBleTransport) Detect(ctx context.Context) (bool, error) {
}
foundChan := make(chan bluetooth.Address, 1)
go func() {
t.adapter.Scan(func(adapter *bluetooth.Adapter, result bluetooth.ScanResult) {
hasUUID := result.HasServiceUUID(NusServiceUUID)
bleLog(fmt.Sprintf("visto: nome=%q hasNUS=%v addr=%s", result.LocalName(), hasUUID, result.Address.String()))
if result.LocalName() == "KVMote" || hasUUID {
err := t.adapter.Scan(func(adapter *bluetooth.Adapter, result bluetooth.ScanResult) {
if result.LocalName() == "KVMote" {
adapter.StopScan()
select {
case foundChan <- result.Address:
default:
}
foundChan <- result.Address
}
})
}()
if err != nil {
return false, err
}
select {
case addr := <-foundChan:
@ -93,65 +77,24 @@ func (t *RealBleTransport) Connect(ctx context.Context) error {
addr := t.address
t.mu.Unlock()
var device bluetooth.Device
var services []bluetooth.DeviceService
var err error
for cycle := 1; cycle <= 3; cycle++ {
if cycle > 1 {
bleLog(fmt.Sprintf("Reconectando (ciclo %d)...", cycle))
time.Sleep(1 * time.Second)
}
bleLog(fmt.Sprintf("Conectando (ciclo %d)...", cycle))
device, err = t.adapter.Connect(addr, bluetooth.ConnectionParams{})
fmt.Println("[BLE] Conectando...")
device, err := t.adapter.Connect(addr, bluetooth.ConnectionParams{})
if err != nil {
bleLog(fmt.Sprintf(" Connect erro: %v", err))
continue
return err
}
t.mu.Lock()
t.device = device
t.mu.Unlock()
// Delay crucial para BT 4.0 estabilizar a conexão antes de pedir serviços
bleLog("Aguardando estabilização (2s)...")
time.Sleep(2 * time.Second)
bleLog("DiscoverServices...")
services, err = device.DiscoverServices(nil)
if err != nil {
bleLog(fmt.Sprintf(" DiscoverServices erro: %v", err))
// Tenta mais uma vez após um pequeno delay antes de desistir do ciclo
time.Sleep(1 * time.Second)
bleLog("DiscoverServices (retry)...")
services, err = device.DiscoverServices(nil)
if err != nil {
bleLog(fmt.Sprintf(" DiscoverServices retry erro: %v", err))
go func() { defer func() { recover() }(); device.Disconnect() }()
continue
}
}
break
}
if err != nil {
return fmt.Errorf("erro ao descobrir serviços: %w", err)
fmt.Println("[BLE] Buscando Serviço...")
services, err := device.DiscoverServices([]bluetooth.UUID{NusServiceUUID})
if err != nil || len(services) == 0 {
return errors.New("serviço não encontrado")
}
bleLog(fmt.Sprintf("Serviços encontrados: %d", len(services)))
nusIdx := -1
for i, s := range services {
bleLog(fmt.Sprintf(" [%d] %s", i, s.UUID().String()))
if s.UUID() == NusServiceUUID {
nusIdx = i
}
}
if nusIdx < 0 {
return errors.New("serviço NUS não encontrado")
}
bleLog("Buscando característica RX...")
chars, err := services[nusIdx].DiscoverCharacteristics([]bluetooth.UUID{NusRxUUID})
fmt.Println("[BLE] Buscando RX...")
chars, err := services[0].DiscoverCharacteristics([]bluetooth.UUID{NusRxUUID})
if err != nil || len(chars) == 0 {
return errors.New("característica não encontrada")
}