From b717bc4b46d5ee6bf64d810da1b42bed2cc51847 Mon Sep 17 00:00:00 2001
From: Cavailles Kevin <kc.mailpro@gmail.com>
Date: Thu, 14 May 2020 11:44:03 +0200
Subject: [PATCH] =?UTF-8?q?Objectif=202=20DFT=20en=20r=C3=A9el?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Project.uvoptx  | 84 ++++++++++++++-----------------------------------
 Project.uvprojx | 10 +++---
 Src/principal.c |  9 +++---
 3 files changed, 32 insertions(+), 71 deletions(-)

diff --git a/Project.uvoptx b/Project.uvoptx
index e5e1010..19d9f3d 100644
--- a/Project.uvoptx
+++ b/Project.uvoptx
@@ -157,55 +157,7 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>29</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134227768</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Src\calcul_dft.s</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\CHTI\Src/calcul_dft.s\29</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>42</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134227652</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Src\principal.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\CHTI\Src/principal.c\42</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>37</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134227626</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Src\principal.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\CHTI\Src/principal.c\37</Expression>
-        </Bp>
-        <Bp>
-          <Number>3</Number>
-          <Type>0</Type>
-          <LineNumber>62</LineNumber>
+          <LineNumber>61</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -230,6 +182,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>res_dft</ItemText>
         </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>compteurs</ItemText>
+        </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>scores</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
@@ -359,18 +321,6 @@
     <File>
       <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
-      <FileType>4</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\GASSP72\gassp72.lib</PathWithFileName>
-      <FilenameWithoutPath>gassp72.lib</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>5</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -380,6 +330,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>4</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\GFSSP72\gfssp72.lib</PathWithFileName>
+      <FilenameWithoutPath>gfssp72.lib</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
diff --git a/Project.uvprojx b/Project.uvprojx
index c44476a..a392889 100644
--- a/Project.uvprojx
+++ b/Project.uvprojx
@@ -407,16 +407,16 @@
         <Group>
           <GroupName>Driver</GroupName>
           <Files>
-            <File>
-              <FileName>gassp72.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\GASSP72\gassp72.lib</FilePath>
-            </File>
             <File>
               <FileName>table_sin_cos.s</FileName>
               <FileType>2</FileType>
               <FilePath>.\Src\table_sin_cos.s</FilePath>
             </File>
+            <File>
+              <FileName>gfssp72.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\GFSSP72\gfssp72.lib</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
diff --git a/Src/principal.c b/Src/principal.c
index b2d35ad..5a09d6d 100644
--- a/Src/principal.c
+++ b/Src/principal.c
@@ -5,6 +5,7 @@
 			
 #define taille 6
 #define SYSTICK_PER 360000 // (360000 ticks équivaut à 5ms)
+#define M2TIR 985988
 
 extern short TabSig[];
 int etat = 0x00020000;
@@ -19,13 +20,13 @@ unsigned short dma_buf[64];
 int compteurs[taille];
 int scores[taille];
 int k_values[] = {17,18,19,20,23,24};
-int M2TIR = 985507;
+
 
 
 
 void checkCounter(void){
 	for(int i=0; i<taille; i++) {
-		if(compteurs[i] == 13){
+		if(compteurs[i] >= 13){
 			compteurs[i]=0;
 			scores[i]++;
 		}
@@ -48,8 +49,6 @@ void sys_callback(void){
 	}
 	
 	checkCounter();
-	
-	
 }
 
 
@@ -72,7 +71,7 @@ int main(void)
 	GPIO_Configure(GPIOB, 14, OUTPUT, OUTPUT_PPULL);
 
 	// activation ADC, sampling time 1us
-	Init_TimingADC_ActiveADC_ff( ADC1, 0x33 );
+	Init_TimingADC_ActiveADC_ff( ADC1, 0x31 );
 	Single_Channel_ADC( ADC1, 2 );
 	// Déclenchement ADC par timer2, periode (72MHz/320kHz)ticks
 	Init_Conversion_On_Trig_Timer_ff( ADC1, TIM2_CC2, 225 );