Browse Source

update project files

Arnaud Vergnet 3 years ago
parent
commit
f5adb05005
2 changed files with 40 additions and 72 deletions
  1. 20
    49
      MDK-ARM/Project.uvoptx
  2. 20
    23
      MDK-ARM/Project.uvprojx

+ 20
- 49
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=-1,-1,-1,-1,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=100,129,658,654,0)(121=-1,-1,-1,-1,0)(122=1005,156,1563,681,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=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=1238,79,1832,588,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=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>
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>39</LineNumber>
385
+          <LineNumber>65</LineNumber>
386 386
           <EnabledFlag>1</EnabledFlag>
387
-          <Address>134224104</Address>
387
+          <Address>134223216</Address>
388 388
           <ByteObject>0</ByteObject>
389 389
           <HtxType>0</HtxType>
390 390
           <ManyObjects>0</ManyObjects>
@@ -393,35 +393,30 @@
393 393
           <BreakIfRCount>1</BreakIfRCount>
394 394
           <Filename>../Src/main.c</Filename>
395 395
           <ExecCommand></ExecCommand>
396
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\39</Expression>
396
+          <Expression>\\NUCLEO_F103RB\../Src/main.c\65</Expression>
397 397
         </Bp>
398 398
         <Bp>
399 399
           <Number>1</Number>
400 400
           <Type>0</Type>
401
-          <LineNumber>40</LineNumber>
401
+          <LineNumber>69</LineNumber>
402 402
           <EnabledFlag>1</EnabledFlag>
403
-          <Address>0</Address>
403
+          <Address>134223230</Address>
404 404
           <ByteObject>0</ByteObject>
405 405
           <HtxType>0</HtxType>
406 406
           <ManyObjects>0</ManyObjects>
407 407
           <SizeOfObject>0</SizeOfObject>
408 408
           <BreakByAccess>0</BreakByAccess>
409
-          <BreakIfRCount>0</BreakIfRCount>
409
+          <BreakIfRCount>1</BreakIfRCount>
410 410
           <Filename>../Src/main.c</Filename>
411 411
           <ExecCommand></ExecCommand>
412
-          <Expression></Expression>
412
+          <Expression>\\NUCLEO_F103RB\../Src/main.c\69</Expression>
413 413
         </Bp>
414 414
       </Breakpoint>
415 415
       <WatchWindow1>
416 416
         <Ww>
417 417
           <count>0</count>
418 418
           <WinNumber>1</WinNumber>
419
-          <ItemText>adcRaw,0x0A</ItemText>
420
-        </Ww>
421
-        <Ww>
422
-          <count>1</count>
423
-          <WinNumber>1</WinNumber>
424
-          <ItemText>adcVolt</ItemText>
419
+          <ItemText>counter,0x10</ItemText>
425 420
         </Ww>
426 421
       </WatchWindow1>
427 422
       <Tracepoint>
@@ -430,7 +425,7 @@
430 425
       <DebugFlag>
431 426
         <trace>0</trace>
432 427
         <periodic>1</periodic>
433
-        <aLwin>0</aLwin>
428
+        <aLwin>1</aLwin>
434 429
         <aCover>0</aCover>
435 430
         <aSer1>0</aSer1>
436 431
         <aSer2>0</aSer2>
@@ -444,7 +439,7 @@
444 439
         <AscS3>0</AscS3>
445 440
         <aSer3>0</aSer3>
446 441
         <eProf>0</eProf>
447
-        <aLa>0</aLa>
442
+        <aLa>1</aLa>
448 443
         <aPa1>0</aPa1>
449 444
         <AscS4>0</AscS4>
450 445
         <aSer4>0</aSer4>
@@ -469,8 +464,8 @@
469 464
       <LogicAnalyzers>
470 465
         <Wi>
471 466
           <IntNumber>0</IntNumber>
472
-          <FirstString>((PORTA &amp; 0x00000200) &gt;&gt; 9 &amp; 0x200) &gt;&gt; 9</FirstString>
473
-          <SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254412026203078303030303032303029203E3E2039000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F170000000000000000000000000000000000000000010008</SecondString>
467
+          <FirstString>((PORTB &amp; 0x00000100) &gt;&gt; 8 &amp; 0x100) &gt;&gt; 8</FirstString>
468
+          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303031303029203E3E2038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1400000000000000000000000000000000000000AE110008</SecondString>
474 469
         </Wi>
475 470
       </LogicAnalyzers>
476 471
       <DebugDescription>
@@ -689,7 +684,7 @@
689 684
       <GroupNumber>3</GroupNumber>
690 685
       <FileNumber>16</FileNumber>
691 686
       <FileType>1</FileType>
692
-      <tvExp>1</tvExp>
687
+      <tvExp>0</tvExp>
693 688
       <tvExpOptDlg>0</tvExpOptDlg>
694 689
       <bDave2>0</bDave2>
695 690
       <PathWithFileName>..\MyDrivers\ADC.c</PathWithFileName>
@@ -713,7 +708,7 @@
713 708
       <GroupNumber>3</GroupNumber>
714 709
       <FileNumber>18</FileNumber>
715 710
       <FileType>1</FileType>
716
-      <tvExp>1</tvExp>
711
+      <tvExp>0</tvExp>
717 712
       <tvExpOptDlg>0</tvExpOptDlg>
718 713
       <bDave2>0</bDave2>
719 714
       <PathWithFileName>..\MyDrivers\USART.c</PathWithFileName>
@@ -777,41 +772,17 @@
777 772
       <RteFlg>0</RteFlg>
778 773
       <bShared>0</bShared>
779 774
     </File>
780
-    <File>
781
-      <GroupNumber>4</GroupNumber>
782
-      <FileNumber>23</FileNumber>
783
-      <FileType>1</FileType>
784
-      <tvExp>0</tvExp>
785
-      <tvExpOptDlg>0</tvExpOptDlg>
786
-      <bDave2>0</bDave2>
787
-      <PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_usart.c</PathWithFileName>
788
-      <FilenameWithoutPath>stm32f1xx_ll_usart.c</FilenameWithoutPath>
789
-      <RteFlg>0</RteFlg>
790
-      <bShared>0</bShared>
791
-    </File>
792
-    <File>
793
-      <GroupNumber>4</GroupNumber>
794
-      <FileNumber>24</FileNumber>
795
-      <FileType>1</FileType>
796
-      <tvExp>0</tvExp>
797
-      <tvExpOptDlg>0</tvExpOptDlg>
798
-      <bDave2>0</bDave2>
799
-      <PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_adc.c</PathWithFileName>
800
-      <FilenameWithoutPath>stm32f1xx_ll_adc.c</FilenameWithoutPath>
801
-      <RteFlg>0</RteFlg>
802
-      <bShared>0</bShared>
803
-    </File>
804 775
   </Group>
805 776
 
806 777
   <Group>
807 778
     <GroupName>Doc</GroupName>
808
-    <tvExp>1</tvExp>
779
+    <tvExp>0</tvExp>
809 780
     <tvExpOptDlg>0</tvExpOptDlg>
810 781
     <cbSel>0</cbSel>
811 782
     <RteFlg>0</RteFlg>
812 783
     <File>
813 784
       <GroupNumber>5</GroupNumber>
814
-      <FileNumber>25</FileNumber>
785
+      <FileNumber>23</FileNumber>
815 786
       <FileType>5</FileType>
816 787
       <tvExp>0</tvExp>
817 788
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -825,13 +796,13 @@
825 796
 
826 797
   <Group>
827 798
     <GroupName>Drivers/CMSIS</GroupName>
828
-    <tvExp>0</tvExp>
799
+    <tvExp>1</tvExp>
829 800
     <tvExpOptDlg>0</tvExpOptDlg>
830 801
     <cbSel>0</cbSel>
831 802
     <RteFlg>0</RteFlg>
832 803
     <File>
833 804
       <GroupNumber>6</GroupNumber>
834
-      <FileNumber>26</FileNumber>
805
+      <FileNumber>24</FileNumber>
835 806
       <FileType>1</FileType>
836 807
       <tvExp>0</tvExp>
837 808
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -851,7 +822,7 @@
851 822
     <RteFlg>0</RteFlg>
852 823
     <File>
853 824
       <GroupNumber>7</GroupNumber>
854
-      <FileNumber>27</FileNumber>
825
+      <FileNumber>25</FileNumber>
855 826
       <FileType>2</FileType>
856 827
       <tvExp>0</tvExp>
857 828
       <tvExpOptDlg>0</tvExpOptDlg>

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

@@ -185,6 +185,7 @@
185 185
             <uocXRam>0</uocXRam>
186 186
             <RvdsVP>0</RvdsVP>
187 187
             <RvdsMve>0</RvdsMve>
188
+            <RvdsCdeCp>0</RvdsCdeCp>
188 189
             <hadIRAM2>0</hadIRAM2>
189 190
             <hadIROM2>0</hadIROM2>
190 191
             <StupSel>8</StupSel>
@@ -351,7 +352,7 @@
351 352
             <NoWarn>0</NoWarn>
352 353
             <uSurpInc>0</uSurpInc>
353 354
             <useXO>0</useXO>
354
-            <uClangAs>0</uClangAs>
355
+            <ClangAsOpt>4</ClangAsOpt>
355 356
             <VariousControls>
356 357
               <MiscControls></MiscControls>
357 358
               <Define></Define>
@@ -507,16 +508,6 @@
507 508
               <FileType>1</FileType>
508 509
               <FilePath>..\LLDrivers\src\stm32f1xx_ll_gpio.c</FilePath>
509 510
             </File>
510
-            <File>
511
-              <FileName>stm32f1xx_ll_usart.c</FileName>
512
-              <FileType>1</FileType>
513
-              <FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
514
-            </File>
515
-            <File>
516
-              <FileName>stm32f1xx_ll_adc.c</FileName>
517
-              <FileType>1</FileType>
518
-              <FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
519
-            </File>
520 511
           </Files>
521 512
         </Group>
522 513
         <Group>
@@ -558,7 +549,7 @@
558 549
       <TargetName>Simulateur</TargetName>
559 550
       <ToolsetNumber>0x4</ToolsetNumber>
560 551
       <ToolsetName>ARM-ADS</ToolsetName>
561
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
552
+      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
562 553
       <uAC6>0</uAC6>
563 554
       <TargetOption>
564 555
         <TargetCommonOption>
@@ -733,6 +724,7 @@
733 724
             <uocXRam>0</uocXRam>
734 725
             <RvdsVP>0</RvdsVP>
735 726
             <RvdsMve>0</RvdsMve>
727
+            <RvdsCdeCp>0</RvdsCdeCp>
736 728
             <hadIRAM2>0</hadIRAM2>
737 729
             <hadIROM2>0</hadIROM2>
738 730
             <StupSel>8</StupSel>
@@ -899,7 +891,7 @@
899 891
             <NoWarn>0</NoWarn>
900 892
             <uSurpInc>0</uSurpInc>
901 893
             <useXO>0</useXO>
902
-            <uClangAs>0</uClangAs>
894
+            <ClangAsOpt>4</ClangAsOpt>
903 895
             <VariousControls>
904 896
               <MiscControls></MiscControls>
905 897
               <Define></Define>
@@ -1055,16 +1047,6 @@
1055 1047
               <FileType>1</FileType>
1056 1048
               <FilePath>..\LLDrivers\src\stm32f1xx_ll_gpio.c</FilePath>
1057 1049
             </File>
1058
-            <File>
1059
-              <FileName>stm32f1xx_ll_usart.c</FileName>
1060
-              <FileType>1</FileType>
1061
-              <FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
1062
-            </File>
1063
-            <File>
1064
-              <FileName>stm32f1xx_ll_adc.c</FileName>
1065
-              <FileType>1</FileType>
1066
-              <FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
1067
-            </File>
1068 1050
           </Files>
1069 1051
         </Group>
1070 1052
         <Group>
@@ -1118,4 +1100,19 @@
1118 1100
     <files/>
1119 1101
   </RTE>
1120 1102
 
1103
+  <LayerInfo>
1104
+    <Layers>
1105
+      <Layer>
1106
+        <LayName>&lt;Project Info&gt;</LayName>
1107
+        <LayDesc></LayDesc>
1108
+        <LayUrl></LayUrl>
1109
+        <LayKeys></LayKeys>
1110
+        <LayCat></LayCat>
1111
+        <LayLic></LayLic>
1112
+        <LayTarg>0</LayTarg>
1113
+        <LayPrjMark>1</LayPrjMark>
1114
+      </Layer>
1115
+    </Layers>
1116
+  </LayerInfo>
1117
+
1121 1118
 </Project>

Loading…
Cancel
Save