Skip to content

Commit 036a149

Browse files
authored
Merge pull request #1227 from tannewt/trellis_m4
Update Trellis M4 Express for Rev C
2 parents 0db68a8 + 3c743f2 commit 036a149

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define CIRCUITPY_MCU_FAMILY samd51
55

6-
// This is for Rev A
6+
// This is for a purple prototype which is Rev C
77
#define MICROPY_HW_APA102_MOSI (&pin_PA01)
88
#define MICROPY_HW_APA102_SCK (&pin_PA00)
99

@@ -28,7 +28,7 @@
2828
#include "external_flash/devices.h"
2929

3030
#define EXTERNAL_FLASH_DEVICE_COUNT 1
31-
#define EXTERNAL_FLASH_DEVICES GD25Q64C
31+
#define EXTERNAL_FLASH_DEVICES W25Q128JV_SQ
3232

3333
#include "external_flash/external_flash.h"
3434

ports/atmel-samd/external_flash/devices.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,23 @@ typedef struct {
266266
}
267267

268268

269+
// Settings for the Winbond W25Q128JV-SQ 8MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
270+
// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
271+
#define W25Q128JV_SQ {\
272+
.total_size = (1 << 23), /* 16 MiB */ \
273+
.start_up_time_us = 5000, \
274+
.manufacturer_id = 0xef, \
275+
.memory_type = 0x40, \
276+
.capacity = 0x18, \
277+
.max_clock_speed_mhz = 133, \
278+
.has_sector_protection = false, \
279+
.supports_fast_read = true, \
280+
.supports_qspi = true, \
281+
.has_quad_enable = true, \
282+
.supports_qspi_writes = true, \
283+
.write_status_register_split = false, \
284+
}
285+
286+
269287

270288
#endif // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H

0 commit comments

Comments
 (0)