Merge pull request #11047 from functionpointer/nexus_xr

New target: Radiomaster Nexus X and Nexus XR

Author: sensei-hacker

cmake/at32-bootloader.cmake

@@ -21,7 +21,7 @@ main_sources(BOOTLOADER_SOURCES
     drivers/time.c
     drivers/timer.c
     drivers/flash_m25p16.c
-    drivers/flash_w25n01g.c 
+    drivers/flash_w25n.c
     drivers/flash.c
 
     fc/firmware_update_common.c

docs/Blackbox.md

@@ -120,6 +120,8 @@ These chips are also supported:
 * Winbond W25Q64 - 64 Mbit / 8 MByte
 * Micron N25Q0128 - 128 Mbit / 16 MByte
 * Winbond W25Q128 - 128 Mbit / 16 MByte
+* Winbond W25N01  - 1 Gbit / 128 MByte
+* Winbond W25N02  - 2 Gbit / 256 MByte
 
 #### Enable recording to dataflash
 On the Configurator's CLI tab, you must enter `set blackbox_device=SPIFLASH` to switch to logging to an onboard dataflash chip, then save.

src/main/CMakeLists.txt

@@ -179,8 +179,8 @@ main_sources(COMMON_SRC
     drivers/flash.h
     drivers/flash_m25p16.c
     drivers/flash_m25p16.h
-    drivers/flash_w25n01g.c
-    drivers/flash_w25n01g.h
+    drivers/flash_w25n.c
+    drivers/flash_w25n.h
     drivers/gimbal_common.h
     drivers/gimbal_common.c
     drivers/headtracker_common.h

src/main/drivers/bus.h

@@ -142,7 +142,7 @@ typedef enum {
     DEVHW_MS4525,       // Pitot meter
     DEVHW_DLVR,         // Pitot meter
     DEVHW_M25P16,       // SPI NOR flash
-    DEVHW_W25N01G,      // SPI 128MB flash
+    DEVHW_W25N,         // SPI 128MB or 256MB flash from Winbond W25N family
     DEVHW_UG2864,       // I2C OLED display
     DEVHW_SDCARD,       // Generic SD-Card
     DEVHW_IRLOCK,       // IR-Lock visual positioning hardware

src/main/drivers/flash.c

@@ -30,7 +30,7 @@
 
 #include "flash.h"
 #include "flash_m25p16.h"
-#include "flash_w25n01g.h"
+#include "flash_w25n.h"
 
 #include "common/time.h"
 
@@ -56,17 +56,17 @@ static flashDriver_t flashDrivers[] = {
     },
 #endif
 
-#ifdef USE_FLASH_W25N01G
+#if defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25N02K)
     {
-        .init = w25n01g_init,
-        .isReady = w25n01g_isReady,
-        .waitForReady = w25n01g_waitForReady,
-        .eraseSector = w25n01g_eraseSector,
-        .eraseCompletely = w25n01g_eraseCompletely,
-        .pageProgram = w25n01g_pageProgram,
-        .readBytes = w25n01g_readBytes,
-        .getGeometry = w25n01g_getGeometry,
-        .flush = w25n01g_flush
+        .init = w25n_init,
+        .isReady = w25n_isReady,
+        .waitForReady = w25n_waitForReady,
+        .eraseSector = w25n_eraseSector,
+        .eraseCompletely = w25n_eraseCompletely,
+        .pageProgram = w25n_pageProgram,
+        .readBytes = w25n_readBytes,
+        .getGeometry = w25n_getGeometry,
+        .flush = w25n_flush
     },
 #endif