Skip to content

Commit 3f53110

Browse files
authored
Merge pull request #1 from MathWorks-Teaching-Resources/release
Update MATLAB Onramp hyperlinks to MATLAB Academy
2 parents 48ac50e + cf74454 commit 3f53110

9 files changed

+69
-2
lines changed

.gitattributes

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
*.fig binary
2+
*.mat binary
3+
*.mdl binary diff merge=mlAutoMerge
4+
*.mdlp binary
5+
*.mexa64 binary
6+
*.mexw64 binary
7+
*.mexmaci64 binary
8+
*.mlapp binary linguist-language=MATLAB
9+
*.mldatx binary
10+
*.mlproj binary
11+
*.mlx binary merge=mlAutoMerge linguist-language=MATLAB
12+
*.p binary
13+
*.sfx binary
14+
*.sldd binary
15+
*.slreqx binary merge=mlAutoMerge
16+
*.slmx binary merge=mlAutoMerge
17+
*.sltx binary
18+
*.slxc binary
19+
*.slx binary merge=mlAutoMerge
20+
*.slxp binary
21+
22+
## Other common binary file types
23+
*.docx binary
24+
*.exe binary
25+
*.jpg binary
26+
*.pdf binary
27+
*.png binary
28+
*.xlsx binary
29+
30+
# Ignore HTML
31+
32+
*.html linguist-detectable=false

.gitignore

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# List of untracked files to ignore
2+
3+
# Autosave files
4+
*.asv
5+
*.m~
6+
*.autosave
7+
*.slx.r*
8+
*.mdl.r*
9+
10+
# Derived content-obscured files
11+
*.p
12+
13+
# Compiled MEX files
14+
*.mex*
15+
16+
# Packaged app and toolbox files
17+
*.mlappinstall
18+
*.mltbx
19+
20+
# Deployable archives
21+
*.ctf
22+
23+
# Generated helpsearch folders
24+
helpsearch*/
25+
26+
# Code generation folders
27+
slprj/
28+
sccprj/
29+
codegen/
30+
31+
# Cache files
32+
*.slxc
33+
34+
# Cloud based storage dotfile
35+
.MATLABDriveTag

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ This curriculum module contains interactive [live scripts](https://www.mathworks
2020
The instructions inside the live scripts will guide you through the exercises and activities. Get started with each live script by running it one section at a time. To stop running the script or a section midway (for example, when an animation is in progress), use the Stop button in the RUN section of the Live Editor tab in the MATLAB Toolstrip.
2121

2222
## Suggested Prework ##
23-
[MATLAB Onramp](https://www.mathworks.com/learn/tutorials/matlab-onramp.html) – a free two-hour introductory tutorial that teaches the essentials of MATLAB.
23+
[MATLAB Onramp](https://matlabacademy.mathworks.com/details/matlab-onramp/gettingstarted) – a free two-hour introductory tutorial that teaches the essentials of MATLAB.
2424
<br>
25-
[Simulink Onramp](https://www.mathworks.com/learn/tutorials/simulink-onramp.html) – a free three-hour introductory tutorial that teaches the essentials of Simulink.
25+
[Simulink Onramp](https://matlabacademy.mathworks.com/details/simulink-onramp/simulink) – a free three-hour introductory tutorial that teaches the essentials of Simulink.
2626

2727
## Details ##
2828

doubleMassSpringDamper.mlx

3.05 KB
Binary file not shown.

doubleMassSpringDamperSoln.mlx

3.05 KB
Binary file not shown.

massSpringDamper.mlx

2.67 KB
Binary file not shown.

massSpringDamperSoln.mlx

2.67 KB
Binary file not shown.

multipleMassSpringDamper.mlx

2.11 KB
Binary file not shown.

multipleMassSpringDamperSoln.mlx

2.11 KB
Binary file not shown.

0 commit comments

Comments
 (0)