GitHub/hellotouchGFX
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

W25Q128内存映射移植成功

Browse Source
This commit is contained in:
Aladdin-Wang 2020-03-13 23:46:18 +08:00
parent f3039ceb61
commit 93828e637d
6 changed files with 3709 additions and 3850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
example3/demo1/MDK-ARM/demo1.uvguix.akqbd
View File

File diff suppressed because one or more lines are too long

18
example3/demo1/MDK-ARM/demo1.uvoptx
View File

@ -150,7 +150,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>ST-LINKIII-KEIL_SWO</Key>
<Name>-U54FF75066578555551530367 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(5BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO3 -FD20000000 -FC4000 -FN2 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F767IGTx$CMSIS\Flash\STM32F7x_1024.FLM) -FF1STM32F767_W25Q256 -FS190000000 -FL11000000</Name>
<Name>-U54FF75066578555551530367 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(5BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO11 -FD20000000 -FC8000 -FN2 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F767IGTx$CMSIS\Flash\STM32F7x_1024.FLM) -FF1STM32F767_W25Q256 -FS190000000 -FL11000000</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
@ -186,6 +186,22 @@
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>305</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Src\qspi_flash.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<MemoryWindow1>
<Mm>

7417
example3/demo1/MDK-ARM/demo1/demo1.hex
View File

File diff suppressed because it is too large Load Diff

4
example3/demo1/MDK-ARM/demo1/flash.sct
View File

@ -16,8 +16,8 @@ LR_IROM1 0x08000000 0x00100000 { ; load region size_region
LR_EROM1 0x90000000 0x01000000 { ; load region size_region
ER_EROM1 0x90000000 0x01000000 { ; load address = execution address
*.o (ExtFlashSection)
;*.o (FontFlashSection)
;*.o (TextFlashSection)
*.o (FontFlashSection)
*.o (TextFlashSection)
}
}

22
example3/demo1/Src/STM32TouchController.cpp
View File

@ -27,7 +27,7 @@ void STM32TouchController::init()
* Initialize touch controller and driver
*
*/
GTP_Init_Panel();
//GTP_Init_Panel();
}
bool STM32TouchController::sampleTouch(int32_t& x, int32_t& y)
@ -42,18 +42,18 @@ bool STM32TouchController::sampleTouch(int32_t& x, int32_t& y)
* By default sampleTouch is called every tick, this can be adjusted by HAL::setTouchSampleRate(int8_t);
*
*/
GT9xx_GetOnePiont();
// GT9xx_GetOnePiont();
if(pre_x == -1 && pre_y == -1)
{
// if(pre_x == -1 && pre_y == -1)
// {
return false;
}
else
{
x = pre_x;
y = pre_y;
return true;
}
// }
// else
// {
// x = pre_x;
// y = pre_y;
// return true;
// }
}

16
example3/demo1/Src/qspi_flash.c
View File

@ -97,15 +97,11 @@ void W25QXX_Init(void)
HAL_Delay(30);
W25QXX_ENTER_QSPI();
W25QXX_ENTER_4BYTEADDR();
// W25QXX_ENTER_4BYTEADDR();
W25QXX_SetReadParam();//<2F><><EFBFBD>ö<EFBFBD><C3B6><EFBFBD><EFBFBD><EFBFBD>
W25_ID = W25QXX_ReadId();
printf("W25_ID=%x",W25_ID);
printf("W25_ID=%x\r\n",W25_ID);
W25QXX_MemoryMappedMode();//<2F><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD>ӳ<EFBFBD><D3B3>ģʽ
printf("W25_ID=%x",*(uint32_t *)0x90000000);
printf("W25_ID=%x",*(uint32_t *)0x90000001);
printf("W25_ID=%x",*(uint32_t *)0x90000002);
printf("W25_ID=%x",*(uint32_t *)0x90000003);
}
//W25Q256<35><36>д<EFBFBD><D0B4><EFBFBD><EFBFBD>
@ -123,7 +119,7 @@ void W25QXX_Read(uint8_t* pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead)
s_command.Instruction = W25X_FastReadData;
s_command.InstructionMode = QSPI_INSTRUCTION_4_LINES;
s_command.AddressMode = QSPI_ADDRESS_4_LINES;
s_command.AddressSize = QSPI_ADDRESS_32_BITS;
s_command.AddressSize = QSPI_ADDRESS_24_BITS;
s_command.DataMode = QSPI_DATA_4_LINES;
s_command.DummyCycles = 8;
s_command.NbData = NumByteToRead;
@ -165,7 +161,7 @@ void W25QXX_EraseSector(uint32_t sector_id)
W25Q_WRITE_ENABLE();
W25QXX_WaitIdle();
QSPI_SendCmd(W25X_SectorErase,QSPI_INSTRUCTION_4_LINES,addr,QSPI_ADDRESS_4_LINES,QSPI_ADDRESS_32_BITS,0);
QSPI_SendCmd(W25X_SectorErase,QSPI_INSTRUCTION_4_LINES,addr,QSPI_ADDRESS_4_LINES,QSPI_ADDRESS_24_BITS,0);
W25QXX_WaitIdle();
}
@ -181,7 +177,7 @@ void W25QXX_Write_Page(uint8_t* pBuffer,uint32_t WriteAddr,uint16_t NumByteToWri
{
W25Q_WRITE_ENABLE(); //дʹ<D0B4><CAB9>
QSPI_SendCmd(W25X_PageProgram,QSPI_INSTRUCTION_4_LINES,
WriteAddr,QSPI_ADDRESS_4_LINES,QSPI_ADDRESS_32_BITS,QSPI_DATA_4_LINES);
WriteAddr,QSPI_ADDRESS_4_LINES,QSPI_ADDRESS_24_BITS,QSPI_DATA_4_LINES);
QSPI_Transmit(pBuffer, NumByteToWrite);
W25QXX_WaitIdle(); //<2F>ȴ<EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
@ -296,7 +292,7 @@ void W25QXX_MemoryMappedMode(void)
s_command.InstructionMode = QSPI_INSTRUCTION_4_LINES;
s_command.Instruction = W25X_FastReadData;
s_command.AddressMode = QSPI_ADDRESS_4_LINES;
s_command.AddressSize = QSPI_ADDRESS_32_BITS;
s_command.AddressSize = QSPI_ADDRESS_24_BITS;
s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE;
s_command.DataMode = QSPI_DATA_4_LINES;
s_command.DummyCycles = 8;