Skip to content

Commit fc93ba7

Browse files
quantum-leapsquantum-leaps
committed
2.0.5
1 parent bd0c157 commit fc93ba7

28 files changed

+4358
-219
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This course focuses on the **essential and fundamental concepts** in embedded pr
4242
- State machines, including modern hierarchical state machines
4343
- Automatic code generation
4444
- Software tracing
45-
- Assertions and Design by Contract
45+
- Assertions and Design by Contract
4646

4747
### ARM Cortex-M Architecture
4848
This course focuses on the prevalent [<b>ARM Cortex-M</b>](https://www.state-machine.com/course/ARM-Cortex-M_for_beginners.pdf) architecture, which over the past decade became unquesionably dominat in the embedded MCU market. Familiarity with ARM Cortex-M is the most sought after skill that employers are looking for.

‎lesson-11/simulator-arm-keil/lesson.uvprojx

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
<PlainCh>0</PlainCh>
324324
<Ropi>0</Ropi>
325325
<Rwpi>0</Rwpi>
326-
<wLevel>2</wLevel>
326+
<wLevel>3</wLevel>
327327
<uThumb>0</uThumb>
328328
<uSurpInc>0</uSurpInc>
329329
<uC99>0</uC99>

‎lesson-12/tm4c123-iar/main.c

+3-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ typedef struct {
2626
Window w, w2;
2727
Triangle t;
2828

29-
int main() {
29+
int main(void) {
3030
Point *pp;
3131
Window *wp;
3232

@@ -52,14 +52,8 @@ int main() {
5252
pp->x = 1U;
5353
wp->top_left = *pp;
5454

55-
SYSCTL->RCGC2 |= (1U << 5); /* enable clock for GPIOF */
5655
SYSCTL->GPIOHSCTL |= (1U << 5); /* enable AHB for GPIOF */
57-
58-
/* make sure the Run Mode and AHB-enable take effects
59-
* before accessing the peripherals
60-
*/
61-
__ISB(); /* Instruction Synchronization Barrier */
62-
__DSB(); /* Data Memory Barrier */
56+
SYSCTL->RCGC2 |= (1U << 5); /* enable clock for GPIOF */
6357

6458
GPIOF_HS->DIR |= (LED_RED | LED_BLUE | LED_GREEN);
6559
GPIOF_HS->DEN |= (LED_RED | LED_BLUE | LED_GREEN);
@@ -76,5 +70,5 @@ int main() {
7670

7771
delay(500000);
7872
}
79-
//return 0;
73+
//return 0; // unreachable code
8074
}

‎lesson-12/tm4c123-iar/project.ewd

+42-18
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</option>
4545
<option>
4646
<name>MemFile</name>
47-
<state></state>
47+
<state>$TOOLKIT_DIR$\CONFIG\debugger\TexasInstruments\TM4C123GH6PM.ddf</state>
4848
</option>
4949
<option>
5050
<name>RunToEnable</name>
@@ -88,7 +88,7 @@
8888
</option>
8989
<option>
9090
<name>OCLastSavedByProductVersion</name>
91-
<state>9.10.2.39304</state>
91+
<state>9.32.1.54977</state>
9292
</option>
9393
<option>
9494
<name>UseFlashLoader</name>
@@ -112,7 +112,7 @@
112112
</option>
113113
<option>
114114
<name>FlashLoadersV3</name>
115-
<state>$TOOLKIT_DIR$\config\flashloader\TexasInstruments\FlashTC4_H6_o.board</state>
115+
<state>$TOOLKIT_DIR$/config/flashloader/TexasInstruments/FlashTC4_H6_o.board</state>
116116
</option>
117117
<option>
118118
<name>OCImagesSuppressCheck1</name>
@@ -140,7 +140,7 @@
140140
</option>
141141
<option>
142142
<name>OverrideDefFlashBoard</name>
143-
<state>1</state>
143+
<state>0</state>
144144
</option>
145145
<option>
146146
<name>OCImagesOffset1</name>
@@ -285,10 +285,6 @@
285285
<version>4</version>
286286
<wantNonLocal>1</wantNonLocal>
287287
<debug>1</debug>
288-
<option>
289-
<name>CatchSFERR</name>
290-
<state>1</state>
291-
</option>
292288
<option>
293289
<name>OCDriverInfo</name>
294290
<state>1</state>
@@ -407,6 +403,10 @@
407403
<name>CatchINTERR</name>
408404
<state>1</state>
409405
</option>
406+
<option>
407+
<name>CatchSFERR</name>
408+
<state>1</state>
409+
</option>
410410
<option>
411411
<name>CatchHARDERR</name>
412412
<state>1</state>
@@ -708,7 +708,7 @@
708708
<option>
709709
<name>IjetTraceSizeList</name>
710710
<version>0</version>
711-
<state>2</state>
711+
<state>4</state>
712712
</option>
713713
<option>
714714
<name>FlashBoardPathSlave</name>
@@ -1072,7 +1072,7 @@
10721072
<name>STLINK_ID</name>
10731073
<archiveVersion>2</archiveVersion>
10741074
<data>
1075-
<version>7</version>
1075+
<version>8</version>
10761076
<wantNonLocal>1</wantNonLocal>
10771077
<debug>1</debug>
10781078
<option>
@@ -1188,7 +1188,15 @@
11881188
<option>
11891189
<name>CCSTLinkProbeList</name>
11901190
<version>1</version>
1191-
<state>0</state>
1191+
<state>2</state>
1192+
</option>
1193+
<option>
1194+
<name>CCSTLinkTargetVccEnable</name>
1195+
<state>1</state>
1196+
</option>
1197+
<option>
1198+
<name>CCSTLinkTargetVoltage</name>
1199+
<state>###Uninitialized###</state>
11921200
</option>
11931201
</data>
11941202
</settings>
@@ -1292,13 +1300,9 @@
12921300
<name>XDS100_ID</name>
12931301
<archiveVersion>2</archiveVersion>
12941302
<data>
1295-
<version>8</version>
1303+
<version>9</version>
12961304
<wantNonLocal>1</wantNonLocal>
12971305
<debug>1</debug>
1298-
<option>
1299-
<name>CCXds100CatchSFERR</name>
1300-
<state>0</state>
1301-
</option>
13021306
<option>
13031307
<name>OCDriverInfo</name>
13041308
<state>1</state>
@@ -1391,6 +1395,10 @@
13911395
<name>CCXds100CatchINTERR</name>
13921396
<state>0</state>
13931397
</option>
1398+
<option>
1399+
<name>CCXds100CatchSFERR</name>
1400+
<state>0</state>
1401+
</option>
13941402
<option>
13951403
<name>CCXds100CatchHARDERR</name>
13961404
<state>0</state>
@@ -1401,7 +1409,7 @@
14011409
</option>
14021410
<option>
14031411
<name>CCXds100CpuClockEdit</name>
1404-
<state>72.0</state>
1412+
<state></state>
14051413
</option>
14061414
<option>
14071415
<name>CCXds100SwoClockAuto</name>
@@ -1417,7 +1425,7 @@
14171425
</option>
14181426
<option>
14191427
<name>CCXds100ResetList</name>
1420-
<version>0</version>
1428+
<version>1</version>
14211429
<state>0</state>
14221430
</option>
14231431
<option>
@@ -1466,6 +1474,10 @@
14661474
<name>OCXDSDigitalStatesConfigFile</name>
14671475
<state>1</state>
14681476
</option>
1477+
<option>
1478+
<name>OCSelectedCoreName</name>
1479+
<state>1</state>
1480+
</option>
14691481
</data>
14701482
</settings>
14711483
<debuggerPlugins>
@@ -1513,6 +1525,18 @@
15131525
<file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
15141526
<loadFlag>0</loadFlag>
15151527
</plugin>
1528+
<plugin>
1529+
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
1530+
<loadFlag>0</loadFlag>
1531+
</plugin>
1532+
<plugin>
1533+
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
1534+
<loadFlag>0</loadFlag>
1535+
</plugin>
1536+
<plugin>
1537+
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
1538+
<loadFlag>0</loadFlag>
1539+
</plugin>
15161540
<plugin>
15171541
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
15181542
<loadFlag>0</loadFlag>

0 commit comments

Comments
 (0)