From c5ab6a9b65bb3eba259cabfc641f78f377febb3e Mon Sep 17 00:00:00 2001 From: deadprogram Date: Fri, 5 Jan 2024 17:16:14 +0100 Subject: [PATCH] ninafw: use NINA settings from board file in main TinyGo repo Signed-off-by: deadprogram --- adapter_ninafw.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/adapter_ninafw.go b/adapter_ninafw.go index 59115fb..7ff3c05 100644 --- a/adapter_ninafw.go +++ b/adapter_ninafw.go @@ -19,7 +19,6 @@ type Adapter struct { isDefault bool scanning bool - reset func() connectHandler func(device Address, connected bool) connectedDevices []*Device @@ -31,7 +30,6 @@ type Adapter struct { // Make sure to call Enable() before using it to initialize the adapter. var DefaultAdapter = &Adapter{ isDefault: true, - reset: resetNINAInverted, connectHandler: func(device Address, connected bool) { return }, @@ -45,14 +43,19 @@ func (a *Adapter) Enable() error { machine.NINA_CS.Configure(machine.PinConfig{Mode: machine.PinOutput}) machine.NINA_RESETN.Configure(machine.PinConfig{Mode: machine.PinOutput}) machine.NINA_CS.Low() - a.reset() + + if machine.NINA_RESET_INVERTED { + resetNINAInverted() + } else { + resetNINA() + } // serial port for nina chip uart := machine.UART1 uart.Configure(machine.UARTConfig{ TX: machine.NINA_TX, RX: machine.NINA_RX, - BaudRate: 115200, + BaudRate: machine.NINA_BAUDRATE, CTS: machine.NINA_CTS, RTS: machine.NINA_RTS, })