Make limited use of the part library

1 files changed, 4 insertions, 11 deletions

diff --git a/test.rb b/test.rb
index e8d2a6b..b524539 100755
--- a/test.rb
+++ b/test.rb
@@ -1,24 +1,17 @@
 #!/usr/bin/ruby
 
 require "./lace"
-
-def r(size)
-  comp("R", "0805", "resistor", size)
-end
-
-def c(size)
-  comp("C", "0805", "capacitor", size)
-end
+require "./library"
 
 def led(color="red")
-  comp("D", "0805", "LED", "1.5V 10mA #{color}") - r("220Ω")
+  comp("D", "0805", "LED", "1.5V 10mA #{color}") - r(220)
 end
 
 def inverter()
   $inverters ||= []
   if $inverters.empty?
     u = comp("U", "TSOP-14", "74HCT04", "hex inverter")
-    $vcc - u[14] - c("100nF") - u[7] - $gnd
+    $vcc - u[14] - c("100n") - u[7] - $gnd
     $inverters += [
       pair(u[1], u[2]),
       pair(u[3], u[4]),
@@ -44,7 +37,7 @@ def probe(attenuation=20, impedance=50)
   if attenuation == 1
     pair(jack[1], jack[2])
   else
-    pair(r("#{(attenuation-1)*impedance}Ω") - jack[1], jack[2])
+    pair(r((attenuation-1)*impedance) - jack[1], jack[2])
   end
 end