diff --git a/examples/lora/lorawan/common/sx126x.go b/examples/lora/lorawan/common/sx126x.go index 7d13d34..5d22d6e 100644 --- a/examples/lora/lorawan/common/sx126x.go +++ b/examples/lora/lorawan/common/sx126x.go @@ -20,13 +20,13 @@ var ( ) var ( - spi = machine.SPI0 - nssPin, busyPin, dio0Pin, dio1Pin = machine.GP17, machine.GP20, machine.GP11, machine.GP10 - rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 + spi = machine.SPI0 + nssPin, busyPin, dio1Pin = machine.GP17, machine.GP10, machine.GP11 + rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 ) func newRadioControl() sx126x.RadioController { - return sx126x.NewRadioControl(nssPin, busyPin, dio0Pin, dio1Pin, rxPin, txLowPin, txHighPin) + return sx126x.NewRadioControl(nssPin, busyPin, dio1Pin, rxPin, txLowPin, txHighPin) } // do sx126x setup here diff --git a/examples/sx126x/lora_continuous/radio.go b/examples/sx126x/lora_continuous/radio.go index 2778164..8657026 100644 --- a/examples/sx126x/lora_continuous/radio.go +++ b/examples/sx126x/lora_continuous/radio.go @@ -9,11 +9,11 @@ import ( ) var ( - spi = machine.SPI0 - nssPin, busyPin, dio0Pin, dio1Pin = machine.GP17, machine.GP20, machine.GP11, machine.GP10 - rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 + spi = machine.SPI0 + nssPin, busyPin, dio1Pin = machine.GP17, machine.GP10, machine.GP11 + rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 ) func newRadioControl() sx126x.RadioController { - return sx126x.NewRadioControl(nssPin, busyPin, dio0Pin, dio1Pin, rxPin, txLowPin, txHighPin) + return sx126x.NewRadioControl(nssPin, busyPin, dio1Pin, rxPin, txLowPin, txHighPin) } diff --git a/examples/sx126x/lora_rxtx/radio.go b/examples/sx126x/lora_rxtx/radio.go index 2778164..8657026 100644 --- a/examples/sx126x/lora_rxtx/radio.go +++ b/examples/sx126x/lora_rxtx/radio.go @@ -9,11 +9,11 @@ import ( ) var ( - spi = machine.SPI0 - nssPin, busyPin, dio0Pin, dio1Pin = machine.GP17, machine.GP20, machine.GP11, machine.GP10 - rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 + spi = machine.SPI0 + nssPin, busyPin, dio1Pin = machine.GP17, machine.GP10, machine.GP11 + rxPin, txLowPin, txHighPin = machine.GP13, machine.GP12, machine.GP12 ) func newRadioControl() sx126x.RadioController { - return sx126x.NewRadioControl(nssPin, busyPin, dio0Pin, dio1Pin, rxPin, txLowPin, txHighPin) + return sx126x.NewRadioControl(nssPin, busyPin, dio1Pin, rxPin, txLowPin, txHighPin) } diff --git a/sx126x/radiocontrol_pins.go b/sx126x/radiocontrol_pins.go index 9c15ec5..f2f4799 100644 --- a/sx126x/radiocontrol_pins.go +++ b/sx126x/radiocontrol_pins.go @@ -8,17 +8,17 @@ import ( "time" ) +// RadioControl for boards that are connected using normal pins. type RadioControl struct { - nssPin, busyPin, dio0Pin, dio1Pin machine.Pin - rxPin, txLowPin, txHighPin machine.Pin + nssPin, busyPin, dio1Pin machine.Pin + rxPin, txLowPin, txHighPin machine.Pin } -func NewRadioControl(nssPin, busyPin, dio0Pin, dio1Pin, +func NewRadioControl(nssPin, busyPin, dio1Pin, rxPin, txLowPin, txHighPin machine.Pin) *RadioControl { return &RadioControl{ nssPin: nssPin, busyPin: busyPin, - dio0Pin: dio0Pin, dio1Pin: dio1Pin, rxPin: rxPin, txLowPin: txLowPin, @@ -56,11 +56,6 @@ func (rc *RadioControl) Init() error { func (rc *RadioControl) SetupInterrupts(handler func()) error { irqHandler = handler - rc.dio0Pin.Configure(machine.PinConfig{Mode: machine.PinInputPulldown}) - if err := rc.dio0Pin.SetInterrupt(machine.PinRising, handleInterrupt); err != nil { - return errRadioNotFound - } - rc.dio1Pin.Configure(machine.PinConfig{Mode: machine.PinInputPulldown}) if err := rc.dio1Pin.SetInterrupt(machine.PinRising, handleInterrupt); err != nil { return errRadioNotFound