完成了对spi flash的支持

完成了对rom flash的data存储
q-iot · Jan 5, 2019 · 7f15a8b · 7f15a8b
1 parent 0674f6f
commit 7f15a8b
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,3 +51,6 @@ Module.symvers
 Mkfile.old
 dkms.conf
 /src/Core/Project/Output
+/src/Core/Project/*.Administrator
+/src/Core/Project/*.lst
+/src/Core/Project/JLinkLog.txt
diff --git a/src/Common/Misc/IoDefines.c b/src/Common/Misc/IoDefines.c
@@ -5,22 +5,24 @@ const IO_IN_HAL_DEFINE *gpIoInDefs=NULL;
 const IO_OUT_HAL_DEFINE *gpIoOutDefs=NULL;
 
 static const IO_IN_HAL_DEFINE gIoInDefs[IOIN_MAX]={
-{IOIN_PIO0,GPI_A,  GPin0, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI0_IRQn,EXTI_Pio_Priority},
-{IOIN_PIO1,GPI_A,  GPin1, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO2,GPI_A,  GPin2, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO3,GPI_A,  GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO4,GPI_A,  GPin4, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO5,GPI_A,  GPin5, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO6,GPI_A,  GPin6, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_PIO7,GPI_A,  GPin7, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO0,		GPI_A,  GPin0, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI0_IRQn,EXTI_Pio_Priority},
+{IOIN_PIO1,		GPI_A,  GPin1, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO2,		GPI_A,  GPin2, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO3,		GPI_A,  GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO4,		GPI_A,  GPin4, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO5,		GPI_A,  GPin5, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO6,		GPI_A,  GPin6, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_PIO7,		GPI_A,  GPin7, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
+{IOIN_IR_IN,		GPI_B,  GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI3_IRQn,EXTI_Pio_Priority},
+
 };
-
-static const IO_OUT_HAL_DEFINE gIoOutDefs[IOOUT_MAX]={
-{IOOUT_LED1,GPI_B,  GPin8, GPIO_Mode_Out_PP,TRUE},
-{IOOUT_LED2,GPI_B,  GPin9, GPIO_Mode_Out_PP,TRUE},
-{IOOUT_FLASH_CS,GPI_A,  GPin8, GPIO_Mode_Out_PP,TRUE},//flash cs
-{IOOUT_FLASH_WP,GPI_B,  GPin12, GPIO_Mode_Out_PP,FALSE},//flash wp
 
+static const IO_OUT_HAL_DEFINE gIoOutDefs[IOOUT_MAX]={
+{IOOUT_LED1,			GPI_B,	GPin8,		GPIO_Mode_Out_PP,TRUE},
+{IOOUT_LED2,			GPI_B,	GPin9,		GPIO_Mode_Out_PP,TRUE},
+{IOOUT_FLASH_CS,	GPI_A,	GPin8,		GPIO_Mode_Out_PP,TRUE},//flash cs
+{IOOUT_FLASH_WP,	GPI_B,	GPin12,	GPIO_Mode_Out_PP,FALSE},//flash wp
+{IOOUT_IR_OUT,		GPI_B,	GPin4,		GPIO_Mode_Out_PP,FALSE},//ir out
 
 };
 

diff --git a/src/Common/Misc/IoDefines.h b/src/Common/Misc/IoDefines.h
@@ -10,6 +10,7 @@ typedef enum{
 	IOIN_PIO5,
 	IOIN_PIO6,
 	IOIN_PIO7,
+	IOIN_IR_IN,
 
 	IOIN_MAX
 }IO_IN_DEFS;
@@ -19,6 +20,7 @@ typedef enum{
 	IOOUT_LED2,
 	IOOUT_FLASH_CS,
 	IOOUT_FLASH_WP,
+	IOOUT_IR_OUT,
 
 	IOOUT_MAX
 }IO_OUT_DEFS;

diff --git a/src/Core/Project/Q-Controllers.uvopt b/src/Core/Project/Q-Controllers.uvopt
@@ -452,6 +452,19 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\Common\Drivers\RomFlash.c</PathWithFileName>
+      <FilenameWithoutPath>RomFlash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -462,7 +475,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
@@ -475,7 +488,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
@@ -494,19 +507,6 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Common\DataSave\RomFlashSave.c</PathWithFileName>
-      <FilenameWithoutPath>RomFlashSave.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
     <File>
       <GroupNumber>4</GroupNumber>
       <FileNumber>24</FileNumber>
@@ -515,8 +515,8 @@
       <Focus>0</Focus>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Common\DataSave\RomFlash.c</PathWithFileName>
-      <FilenameWithoutPath>RomFlash.c</FilenameWithoutPath>
+      <PathWithFileName>..\Data\RomFlashSave.c</PathWithFileName>
+      <FilenameWithoutPath>RomFlashSave.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

diff --git a/src/Core/Project/Q-Controllers.uvproj b/src/Core/Project/Q-Controllers.uvproj
@@ -367,7 +367,7 @@
               <MiscControls></MiscControls>
               <Define>USE_STDPERIPH_DRIVER,STM32F10X_MD</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\Common\Drivers;..\..\Common\Lib;..\..\Common\Lib\inc;..\..\Common\DataSave;..\..\Common\InfoSave;..\..\Common\Misc;..\..\Common\SysHandler;..\..\Common\SysTimer;..\Controllers;..\Include;..\User</IncludePath>
+              <IncludePath>..\..\Common\Drivers;..\..\Common\Lib;..\..\Common\Lib\inc;..\..\Common\Storage;..\..\Common\Misc;..\..\Common\SysHandler;..\..\Common\SysTimer;..\Controllers;..\Include;..\User;..\Data</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -515,6 +515,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Common\Drivers\SpiFlash_w25q.c</FilePath>
             </File>
+            <File>
+              <FileName>RomFlash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Common\Drivers\RomFlash.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -538,12 +543,7 @@
             <File>
               <FileName>RomFlashSave.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\Common\DataSave\RomFlashSave.c</FilePath>
-            </File>
-            <File>
-              <FileName>RomFlash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Common\DataSave\RomFlash.c</FilePath>
+              <FilePath>..\Data\RomFlashSave.c</FilePath>
             </File>
           </Files>
         </Group>