From f8b55940efd839e0463c6b64617c4a724264c0e6 Mon Sep 17 00:00:00 2001
From: lei <3224404793@qq.com>
Date: Fri, 2 Sep 2022 20:33:32 +0800
Subject: [PATCH] 	modified:   src/W25QXXArduino/w25qxx.cpp

---
 .vscode/arduino.json         |  3 ++-
 spi_test.ino                 |  4 ----
 src/W25QXXArduino/w25qxx.cpp | 17 ++++++++---------
 src/W25QXXArduino/w25qxx.h   |  8 ++++----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.vscode/arduino.json b/.vscode/arduino.json
index f8559e2..fa9b95e 100644
--- a/.vscode/arduino.json
+++ b/.vscode/arduino.json
@@ -2,5 +2,6 @@
     "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",
     "sketch": "spi_test.ino",
-    "port": "COM10"
+    "port": "COM10",
+    "programmer": "esp32:esptool"
 }
\ No newline at end of file
diff --git a/spi_test.ino b/spi_test.ino
index dbec90e..8972ce1 100644
--- a/spi_test.ino
+++ b/spi_test.ino
@@ -7,10 +7,6 @@ void setup() {
   Serial.setRxBufferSize(256);
   Serial.onReceive(SerialRe,true);
   W25QXX_Init();
-  W25QXX_Write((uint8_t*)"my name is lei kkk",1000,strlen("my name is lei yun"));
-  W25QXX_Read(table,1001,strlen("my name is lei yun"));
-  // Serial.printf("%04X\n",W25QXX_TYPE);
-  Serial.printf("%s\n",table);
   delay(3000);
 }
 
diff --git a/src/W25QXXArduino/w25qxx.cpp b/src/W25QXXArduino/w25qxx.cpp
index f83167b..9883ef8 100644
--- a/src/W25QXXArduino/w25qxx.cpp
+++ b/src/W25QXXArduino/w25qxx.cpp
@@ -45,10 +45,10 @@ void SPI1S_Init(void){
 #ifdef FLASH_TEST_ENABLE
     /* readwrite test */
     int g = 0;
-    uint8_t str[1280];
+    uint8_t str[512];
     memset(str, 0, sizeof(str));
     unsigned int  j = 0;       
-    for(int k=0; k < 5; k++)
+    for(int k=0; k < 2; k++)
     {
       for(int i = 0; i < 256; i++)
       {
@@ -60,7 +60,10 @@ void SPI1S_Init(void){
     Serial.println("-----write data-------");
     W25QXX_CS0;
     W25QXX_Erase_Sector(0x00);
-    W25QXX_Write(str,0x10,256);
+    for (uint8_t i = 0; i < 2; i++)
+    {
+        W25QXX_Write(&str[256*i],256*i,256);
+    }
     memset(str, 0, sizeof(str));
     W25QXX_Read(str,0x00,512);
     W25QXX_CS1;
@@ -69,13 +72,9 @@ void SPI1S_Init(void){
       if(g == 16){
             Serial.println("|");
             if(k % 256 == 0) Serial.println("---------------");
-            {
-              g = 1;
-            }
-        }   
-        else {
-          g++;
+            g = 1;
         }
+        else  g++;
         Serial.printf("%02X ", str[k]);
     }
 #endif
diff --git a/src/W25QXXArduino/w25qxx.h b/src/W25QXXArduino/w25qxx.h
index ea553cd..bd07dfa 100644
--- a/src/W25QXXArduino/w25qxx.h
+++ b/src/W25QXXArduino/w25qxx.h
@@ -49,12 +49,12 @@ extern uint16_t W25QXX_TYPE;					//
 //////////////////////////////////////////////////////////////////////////
 //SPI相关设定
 #define SPI_FREQUENCY 30*1000000  //SPI时钟频率，硬件SPI使用
-#define HARDWARE_SPI              //使用硬件SPI
-// #define SOFTWARE_SPI           //使用软件SPI
-// #define FLASH_TEST_ENABLE      //使能测试
+// #define HARDWARE_SPI              //使用硬件SPI
+#define SOFTWARE_SPI           //使用软件SPI
+#define FLASH_TEST_ENABLE      //使能测试
 //////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////////////////////////////// 
+//////////////////////////////////////////////////////////////////////////
 //指令表
 #define W25X_WriteEnable		0x06 
 #define W25X_WriteDisable		0x04