Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 0d1454b

Browse files
smaillet-mssmaillet-ms
committed
Keil uVision common project updates
- reset keil project doc paths to default install location so they work correctly (unfortunately the uVision project format doesn't distinguish between per project and per user persistent data very well) - removed preset breakpoints in uVision project as that just confuses multiple users of checked in code - updated STM32 CMSIS pack reference in uVision project to latest version - updated debugger settings to allow ITM "printf" capture in TinyBooter
1 parent ecbe124 commit 0d1454b

File tree

2 files changed

+29
-46
lines changed

2 files changed

+29
-46
lines changed

‎Solutions/MCBSTM32F400/netmfdbg/netmfdbg.uvoptx‎

Lines changed: 24 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -75,44 +75,44 @@
7575
<OPTFL>
7676
<tvExp>1</tvExp>
7777
<tvExpOptDlg>0</tvExpOptDlg>
78-
<IsCurrentTarget>0</IsCurrentTarget>
78+
<IsCurrentTarget>1</IsCurrentTarget>
7979
</OPTFL>
8080
<CpuCode>18</CpuCode>
8181
<Books>
8282
<Book>
8383
<Number>0</Number>
84-
<Title>Schematics (MCBSTM32F400)</Title>
85-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\Keil\MCBSTM32F400\Documentation\mcbstm32f400-schematics.pdf</Path>
84+
<Title>User Manual (MCBSTM32F400)</Title>
85+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/Keil/MCBSTM32F400/Documentation/mcbstm32f200.chm</Path>
8686
</Book>
8787
<Book>
8888
<Number>1</Number>
89-
<Title>User Manual (MCBSTM32F400)</Title>
90-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\Keil\MCBSTM32F400\Documentation\mcbstm32f400.chm</Path>
89+
<Title>Schematics (MCBSTM32F400)</Title>
90+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/Keil/MCBSTM32F400/Documentation/mcbstm32f400-schematics.pdf</Path>
9191
</Book>
9292
<Book>
9393
<Number>2</Number>
9494
<Title>Getting Started (STM32F4-Discovery)</Title>
95-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\DM00037368.pdf</Path>
95+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/DM00037368.pdf</Path>
9696
</Book>
9797
<Book>
9898
<Number>3</Number>
9999
<Title>User Manual (STM32F4-Discovery)</Title>
100-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\DM00039084.pdf</Path>
100+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/DM00039084.pdf</Path>
101101
</Book>
102102
<Book>
103103
<Number>4</Number>
104104
<Title>Bill of Materials (STM32F4-Discovery)</Title>
105-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_bom.zip</Path>
105+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_bom.zip</Path>
106106
</Book>
107107
<Book>
108108
<Number>5</Number>
109109
<Title>Gerber Files (STM32F4-Discovery)</Title>
110-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_gerber.zip</Path>
110+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_gerber.zip</Path>
111111
</Book>
112112
<Book>
113113
<Number>6</Number>
114114
<Title>Schematics (STM32F4-Discovery)</Title>
115-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_sch.zip</Path>
115+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_sch.zip</Path>
116116
</Book>
117117
<Book>
118118
<Number>7</Number>
@@ -184,32 +184,15 @@
184184
<SetRegEntry>
185185
<Number>0</Number>
186186
<Key>ULP2CM3</Key>
187-
<Name>-UP1209218 -O2255 -S14 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC168000000 -TP18 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIE80000001 -TIP9 -FO23 -FD20000000 -FC1000 -FN2 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407IGHx$CMSIS\Flash\STM32F4xx_1024.FLM) -FF1M29W640FB -FS160000000 -FL1800000</Name>
187+
<Name>-UP1209218 -O2254 -S14 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO32771 -TC168000000 -TP18 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIE80000001 -TIP9 -FO19 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407IGHx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
188188
</SetRegEntry>
189189
<SetRegEntry>
190190
<Number>0</Number>
191191
<Key>UL2CM3</Key>
192192
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F407IGHx$CMSIS\Flash\STM32F4xx_1024.FLM))</Name>
193193
</SetRegEntry>
194194
</TargetDriverDllRegistry>
195-
<Breakpoint>
196-
<Bp>
197-
<Number>0</Number>
198-
<Type>0</Type>
199-
<LineNumber>203</LineNumber>
200-
<EnabledFlag>1</EnabledFlag>
201-
<Address>134235254</Address>
202-
<ByteObject>0</ByteObject>
203-
<HtxType>0</HtxType>
204-
<ManyObjects>0</ManyObjects>
205-
<SizeOfObject>0</SizeOfObject>
206-
<BreakByAccess>0</BreakByAccess>
207-
<BreakIfRCount>1</BreakIfRCount>
208-
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\Solutions\MCBSTM32F400\TinyBooter\TinyBooterEntry.cpp</Filename>
209-
<ExecCommand></ExecCommand>
210-
<Expression></Expression>
211-
</Bp>
212-
</Breakpoint>
195+
<Breakpoint/>
213196
<MemoryWindow1>
214197
<Mm>
215198
<WinNumber>1</WinNumber>
@@ -224,7 +207,7 @@
224207
<DebugFlag>
225208
<trace>0</trace>
226209
<periodic>1</periodic>
227-
<aLwin>1</aLwin>
210+
<aLwin>0</aLwin>
228211
<aCover>0</aCover>
229212
<aSer1>0</aSer1>
230213
<aSer2>0</aSer2>
@@ -306,44 +289,44 @@
306289
<OPTFL>
307290
<tvExp>1</tvExp>
308291
<tvExpOptDlg>0</tvExpOptDlg>
309-
<IsCurrentTarget>1</IsCurrentTarget>
292+
<IsCurrentTarget>0</IsCurrentTarget>
310293
</OPTFL>
311294
<CpuCode>18</CpuCode>
312295
<Books>
313296
<Book>
314297
<Number>0</Number>
315-
<Title>Schematics (MCBSTM32F400)</Title>
316-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\Keil\MCBSTM32F400\Documentation\mcbstm32f400-schematics.pdf</Path>
298+
<Title>User Manual (MCBSTM32F400)</Title>
299+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/Keil/MCBSTM32F400/Documentation/mcbstm32f200.chm</Path>
317300
</Book>
318301
<Book>
319302
<Number>1</Number>
320-
<Title>User Manual (MCBSTM32F400)</Title>
321-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\Keil\MCBSTM32F400\Documentation\mcbstm32f400.chm</Path>
303+
<Title>Schematics (MCBSTM32F400)</Title>
304+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/Keil/MCBSTM32F400/Documentation/mcbstm32f400-schematics.pdf</Path>
322305
</Book>
323306
<Book>
324307
<Number>2</Number>
325308
<Title>Getting Started (STM32F4-Discovery)</Title>
326-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\DM00037368.pdf</Path>
309+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/DM00037368.pdf</Path>
327310
</Book>
328311
<Book>
329312
<Number>3</Number>
330313
<Title>User Manual (STM32F4-Discovery)</Title>
331-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\DM00039084.pdf</Path>
314+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/DM00039084.pdf</Path>
332315
</Book>
333316
<Book>
334317
<Number>4</Number>
335318
<Title>Bill of Materials (STM32F4-Discovery)</Title>
336-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_bom.zip</Path>
319+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_bom.zip</Path>
337320
</Book>
338321
<Book>
339322
<Number>5</Number>
340323
<Title>Gerber Files (STM32F4-Discovery)</Title>
341-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_gerber.zip</Path>
324+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_gerber.zip</Path>
342325
</Book>
343326
<Book>
344327
<Number>6</Number>
345328
<Title>Schematics (STM32F4-Discovery)</Title>
346-
<Path>C:\Keil\ARM\PACK\Keil\STM32F4xx_DFP\2.2.0\MDK\Boards\ST\STM32F4-Discovery\Documentation\stm32f4discovery_sch.zip</Path>
329+
<Path>C:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.5.0\MDK/Boards/ST/STM32F4-Discovery/Documentation/stm32f4discovery_sch.zip</Path>
347330
</Book>
348331
<Book>
349332
<Number>7</Number>
@@ -438,7 +421,7 @@
438421
<DebugFlag>
439422
<trace>0</trace>
440423
<periodic>1</periodic>
441-
<aLwin>1</aLwin>
424+
<aLwin>0</aLwin>
442425
<aCover>0</aCover>
443426
<aSer1>0</aSer1>
444427
<aSer2>0</aSer2>

‎Solutions/MCBSTM32F400/netmfdbg/netmfdbg.uvprojx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<TargetCommonOption>
1515
<Device>STM32F407IGHx</Device>
1616
<Vendor>STMicroelectronics</Vendor>
17-
<PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
17+
<PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
1818
<PackURL>http://www.keil.com/pack</PackURL>
1919
<Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
2020
<FlashUtilSpec></FlashUtilSpec>
@@ -430,7 +430,7 @@
430430
<TargetCommonOption>
431431
<Device>STM32F407IGHx</Device>
432432
<Vendor>STMicroelectronics</Vendor>
433-
<PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
433+
<PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
434434
<PackURL>http://www.keil.com/pack</PackURL>
435435
<Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
436436
<FlashUtilSpec></FlashUtilSpec>
@@ -846,7 +846,7 @@
846846
<TargetCommonOption>
847847
<Device>STM32F407IGHx</Device>
848848
<Vendor>STMicroelectronics</Vendor>
849-
<PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
849+
<PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
850850
<PackURL>http://www.keil.com/pack</PackURL>
851851
<Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
852852
<FlashUtilSpec></FlashUtilSpec>
@@ -1262,7 +1262,7 @@
12621262
<TargetCommonOption>
12631263
<Device>STM32F407IGHx</Device>
12641264
<Vendor>STMicroelectronics</Vendor>
1265-
<PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
1265+
<PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
12661266
<PackURL>http://www.keil.com/pack</PackURL>
12671267
<Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
12681268
<FlashUtilSpec></FlashUtilSpec>
@@ -1678,7 +1678,7 @@
16781678
<TargetCommonOption>
16791679
<Device>STM32F407IGHx</Device>
16801680
<Vendor>STMicroelectronics</Vendor>
1681-
<PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
1681+
<PackID>Keil.STM32F4xx_DFP.2.5.0</PackID>
16821682
<PackURL>http://www.keil.com/pack</PackURL>
16831683
<Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
16841684
<FlashUtilSpec></FlashUtilSpec>

0 commit comments

Comments
 (0)