nrf: fix CGo errors after TinyGo update

For details, see: https://github.com/tinygo-org/tinygo/pull/2774
This commit is contained in:
Ayke van Laethem 2022-04-13 18:02:17 +02:00 committed by Ron Evans
parent e75811786c
commit 4c0df2892d
4 changed files with 12 additions and 3 deletions

@ -10,6 +10,14 @@ import (
"unsafe"
)
// #include "ble.h"
// #ifdef NRF51
// #include "nrf_soc.h"
// #else
// #include "nrf_nvic.h"
// #endif
import "C"
var (
ErrNotDefaultAdapter = errors.New("bluetooth: not the default adapter")
)

@ -134,7 +134,7 @@ func (d *Device) DiscoverServices(uuids []UUID) ([]DeviceService, error) {
// Store the discovered service.
svc := DeviceService{
uuid: suuid,
uuid: shortUUID(suuid),
connectionHandle: d.connectionHandle,
startHandle: startHandle,
endHandle: endHandle,
@ -276,7 +276,7 @@ func (s *DeviceService) DiscoverCharacteristics(uuids []UUID) ([]DeviceCharacter
permissions |= CharacteristicIndicatePermission
}
dc := DeviceCharacteristic{uuid: discoveringCharacteristic.uuid}
dc := DeviceCharacteristic{uuid: shortUUID(discoveringCharacteristic.uuid)}
dc.permissions = permissions
dc.valueHandle = foundCharacteristicHandle

@ -8,6 +8,7 @@ package bluetooth
#define SVCALL_AS_NORMAL_FUNCTION
#include "ble_gap.h"
#include "ble_gatts.h"
*/
import "C"

@ -39,7 +39,7 @@ func (s shortUUID) UUID() UUID {
// IsIn checks the passed in slice of short UUIDs to see if this uuid is in it.
func (s shortUUID) IsIn(uuids []C.ble_uuid_t) bool {
for _, u := range uuids {
if u == s {
if shortUUID(u) == s {
return true
}
}