[RK35] add some logic to identify Luckfox Lyra Zero W target

Author: lyusupov

software/firmware/source/SoftRF/src/platform/RK35.cpp

@@ -597,6 +597,30 @@ void RK35_SerialNumber(void)
 
 static void RK35_setup()
 {
+  FILE *fp = fopen("/sys/firmware/devicetree/base/model", "r");
+
+  if (fp == NULL)
+  {
+      perror("/sys/firmware/devicetree/base/model");
+      exit(EXIT_FAILURE);
+  }
+
+  char value[80];
+
+  if (fgets(value, sizeof(value), fp) != NULL)
+  {
+    if (strncmp(value, "Luckfox Lyra Zero W",      sizeof(value)) == 0 ||
+        strncmp(value, "Luckfox Lyra Zero",        sizeof(value)) == 0) {
+      RK35_board = RK35_LUCKFOX_LYRA_ZW;
+      RK35_hat   = RK35_WAVESHARE_HAT_LORA_GNSS;
+    } else if (strncmp(value, "Luckfox Lyra Plus", sizeof(value)) == 0 ||
+               strncmp(value, "Luckfox Lyra",      sizeof(value)) == 0) {
+      RK35_board = RK35_LUCKFOX_LYRA_B;
+    }
+  }
+
+  fclose(fp);
+
 #if defined(EXCLUDE_EEPROM)
   eeprom_block.field.magic                  = SOFTRF_EEPROM_MAGIC;
   eeprom_block.field.version                = SOFTRF_EEPROM_VERSION;
@@ -632,9 +656,30 @@ static void RK35_setup()
 
   RK35_SerialNumber();
 
-#if defined(USE_RADIOLIB)
-  lmic_pins.dio[0] = SOC_GPIO_PIN_DIO0;
-#endif /* USE_RADIOLIB */
+  switch (RK35_board)
+  {
+    case RK35_LUCKFOX_LYRA_ZW:
+      lmic_pins.nss  = SOC_GPIO_PIN_HAT_SS;
+      lmic_pins.rst  = SOC_GPIO_PIN_HAT_RST;
+      lmic_pins.busy = SOC_GPIO_PIN_HAT_BUSY;
+#if defined(USE_RADIOLIB) || defined(USE_RADIOHEAD)
+      lmic_pins.dio[0] = SOC_GPIO_PIN_HAT_DIO;
+#endif /* USE_RADIOLIB || USE_RADIOHEAD */
+      break;
+    case RK35_LUCKFOX_LYRA_B:
+    default:
+      lmic_pins.nss    = SOC_GPIO_PIN_SS;
+      lmic_pins.rst    = SOC_GPIO_PIN_RST;
+      lmic_pins.busy   = SOC_GPIO_PIN_BUSY;
+#if defined(USE_RADIOLIB) || defined(USE_RADIOHEAD)
+      lmic_pins.dio[0] = SOC_GPIO_PIN_DIO0;
+#endif /* USE_RADIOLIB || USE_RADIOHEAD */
+      break;
+  }
+
+  if (RK35_hat == RK35_WAVESHARE_HAT_LORA_GNSS) {
+    lmic_pins.tcxo = lmic_pins.rst; /* SX1262 with XTAL */
+  }
 }
 
 static void RK35_post_init()

software/firmware/source/SoftRF/src/platform/RK35.h

@@ -110,20 +110,21 @@ struct rst_info {
 #define SOC_GPIO_PIN_NEOPIXEL 4  // RMIO4
 #define SOC_GPIO_PIN_LED      SOC_GPIO_PIN_NEOPIXEL
 #define SOC_GPIO_PIN_STATUS   SOC_UNUSED_PIN
-#define SOC_GPIO_PIN_BUZZER   8  // RMIO8
-
-// Luckfox Lyra Zero W with Waveshare SX1262-L76K HAT
-#define SOC_GPIO_PIN_HAT_MOSI 0 RMIO6
-#define SOC_GPIO_PIN_HAT_MISO 0 RMIO7
-#define SOC_GPIO_PIN_HAT_SCK  0 RMIO8
-#define SOC_GPIO_PIN_HAT_SS   0 // RMIO18
-#define SOC_GPIO_PIN_HAT_RST  0 // RMIO14
-#define SOC_GPIO_PIN_HAT_DIO  0 // RMIO29
-#define SOC_GPIO_PIN_HAT_BUSY 0 // RMIO17
-#define SOC_GPIO_PIN_HAT_SDA  RMIO0
-#define SOC_GPIO_PIN_HAT_SCL  RMIO1
-#define SOC_GPIO_PIN_HAT_GNSS_RX    RMIO23
-#define SOC_GPIO_PIN_HAT_GNSS_TX    RMIO22
+#define SOC_GPIO_PIN_BUZZER   (RK35_board == RK35_LUCKFOX_LYRA_B ? \
+                               8 /* RMIO8 */ : SOC_UNUSED_PIN)
+
+// Luckfox Lyra Zero W with Waveshare SX1262+L76K HAT
+#define SOC_GPIO_PIN_HAT_MOSI 6  // RMIO6
+#define SOC_GPIO_PIN_HAT_MISO 7  // RMIO7
+#define SOC_GPIO_PIN_HAT_SCK  8  // RMIO8
+#define SOC_GPIO_PIN_HAT_SS   18 // RMIO18
+#define SOC_GPIO_PIN_HAT_RST  14 // RMIO14
+#define SOC_GPIO_PIN_HAT_DIO  29 // RMIO29
+#define SOC_GPIO_PIN_HAT_BUSY 17 // RMIO17
+#define SOC_GPIO_PIN_HAT_SDA  0  // RMIO0
+#define SOC_GPIO_PIN_HAT_SCL  1  // RMIO1
+#define SOC_GPIO_PIN_HAT_GNSS_RX 23 // RMIO23
+#define SOC_GPIO_PIN_HAT_GNSS_TX 22 // RMIO22
 #define SOC_GPIO_PIN_HAT_GNSS_PPS   SOC_UNUSED_PIN
 
 #define HTTP_SRV_PORT         8081 /* port 8080 can cause conflict with dump1090 */

software/firmware/source/libraries/arduino-basicmac/src/hal/hal.cpp

@@ -283,7 +283,7 @@ void hal_pin_tcxo_init()
 #endif /* ARDUINO_NUCLEO_L073RZ */
 
 bool hal_pin_tcxo (u1_t val) {
-#if !defined(__ASR6501__) && !defined(RASPBERRY_PI)
+#if !defined(__ASR6501__) && !defined(RASPBERRY_PI) && !defined(LUCKFOX_LYRA)
     if (lmic_pins.tcxo == LMIC_UNUSED_PIN)
         return false;
 

software/firmware/source/libraries/arduino-basicmac/src/lmic/radio-sx126x.c

@@ -314,8 +314,8 @@ static void SetDIO3AsTcxoCtrl (uint8_t voltage) {
     uint32_t timeout = 320;
     uint8_t data[] = {voltage, (timeout >> 16) & 0xff, (timeout >> 8) & 0xff, timeout & 0xff };
 
-#if defined(__ASR6501__) || defined(ARDUINO_GENERIC_WLE5CCUX) || \
-    defined(RASPBERRY_PI)
+#if defined(__ASR6501__)  || defined(ARDUINO_GENERIC_WLE5CCUX) || \
+    defined(RASPBERRY_PI) || defined(LUCKFOX_LYRA)
     if (hal_pin_tcxo(voltage))
 #elif defined(ARDUINO_ARCH_ASR6601)
     if (LORAC->CR1 & 0x1)