Browse Source

Basic fonct.

Neluji 3 years ago
parent
commit
830ccb8cb7
5 changed files with 146 additions and 35 deletions
  1. 58
    18
      MDK-ARM/Project.uvoptx
  2. 20
    0
      MDK-ARM/Project.uvprojx
  3. 43
    0
      MyDrivers/MySysTick.c
  4. 15
    0
      MyDrivers/MySysTick.h
  5. 10
    17
      Src/main.c

+ 58
- 18
MDK-ARM/Project.uvoptx View File

@@ -317,7 +317,7 @@
317 317
         <SetRegEntry>
318 318
           <Number>0</Number>
319 319
           <Key>DLGDARM</Key>
320
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=504,37,1150,710,0)(110=60,88,280,548,0)(111=752,104,972,564,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=864,64,1285,491,0)(121=892,96,1313,523,0)(122=674,103,1095,530,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=709,11,1303,762,0)(131=736,17,1330,768,0)(132=599,17,1193,768,0)(133=295,17,889,768,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
320
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=675,52,1051,288,0)(1009=-1,-1,-1,-1,0)(100=504,37,1150,710,0)(110=60,88,280,548,0)(111=752,104,972,564,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=864,64,1285,491,0)(121=892,96,1313,523,0)(122=674,103,1095,530,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=709,11,1303,762,0)(131=736,17,1330,768,0)(132=599,17,1193,768,0)(133=295,17,889,768,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
321 321
         </SetRegEntry>
322 322
         <SetRegEntry>
323 323
           <Number>0</Number>
@@ -354,18 +354,34 @@
354 354
         <Bp>
355 355
           <Number>0</Number>
356 356
           <Type>0</Type>
357
-          <LineNumber>25</LineNumber>
357
+          <LineNumber>42</LineNumber>
358 358
           <EnabledFlag>1</EnabledFlag>
359
-          <Address>134219120</Address>
359
+          <Address>134218898</Address>
360 360
           <ByteObject>0</ByteObject>
361 361
           <HtxType>0</HtxType>
362 362
           <ManyObjects>0</ManyObjects>
363 363
           <SizeOfObject>0</SizeOfObject>
364 364
           <BreakByAccess>0</BreakByAccess>
365 365
           <BreakIfRCount>1</BreakIfRCount>
366
-          <Filename>F:\Etudes\4A\µC - Périphériques\Periph-Voilier\Services\Moteur.c</Filename>
366
+          <Filename>F:\Etudes\4A\µC - Périphériques\Periph-Voilier\Src\main.c</Filename>
367 367
           <ExecCommand></ExecCommand>
368
-          <Expression>\\NUCLEO_F103RB\../Services/Moteur.c\25</Expression>
368
+          <Expression>\\NUCLEO_F103RB\../Src/main.c\42</Expression>
369
+        </Bp>
370
+        <Bp>
371
+          <Number>1</Number>
372
+          <Type>0</Type>
373
+          <LineNumber>52</LineNumber>
374
+          <EnabledFlag>1</EnabledFlag>
375
+          <Address>134218878</Address>
376
+          <ByteObject>0</ByteObject>
377
+          <HtxType>0</HtxType>
378
+          <ManyObjects>0</ManyObjects>
379
+          <SizeOfObject>0</SizeOfObject>
380
+          <BreakByAccess>0</BreakByAccess>
381
+          <BreakIfRCount>1</BreakIfRCount>
382
+          <Filename>F:\Etudes\4A\µC - Périphériques\Periph-Voilier\Src\main.c</Filename>
383
+          <ExecCommand></ExecCommand>
384
+          <Expression>\\NUCLEO_F103RB\../Src/main.c\52</Expression>
369 385
         </Bp>
370 386
       </Breakpoint>
371 387
       <WatchWindow1>
@@ -391,7 +407,7 @@
391 407
         <periodic>1</periodic>
392 408
         <aLwin>1</aLwin>
393 409
         <aCover>0</aCover>
394
-        <aSer1>0</aSer1>
410
+        <aSer1>1</aSer1>
395 411
         <aSer2>0</aSer2>
396 412
         <aPa>0</aPa>
397 413
         <viewmode>1</viewmode>
@@ -429,12 +445,12 @@
429 445
         <Wi>
430 446
           <IntNumber>0</IntNumber>
431 447
           <FirstString>((porta &amp; 0x00000002) &gt;&gt; 1 &amp; 0x2) &gt;&gt; 1</FirstString>
432
-          <SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274612026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0B00000000000000000000000000000000000000320F0008</SecondString>
448
+          <SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274612026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1700000000000000000000000000000000000000320F0008</SecondString>
433 449
         </Wi>
434 450
         <Wi>
435 451
           <IntNumber>1</IntNumber>
436 452
           <FirstString>((porta &amp; 0x00000004) &gt;&gt; 2 &amp; 0x4) &gt;&gt; 2</FirstString>
437
-          <SecondString>00008000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274612026203078303030303030303429203E3E2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F0B00000000000000000000000000000000000000320F0008</SecondString>
453
+          <SecondString>00008000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274612026203078303030303030303429203E3E2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1700000000000000000000000000000000000000320F0008</SecondString>
438 454
         </Wi>
439 455
       </LogicAnalyzers>
440 456
       <DebugDescription>
@@ -497,7 +513,7 @@
497 513
       <GroupNumber>3</GroupNumber>
498 514
       <FileNumber>3</FileNumber>
499 515
       <FileType>1</FileType>
500
-      <tvExp>0</tvExp>
516
+      <tvExp>1</tvExp>
501 517
       <tvExpOptDlg>0</tvExpOptDlg>
502 518
       <bDave2>0</bDave2>
503 519
       <PathWithFileName>..\MyDrivers\MyTimer.c</PathWithFileName>
@@ -509,7 +525,7 @@
509 525
       <GroupNumber>3</GroupNumber>
510 526
       <FileNumber>4</FileNumber>
511 527
       <FileType>1</FileType>
512
-      <tvExp>0</tvExp>
528
+      <tvExp>1</tvExp>
513 529
       <tvExpOptDlg>0</tvExpOptDlg>
514 530
       <bDave2>0</bDave2>
515 531
       <PathWithFileName>..\MyDrivers\MyPWM.c</PathWithFileName>
@@ -517,6 +533,30 @@
517 533
       <RteFlg>0</RteFlg>
518 534
       <bShared>0</bShared>
519 535
     </File>
536
+    <File>
537
+      <GroupNumber>3</GroupNumber>
538
+      <FileNumber>5</FileNumber>
539
+      <FileType>1</FileType>
540
+      <tvExp>0</tvExp>
541
+      <tvExpOptDlg>0</tvExpOptDlg>
542
+      <bDave2>0</bDave2>
543
+      <PathWithFileName>..\MyDrivers\MySysTick.c</PathWithFileName>
544
+      <FilenameWithoutPath>MySysTick.c</FilenameWithoutPath>
545
+      <RteFlg>0</RteFlg>
546
+      <bShared>0</bShared>
547
+    </File>
548
+    <File>
549
+      <GroupNumber>3</GroupNumber>
550
+      <FileNumber>6</FileNumber>
551
+      <FileType>5</FileType>
552
+      <tvExp>0</tvExp>
553
+      <tvExpOptDlg>0</tvExpOptDlg>
554
+      <bDave2>0</bDave2>
555
+      <PathWithFileName>..\MyDrivers\MySysTick.h</PathWithFileName>
556
+      <FilenameWithoutPath>MySysTick.h</FilenameWithoutPath>
557
+      <RteFlg>0</RteFlg>
558
+      <bShared>0</bShared>
559
+    </File>
520 560
   </Group>
521 561
 
522 562
   <Group>
@@ -527,7 +567,7 @@
527 567
     <RteFlg>0</RteFlg>
528 568
     <File>
529 569
       <GroupNumber>4</GroupNumber>
530
-      <FileNumber>5</FileNumber>
570
+      <FileNumber>7</FileNumber>
531 571
       <FileType>1</FileType>
532 572
       <tvExp>0</tvExp>
533 573
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -539,7 +579,7 @@
539 579
     </File>
540 580
     <File>
541 581
       <GroupNumber>4</GroupNumber>
542
-      <FileNumber>6</FileNumber>
582
+      <FileNumber>8</FileNumber>
543 583
       <FileType>1</FileType>
544 584
       <tvExp>0</tvExp>
545 585
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -551,7 +591,7 @@
551 591
     </File>
552 592
     <File>
553 593
       <GroupNumber>4</GroupNumber>
554
-      <FileNumber>7</FileNumber>
594
+      <FileNumber>9</FileNumber>
555 595
       <FileType>1</FileType>
556 596
       <tvExp>0</tvExp>
557 597
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -563,7 +603,7 @@
563 603
     </File>
564 604
     <File>
565 605
       <GroupNumber>4</GroupNumber>
566
-      <FileNumber>8</FileNumber>
606
+      <FileNumber>10</FileNumber>
567 607
       <FileType>1</FileType>
568 608
       <tvExp>0</tvExp>
569 609
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -575,7 +615,7 @@
575 615
     </File>
576 616
     <File>
577 617
       <GroupNumber>4</GroupNumber>
578
-      <FileNumber>9</FileNumber>
618
+      <FileNumber>11</FileNumber>
579 619
       <FileType>1</FileType>
580 620
       <tvExp>0</tvExp>
581 621
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -595,7 +635,7 @@
595 635
     <RteFlg>0</RteFlg>
596 636
     <File>
597 637
       <GroupNumber>5</GroupNumber>
598
-      <FileNumber>10</FileNumber>
638
+      <FileNumber>12</FileNumber>
599 639
       <FileType>5</FileType>
600 640
       <tvExp>0</tvExp>
601 641
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -615,7 +655,7 @@
615 655
     <RteFlg>0</RteFlg>
616 656
     <File>
617 657
       <GroupNumber>6</GroupNumber>
618
-      <FileNumber>11</FileNumber>
658
+      <FileNumber>13</FileNumber>
619 659
       <FileType>1</FileType>
620 660
       <tvExp>0</tvExp>
621 661
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -635,7 +675,7 @@
635 675
     <RteFlg>0</RteFlg>
636 676
     <File>
637 677
       <GroupNumber>7</GroupNumber>
638
-      <FileNumber>12</FileNumber>
678
+      <FileNumber>14</FileNumber>
639 679
       <FileType>2</FileType>
640 680
       <tvExp>0</tvExp>
641 681
       <tvExpOptDlg>0</tvExpOptDlg>

+ 20
- 0
MDK-ARM/Project.uvprojx View File

@@ -412,6 +412,16 @@
412 412
               <FileType>1</FileType>
413 413
               <FilePath>..\MyDrivers\MyPWM.c</FilePath>
414 414
             </File>
415
+            <File>
416
+              <FileName>MySysTick.c</FileName>
417
+              <FileType>1</FileType>
418
+              <FilePath>..\MyDrivers\MySysTick.c</FilePath>
419
+            </File>
420
+            <File>
421
+              <FileName>MySysTick.h</FileName>
422
+              <FileType>5</FileType>
423
+              <FilePath>..\MyDrivers\MySysTick.h</FilePath>
424
+            </File>
415 425
           </Files>
416 426
         </Group>
417 427
         <Group>
@@ -885,6 +895,16 @@
885 895
               <FileType>1</FileType>
886 896
               <FilePath>..\MyDrivers\MyPWM.c</FilePath>
887 897
             </File>
898
+            <File>
899
+              <FileName>MySysTick.c</FileName>
900
+              <FileType>1</FileType>
901
+              <FilePath>..\MyDrivers\MySysTick.c</FilePath>
902
+            </File>
903
+            <File>
904
+              <FileName>MySysTick.h</FileName>
905
+              <FileType>5</FileType>
906
+              <FilePath>..\MyDrivers\MySysTick.h</FilePath>
907
+            </File>
888 908
           </Files>
889 909
         </Group>
890 910
         <Group>

+ 43
- 0
MyDrivers/MySysTick.c View File

@@ -0,0 +1,43 @@
1
+#include "MySysTick.h"
2
+
3
+#include "stm32f1xx_ll_bus.h" // Pour l'activation des horloges
4
+#include "stm32f1xx_ll_cortex.h"
5
+
6
+
7
+void (*Ptr_ItFct_SysTick)(void); 
8
+
9
+void MySysTick_Conf(uint32_t ticks) {
10
+	
11
+	SysTick_Config(ticks);
12
+	
13
+	MySysTick_IT_Disable();
14
+	
15
+}
16
+
17
+void MySysTick_IT_Conf (void (*IT_function)(void), int Prio) {
18
+	
19
+	//Affectation de la fonction du handler
20
+	Ptr_ItFct_SysTick = IT_function;
21
+	
22
+	//Désactivation des IT
23
+	LL_SYSTICK_DisableIT();
24
+	
25
+	//Configuration du NVIC
26
+	NVIC_SetPriority(SysTick_IRQn, Prio);
27
+	NVIC_EnableIRQ(SysTick_IRQn);
28
+	
29
+}
30
+
31
+void MySysTick_IT_Enable (void) {
32
+	LL_SYSTICK_EnableIT();
33
+}
34
+
35
+void MySysTick_IT_Disable (void) {
36
+	LL_SYSTICK_DisableIT();
37
+}
38
+
39
+/*========Handler d'IT==========*/
40
+
41
+void SysTick_Handler (void) {
42
+	(*Ptr_ItFct_SysTick)();
43
+}

+ 15
- 0
MyDrivers/MySysTick.h View File

@@ -0,0 +1,15 @@
1
+#ifndef MY_SYSTICK_H
2
+#define MY_SYSTICK_H
3
+
4
+#include "stm32f103xb.h"
5
+
6
+	
7
+	void MySysTick_Conf(uint32_t ticks);
8
+	
9
+	void MySysTick_IT_Conf (void (*IT_function)(void), int Prio);
10
+	
11
+	void MySysTick_IT_Enable (void);
12
+	
13
+	void MySysTick_IT_Disable (void);
14
+
15
+#endif

+ 10
- 17
Src/main.c View File

@@ -23,6 +23,8 @@
23 23
 #include "MyTimer.h"
24 24
 #include "MyPWM.h"
25 25
 #include "Moteur.h"
26
+#include "MySysTick.h"
27
+#include <stdio.h>
26 28
 
27 29
 void  SystemClock_Config(void);
28 30
 
@@ -35,26 +37,19 @@ void  SystemClock_Config(void);
35 37
   */
36 38
 	
37 39
 
40
+
41
+void test (void) {
42
+	printf("ok");
43
+}
44
+
38 45
 int main(void)
39 46
 {
40 47
   /* Configure the system clock to 72 MHz */
41 48
   SystemClock_Config();
42 49
 	
43
-	/*===Test Moteur===*/
44
-	
45
-	//INIT GPIO MARCHE PAS->PB PIN
46
-	Moteur_Conf();
47
-	
48
-	Moteur_Speed(30);
49
-	Moteur_Sens(0);
50
-  
51
-  /* Infinite loop */
52
-  for (int i =0; i<0xFFFF; i++)
53
-  {
54
-  }
55
-	
56
-	Moteur_Speed(60);
57
-	Moteur_Sens(1);
50
+	MySysTick_Conf(0xAFC80);
51
+	MySysTick_IT_Conf(test,3);
52
+	MySysTick_IT_Enable();
58 53
 	
59 54
 	while (1)
60 55
 	{
@@ -65,8 +60,6 @@ int main(void)
65 60
 
66 61
 
67 62
 
68
-
69
-
70 63
 /**
71 64
   * @brief  System Clock Configuration
72 65
   *         The system Clock is configured as follow :

Loading…
Cancel
Save