Develop

Makefile

@@ -42,17 +42,19 @@ MAINTAINER_EMAIL = "$(shell git config user.email)"
 all: version lib
 
 version:
-	@git rev-list --tags --max-count=1 | xargs -I{} git describe --tags {} | cut -c2- > VERSION
+	@git describe --tags --abbrev=0 | cut -c2- > VERSION
 
 linux: lib
 	mkdir -p lm-linux/usr/local/bin
 	cp bin/ckt/lm lm-linux/usr/local/bin
+	mkdir -p lm-linux/usr/local/share/
+	cp -r tech lm-linux/usr/local/share
 	mkdir -p lm-linux/DEBIAN
 	mkdir -p debian
 	touch debian/control
 	echo "Package: loom" > lm-linux/DEBIAN/control
 	git fetch --tags --no-recurse-submodules
-	git rev-list --tags --max-count=1 | xargs -I{} git describe --tags {} | sed 's/v\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)/\1.\2-\3/g' | xargs -I{} echo "Version: {}" >> lm-linux/DEBIAN/control
+	git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)/\1.\2-\3/g' | xargs -I{} echo "Version: {}" >> lm-linux/DEBIAN/control
 	echo "Section: base" >> lm-linux/DEBIAN/control
 	echo "Priority: optional" >> lm-linux/DEBIAN/control
 	echo "Architecture: amd64" >> lm-linux/DEBIAN/control

VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

tech/floret.py → tech/loom.py

@@ -9,6 +9,9 @@
 def dbunit(value):
 	print(f"dbunit({value})")
 
+def scale(value):
+	print(f"scale({value})")
+
 def paint(name, major, minor):
 	global Layers
 	Layers += 1
@@ -21,25 +24,28 @@ def width(layer, value):
 def fill(layer):
 	print(f"fill({layer})")
 
-def nmos(name, polyOverhang):
+def nmos(variant, name, stack, exclude=[], bins=[]):
 	global Models
 	Models += 1
-	print(f"nmos(\"{name}\", {polyOverhang}) # {-Models}")
+	print(f"nmos(\"{variant}\", \"{name}\", {stack}, {exclude}, {bins}) # {-Models}")
 	return -Models
 
-def pmos(name, polyOverhang):
+def pmos(variant, name, stack, exclude=[], bins=[]):
 	global Models
 	Models += 1
-	print(f"pmos(\"{name}\", {polyOverhang}) # {-Models}")
+	print(f"pmos(\"{variant}\", \"{name}\", {stack}, {exclude}, {bins}) # {-Models}")
 	return -Models
 
-def subst(model, draw, label, pin, overhangX, overhangY):
-	print(f"subst({model}, {draw}, {label}, {pin}, {overhangX}, {overhangY})")
+def subst(draw, label, pin):
+	print(f"subst({draw}, {label}, {pin})")
+
+def well(draw, label, pin):
+	print(f"well({draw}, {label}, {pin})")
 
-def via(draw, label, pin, downLevel, upLevel, downLo, downHi, upLo, upHi):
+def via(level, downLevel, upLevel):
 	global Vias
 	Vias += 1
-	print(f"via({draw}, {label}, {pin}, {downLevel}, {upLevel}, {downLo}, {downHi}, {upLo}, {upHi}) # {Vias-1}")
+	print(f"via({level}, {downLevel}, {upLevel}) # {Vias-1}")
 	return Vias-1
 
 def route(draw, label, pin):
@@ -54,6 +60,12 @@ def spacing(left, right, value):
 	print(f"spacing({left}, {right}, {value}) # {-Rules}")
 	return -Rules
 
+def enclosing(left, right, lo, hi):
+	global Rules
+	Rules += 1
+	print(f"spacing({left}, {right}, {lo}, {hi}) # {-Rules}")
+	return -Rules
+
 def b_and(left, right):
 	global Rules
 	Rules += 1

tech/sky130.py → tech/sky130/tech.py

@@ -1,4 +1,6 @@
-from floret import *
+#!/usr/bin/python3
+
+from loom import *
 
 AL = 0  # do not change
 CU = 1  # do not change
@@ -271,6 +273,7 @@
 fill(nwell_label)
 fill(dnwell)
 fill(hvtp)
+fill(lvtn)
 fill(nsdm)
 fill(psdm)
 fill(pwell_pin)
@@ -321,6 +324,7 @@
 spacing(psdm, psdm, 76)
 spacing(diff, diff, 54)
 spacing(hvtp, hvtp, 76)
+spacing(lvtn, lvtn, 76)
 spacing(poly, poly, 42)
 spacing(licon1, licon1, 34)
 spacing(li1, li1, 34)