diff --git a/software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp b/software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp
index eb903135b..974269d03 100644
--- a/software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp
+++ b/software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp
@@ -475,6 +475,7 @@ static void lr11xx_setup()
   switch (hw_info.model)
   {
   case SOFTRF_MODEL_STANDALONE:
+  case SOFTRF_MODEL_ACADEMY:
     // Ebyte E80-900M2213S
     // LR1121 TCXO Voltage
     Vtcxo = 1.8;
@@ -727,6 +728,7 @@ static void lr11xx_setup()
     break;
 
   case SOFTRF_MODEL_STANDALONE:
+  case SOFTRF_MODEL_ACADEMY:
     /* Ebyte E80-900M2213S */
 #if 1
     radio->setDioAsRfSwitch(0x07, 0x0, 0x02, 0x03, 0x01, 0x0, 0x4, 0x0);
diff --git a/software/firmware/source/SoftRF/src/platform/CH32.h b/software/firmware/source/SoftRF/src/platform/CH32.h
index 0338813ac..db7c6675e 100644
--- a/software/firmware/source/SoftRF/src/platform/CH32.h
+++ b/software/firmware/source/SoftRF/src/platform/CH32.h
@@ -88,8 +88,16 @@ struct rst_info {
 #if defined(CH32V30x)
 
 /* Peripherals */
-#define SOC_GPIO_PIN_CONS_RX  PB5
-#define SOC_GPIO_PIN_CONS_TX  PB8
+#if defined(PD6)
+#define SOC_GPIO_PIN_CONS_RX  PD6
+#else
+#define SOC_GPIO_PIN_CONS_RX  PD_6
+#endif
+#if defined(PD5)
+#define SOC_GPIO_PIN_CONS_TX  PD5
+#else
+#define SOC_GPIO_PIN_CONS_TX  PD_5
+#endif
 
 #define SOC_GPIO_PIN_GNSS_RX  PA10
 #define SOC_GPIO_PIN_GNSS_TX  PA9
@@ -110,11 +118,16 @@ struct rst_info {
 #define SOC_GPIO_PIN_SCK      PB13
 #define SOC_GPIO_PIN_SS       PB12
 
-//#include <SoftSPI.h>
-//extern  SoftSPI RadioSPI;
-//#undef  SPI
-//#define SPI                   RadioSPI
 //#define USE_SOFTSPI
+#if defined(USE_SOFTSPI)
+#include <SoftSPI.h>
+extern  SoftSPI RadioSPI;
+#else
+#include <SPI.h>
+extern  SPIClass RadioSPI;
+#endif /* USE_SOFTSPI */
+#undef  SPI
+#define SPI                   RadioSPI
 
 /* NRF905 */
 #define SOC_GPIO_PIN_TXE      SOC_UNUSED_PIN