Update lab2 and timeline

_data/fa26.yml

@@ -63,12 +63,12 @@ staff:
       SCuM-V '26 tapeout, Fall '25 SCuM-V bring-up.
 
 # ---------------------------------------------------------------------------
-# Slide deck URLs, keyed by the name the importer produces (the Slides cell
-# minus its file extension). Kept out of the weeks block so a re-import does
-# not wipe them.
+# Slide deck URLs, keyed by week number. Kept out of the weeks block so a
+# re-import does not wipe them.
 # ---------------------------------------------------------------------------
 slide_links:
-  "Lecture 1": "https://docs.google.com/presentation/d/1psqea8kYcc_5TjZENkLpGUXaTFXarX85ZRN-n_WSEXM/edit?usp=sharing"
+  "1": "https://docs.google.com/presentation/d/1psqea8kYcc_5TjZENkLpGUXaTFXarX85ZRN-n_WSEXM/edit?usp=sharing"
+  "2": "https://docs.google.com/presentation/d/16lRiiqOjpSRyHzCrbcEbWbjYOWwTZnEv2IEmjbekmek/edit?usp=sharing"
 
 # ---------------------------------------------------------------------------
 # Weekly schedule, generated by scripts/import_calendar.py from the [Public]
@@ -90,7 +90,6 @@ weeks:
       - name: "Lecture 1"
     labs:
       - name: "Lab 1 Chipyard Released"
-    notes: "Bare dies back"
 
   - number: 2
     date: "Sep 4"
@@ -106,6 +105,7 @@ weeks:
     labs:
       - name: "Lab 3 FPGA Released"
       - name: "Lab 1 Chipyard Due"
+    notes: "Bare dies back"
 
   - number: 4
     date: "Sep 18"
@@ -127,7 +127,6 @@ weeks:
       - name: "Lab 3 FPGA Due"
     milestones:
       - name: "Breakout Board Layout"
-    notes: "Packaged chips back"
 
   - number: 6
     date: "Oct 2"
@@ -137,19 +136,20 @@ weeks:
       - name: "Lab 4 Baremetal IDE Due"
     milestones:
       - name: "Send out Breakout Board"
+    notes: "Packaged chips back"
 
   - number: 7
     date: "Oct 9"
     start: "2026-10-05"
     topic: "Team Presentation"
-    notes: "Assembled chips back"
 
   - number: 8
     date: "Oct 16"
     start: "2026-10-12"
     topic: "Team Presentation"
     milestones:
       - name: "SODIMM Board Schematic + Layout"
+    notes: "Assembled chips back"
 
   - number: 9
     date: "Oct 23"
@@ -204,7 +204,10 @@ sections:
     id: "labs"
     links:
       - name: "Lab 1: Chipyard"
-      - name: "Lab 2: PCB"
+      - name: "Lab 2: PCB (KiCad)"
+        url: "https://docs.google.com/document/d/1IKHQXg2jLJTqXtq4N0vtaWjvkmNU7mZcR7Kqh2qMf1g/edit?usp=sharing"
+      - name: "Lab 2: PCB (Altium)"
+        url: "https://docs.google.com/presentation/d/17N9VFr_9k82WmoItjAEJApA0vhc2WLPA4ZAqwGVu8FU/edit?usp=sharing"
       - name: "Lab 3: FPGA"
       - name: "Lab 4: Baremetal IDE"
 

_layouts/course-home.html

@@ -94,29 +94,23 @@ <h2 class="standard-title">Semester Calendar</h2>
               </td>
               <td class="col-topic" data-label="Topic">
                 {{ week.topic }}
-                {%- if week.slides %}
+                {%- comment -%}
+                Decks are keyed by week number in slide_links, not by the
+                spreadsheet's Slides cell, which is rarely filled in. Falls
+                back to naming an unlinked deck the sheet does know about.
+                {%- endcomment -%}
+                {%- assign week_key = week.number | append: '' -%}
+                {%- assign slide_url = c.slide_links[week_key] -%}
+                {%- if slide_url or week.slides %}
                   <span class="topic-slides">
-                    {%- for item in week.slides -%}
-                      {%- comment -%}
-                      URLs live in slide_links, keyed by name, so they survive
-                      re-importing the calendar.
-                      {%- endcomment -%}
-                      {%- assign slide_url = item.url | default: c.slide_links[item.name] -%}
-                      {%- comment -%}
-                      A lone deck reads "Slides"; several keep their own names.
-                      {%- endcomment -%}
-                      {%- if week.slides.size == 1 -%}
-                        {%- assign slide_label = "Slides" -%}
-                      {%- else -%}
-                        {%- assign slide_label = item.name -%}
-                      {%- endif -%}
-                      {%- if slide_url -%}
-                        <a href="{% include course-url.html url=slide_url %}">{{ slide_label }}</a>
-                      {%- else -%}
-                        <span class="pending">{{ slide_label }}</span>
-                      {%- endif -%}
-                      {%- unless forloop.last %}, {% endunless -%}
-                    {%- endfor -%}
+                    {%- if slide_url -%}
+                      <a href="{% include course-url.html url=slide_url %}">Slides</a>
+                    {%- else -%}
+                      {%- for item in week.slides -%}
+                        <span class="pending">{{ item.name }}</span>
+                        {%- unless forloop.last %}, {% endunless -%}
+                      {%- endfor -%}
+                    {%- endif -%}
                   </span>
                 {%- endif %}
               </td>