[nRF54] build with Core 0.9.135

Author: lyusupov

.github/workflows/main.yml

@@ -421,7 +421,7 @@ jobs:
           if [[ "$BOARD" =~ "nrf54l15clean:nrf54l15clean:" ]]; then
             arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/lolren/NRF54L15-Clean-Arduino-core/refs/heads/main/package_nrf54l15clean_index.json" --save-prefs ;
             # arduino --pref "boardsmanager.additional.urls=https://github.com/lolren/nrf54-arduino-core/releases/download/v0.7.0/package_nrf54l15clean_index.json" --save-prefs ;
-            arduino --install-boards nrf54l15clean:nrf54l15clean:0.9.120 ;
+            arduino --install-boards nrf54l15clean:nrf54l15clean:0.9.135 ;
             arduino --pref "custom_clean_cpu=xiao_nrf54l15_cpu128" --save-prefs ;
             arduino --pref "custom_clean_vpr=xiao_nrf54l15_off"    --save-prefs ;
             arduino --pref "custom_clean_zigbee=xiao_nrf54l15_off" --save-prefs ;

software/firmware/source/SoftRF/src/platform/iomap/Lierda_AM36_PK02.h

@@ -30,7 +30,7 @@
 #define SOC_GPIO_PIN_AM36_SCL1          10
 
 // User button
-#define SOC_GPIO_PIN_AM36_BUTTON_AUX    4
+#define SOC_GPIO_PIN_AM36_BUTTON        4
 
 // NeoPixel
 #define SOC_GPIO_PIN_AM36_LED           18

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

@@ -251,33 +251,15 @@ enum {
 
   PY25Q64HA_INDEX,
 
-  NRF54_EXTERNAL_FLASH_DEVICE_COUNT
+  EXTERNAL_FLASH_DEVICE_COUNT
 };
 
-#if !defined(MX25R6435F)
-// Settings for the Macronix MX25R6435F 8MiB SPI flash.
-// Datasheet:
-// http://www.macronix.com/Lists/Datasheet/Attachments/7428/MX25R6435F,%20Wide%20Range,%2064Mb,%20v1.4.pdf
-// By default its in lower power mode which can only do 8mhz. In high power mode
-// it can do 80mhz.
-#define MX25R6435F                                                             \
-  {                                                                            \
-    .total_size = (1UL << 23), /* 8 MiB */                                     \
-        .start_up_time_us = 5000, .manufacturer_id = 0xc2,                     \
-    .memory_type = 0x28, .capacity = 0x17, .max_clock_speed_mhz = 8,           \
-    .quad_enable_bit_mask = 0x40, .has_sector_protection = false,              \
-    .supports_fast_read = true, .supports_qspi = true,                         \
-    .supports_qspi_writes = true, .write_status_register_split = false,        \
-    .single_status_byte = true, .is_fram = false,                              \
-  }
-#endif /* MX25R6435F */
-
 /// List of all possible flash devices used by nRF54 boards
-static SPIFlash_Device_t nrf54_possible_devices[] = {
+static SPIFlash_Device_t possible_devices[] = {
   // Nordic Semi L15 and LM20 DKs
   [MX25R6435F_INDEX] = MX25R6435F,
   // Seeed Studio XIAO LM20A
-  [PY25Q64HA_INDEX]  = P25Q64HA_ALT_JEDEC,
+  [PY25Q64HA_INDEX]  = PY25Q64HA_ALT_JEDEC,
 };
 
 #include <SdFat_Adafruit_Fork.h>
@@ -363,9 +345,9 @@ static void nRF54_setup()
   {
     case NRF54_LR2021EVK1XCS1:
 #if defined(ARDUINO_XIAO_NRF54LM20A_CLEAN)
-      nrf54_possible_devices[PY25Q64HA_INDEX].max_clock_speed_mhz  = 33;
-      nrf54_possible_devices[PY25Q64HA_INDEX].supports_qspi        = false;
-      nrf54_possible_devices[PY25Q64HA_INDEX].supports_qspi_writes = false;
+      possible_devices[PY25Q64HA_INDEX].max_clock_speed_mhz  = 33;
+      possible_devices[PY25Q64HA_INDEX].supports_qspi        = false;
+      possible_devices[PY25Q64HA_INDEX].supports_qspi_writes = false;
 #if 1
       FlashTrans = new Adafruit_FlashTransport_QSPI_NRF54(
                      SOC_GPIO_PIN_SFL_EVK_SCK,
@@ -386,9 +368,9 @@ static void nRF54_setup()
 
     case NRF54_PCA10156:
 #if defined(ARDUINO_NRF54L15DK_PCA10156)
-      nrf54_possible_devices[MX25R6435F_INDEX].max_clock_speed_mhz  = 33;
-      nrf54_possible_devices[MX25R6435F_INDEX].supports_qspi        = false;
-      nrf54_possible_devices[MX25R6435F_INDEX].supports_qspi_writes = false;
+      possible_devices[MX25R6435F_INDEX].max_clock_speed_mhz  = 33;
+      possible_devices[MX25R6435F_INDEX].supports_qspi        = false;
+      possible_devices[MX25R6435F_INDEX].supports_qspi_writes = false;
 #if 0
       FlashTrans = new Adafruit_FlashTransport_QSPI_NRF54(
                      SOC_GPIO_PIN_SFL_DK_SCK,
@@ -416,8 +398,8 @@ static void nRF54_setup()
     FlashTrans->end();
 
     SPIFlash = new Adafruit_SPIFlash(FlashTrans);
-    nRF54_has_spiflash = SPIFlash->begin(nrf54_possible_devices,
-                                         NRF54_EXTERNAL_FLASH_DEVICE_COUNT);
+    nRF54_has_spiflash = SPIFlash->begin(possible_devices,
+                                         EXTERNAL_FLASH_DEVICE_COUNT);
   }
 
   if (nRF54_has_spiflash) {