From 84f7fbfdcdb2d1b4e4c9cf4810a74f19d2ca91fb Mon Sep 17 00:00:00 2001 From: lei <3224404793@qq.com> Date: Fri, 2 Sep 2022 20:58:27 +0800 Subject: [PATCH] modified: .vscode/arduino.json modified: src/W25QXXArduino/w25qxx.h --- .vscode/arduino.json | 6 +++--- src/W25QXXArduino/w25qxx.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vscode/arduino.json b/.vscode/arduino.json index fa9b95e..2a1b24f 100644 --- a/.vscode/arduino.json +++ b/.vscode/arduino.json @@ -1,7 +1,7 @@ { - "configuration": "PSRAM=disabled,FlashMode=qio,FlashSize=4M,LoopCore=1,EventsCore=1,USBMode=hwcdc,CDCOnBoot=default,MSCOnBoot=default,DFUOnBoot=default,UploadMode=default,PartitionScheme=min_spiffs,CPUFreq=240,UploadSpeed=921600,DebugLevel=none", - "board": "esp32:esp32:esp32s3", + "configuration": "PSRAM=disabled,PartitionScheme=min_spiffs,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,LoopCore=1,EventsCore=1,DebugLevel=none", + "board": "esp32:esp32:esp32", "sketch": "spi_test.ino", - "port": "COM10", + "port": "COM4", "programmer": "esp32:esptool" } \ No newline at end of file diff --git a/src/W25QXXArduino/w25qxx.h b/src/W25QXXArduino/w25qxx.h index aab6aed..0b0a48d 100644 --- a/src/W25QXXArduino/w25qxx.h +++ b/src/W25QXXArduino/w25qxx.h @@ -38,7 +38,7 @@ extern uint16_t W25QXX_TYPE; // #define FLASH_TEST_ENABLE //使能测试 //端口定义 #ifdef HARDWARE_SPI - #define ESP32S3 + #define ESP32S3 //使用硬件SPI,需要选择器件 #ifdef ESP32 //choose ESP32 #define NORFLASH_CS_PIN 5 #define NORFLASH_CLK_PIN 18 @@ -53,10 +53,10 @@ extern uint16_t W25QXX_TYPE; // #endif #endif #ifdef SOFTWARE_SPI - #define NORFLASH_CS_PIN 10 - #define NORFLASH_CLK_PIN 12 - #define NORFLASH_MOSI_PIN 11 - #define NORFLASH_MISO_PIN 14 + #define NORFLASH_CS_PIN 19 + #define NORFLASH_CLK_PIN 5 + #define NORFLASH_MOSI_PIN 17 + #define NORFLASH_MISO_PIN 18 #endif ////////////////////////////////////////////////////////////////////////// //指令表