Differences

This shows you the differences between two versions of the page.

--- demonstrations:3_oscillations_and_waves:u-shape_track:start [2019/02/14 23:33] – external edit 127.0.0.1
+++ demonstrations:3_oscillations_and_waves:u-shape_track:start [2020/02/10 17:57] (current) – demoroom
@@ Line 1: / Line 1: @@
 ====== U-shape Track ======
-{{tag>SHM Oscillation needs_review untagged unlocated}}
+{{tag> simple_harmonic_motion Oscillation untagged located}}
 <WRAP box right>
@@ Line 19: / Line 19: @@
 ===== Purpose =====
+Like a pendulum without a string (with damping from friction)
 ===== Apparatus =====
@@ Line 47: / Line 47: @@
 </WRAP>
 <WRAP tablewidth 100%>
-| **Location** | ---- |
+| **Location** | M2 |
 | **Maker** | Unknown |
 | **Current State** | Working |