Merge branch 'master' of 192.168.0.7:/home/tim/gitsrc/open_pdks/

Pull before push

sky130/magic/sky130.tcl

diff --git a/sky130/magic/sky130.tcl b/sky130/magic/sky130.tcl
index 04a31f3..69250f2 100644
--- a/sky130/magic/sky130.tcl
+++ b/sky130/magic/sky130.tcl
@@ -746,6 +746,7 @@
 
 proc sky130::diode_check {parameters} {
 
+    set guard 0
     # Set a local variable for each parameter (e.g., $l, $w, etc.)
     foreach key [dict keys $parameters] {
         set $key [dict get $parameters $key]

sky130/sky130.json

diff --git a/sky130/sky130.json b/sky130/sky130.json
index bf54238..f9c69ab 100644
--- a/sky130/sky130.json
+++ b/sky130/sky130.json
@@ -45,7 +45,10 @@
 	"sky130_fd_sc_lp",
 	"sky130_fd_sc_ls",
 	"sky130_fd_sc_ms",
-	"sky130_osu130"
+	"sky130_osu_sc",
+	"sky130_osu_sc_t12",
+	"sky130_osu_sc_t15",
+	"sky130_osu_sc_t18"
     ],
     "iocells" : [
         "sky130_fd_io"