diff --git a/.gitmodules b/.gitmodules
index b422b45..0a934ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/LoRaMac-node"]
 	path = src/LoRaMac-node
-	url = https://github.com/Lora-net/LoRaMac-node.git
+	url = https://github.com/boston-engineering/LoRaMac-node.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3da2380..f980f89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,10 @@ set(COMPONENT_SRCS
 "src/LoRaMac-node/src/apps/LoRaMac/common/LmHandler/packages/LmhpClockSync.c"
 "src/LoRaMac-node/src/apps/LoRaMac/common/LmHandler/packages/LmhpCompliance.c"
 "src/LoRaMac-node/src/mac/region/Region.c"
+"src/LoRaMac-node/src/mac/region/RegionBaseUS.c"
 "src/LoRaMac-node/src/mac/region/RegionCommon.c"
 "src/LoRaMac-node/src/mac/region/RegionEU868.c"
+"src/LoRaMac-node/src/mac/region/RegionUS915.c"
 )
 
 # idf.py build 2>&1 | tee LOG | grep "undefined reference" | sed -e 's/.*reference to//' | sort | uniq
@@ -54,7 +56,14 @@ set(COMPONENT_ADD_INCLUDEDIRS
     "src/LoRaMac-node/src/peripherals/soft-se"
 )
 
-register_component()
+idf_component_register(SRCS ${COMPONENT_SRCS}
+                       INCLUDE_DIRS ${COMPONENT_ADD_INCLUDEDIRS}
+                       REQUIRES ${COMPONENT_REQUIRES}
+)
 
-add_definitions(-DREGION_EU868=1)
+include_directories(
+    $ENV{IDF_PATH}/components/driver/gpio/include
+    $ENV{IDF_PATH}/components/driver/spi/include
+    $ENV{IDF_PATH}/components/esp_timer/include
+)
 add_definitions(-DSOFT_SE)
diff --git a/Kconfig b/Kconfig
new file mode 100644
index 0000000..c170da5
--- /dev/null
+++ b/Kconfig
@@ -0,0 +1,47 @@
+menu "SX126x Configuration"
+
+    config SX126X_SPI_MISO_GPIO
+        int "SX126x SPI MISO GPIO"
+        help
+            Set the GPIO number used for SPI MISO.
+
+    config SX126X_SPI_MOSI_GPIO
+        int "SX126x SPI MOSI GPIO"
+        help
+            Set the GPIO number used for SPI MOSI.
+
+    config SX126X_SPI_SCLK_GPIO
+        int "SX126x SPI SCLK GPIO"
+        help
+            Set the GPIO number used for SPI SCLK.
+
+    config SX126X_SPI_CS_GPIO
+        int "SX126x SPI CS GPIO"
+        help
+            Set the GPIO number used for SPI CS.
+
+    config SX126X_RESET_GPIO
+        int "SX126x RESET GPIO"
+        help
+            Set the GPIO number used for RESET.
+
+    config SX126X_IRQ_DIO1_GPIO
+        int "SX126x IRQ (DIO1) GPIO"
+        help
+            Set the GPIO number used for IRQ (DIO1).
+
+    config SX126X_BUSY_GPIO
+        int "SX126x BUSY GPIO"
+        help
+            Set the GPIO number used for BUSY.
+
+    config SX126X_SPI_HOST
+        int "SX126x SPI HOST"
+        default 1
+        help
+            The SPI peripheral used to communicate with the SX1262.
+            0 = SPI1_HOST
+            1 = SPI2_HOST
+            2 = SPI3_HOST
+
+endmenu
\ No newline at end of file
diff --git a/README.md b/README.md
index 384e180..5187c1a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,15 @@
 # LoRaMac-node-esp32
-ESP32 port of LoRaMac-node
+#### ESP32 port of LoRaMac-node
+Creates a Semtech SX126x compatible ESP32 component that pulls in all LoRaMac-node sources, allowing for a custom ESP32 board definition to be used.
 
-This is work in progress - not usable yet
+## Compatibility
+This library is written for and is currently only compatible with Semtech SX126x LoRaWAN chips.
+
+## Configuration
+- Running menuconfig with LoRaMac-node-esp32 added as a component will allow for configuration of SPI pins and the host to be used.
+- Region(s) of operation must be selected by pulling in one of the pre-processor definitions used by LoRaMac-node, e.g. `REGION_US915`.
+  - Regions are listed in `src/LoRaMac-node/src/mac/region/Region.h`
+
+## Notes
+- `SX126xWaitOnBusy()` indefinitely blocks with a busy wait, waiting for a low BUSY signal 
+- This is work in progress - not usable yet
diff --git a/idf_component.yml b/idf_component.yml
new file mode 100644
index 0000000..d9e375f
--- /dev/null
+++ b/idf_component.yml
@@ -0,0 +1,4 @@
+description: Creates an ESP32 component to allow ESP32 board compatibility with the LoRaMac-node stack.
+dependencies:
+  idf:
+    version: ">=5.0"
diff --git a/src/LoRaMac-node b/src/LoRaMac-node
index 2bf36bd..5aa59d0 160000
--- a/src/LoRaMac-node
+++ b/src/LoRaMac-node
@@ -1 +1 @@
-Subproject commit 2bf36bde72f68257eb96b5c00900619546bedca8
+Subproject commit 5aa59d026a883e00f3226d74101b2a73735ca99e
diff --git a/src/board/generic_esp32/generic-esp32-board.c b/src/board/generic_esp32/generic-esp32-board.c
index 478ba6a..9ac7424 100644
--- a/src/board/generic_esp32/generic-esp32-board.c
+++ b/src/board/generic_esp32/generic-esp32-board.c
@@ -1,30 +1,133 @@
-
+/* In this implementation, milliseconds units are used throughout. Ticks are milliseconds. */
 #include "sdkconfig.h"
 
 #include "freertos/FreeRTOS.h"
 #include "esp_err.h"
 #include "esp_log.h"
+#include "esp_timer.h"
+
+#include "driver/gpio.h"
+#include "driver/spi_common.h"
+#include "driver/spi_master.h"
 
 #include "freertos/task.h"
 
 // from LoRaMac
 #include "board.h"
+#include "timer.h"
 
 // ANSI
 #include <string.h>
-
+#include <sys/time.h>
+
+#define ESP_INTR_FLAG_DEFAULT   0
+
+#define HZ_PER_KHZ  1000
+#define KHZ_PER_MHZ 1000
+#define HZ_PER_MHZ  (HZ_PER_KHZ * KHZ_PER_MHZ)
+
+#define MS_PER_S    1000
+#define US_PER_MS   1000
+#define US_PER_S    (MS_PER_S * US_PER_MS)
+
+#define SX126X_MAX_SPI_CLOCK_SPEED_MHZ      16
+#define SX126X_NUM_COMMAND_BITS             8
+#define SX126X_NUM_REGISTER_ADDRESS_BITS    16
+#define SX126X_NUM_COMMAND_ADDRESS_BITS     0
+#define SX126X_NUM_BUFFER_OFFSET_BITS       8
+
+typedef struct spi_s {
+    spi_device_handle_t handle;
+    gpio_num_t miso;
+    gpio_num_t mosi;
+    gpio_num_t sclk;
+    gpio_num_t cs;
+    gpio_num_t reset;
+    gpio_num_t irq_dio1;
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    gpio_num_t busy;
+#endif
+} spi_c;
+
+static spi_c lora_spi;
 
 static const char *TAG = "ESP32Board";
 
 static portMUX_TYPE my_spinlock = portMUX_INITIALIZER_UNLOCKED;
 
+static esp_timer_handle_t irq_timer_handle;
+static uint32_t rtc_timer_context;
+static uint32_t alarm_start_time;
+
+static void IrqTimerExpiryCallback(void* arg) {
+    TimerIrqHandler();
+}
+
 void BoardInitMcu( void )
 {
 }
 
 void BoardInitPeriph(void)
 {
-
+    // Create timer
+    const esp_timer_create_args_t timer_args = {
+        .callback = &IrqTimerExpiryCallback,
+        .name = "SX126X IRQ Timer"
+    };
+    ESP_ERROR_CHECK(esp_timer_create(&timer_args, &irq_timer_handle));
+
+    lora_spi.miso = CONFIG_SX126X_SPI_MISO_GPIO;
+    lora_spi.mosi = CONFIG_SX126X_SPI_MOSI_GPIO;
+    lora_spi.sclk = CONFIG_SX126X_SPI_SCLK_GPIO;
+    lora_spi.cs = CONFIG_SX126X_SPI_CS_GPIO;
+    lora_spi.reset = CONFIG_SX126X_RESET_GPIO;
+    lora_spi.irq_dio1 = CONFIG_SX126X_IRQ_DIO1_GPIO;
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    lora_spi.busy = CONFIG_SX126X_BUSY_GPIO;
+
+    gpio_config_t busy_conf = {
+        (1ULL<<lora_spi.busy),
+        GPIO_MODE_INPUT,
+        GPIO_PULLUP_DISABLE,
+        GPIO_PULLDOWN_ENABLE,
+        GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&busy_conf));
+#endif
+
+    gpio_config_t cfg_reset_output = {
+        (1ULL<<lora_spi.reset),
+        GPIO_MODE_OUTPUT,
+        GPIO_PULLUP_ENABLE,
+        GPIO_PULLDOWN_DISABLE,
+        GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&cfg_reset_output));
+
+    CRITICAL_SECTION_BEGIN();
+
+    // SPI initialization
+    spi_bus_config_t buscfg = {
+        .miso_io_num = lora_spi.miso,
+        .mosi_io_num = lora_spi.mosi,
+        .sclk_io_num = lora_spi.sclk,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1
+    };
+    spi_device_interface_config_t devcfg = {
+        .clock_speed_hz = SX126X_MAX_SPI_CLOCK_SPEED_MHZ * HZ_PER_MHZ,
+        .mode = 0,
+        .spics_io_num = lora_spi.cs,
+        .command_bits = SX126X_NUM_COMMAND_BITS,
+        .address_bits = SX126X_NUM_REGISTER_ADDRESS_BITS,
+        .queue_size = 1 // using ESP32 synchronous SPI API, will only ever be one transaction "in the air" at a time.
+        // https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/spi_master.html#_CPPv4N29spi_device_interface_config_t10queue_sizeE
+    };
+    ESP_ERROR_CHECK(spi_bus_initialize((spi_host_device_t)CONFIG_SX126X_SPI_HOST, &buscfg, SPI_DMA_CH_AUTO));
+
+    ESP_ERROR_CHECK(spi_bus_add_device((spi_host_device_t)CONFIG_SX126X_SPI_HOST, &devcfg, &lora_spi.handle));
+
+    CRITICAL_SECTION_END();
 }
 
 void BoardResetMcu( void )
@@ -179,8 +282,12 @@ void RtcBkupRead( uint32_t *data0, uint32_t *data1 )
  */
 uint32_t RtcGetCalendarTime( uint16_t *milliseconds )
 {
-    *milliseconds = 29;
-    return  42 /* seconds */;
+    int64_t time_us = esp_timer_get_time();
+    uint32_t time_s = (uint32_t)(time_us / US_PER_S);
+
+    *milliseconds = (uint16_t)((time_us / US_PER_MS) % MS_PER_S);
+
+    return time_s;
 }
 
 /*!
@@ -200,7 +307,13 @@ uint32_t RtcGetMinimumTimeout( void )
  */
 uint32_t RtcGetTimerElapsedTime( void )
 {
-    return 0;
+    int64_t current_time_ms;
+    uint32_t elapsed_time_ms;
+
+    current_time_ms = esp_timer_get_time() / US_PER_MS;
+    elapsed_time_ms = current_time_ms - alarm_start_time; 
+
+    return elapsed_time_ms;
 }
 
 /*!
@@ -210,7 +323,7 @@ uint32_t RtcGetTimerElapsedTime( void )
  */
 uint32_t RtcGetTimerValue( void )
 {
-    return 0;
+    return (esp_timer_get_time() / US_PER_MS);
 }
 
 /*!
@@ -221,7 +334,7 @@ uint32_t RtcGetTimerValue( void )
  */
 uint32_t RtcMs2Tick( TimerTime_t milliseconds )
 {
-    return 0;
+    return milliseconds;
 }
 
 
@@ -233,7 +346,7 @@ uint32_t RtcMs2Tick( TimerTime_t milliseconds )
  */
 TimerTime_t RtcTick2Ms( uint32_t tick )
 {
-    return 0;
+    return tick;
 }
 
 
@@ -244,7 +357,19 @@ TimerTime_t RtcTick2Ms( uint32_t tick )
  */
 uint32_t RtcSetTimerContext( void )
 {
-    return 0;
+    rtc_timer_context = esp_timer_get_time() / US_PER_MS;
+
+    return rtc_timer_context;
+}
+
+
+/*!
+ * \brief Gets the RTC timer reference
+ *
+ * \retval value Timer reference value in ticks
+ */
+uint32_t RtcGetTimerContext( void ) {
+    return rtc_timer_context;
 }
 
 
@@ -257,7 +382,16 @@ uint32_t RtcSetTimerContext( void )
  */
 void RtcSetAlarm( uint32_t timeout )
 {
-    
+    uint32_t timeout_us = timeout * US_PER_MS;
+
+    alarm_start_time = esp_timer_get_time() / US_PER_MS;
+
+    if (esp_timer_is_active(irq_timer_handle)) {
+        ESP_ERROR_CHECK(esp_timer_restart(irq_timer_handle, timeout_us));
+    }
+    else {
+        ESP_ERROR_CHECK(esp_timer_start_once(irq_timer_handle, timeout_us));
+    }
 }
 
 /*!
@@ -265,7 +399,9 @@ void RtcSetAlarm( uint32_t timeout )
  */
 void RtcStopAlarm( void )
 {
-    
+    if (esp_timer_is_active(irq_timer_handle)) {
+        ESP_ERROR_CHECK(esp_timer_stop(irq_timer_handle));
+    }
 }
 
 
@@ -278,12 +414,34 @@ void RtcStopAlarm( void )
 
 static RadioOperatingModes_t OperatingMode;
 
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+void SX126xWaitOnBusy( void )
+{
+    while(gpio_get_level(lora_spi.busy) == 1) {
+        vTaskDelay(pdTICKS_TO_MS(1));
+    };
+}
+#endif
+
 /*!
  * \brief HW Reset of the radio
  */
 void SX126xReset( void )
 {
+    ESP_ERROR_CHECK(gpio_set_level(lora_spi.reset, 0));
 
+    // Hold low for at least 100us.
+    // SX1261/2 Datasheet, Rev 1.1 Section 8.1 Reset
+    DelayMs(1);
+
+    ESP_ERROR_CHECK(gpio_set_level(lora_spi.reset, 1));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    // Wait for chip to be ready.
+    SX126xWaitOnBusy();
+#endif
+
+    SX126xSetOperatingMode(MODE_STDBY_RC);
 }
 
 /*!
@@ -291,9 +449,29 @@ void SX126xReset( void )
  */
 void SX126xWakeup( void )
 {
+    CRITICAL_SECTION_BEGIN( );
+
+    ESP_ERROR_CHECK(gpio_set_level(lora_spi.cs, 0));
+    ESP_ERROR_CHECK(gpio_set_level(lora_spi.cs, 1));
 
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    // Wait for chip to be ready.
+    SX126xWaitOnBusy();
+#endif
+
+    // Update operating mode context variable
+    SX126xSetOperatingMode(MODE_STDBY_RC);
+
+    CRITICAL_SECTION_END( );
 }
 
+/*!
+ * \brief Initializes the RF Switch I/Os pins interface
+ */
+void SX126xAntSwOn( void )
+{
+    // No antenna switch available on this board design.
+}
 
 /*!
  * \brief De-initializes the RF Switch I/Os pins interface
@@ -302,7 +480,7 @@ void SX126xWakeup( void )
  */
 void SX126xAntSwOff( void )
 {
-
+    // No antenna switch available on this board design.
 }
 
 /*!
@@ -322,7 +500,11 @@ uint32_t SX126xGetBoardTcxoWakeupTime( void )
  */
 uint8_t SX126xGetDeviceId( void )
 {
+#ifdef SX1261MBXBAS
+    return SX1261;
+#elif defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
     return SX1262;
+#endif
 }
 
 /*!
@@ -355,8 +537,17 @@ void SX126xSetOperatingMode( RadioOperatingModes_t mode )
  */
 void SX126xIoIrqInit( DioIrqHandler dioIrq )
 {
-    //GpioSetInterrupt( &SX126x.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, dioIrq );
-
+    gpio_config_t io_conf = {
+        (1ULL<<lora_spi.irq_dio1),
+        GPIO_MODE_INPUT,
+        GPIO_PULLUP_DISABLE,
+        GPIO_PULLDOWN_ENABLE,
+        GPIO_INTR_POSEDGE
+    };
+    ESP_ERROR_CHECK(gpio_config(&io_conf));
+    ESP_ERROR_CHECK(gpio_set_intr_type(lora_spi.irq_dio1, GPIO_INTR_POSEDGE));
+    ESP_ERROR_CHECK(gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT));
+    ESP_ERROR_CHECK(gpio_isr_handler_add(lora_spi.irq_dio1, dioIrq, (void*) lora_spi.irq_dio1));
 }
 
 /*!
@@ -366,7 +557,7 @@ void SX126xIoIrqInit( DioIrqHandler dioIrq )
  */
 uint32_t SX126xGetDio1PinState( void )
 {
-    return 0;
+    return gpio_get_level(lora_spi.irq_dio1);
 }
 
 /*!
@@ -374,7 +565,7 @@ uint32_t SX126xGetDio1PinState( void )
  */
 void SX126xIoRfSwitchInit( void )
 {
-
+    SX126xSetDio2AsRfSwitchCtrl(true);
 }
 
 /*!
@@ -382,7 +573,7 @@ void SX126xIoRfSwitchInit( void )
  */
 void SX126xIoTcxoInit( void )
 {
-
+    // No TCXO component available on this board design.
 }
 
 /*!
@@ -392,7 +583,7 @@ void SX126xIoTcxoInit( void )
  */
 void SX126xSetRfTxPower( int8_t power )
 {
-
+    SX126xSetTxParams( power, RADIO_RAMP_40_US );
 }
 
 // SPI stuff
@@ -405,7 +596,7 @@ void SX126xSetRfTxPower( int8_t power )
  */
 void SX126xWriteRegister( uint16_t address, uint8_t value )
 {
-
+    SX126xWriteRegisters(address, &value, 1);
 }
 
 /*!
@@ -417,15 +608,49 @@ void SX126xWriteRegister( uint16_t address, uint8_t value )
  */
 uint8_t SX126xReadRegister( uint16_t address )
 {
-    return 0;    
+    uint8_t data;
+    SX126xReadRegisters(address, &data, 1);
+    return data;
 }
 
 void SX126xReadRegisters( uint16_t address, uint8_t *buffer, uint16_t size )
 {
-    
+    spi_transaction_t trans = {
+        .cmd = RADIO_READ_REGISTER,
+        .addr = address,
+        .rx_buffer = buffer,
+        .length = size * 8  // size is in bits, not bytes
+                            // https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/spi_master.html#_CPPv4N17spi_transaction_t6lengthE
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
+
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, &trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
 }
 void SX126xWriteRegisters( uint16_t address, uint8_t *buffer, uint16_t size )
 {
+    spi_transaction_t trans = {
+        .cmd = RADIO_WRITE_REGISTER,
+        .addr = address,
+        .tx_buffer = buffer,
+        .length = size * 8
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
+
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, &trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
 }
 
 /*!
@@ -437,7 +662,25 @@ void SX126xWriteRegisters( uint16_t address, uint8_t *buffer, uint16_t size )
  */
 void SX126xWriteCommand( RadioCommands_t opcode, uint8_t *buffer, uint16_t size )
 {
+    spi_transaction_ext_t trans = {
+        .base = {
+            .cmd = opcode,
+            .tx_buffer = buffer,
+            .length = size * 8,
+            .flags = SPI_TRANS_VARIABLE_ADDR,
+        },
+        .address_bits = SX126X_NUM_COMMAND_ADDRESS_BITS
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
 
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, (spi_transaction_t *)&trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
 }
 
 /*!
@@ -451,14 +694,74 @@ void SX126xWriteCommand( RadioCommands_t opcode, uint8_t *buffer, uint16_t size
  */
 uint8_t SX126xReadCommand( RadioCommands_t opcode, uint8_t *buffer, uint16_t size )
 {
+    spi_transaction_ext_t trans = {
+        .base = {
+            .cmd = opcode,
+            .rx_buffer = buffer,
+            .length = size * 8,
+            .flags = SPI_TRANS_VARIABLE_ADDR,
+        },
+        .address_bits = SX126X_NUM_COMMAND_ADDRESS_BITS
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
+
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, (spi_transaction_t *)&trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
+
     return 0;
 }
 
 void SX126xReadBuffer( uint8_t offset, uint8_t *buffer, uint8_t size )
 {
+    spi_transaction_ext_t trans = {
+        .base = {
+            .cmd = RADIO_READ_BUFFER,
+            .addr = offset,
+            .rx_buffer = buffer,
+            .length = size * 8,
+            .flags = SPI_TRANS_VARIABLE_ADDR,
+        },
+        .address_bits = SX126X_NUM_BUFFER_OFFSET_BITS
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
+
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, (spi_transaction_t *)&trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
 }
 
 void SX126xWriteBuffer( uint8_t offset, uint8_t *buffer, uint8_t size )
 {
+    spi_transaction_ext_t trans = {
+        .base = {
+            .cmd = RADIO_WRITE_BUFFER,
+            .addr = offset,
+            .tx_buffer = buffer,
+            .length = size * 8,
+            .flags = SPI_TRANS_VARIABLE_ADDR,
+        },
+        .address_bits = SX126X_NUM_BUFFER_OFFSET_BITS
+    };
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xCheckDeviceReady();
+#endif
+
+    ESP_ERROR_CHECK(spi_device_transmit(lora_spi.handle, (spi_transaction_t *)&trans));
+
+#if defined(SX1261MBXBAS) || defined(SX1262MBXCAS) || defined(SX1262MBXDAS)
+    SX126xWaitOnBusy();
+#endif
 }