Skip to content

Commit 2719b9b

Browse files
zelenskiCS107E Bot
zelenski
authored and
CS107E Bot
committed
Assignments/labs page list now shows preview of upcoming titles (before release)
commit 05a25e98ef579997396d821e735b6858b7b75e72 Author: Julie Zelenski <[email protected]> Date: Tue Jan 8 16:59:38 2019 -0800 Assignments/labs page list now shows preview of upcoming titles (before release)
1 parent 7dd9864 commit 2719b9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+165
-136
lines changed

‎assets/ashwin.png ‎_assets/ashwin.png

File renamed without changes.

‎assets/berry.png ‎_assets/berry.png

File renamed without changes.

‎assets/eric.png ‎_assets/eric.png

File renamed without changes.

‎_assets/favicon.png

4.24 KB
Loading

‎assets/jenn.png ‎_assets/jenn.png

File renamed without changes.

‎assets/julie.jpg ‎_assets/julie.jpg

File renamed without changes.

‎assets/natasha.png ‎_assets/natasha.png

File renamed without changes.

‎assets/pat.png ‎_assets/pat.png

File renamed without changes.

‎assets/site.scss ‎_assets/site.scss

File renamed without changes.

‎assets/tocbot.css ‎_assets/tocbot.css

File renamed without changes.

‎assets/tocbot.min.js ‎_assets/tocbot.min.js

File renamed without changes.

‎_config.yml

+21
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,29 @@ kramdown:
55
permalink: pretty
66
exclude:
77
- /cs107e/
8+
include:
9+
- _assets
810
collections:
911
assignments:
1012
output: true
1113
labs:
1214
output: true
15+
defaults:
16+
-
17+
scope:
18+
path: "" # an empty string here means all files in the project
19+
type: "pages"
20+
values:
21+
layout: "default"
22+
-
23+
scope:
24+
path: "" # an empty string here means all files in the project
25+
type: "assignments"
26+
values:
27+
layout: "default"
28+
-
29+
scope:
30+
path: "" # an empty string here means all files in the project
31+
type: "labs"
32+
values:
33+
layout: "default"

‎_data/quarter.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,27 @@
44
name: Winter 2019
55
instructors:
66
- name: Pat Hanrahan
7-
img: assets/pat.png
7+
img: _assets/pat.png
88
- name: Julie Zelenski
9-
img: assets/julie.jpg
9+
img: _assets/julie.jpg
1010
cas:
1111
- name: Jennifer Lin
12-
img: assets/jenn.png
12+
img: _assets/jenn.png
1313
- name: Eric Yang
14-
img: assets/eric.png
14+
img: _assets/eric.png
1515
sls:
1616
- name: Ashwin Agarwal
17-
img: assets/ashwin.png
17+
img: _assets/ashwin.png
1818
- name: Natasha Goenawan
19-
img: assets/natasha.png
20-
lectures: Mon & Fri 11:30am-12:50pm in McMurtry Art Building, Room 350
21-
labs: Tue & Wed 6:30-8:30pm in Gates B21
19+
img: _assets/natasha.png
20+
lectures: Mon and Fri 11:30am-12:50pm in McMurtry Art Building, Room 350
21+
labs: Tue or Wed 6:30-8:30pm in Gates B21
2222
forum: 'https://piazza.com/stanford/winter2019/cs107e'
2323
weeks:
2424
# set start date to date of first lecture (a Monday)
2525
- start_date: "2019-01-07"
2626
mon: /lectures/Intro/
27+
lab: No lab in first week
2728
assign: /assignments/assign0/
2829
fri: /lectures/ARM/
2930
-

‎_data/unreleased.csv

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ permalink,title,released
88
"/labs/projectlab2/","Project Lab 2: How Are You Doing?",false
99
"/labs/lab7/","Lab 7: Raspberry Pi, Interrupted",false
1010
"/labs/lab2/","Lab 2: Below C Level",false
11-
"/lectures/Serial/","Communication: The Serial Protocol and ASCII Character Codes",false
12-
"/lectures/C1/","C and Assembly Language",false
11+
"/lectures/Serial/","Communication and the Serial Protocol",false
12+
"/lectures/C1/","From Assembly to C",false
1313
"/lectures/Interrupts1/","Interrupts",false
1414
"/lectures/Performance/","Performance",false
15-
"/lectures/Functions/","Functions",false
16-
"/lectures/Arithmetic/","Computer Arithmetic, signed and unsigned numbers",false
17-
"/lectures/Interrupts2/","Interrupts and Concurrency",false
15+
"/lectures/Functions/","C Functions",false
16+
"/lectures/Arithmetic/","Computer Arithmetic, Signed and Unsigned",false
17+
"/lectures/Interrupts2/","Interrupts, cont'd",false
1818
"/lectures/FloatingPoint/","Floating Point",false
19-
"/lectures/C-mastery/","C-mastery",false
19+
"/lectures/C-mastery/","C Mastery",false
2020
"/lectures/Linking/","Modules, Libraries, and Linking",false
2121
"/lectures/Sound/","Sound",false
2222
"/lectures/C2/","C Pointers and Arrays",false
2323
"/lectures/GitWorkflow/","Git Workflow",false
2424
"/lectures/Sensors/","Sensors",false
2525
"/lectures/Framebuffer/","Graphics and the framebuffer",false
2626
"/lectures/ARM/","ARM processor and architecture",false
27-
"/lectures/Wrap/","Wrap Up",false
27+
"/lectures/Wrap/","Wrap",false
2828
"/lectures/ASM/","ARM assembly and machine code",false
2929
"/lectures/Memory/","Memory Management",false
3030
"/lectures/Keyboard/","Keyboards and the PS/2 Protocol",false

‎_includes/body.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{% if include.toc == true %}
2+
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12" id="main_for_toc">
3+
{{ content }}
4+
</div>
5+
<div class="toc-column col-lg-2 col-md-2 col-sm-2 hidden-xs">
6+
<div id="toc" class="toc" data-spy="affix" data-offset-top="0"></div>
7+
</div>
8+
</div>
9+
10+
<script src="/_assets/tocbot.min.js"></script>
11+
<link rel="stylesheet" href="/_assets/tocbot.css">
12+
13+
<script>
14+
tocbot.init({
15+
// Where to render the table of contents.
16+
tocSelector: '#toc',
17+
// Where to grab the headings to build the table of contents.
18+
contentSelector: '#main_for_toc',
19+
// Which headings to grab inside of the contentSelector element.
20+
headingSelector: 'h2, h3, h4',
21+
});
22+
</script>
23+
{% else %}
24+
{{ content }}
25+
{% endif %}
26+

‎_includes/bodywithtoc.html

-21
This file was deleted.

‎_includes/event.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- This partial used like a function to havest info for schedule entry, include.plink is permalink ref -->
1+
<!-- This partial used like a function to harvest info for lab/lect/assign, include.plink is permalink ref -->
22

33
<!-- look up by permalink if possible -->
44
{% if include.plink != null %}

‎_includes/footer.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="footer navbar-default navbar-static-bottom navbar-text">
2+
<p style="font-size: 75%;">
3+
<i>CS107e {{ site.data.quarter.name }} &middot; Page generated {{ "now" | date: "%Y-%m-%d %H:%M" }}</i>
4+
</p>
5+
</div>

‎_includes/itemlist.html

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!-- This partial used like a function to harvest list from schedule, include.type is either "lab" or "assign" -->
2+
3+
{% assign all_pages = site.pages | concat: site.labs | concat: site.assignments %}
4+
5+
6+
<div class="list-group">
7+
{% for week in site.data.quarter.weeks %}
8+
9+
{% assign plink = week[include.type] %}
10+
<!-- look up by permalink if possible -->
11+
{% assign found = all_pages | where:"permalink",plink | first %}
12+
<!-- Public site won't have unreleased assign/lab, read title from _data/unreleased.csv -->
13+
{% if found == null %}
14+
{% assign found = site.data.unreleased | where:"permalink",plink | first %}
15+
{% if found == null %}
16+
{% continue %}
17+
{% endif %}
18+
{% endif %}
19+
20+
<div class="list-group-item" style="padding: 3px 15px;">
21+
{% if found.released %}
22+
<a href="{{ found.permalink }}">{{ found.title }}</a>
23+
{% else %}
24+
<i>{{ found.title }}</i>
25+
{% endif %}
26+
</div>
27+
{% endfor %}
28+
</div>

‎_includes/navbar.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="icon-bar"></span>
1111
</button>
1212

13-
<img class="navbar-brand navbar-brand-image" src="/assets/berry.png" >
13+
<img class="navbar-brand navbar-brand-image" src="/_assets/berry.png" >
1414
<a class="navbar-brand" href="/">CS107e {{ site.data.quarter.name }}</a>
1515
</div>
1616

@@ -24,7 +24,7 @@
2424
Resources
2525
<span class="caret"></span></a>
2626
<ul class="dropdown-menu">
27-
<li><a href="/about">Course description</a></li>
27+
<li><a href="/description">Course description</a></li>
2828
<li><a href="/policies">Policies</a></li>
2929
<li><a href="/schedule">Schedule</a></li>
3030
<li><a href="/guides">Guides</a></li>

‎_layouts/default.html

+6-22
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,18 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88

9-
<link href="/assets/site.css" rel="stylesheet">
10-
<link rel="shortcut icon" type="image/x-icon" href="{{ "/assets/favicon.ico" | absolute_url }}">
11-
<title>CS107E {{ page.title }} </title>
9+
<link href="/_assets/site.css" rel="stylesheet">
10+
<link rel="icon" type="image/png" href="{{ "/_assets/favicon.png" | absolute_url }}">
11+
<title>CS107E {% if page.title %}{{ page.title }}{% endif %}</title>
1212
</head>
1313

1414
<body>
1515
{% include navbar.html %}
16-
1716
<div class="container">
18-
19-
{% if page.title %}
20-
<h1 class="title">{{ page.title }}</h1>
21-
<hr>
22-
{% endif %}
23-
24-
{% if page.toc == true %}
25-
{% include bodywithtoc.html %}
26-
{% else %}
27-
{{ content }}
28-
{% endif %}
29-
30-
<div class="footer navbar-default navbar-static-bottom">
31-
<div class="small navbar-text text-center">
32-
CS107e Winter 2019 &middot; {{ page.title }}
33-
</div>
34-
</div>
35-
17+
{% if page.title %}<h1 class="title">{{ page.title }}</h1><hr>{% endif %}
18+
{% include body.html toc=page.toc %}
3619
</div>
20+
{% include footer.html %}
3721
</body>
3822

3923
<!-- jQuery library -->

‎_layouts/page.html

-6
This file was deleted.

‎assets/favicon.ico

-14.7 KB
Binary file not shown.

‎circle.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
dependencies:
2+
override:
3+
- if [ ! -d ~/gcc-arm-none-eabi-4_8-2014q3 ]; then (curl -L -s -o - https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q3-update/+download/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 | tar xjf - -C ~); fi
4+
cache_directories:
5+
- "~/gcc-arm-none-eabi-4_8-2014q3"
6+
7+
test:
8+
override:
9+
- make:
10+
environment: { PATH: "${PATH}:/home/ubuntu/gcc-arm-none-eabi-4_8-2014q3/bin" }
11+
pwd: private/libraries/libpi
12+
- make clean:
13+
environment: { PATH: "${PATH}:/home/ubuntu/gcc-arm-none-eabi-4_8-2014q3/bin" }
14+
pwd: private/libraries/libpi
15+
- git checkout -- .
16+
17+
deployment:
18+
public:
19+
branch: master
20+
commands:
21+
- git config --global user.email "[email protected]"
22+
- git config --global user.name "CS107E Bot"
23+
- ./private/scripts/deploy_public.sh deploy

‎guides/UART-WiFi-Bridge.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: UART->WiFi bridge for two Raspberry Pis
43
---
54

‎guides/WebPage.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Using an ESP-32 to create a web page
43
---
54

‎guides/binutils.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Binary Utilities (binutils)
43
toc: true
54
---

‎guides/bom.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Kit inventory
43
---
54

‎guides/bootloader.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Using the console cable and bootloader
43
---
54

‎guides/ci.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Guide to automated checker
43
---
54

‎guides/electricity.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Electricity
43
---
54

‎guides/gcc.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Guide to Bare Metal Programming with GCC
43
---
54

‎guides/gdb.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Guide to using GDB in simulation mode
43
---
54

‎guides/index.md

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
---
2-
layout: page
32
title: Course Guides
4-
menu_item: true
53
---
64

75
We prepared these guides on various topics relevant to CS107E students. Hope you find them useful!
86

97
## Review
108

11-
1. [Basic electricity](electricity)
12-
2. [Binary and hexadecimal number representations](numbers)
13-
3. [Unix command line](unix)
9+
- [Basic electricity](electricity)
10+
- [Binary and hexadecimal number representations](numbers)
11+
- [Unix command line](unix)
1412

1513
## Setup
1614

17-
1. [Powering the Pi](power)
18-
2. [Working with SD cards](sd)
19-
3. [Installing the development tools on a Mac](mac_toolchain)
20-
4. [Installing a Ubuntu virtual machine on Windows](vmware)
21-
5. [Using the console cable and bootloader](bootloader)
22-
6. [Installing a reset button](reset-button)
23-
7. [Setting up the course directory structure](directory-structure)
15+
- [Powering the Pi](power)
16+
- [Working with SD cards](sd)
17+
- [Installing the development tools on a Mac](mac_toolchain)
18+
- [Installing a Ubuntu virtual machine on Windows](vmware)
19+
- [Using the console cable and bootloader](bootloader)
20+
- [Installing a reset button](reset-button)
21+
- [Setting up the course directory structure](directory-structure)
2422

2523
## Tools
2624

27-
1. [binutils](binutils)
28-
2. [Bare metal programming using gcc](gcc)
29-
3. [Using Make for ARM cross-development](make)
30-
4. [Using gdb in simulation mode](gdb)
31-
5. [Automated checker](ci)
25+
- [binutils](binutils)
26+
- [Bare metal programming using gcc](gcc)
27+
- [Using Make for ARM cross-development](make)
28+
- [Using gdb in simulation mode](gdb)
29+
- [Automated checker](ci)
3230

3331
## Libraries
34-
1. [UART-WiFi-Bridge to wirelessly connect two Raspberry Pis (requires two ESP32 Arduino devices)](UART-WiFi-Bridge)
35-
1. [WiFi web page](WebPage)
36-
1. [SD Card Library for reading and writing files](sd_library)
32+
- [UART-WiFi-Bridge to wirelessly connect two Raspberry Pis (requires two ESP32 Arduino devices)](UART-WiFi-Bridge)
33+
- [WiFi web page](WebPage)
34+
- [SD Card Library for reading and writing files](sd_library)

‎guides/mac_toolchain/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Mac Installation Guide
43
---
54

‎guides/make.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: Guide to Make for ARM cross-development
43
---
54

0 commit comments

Comments
 (0)