diff --git a/source/Core/BSP/Miniware/BSP_PD.c b/source/Core/BSP/Miniware/BSP_PD.c
deleted file mode 100644
index f2612726..00000000
--- a/source/Core/BSP/Miniware/BSP_PD.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * BSP_PD.c
- *
- *  Created on: 21 Jul 2020
- *      Author: Ralim
- */
-
-#include "BSP_PD.h"
-#include "Model_Config.h"
-#ifdef POW_PD
-
-#endif
diff --git a/source/Core/BSP/Miniware/fusb302b.cpp b/source/Core/BSP/Miniware/fusb302b.cpp
deleted file mode 100644
index 99cdf495..00000000
--- a/source/Core/BSP/Miniware/fusb302b.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * PD Buddy Firmware Library - USB Power Delivery for everyone
- * Copyright 2017-2018 Clayton G. Hobbs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "Model_Config.h"
-#ifdef POW_PD
-#include "BSP.h"
-#include "I2CBB.hpp"
-#include "fusb302b.h"
-#include "int_n.h"
-#include <pd.h>
-/*
- * Read a single byte from the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address from which to read
- *
- * Returns the value read from addr.
- */
-static uint8_t fusb_read_byte(uint8_t addr) {
-  uint8_t data[1];
-  if (!I2CBB::Mem_Read(FUSB302B_ADDR, addr, (uint8_t *)data, 1)) {
-    return 0;
-  }
-  return data[0];
-}
-
-/*
- * Read multiple bytes from the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address from which to read
- * size: The number of bytes to read
- * buf: The buffer into which data will be read
- */
-static bool fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf) { return I2CBB::Mem_Read(FUSB302B_ADDR, addr, buf, size); }
-
-/*
- * Write a single byte to the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address to which we will write
- * byte: The value to write
- */
-static bool fusb_write_byte(uint8_t addr, uint8_t byte) { return I2CBB::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)&byte, 1); }
-
-/*
- * Write multiple bytes to the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address to which we will write
- * size: The number of bytes to write
- * buf: The buffer to write
- */
-static bool fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf) { return I2CBB::Mem_Write(FUSB302B_ADDR, addr, buf, size); }
-
-void fusb_send_message(const union pd_msg *msg) {
-  if (!I2CBB::lock2()) {
-    return;
-  }
-  /* Token sequences for the FUSB302B */
-  static uint8_t       sop_seq[5] = {FUSB_FIFO_TX_SOP1, FUSB_FIFO_TX_SOP1, FUSB_FIFO_TX_SOP1, FUSB_FIFO_TX_SOP2, FUSB_FIFO_TX_PACKSYM};
-  static const uint8_t eop_seq[4] = {FUSB_FIFO_TX_JAM_CRC, FUSB_FIFO_TX_EOP, FUSB_FIFO_TX_TXOFF, FUSB_FIFO_TX_TXON};
-
-  /* Take the I2C2 mutex now so there can't be a race condition on sop_seq */
-  /* Get the length of the message: a two-octet header plus NUMOBJ four-octet
-   * data objects */
-  uint8_t msg_len = 2 + 4 * PD_NUMOBJ_GET(msg);
-
-  /* Set the number of bytes to be transmitted in the packet */
-  sop_seq[4] = FUSB_FIFO_TX_PACKSYM | msg_len;
-
-  /* Write all three parts of the message to the TX FIFO */
-  fusb_write_buf(FUSB_FIFOS, 5, sop_seq);
-  fusb_write_buf(FUSB_FIFOS, msg_len, msg->bytes);
-  fusb_write_buf(FUSB_FIFOS, 4, eop_seq);
-
-  I2CBB::unlock2();
-}
-
-uint8_t fusb_read_message(union pd_msg *msg) {
-  if (!I2CBB::lock2()) {
-    asm("bkpt");
-  }
-  static uint8_t garbage[4];
-  uint8_t        numobj;
-
-  // Read the header. If its not a SOP we dont actually want it at all
-  // But on some revisions of the fusb if you dont both pick them up and read them out of the fifo, it gets stuck
-  fusb_read_byte(FUSB_FIFOS);
-  /* Read the message header into msg */
-  fusb_read_buf(FUSB_FIFOS, 2, msg->bytes);
-  /* Get the number of data objects */
-  numobj = PD_NUMOBJ_GET(msg);
-  /* If there is at least one data object, read the data objects */
-  if (numobj > 0) {
-    fusb_read_buf(FUSB_FIFOS, numobj * 4, msg->bytes + 2);
-  }
-  /* Throw the CRC32 in the garbage, since the PHY already checked it. */
-  fusb_read_buf(FUSB_FIFOS, 4, garbage);
-
-  I2CBB::unlock2();
-  return 0;
-}
-
-void fusb_send_hardrst() {
-
-  if (!I2CBB::lock2()) {
-    return;
-  }
-  /* Send a hard reset */
-  fusb_write_byte(FUSB_CONTROL3, 0x07 | FUSB_CONTROL3_SEND_HARD_RESET);
-
-  I2CBB::unlock2();
-}
-
-bool fusb_setup() {
-
-  if (!I2CBB::lock2()) {
-    return false;
-  }
-  /* Fully reset the FUSB302B */
-  fusb_write_byte(FUSB_RESET, FUSB_RESET_SW_RES);
-  vTaskDelay(TICKS_10MS);
-  uint8_t tries = 0;
-  while (!fusb_read_id()) {
-    vTaskDelay(TICKS_10MS);
-    tries++;
-    if (tries > 5) {
-      return false; // Welp :(
-    }
-  }
-
-  /* Turn on all power */
-  fusb_write_byte(FUSB_POWER, 0x0F);
-
-  /* Set interrupt masks */
-  // Setting to 0 so interrupts are allowed
-  fusb_write_byte(FUSB_MASK1, 0x00);
-  fusb_write_byte(FUSB_MASKA, 0x00);
-  fusb_write_byte(FUSB_MASKB, 0x00);
-  fusb_write_byte(FUSB_CONTROL0, 0b11 << 2);
-
-  /* Enable automatic retransmission */
-  fusb_write_byte(FUSB_CONTROL3, 0x07);
-  // set defaults
-  fusb_write_byte(FUSB_CONTROL2, 0x00);
-  /* Flush the RX buffer */
-  fusb_write_byte(FUSB_CONTROL1, FUSB_CONTROL1_RX_FLUSH);
-
-  /* Measure CC1 */
-  fusb_write_byte(FUSB_SWITCHES0, 0x07);
-  vTaskDelay(TICKS_10MS);
-  uint8_t cc1 = fusb_read_byte(FUSB_STATUS0) & FUSB_STATUS0_BC_LVL;
-
-  /* Measure CC2 */
-  fusb_write_byte(FUSB_SWITCHES0, 0x0B);
-  vTaskDelay(TICKS_10MS);
-  uint8_t cc2 = fusb_read_byte(FUSB_STATUS0) & FUSB_STATUS0_BC_LVL;
-
-  /* Select the correct CC line for BMC signaling; also enable AUTO_CRC */
-  if (cc1 > cc2) {
-    fusb_write_byte(FUSB_SWITCHES1, 0x25);
-    fusb_write_byte(FUSB_SWITCHES0, 0x07);
-  } else {
-    fusb_write_byte(FUSB_SWITCHES1, 0x26);
-    fusb_write_byte(FUSB_SWITCHES0, 0x0B);
-  }
-  I2CBB::unlock2();
-  fusb_reset();
-  GPIO_InitTypeDef GPIO_InitStruct;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  GPIO_InitStruct.Pin   = GPIO_PIN_9;
-  GPIO_InitStruct.Mode  = GPIO_MODE_IT_FALLING;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-  HAL_NVIC_SetPriority(EXTI9_5_IRQn, 10, 0);
-  HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
-  return true;
-}
-
-void fusb_get_status(union fusb_status *status) {
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    if (!I2CBB::lock2()) {
-      return;
-    }
-  }
-
-  /* Read the interrupt and status flags into status */
-  fusb_read_buf(FUSB_STATUS0A, 7, status->bytes);
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    I2CBB::unlock2();
-  }
-}
-
-enum fusb_typec_current fusb_get_typec_current() {
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    if (!I2CBB::lock2()) {
-      return fusb_tcc_none;
-    }
-  }
-  /* Read the BC_LVL into a variable */
-  enum fusb_typec_current bc_lvl = (enum fusb_typec_current)(fusb_read_byte(FUSB_STATUS0) & FUSB_STATUS0_BC_LVL);
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    I2CBB::unlock2();
-  }
-  return bc_lvl;
-}
-
-void fusb_reset() {
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    if (!I2CBB::lock2()) {
-      return;
-    }
-  }
-
-  /* Flush the TX buffer */
-  fusb_write_byte(FUSB_CONTROL0, 0x44);
-  /* Flush the RX buffer */
-  fusb_write_byte(FUSB_CONTROL1, FUSB_CONTROL1_RX_FLUSH);
-  if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-    I2CBB::unlock2();
-  }
-}
-
-bool fusb_read_id() {
-  // Return true if read of the revision ID is sane
-  uint8_t version = 0;
-  fusb_read_buf(FUSB_DEVICE_ID, 1, &version);
-  if (version == 0 || version == 0xFF)
-    return false;
-  return true;
-}
-uint8_t fusb302_detect() {
-  // Probe the I2C bus for its address
-  return I2CBB::probe(FUSB302B_ADDR);
-}
-
-#endif
diff --git a/source/Core/BSP/Miniware/fusb_user.cpp b/source/Core/BSP/Miniware/fusb_user.cpp
new file mode 100644
index 00000000..5ae87423
--- /dev/null
+++ b/source/Core/BSP/Miniware/fusb_user.cpp
@@ -0,0 +1,68 @@
+#include "Model_Config.h"
+#ifdef POW_PD
+#include "BSP.h"
+#include "I2CBB.hpp"
+#include "Setup.h"
+#include "fusb302b.h"
+#include "fusb_user.h"
+/*
+ * Read a single byte from the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address from which to read
+ *
+ * Returns the value read from addr.
+ */
+uint8_t fusb_read_byte(uint8_t addr) {
+  uint8_t data[1];
+  if (!I2CBB::Mem_Read(FUSB302B_ADDR, addr, (uint8_t *)data, 1)) {
+    return 0;
+  }
+  return data[0];
+}
+
+/*
+ * Read multiple bytes from the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address from which to read
+ * size: The number of bytes to read
+ * buf: The buffer into which data will be read
+ */
+bool fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf) { return I2CBB::Mem_Read(FUSB302B_ADDR, addr, buf, size); }
+
+/*
+ * Write a single byte to the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address to which we will write
+ * byte: The value to write
+ */
+bool fusb_write_byte(uint8_t addr, uint8_t byte) { return I2CBB::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)&byte, 1); }
+
+/*
+ * Write multiple bytes to the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address to which we will write
+ * size: The number of bytes to write
+ * buf: The buffer to write
+ */
+bool fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf) { return I2CBB::Mem_Write(FUSB302B_ADDR, addr, buf, size); }
+
+uint8_t fusb302_detect() {
+  // Probe the I2C bus for its address
+  return I2CBB::probe(FUSB302B_ADDR);
+}
+
+void setupFUSBIRQ() {
+  GPIO_InitTypeDef GPIO_InitStruct;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  GPIO_InitStruct.Pin   = GPIO_PIN_9;
+  GPIO_InitStruct.Mode  = GPIO_MODE_IT_FALLING;
+  GPIO_InitStruct.Pull  = GPIO_PULLUP;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  HAL_NVIC_SetPriority(EXTI9_5_IRQn, 10, 0);
+  HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
+}
+#endif
diff --git a/source/Core/BSP/Pine64/BSP_PD.c b/source/Core/BSP/Pine64/BSP_PD.c
deleted file mode 100644
index f2612726..00000000
--- a/source/Core/BSP/Pine64/BSP_PD.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * BSP_PD.c
- *
- *  Created on: 21 Jul 2020
- *      Author: Ralim
- */
-
-#include "BSP_PD.h"
-#include "Model_Config.h"
-#ifdef POW_PD
-
-#endif
diff --git a/source/Core/BSP/Pine64/fusb_user.cpp b/source/Core/BSP/Pine64/fusb_user.cpp
new file mode 100644
index 00000000..bc62bc62
--- /dev/null
+++ b/source/Core/BSP/Pine64/fusb_user.cpp
@@ -0,0 +1,58 @@
+#include "Model_Config.h"
+#ifdef POW_PD
+#include "BSP.h"
+#include "I2C_Wrapper.hpp"
+#include "Setup.h"
+#include "fusb302b.h"
+#include "fusb_user.h"
+/*
+ * Read a single byte from the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address from which to read
+ *
+ * Returns the value read from addr.
+ */
+uint8_t fusb_read_byte(uint8_t addr) {
+  uint8_t data[1];
+  if (!FRToSI2C::Mem_Read(FUSB302B_ADDR, addr, (uint8_t *)data, 1)) {
+    return 0;
+  }
+  return data[0];
+}
+
+/*
+ * Read multiple bytes from the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address from which to read
+ * size: The number of bytes to read
+ * buf: The buffer into which data will be read
+ */
+bool fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Read(FUSB302B_ADDR, addr, buf, size); }
+
+/*
+ * Write a single byte to the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address to which we will write
+ * byte: The value to write
+ */
+bool fusb_write_byte(uint8_t addr, uint8_t byte) { return FRToSI2C::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)&byte, 1); }
+
+/*
+ * Write multiple bytes to the FUSB302B
+ *
+ * cfg: The FUSB302B to communicate with
+ * addr: The memory address to which we will write
+ * size: The number of bytes to write
+ * buf: The buffer to write
+ */
+bool fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf) { return FRToSI2C::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)buf, size); }
+
+uint8_t fusb302_detect() {
+  // Probe the I2C bus for its address
+  return FRToSI2C::probe(FUSB302B_ADDR);
+}
+
+#endif
diff --git a/source/Core/BSP/Pine64/fusb302b.cpp b/source/Core/Drivers/FUSB302/fusb302b.cpp
similarity index 75%
rename from source/Core/BSP/Pine64/fusb302b.cpp
rename to source/Core/Drivers/FUSB302/fusb302b.cpp
index 08a399f9..63ef5baf 100644
--- a/source/Core/BSP/Pine64/fusb302b.cpp
+++ b/source/Core/Drivers/FUSB302/fusb302b.cpp
@@ -14,65 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Model_Config.h"
-#ifdef POW_PD
+#include "fusb302b.h"
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
 #include "Setup.h"
-#include "fusb302b.h"
+#include "fusb_user.h"
 #include "int_n.h"
 #include <pd.h>
-/*
- * Read a single byte from the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address from which to read
- *
- * Returns the value read from addr.
- */
-static uint8_t fusb_read_byte(uint8_t addr) {
-  uint8_t data[1];
-  if (!FRToSI2C::Mem_Read(FUSB302B_ADDR, addr, (uint8_t *)data, 1)) {
-    return 0;
-  }
-  return data[0];
-}
-
-/*
- * Read multiple bytes from the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address from which to read
- * size: The number of bytes to read
- * buf: The buffer into which data will be read
- */
-static bool fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Read(FUSB302B_ADDR, addr, buf, size); }
-
-/*
- * Write a single byte to the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address to which we will write
- * byte: The value to write
- */
-static bool fusb_write_byte(uint8_t addr, uint8_t byte) {
-  FRToSI2C::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)&byte, 1);
-  return true;
-}
-
-/*
- * Write multiple bytes to the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address to which we will write
- * size: The number of bytes to write
- * buf: The buffer to write
- */
-static bool fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf) {
-  FRToSI2C::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)buf, size);
-  return true; // TODO
-}
-
 void fusb_send_message(const union pd_msg *msg) {
 
   /* Token sequences for the FUSB302B */
@@ -122,9 +70,6 @@ void fusb_send_hardrst() {
 }
 
 bool fusb_setup() {
-  if (!FRToSI2C::probe(FUSB302B_ADDR)) {
-    return false;
-  }
   /* Fully reset the FUSB302B */
   fusb_write_byte(FUSB_RESET, FUSB_RESET_SW_RES);
   vTaskDelay(TICKS_10MS);
@@ -209,10 +154,4 @@ bool fusb_read_id() {
   if (version == 0 || version == 0xFF)
     return false;
   return true;
-}
-uint8_t fusb302_detect() {
-  // Probe the I2C bus for its address
-  return FRToSI2C::probe(FUSB302B_ADDR);
-}
-
-#endif
+}
\ No newline at end of file
diff --git a/source/Core/Drivers/FUSB302/fusb_user.h b/source/Core/Drivers/FUSB302/fusb_user.h
new file mode 100644
index 00000000..9a81c611
--- /dev/null
+++ b/source/Core/Drivers/FUSB302/fusb_user.h
@@ -0,0 +1,29 @@
+/*
+ * PD Buddy Firmware Library - USB Power Delivery for everyone
+ * Copyright 2017-2018 Clayton G. Hobbs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef PDB_FUSB_USER_H
+#define PDB_FUSB_USER_H
+
+#include <stdint.h>
+uint8_t fusb_read_byte(uint8_t addr);
+bool    fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf);
+bool    fusb_write_byte(uint8_t addr, uint8_t byte);
+bool    fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf);
+uint8_t fusb302_detect();
+void    setupFUSBIRQ();
+
+#endif /* PDB_FUSB302B_H */
diff --git a/source/Core/Drivers/I2CBB.cpp b/source/Core/Drivers/I2CBB.cpp
index 07474bfd..b55435d7 100644
--- a/source/Core/Drivers/I2CBB.cpp
+++ b/source/Core/Drivers/I2CBB.cpp
@@ -10,8 +10,6 @@
 #include <I2CBB.hpp>
 SemaphoreHandle_t I2CBB::I2CSemaphore = NULL;
 StaticSemaphore_t I2CBB::xSemaphoreBuffer;
-SemaphoreHandle_t I2CBB::I2CSemaphore2 = NULL;
-StaticSemaphore_t I2CBB::xSemaphoreBuffer2;
 void              I2CBB::init() {
   // Set GPIO's to output open drain
   GPIO_InitTypeDef GPIO_InitStruct;
@@ -28,10 +26,8 @@ void              I2CBB::init() {
   HAL_GPIO_Init(SCL2_GPIO_Port, &GPIO_InitStruct);
   SOFT_SDA_HIGH();
   SOFT_SCL_HIGH();
-  I2CSemaphore  = xSemaphoreCreateMutexStatic(&xSemaphoreBuffer);
-  I2CSemaphore2 = xSemaphoreCreateMutexStatic(&xSemaphoreBuffer2);
+  I2CSemaphore = xSemaphoreCreateMutexStatic(&xSemaphoreBuffer);
   unlock();
-  unlock2();
 }
 
 bool I2CBB::probe(uint8_t address) {
@@ -291,14 +287,4 @@ void I2CBB::write_bit(uint8_t val) {
   SOFT_SCL_LOW();
 }
 
-void I2CBB::unlock2() { xSemaphoreGive(I2CSemaphore2); }
-
-bool I2CBB::lock2() {
-  if (I2CSemaphore2 == NULL) {
-    asm("bkpt");
-  }
-  bool a = xSemaphoreTake(I2CSemaphore2, (TickType_t)500) == pdTRUE;
-
-  return a;
-}
 #endif
diff --git a/source/Core/Drivers/I2CBB.hpp b/source/Core/Drivers/I2CBB.hpp
index bd25b8df..7b580b07 100644
--- a/source/Core/Drivers/I2CBB.hpp
+++ b/source/Core/Drivers/I2CBB.hpp
@@ -28,14 +28,10 @@ public:
   static void Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size);
   static void Receive(uint16_t DevAddress, uint8_t *pData, uint16_t Size);
   static void TransmitReceive(uint16_t DevAddress, uint8_t *pData_tx, uint16_t Size_tx, uint8_t *pData_rx, uint16_t Size_rx);
-  static void unlock2();
-  static bool lock2();
 
 private:
   static SemaphoreHandle_t I2CSemaphore;
   static StaticSemaphore_t xSemaphoreBuffer;
-  static SemaphoreHandle_t I2CSemaphore2;
-  static StaticSemaphore_t xSemaphoreBuffer2;
   static void              unlock();
   static bool              lock();
   static void              start();