Skip to content

Commit 7f15a8b

Browse files
yuanyin1985yuanyin1985
committed
完成了对spi flash的支持
完成了对rom flash的data存储
1 parent 0674f6f commit 7f15a8b

File tree

5 files changed

+45
-38
lines changed

5 files changed

+45
-38
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ Module.symvers
5151
Mkfile.old
5252
dkms.conf
5353
/src/Core/Project/Output
54+
/src/Core/Project/*.Administrator
55+
/src/Core/Project/*.lst
56+
/src/Core/Project/JLinkLog.txt

‎src/Common/Misc/IoDefines.c‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ const IO_IN_HAL_DEFINE *gpIoInDefs=NULL;
55
const IO_OUT_HAL_DEFINE *gpIoOutDefs=NULL;
66

77
static const IO_IN_HAL_DEFINE gIoInDefs[IOIN_MAX]={
8-
{IOIN_PIO0,GPI_A, GPin0, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI0_IRQn,EXTI_Pio_Priority},
9-
{IOIN_PIO1,GPI_A, GPin1, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
10-
{IOIN_PIO2,GPI_A, GPin2, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
11-
{IOIN_PIO3,GPI_A, GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
12-
{IOIN_PIO4,GPI_A, GPin4, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
13-
{IOIN_PIO5,GPI_A, GPin5, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
14-
{IOIN_PIO6,GPI_A, GPin6, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
15-
{IOIN_PIO7,GPI_A, GPin7, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
8+
{IOIN_PIO0, GPI_A, GPin0, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI0_IRQn,EXTI_Pio_Priority},
9+
{IOIN_PIO1, GPI_A, GPin1, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
10+
{IOIN_PIO2, GPI_A, GPin2, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
11+
{IOIN_PIO3, GPI_A, GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
12+
{IOIN_PIO4, GPI_A, GPin4, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
13+
{IOIN_PIO5, GPI_A, GPin5, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
14+
{IOIN_PIO6, GPI_A, GPin6, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
15+
{IOIN_PIO7, GPI_A, GPin7, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
16+
{IOIN_IR_IN, GPI_B, GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI3_IRQn,EXTI_Pio_Priority},
17+
1618
};
17-
18-
static const IO_OUT_HAL_DEFINE gIoOutDefs[IOOUT_MAX]={
19-
{IOOUT_LED1,GPI_B, GPin8, GPIO_Mode_Out_PP,TRUE},
20-
{IOOUT_LED2,GPI_B, GPin9, GPIO_Mode_Out_PP,TRUE},
21-
{IOOUT_FLASH_CS,GPI_A, GPin8, GPIO_Mode_Out_PP,TRUE},//flash cs
22-
{IOOUT_FLASH_WP,GPI_B, GPin12, GPIO_Mode_Out_PP,FALSE},//flash wp
2319

20+
static const IO_OUT_HAL_DEFINE gIoOutDefs[IOOUT_MAX]={
21+
{IOOUT_LED1, GPI_B, GPin8, GPIO_Mode_Out_PP,TRUE},
22+
{IOOUT_LED2, GPI_B, GPin9, GPIO_Mode_Out_PP,TRUE},
23+
{IOOUT_FLASH_CS, GPI_A, GPin8, GPIO_Mode_Out_PP,TRUE},//flash cs
24+
{IOOUT_FLASH_WP, GPI_B, GPin12, GPIO_Mode_Out_PP,FALSE},//flash wp
25+
{IOOUT_IR_OUT, GPI_B, GPin4, GPIO_Mode_Out_PP,FALSE},//ir out
2426

2527
};
2628

‎src/Common/Misc/IoDefines.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ typedef enum{
1010
IOIN_PIO5,
1111
IOIN_PIO6,
1212
IOIN_PIO7,
13+
IOIN_IR_IN,
1314

1415
IOIN_MAX
1516
}IO_IN_DEFS;
@@ -19,6 +20,7 @@ typedef enum{
1920
IOOUT_LED2,
2021
IOOUT_FLASH_CS,
2122
IOOUT_FLASH_WP,
23+
IOOUT_IR_OUT,
2224

2325
IOOUT_MAX
2426
}IO_OUT_DEFS;

‎src/Core/Project/Q-Controllers.uvopt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,19 @@
452452
<RteFlg>0</RteFlg>
453453
<bShared>0</bShared>
454454
</File>
455+
<File>
456+
<GroupNumber>2</GroupNumber>
457+
<FileNumber>21</FileNumber>
458+
<FileType>1</FileType>
459+
<tvExp>0</tvExp>
460+
<Focus>0</Focus>
461+
<tvExpOptDlg>0</tvExpOptDlg>
462+
<bDave2>0</bDave2>
463+
<PathWithFileName>..\..\Common\Drivers\RomFlash.c</PathWithFileName>
464+
<FilenameWithoutPath>RomFlash.c</FilenameWithoutPath>
465+
<RteFlg>0</RteFlg>
466+
<bShared>0</bShared>
467+
</File>
455468
</Group>
456469

457470
<Group>
@@ -462,7 +475,7 @@
462475
<RteFlg>0</RteFlg>
463476
<File>
464477
<GroupNumber>3</GroupNumber>
465-
<FileNumber>21</FileNumber>
478+
<FileNumber>22</FileNumber>
466479
<FileType>1</FileType>
467480
<tvExp>0</tvExp>
468481
<Focus>0</Focus>
@@ -475,7 +488,7 @@
475488
</File>
476489
<File>
477490
<GroupNumber>3</GroupNumber>
478-
<FileNumber>22</FileNumber>
491+
<FileNumber>23</FileNumber>
479492
<FileType>1</FileType>
480493
<tvExp>0</tvExp>
481494
<Focus>0</Focus>
@@ -494,19 +507,6 @@
494507
<tvExpOptDlg>0</tvExpOptDlg>
495508
<cbSel>0</cbSel>
496509
<RteFlg>0</RteFlg>
497-
<File>
498-
<GroupNumber>4</GroupNumber>
499-
<FileNumber>23</FileNumber>
500-
<FileType>1</FileType>
501-
<tvExp>0</tvExp>
502-
<Focus>0</Focus>
503-
<tvExpOptDlg>0</tvExpOptDlg>
504-
<bDave2>0</bDave2>
505-
<PathWithFileName>..\..\Common\DataSave\RomFlashSave.c</PathWithFileName>
506-
<FilenameWithoutPath>RomFlashSave.c</FilenameWithoutPath>
507-
<RteFlg>0</RteFlg>
508-
<bShared>0</bShared>
509-
</File>
510510
<File>
511511
<GroupNumber>4</GroupNumber>
512512
<FileNumber>24</FileNumber>
@@ -515,8 +515,8 @@
515515
<Focus>0</Focus>
516516
<tvExpOptDlg>0</tvExpOptDlg>
517517
<bDave2>0</bDave2>
518-
<PathWithFileName>..\..\Common\DataSave\RomFlash.c</PathWithFileName>
519-
<FilenameWithoutPath>RomFlash.c</FilenameWithoutPath>
518+
<PathWithFileName>..\Data\RomFlashSave.c</PathWithFileName>
519+
<FilenameWithoutPath>RomFlashSave.c</FilenameWithoutPath>
520520
<RteFlg>0</RteFlg>
521521
<bShared>0</bShared>
522522
</File>

‎src/Core/Project/Q-Controllers.uvproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
<MiscControls></MiscControls>
368368
<Define>USE_STDPERIPH_DRIVER,STM32F10X_MD</Define>
369369
<Undefine></Undefine>
370-
<IncludePath>..\..\Common\Drivers;..\..\Common\Lib;..\..\Common\Lib\inc;..\..\Common\DataSave;..\..\Common\InfoSave;..\..\Common\Misc;..\..\Common\SysHandler;..\..\Common\SysTimer;..\Controllers;..\Include;..\User</IncludePath>
370+
<IncludePath>..\..\Common\Drivers;..\..\Common\Lib;..\..\Common\Lib\inc;..\..\Common\Storage;..\..\Common\Misc;..\..\Common\SysHandler;..\..\Common\SysTimer;..\Controllers;..\Include;..\User;..\Data</IncludePath>
371371
</VariousControls>
372372
</Cads>
373373
<Aads>
@@ -515,6 +515,11 @@
515515
<FileType>1</FileType>
516516
<FilePath>..\..\Common\Drivers\SpiFlash_w25q.c</FilePath>
517517
</File>
518+
<File>
519+
<FileName>RomFlash.c</FileName>
520+
<FileType>1</FileType>
521+
<FilePath>..\..\Common\Drivers\RomFlash.c</FilePath>
522+
</File>
518523
</Files>
519524
</Group>
520525
<Group>
@@ -538,12 +543,7 @@
538543
<File>
539544
<FileName>RomFlashSave.c</FileName>
540545
<FileType>1</FileType>
541-
<FilePath>..\..\Common\DataSave\RomFlashSave.c</FilePath>
542-
</File>
543-
<File>
544-
<FileName>RomFlash.c</FileName>
545-
<FileType>1</FileType>
546-
<FilePath>..\..\Common\DataSave\RomFlash.c</FilePath>
546+
<FilePath>..\Data\RomFlashSave.c</FilePath>
547547
</File>
548548
</Files>
549549
</Group>

0 commit comments

Comments
 (0)