Browse Source

update project files

Arnaud Vergnet 3 years ago
parent
commit
2d5c4e4f94
2 changed files with 67 additions and 24 deletions
  1. 47
    24
      MDK-ARM/Project.uvoptx
  2. 20
    0
      MDK-ARM/Project.uvprojx

+ 47
- 24
MDK-ARM/Project.uvoptx View File

@@ -345,7 +345,7 @@
345 345
         <SetRegEntry>
346 346
           <Number>0</Number>
347 347
           <Key>DLGDARM</Key>
348
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=2156,213,2522,450,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=2124,217,2535,660,0)(122=-1,-1,-1,-1,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=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=2076,105,2660,897,0)(133=2592,151,3176,943,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>
348
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=1554,213,1920,450,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=1509,217,1920,660,0)(122=-1,-1,-1,-1,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=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=1336,105,1920,897,0)(133=1148,116,1732,908,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=915,87,1508,879,0)(151=-1,-1,-1,-1,0)</Name>
349 349
         </SetRegEntry>
350 350
         <SetRegEntry>
351 351
           <Number>0</Number>
@@ -382,9 +382,9 @@
382 382
         <Bp>
383 383
           <Number>0</Number>
384 384
           <Type>0</Type>
385
-          <LineNumber>65</LineNumber>
385
+          <LineNumber>84</LineNumber>
386 386
           <EnabledFlag>1</EnabledFlag>
387
-          <Address>134223216</Address>
387
+          <Address>134226236</Address>
388 388
           <ByteObject>0</ByteObject>
389 389
           <HtxType>0</HtxType>
390 390
           <ManyObjects>0</ManyObjects>
@@ -393,23 +393,7 @@
393 393
           <BreakIfRCount>1</BreakIfRCount>
394 394
           <Filename>../Src/main.c</Filename>
395 395
           <ExecCommand></ExecCommand>
396
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\65</Expression>
397
-        </Bp>
398
-        <Bp>
399
-          <Number>1</Number>
400
-          <Type>0</Type>
401
-          <LineNumber>69</LineNumber>
402
-          <EnabledFlag>1</EnabledFlag>
403
-          <Address>134223230</Address>
404
-          <ByteObject>0</ByteObject>
405
-          <HtxType>0</HtxType>
406
-          <ManyObjects>0</ManyObjects>
407
-          <SizeOfObject>0</SizeOfObject>
408
-          <BreakByAccess>0</BreakByAccess>
409
-          <BreakIfRCount>1</BreakIfRCount>
410
-          <Filename>../Src/main.c</Filename>
411
-          <ExecCommand></ExecCommand>
412
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\69</Expression>
396
+          <Expression>\\NUCLEO_F103RB\../Src/main.c\84</Expression>
413 397
         </Bp>
414 398
       </Breakpoint>
415 399
       <WatchWindow1>
@@ -418,6 +402,21 @@
418 402
           <WinNumber>1</WinNumber>
419 403
           <ItemText>counter,0x10</ItemText>
420 404
         </Ww>
405
+        <Ww>
406
+          <count>1</count>
407
+          <WinNumber>1</WinNumber>
408
+          <ItemText>adcVolt1</ItemText>
409
+        </Ww>
410
+        <Ww>
411
+          <count>2</count>
412
+          <WinNumber>1</WinNumber>
413
+          <ItemText>adcVolt2</ItemText>
414
+        </Ww>
415
+        <Ww>
416
+          <count>3</count>
417
+          <WinNumber>1</WinNumber>
418
+          <ItemText>angle,0x0A</ItemText>
419
+        </Ww>
421 420
       </WatchWindow1>
422 421
       <Tracepoint>
423 422
         <THDelay>0</THDelay>
@@ -465,7 +464,7 @@
465 464
         <Wi>
466 465
           <IntNumber>0</IntNumber>
467 466
           <FirstString>((PORTB &amp; 0x00000100) &gt;&gt; 8 &amp; 0x100) &gt;&gt; 8</FirstString>
468
-          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303031303029203E3E2038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1400000000000000000000000000000000000000AE110008</SecondString>
467
+          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303031303029203E3E2038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1300000000000000000000000000000000000000AE110008</SecondString>
469 468
         </Wi>
470 469
       </LogicAnalyzers>
471 470
       <DebugDescription>
@@ -772,6 +771,30 @@
772 771
       <RteFlg>0</RteFlg>
773 772
       <bShared>0</bShared>
774 773
     </File>
774
+    <File>
775
+      <GroupNumber>4</GroupNumber>
776
+      <FileNumber>23</FileNumber>
777
+      <FileType>1</FileType>
778
+      <tvExp>0</tvExp>
779
+      <tvExpOptDlg>0</tvExpOptDlg>
780
+      <bDave2>0</bDave2>
781
+      <PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_usart.c</PathWithFileName>
782
+      <FilenameWithoutPath>stm32f1xx_ll_usart.c</FilenameWithoutPath>
783
+      <RteFlg>0</RteFlg>
784
+      <bShared>0</bShared>
785
+    </File>
786
+    <File>
787
+      <GroupNumber>4</GroupNumber>
788
+      <FileNumber>24</FileNumber>
789
+      <FileType>1</FileType>
790
+      <tvExp>0</tvExp>
791
+      <tvExpOptDlg>0</tvExpOptDlg>
792
+      <bDave2>0</bDave2>
793
+      <PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_adc.c</PathWithFileName>
794
+      <FilenameWithoutPath>stm32f1xx_ll_adc.c</FilenameWithoutPath>
795
+      <RteFlg>0</RteFlg>
796
+      <bShared>0</bShared>
797
+    </File>
775 798
   </Group>
776 799
 
777 800
   <Group>
@@ -782,7 +805,7 @@
782 805
     <RteFlg>0</RteFlg>
783 806
     <File>
784 807
       <GroupNumber>5</GroupNumber>
785
-      <FileNumber>23</FileNumber>
808
+      <FileNumber>25</FileNumber>
786 809
       <FileType>5</FileType>
787 810
       <tvExp>0</tvExp>
788 811
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -802,7 +825,7 @@
802 825
     <RteFlg>0</RteFlg>
803 826
     <File>
804 827
       <GroupNumber>6</GroupNumber>
805
-      <FileNumber>24</FileNumber>
828
+      <FileNumber>26</FileNumber>
806 829
       <FileType>1</FileType>
807 830
       <tvExp>0</tvExp>
808 831
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -822,7 +845,7 @@
822 845
     <RteFlg>0</RteFlg>
823 846
     <File>
824 847
       <GroupNumber>7</GroupNumber>
825
-      <FileNumber>25</FileNumber>
848
+      <FileNumber>27</FileNumber>
826 849
       <FileType>2</FileType>
827 850
       <tvExp>0</tvExp>
828 851
       <tvExpOptDlg>0</tvExpOptDlg>

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

@@ -508,6 +508,16 @@
508 508
               <FileType>1</FileType>
509 509
               <FilePath>..\LLDrivers\src\stm32f1xx_ll_gpio.c</FilePath>
510 510
             </File>
511
+            <File>
512
+              <FileName>stm32f1xx_ll_usart.c</FileName>
513
+              <FileType>1</FileType>
514
+              <FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
515
+            </File>
516
+            <File>
517
+              <FileName>stm32f1xx_ll_adc.c</FileName>
518
+              <FileType>1</FileType>
519
+              <FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
520
+            </File>
511 521
           </Files>
512 522
         </Group>
513 523
         <Group>
@@ -1047,6 +1057,16 @@
1047 1057
               <FileType>1</FileType>
1048 1058
               <FilePath>..\LLDrivers\src\stm32f1xx_ll_gpio.c</FilePath>
1049 1059
             </File>
1060
+            <File>
1061
+              <FileName>stm32f1xx_ll_usart.c</FileName>
1062
+              <FileType>1</FileType>
1063
+              <FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
1064
+            </File>
1065
+            <File>
1066
+              <FileName>stm32f1xx_ll_adc.c</FileName>
1067
+              <FileType>1</FileType>
1068
+              <FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
1069
+            </File>
1050 1070
           </Files>
1051 1071
         </Group>
1052 1072
         <Group>

Loading…
Cancel
Save