From 8d24030a0e266dfbf53d06b332881dfc30d03b58 Mon Sep 17 00:00:00 2001 From: bobobo1618 Date: Fri, 22 Dec 2023 01:05:13 +0100 Subject: [PATCH 1/5] Fix typo in flash device definition This was a typo from a previous PR. This fixes the invalid struct. --- src/flash_devices.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flash_devices.h b/src/flash_devices.h index 3fa6580..fce7cac 100644 --- a/src/flash_devices.h +++ b/src/flash_devices.h @@ -533,7 +533,7 @@ typedef struct { .total_size = (1 << 21), /* 2 MiB */ \ .start_up_time_us = 5000, .manufacturer_id = 0x85, \ .memory_type = 0x60, .capacity = 0x15, \ - .max_clock_speed_mhz = 104.quad_enable_bit_mask = 0x02, \ + .max_clock_speed_mhz = 104, .quad_enable_bit_mask = 0x02, \ .has_sector_protection = false, .supports_fast_read = true, \ .supports_qspi = true, .supports_qspi_writes = true, \ .write_status_register_split = false, .single_status_byte = false, \ From 823ed1beec0fa129e48c1470b0679e284231387e Mon Sep 17 00:00:00 2001 From: bobobo1618 Date: Fri, 22 Dec 2023 15:26:53 +0100 Subject: [PATCH 2/5] Update flash_devices.h --- src/flash_devices.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/flash_devices.h b/src/flash_devices.h index fce7cac..2b8fffe 100644 --- a/src/flash_devices.h +++ b/src/flash_devices.h @@ -529,15 +529,11 @@ typedef struct { // Datasheet: // https://www.puyasemi.com/uploadfiles/2021/12/202112201130233023.pdf #define P25Q16H \ - { \ - .total_size = (1 << 21), /* 2 MiB */ \ - .start_up_time_us = 5000, .manufacturer_id = 0x85, \ - .memory_type = 0x60, .capacity = 0x15, \ - .max_clock_speed_mhz = 104, .quad_enable_bit_mask = 0x02, \ - .has_sector_protection = false, .supports_fast_read = true, \ - .supports_qspi = true, .supports_qspi_writes = true, \ - .write_status_register_split = false, .single_status_byte = false, \ - .is_fram = false, \ + .memory_type = 0x60, .capacity = 0x15, .max_clock_speed_mhz = 104, \ + .quad_enable_bit_mask = 0x02, .has_sector_protection = false, \ + .supports_fast_read = true, .supports_qspi = true, \ + .supports_qspi_writes = true, .write_status_register_split = false, \ + .single_status_byte = false, .is_fram = false, \ } #endif // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H From 1e5f015a251862f7380b0246d1a6378848df5467 Mon Sep 17 00:00:00 2001 From: bobobo1618 Date: Fri, 22 Dec 2023 15:27:39 +0100 Subject: [PATCH 3/5] Update flash_devices.h --- src/flash_devices.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/flash_devices.h b/src/flash_devices.h index 2b8fffe..25b46a3 100644 --- a/src/flash_devices.h +++ b/src/flash_devices.h @@ -529,6 +529,8 @@ typedef struct { // Datasheet: // https://www.puyasemi.com/uploadfiles/2021/12/202112201130233023.pdf #define P25Q16H \ + .total_size = (1 << 21), /* 2 MiB */ \ + .start_up_time_us = 5000, .manufacturer_id = 0x85, \ .memory_type = 0x60, .capacity = 0x15, .max_clock_speed_mhz = 104, \ .quad_enable_bit_mask = 0x02, .has_sector_protection = false, \ .supports_fast_read = true, .supports_qspi = true, \ From 49a4774f8dd1e42b6d39286f3c71d4eff0cc60c5 Mon Sep 17 00:00:00 2001 From: bobobo1618 Date: Fri, 22 Dec 2023 16:57:22 +0100 Subject: [PATCH 4/5] Update flash_devices.h --- src/flash_devices.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/flash_devices.h b/src/flash_devices.h index 25b46a3..a90cefb 100644 --- a/src/flash_devices.h +++ b/src/flash_devices.h @@ -529,6 +529,7 @@ typedef struct { // Datasheet: // https://www.puyasemi.com/uploadfiles/2021/12/202112201130233023.pdf #define P25Q16H \ + { \ .total_size = (1 << 21), /* 2 MiB */ \ .start_up_time_us = 5000, .manufacturer_id = 0x85, \ .memory_type = 0x60, .capacity = 0x15, .max_clock_speed_mhz = 104, \ From 43c946046dbecda3bc6076a04e547d4d8d0c2a7a Mon Sep 17 00:00:00 2001 From: bobobo1618 Date: Fri, 22 Dec 2023 16:57:51 +0100 Subject: [PATCH 5/5] Update flash_devices.h --- src/flash_devices.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flash_devices.h b/src/flash_devices.h index a90cefb..3276709 100644 --- a/src/flash_devices.h +++ b/src/flash_devices.h @@ -529,7 +529,7 @@ typedef struct { // Datasheet: // https://www.puyasemi.com/uploadfiles/2021/12/202112201130233023.pdf #define P25Q16H \ - { \ + { \ .total_size = (1 << 21), /* 2 MiB */ \ .start_up_time_us = 5000, .manufacturer_id = 0x85, \ .memory_type = 0x60, .capacity = 0x15, .max_clock_speed_mhz = 104, \