Skip to content

Commit 52c3c06

Browse files
jagobagascondeadprogram
authored andcommitted
winrt: bump to latest
The latest version of winrt-go fixes an error that could cause function name collisions for static methods. Diff: saltosystems/winrt-go@43a7178...a2e4fc0
1 parent 852fa4a commit 52c3c06

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

gap_windows.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func getScanResultFromArgs(args *advertisement.BluetoothLEAdvertisementReceivedE
150150
}
151151

152152
func bufferToSlice(buffer *streams.IBuffer) []byte {
153-
dataReader, _ := streams.FromBuffer(buffer)
153+
dataReader, _ := streams.DataReaderFromBuffer(buffer)
154154
defer dataReader.Release()
155155
bufferSize, _ := buffer.GetLength()
156156
if bufferSize == 0 {
@@ -186,7 +186,7 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
186186
}
187187

188188
// IAsyncOperation<BluetoothLEDevice>
189-
bleDeviceOp, err := bluetooth.FromBluetoothAddressAsync(winAddr)
189+
bleDeviceOp, err := bluetooth.BluetoothLEDeviceFromBluetoothAddressAsync(winAddr)
190190
if err != nil {
191191
return Device{}, err
192192
}
@@ -219,7 +219,7 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
219219
// Windows does not support explicitly connecting to a device.
220220
// Instead it has the concept of a GATT session that is owned
221221
// by the calling program.
222-
gattSessionOp, err := genericattributeprofile.FromDeviceIdAsync(dID) // IAsyncOperation<GattSession>
222+
gattSessionOp, err := genericattributeprofile.GattSessionFromDeviceIdAsync(dID) // IAsyncOperation<GattSession>
223223
if err != nil {
224224
return Device{}, err
225225
}

gattc_windows.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ func (c DeviceCharacteristic) Read(data []byte) (int, error) {
341341
return 0, err
342342
}
343343

344-
datareader, err := streams.FromBuffer(buffer)
344+
datareader, err := streams.DataReaderFromBuffer(buffer)
345345
if err != nil {
346346
return 0, err
347347
}
@@ -381,7 +381,7 @@ func (c DeviceCharacteristic) EnableNotifications(callback func(buf []byte)) err
381381
return
382382
}
383383

384-
reader, err := streams.FromBuffer(buf)
384+
reader, err := streams.DataReaderFromBuffer(buf)
385385
if err != nil {
386386
return
387387
}

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/go-ole/go-ole v1.2.6
77
github.com/godbus/dbus/v5 v5.1.0
8-
github.com/saltosystems/winrt-go v0.0.0-20240312144256-43a71786fba4
8+
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4
99
github.com/tinygo-org/cbgo v0.0.4
1010
golang.org/x/crypto v0.12.0
1111
tinygo.org/x/drivers v0.26.1-0.20230922160320-ed51435c2ef6

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
1010
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
1111
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1212
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
13-
github.com/saltosystems/winrt-go v0.0.0-20240312144256-43a71786fba4 h1:3R7V8/xskRIAxAfHKDRWHu5pey0uiyf4wio2RwLXGyM=
14-
github.com/saltosystems/winrt-go v0.0.0-20240312144256-43a71786fba4/go.mod h1:CIltaIm7qaANUIvzr0Vmz71lmQMAIbGJ7cvgzX7FMfA=
13+
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4 h1:zurEWtOr/OYiTb5bcD7eeHLOfj6vCR30uldlwse1cSM=
14+
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4/go.mod h1:CIltaIm7qaANUIvzr0Vmz71lmQMAIbGJ7cvgzX7FMfA=
1515
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
1616
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
1717
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=

0 commit comments

Comments
 (0)