qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-22 21:32:29 +02:00
Code

Avoid leading zeroes in resistance and capacitance values (except 0R)

Browse Source 
- boom/lib/e12.inc: several rules produces mal-formed results with leading
  zeroes
- boom/manu/Makefile.common (spotless): added new target to remove
  $(NAME).chr
- boom/manu/Makefile.common (MALFORMED): test for leading zeroes, allowing
  only 0R as an exception
- boom/manu/stackpole/stackpole.gen: catch values < 1 R and convert them
  to mR
This commit is contained in:
Werner Almesberger 2010-10-18 17:23:19 -03:00
parent 9e9eb89f3b
commit 2744057e98
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boom/lib/e12.inc
View File

@ -8,7 +8,8 @@ _E12_1=(??)4 -> _E12=${_E12_1:1}0k
_E12_1=(?)(?)5 -> _E12=$_E12_1:1.${_E12_1:2}M _E12_1=(?)(?)5 -> _E12=$_E12_1:1.${_E12_1:2}M
_E12_1=(??)6 -> _E12=${_E12_1:1}M _E12_1=(??)6 -> _E12=${_E12_1:1}M
_E12_1=(??)7 -> _E12=${_E12_1:1}0M _E12_1=(??)7 -> _E12=${_E12_1:1}0M
_E12_1=R(??) -> _E12=0.$_E12_1:1 _E12_1=R(??) -> _E12=${_E12_1:1}0m
_E12_1=R00 -> _E12=0 # override previous
_E12_1=(?)R(?) -> _E12=$_E12_1:1.$_E12_1:2 _E12_1=(?)R(?) -> _E12=$_E12_1:1.$_E12_1:2
# E96 scale # E96 scale
@ -19,7 +20,7 @@ _E12_1=(??)(?)2 -> _E12=$_E12_1:1.${_E12_1:2}k
_E12_1=(???)3 -> _E12=${_E12_1:1}k _E12_1=(???)3 -> _E12=${_E12_1:1}k
_E12_1=(?)(??)4 -> _E12=$_E12_1:1.${_E12_1:2}M _E12_1=(?)(??)4 -> _E12=$_E12_1:1.${_E12_1:2}M
_E12_1=(??)(?)5 -> _E12=$_E12_1:1.${_E12_1:2}M _E12_1=(??)(?)5 -> _E12=$_E12_1:1.${_E12_1:2}M
_E12_1=R(???) -> _E12=0.$_E12_1:1 _E12_1=R(???) -> _E12=${_E12_1:1}m
_E12_1=(?)R(??) -> _E12=$_E12_1:1.$_E12_1:2 _E12_1=(?)R(??) -> _E12=$_E12_1:1.$_E12_1:2
_E12_1=(??)R(?) -> _E12=$_E12_1:1.$_E12_1:2 _E12_1=(??)R(?) -> _E12=$_E12_1:1.$_E12_1:2
@ -35,8 +36,9 @@ _E12_P=(??)4 -> _E12=${_E12_P:1}0n
_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u _E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
_E12_P=(??)6 -> _E12=${_E12_P:1}u _E12_P=(??)6 -> _E12=${_E12_P:1}u
_E12_P=(??)7 -> _E12=${_E12_P:1}0u _E12_P=(??)7 -> _E12=${_E12_P:1}0u
_E12_P=R(??) -> _E12=0.${_E12_P:1}p _E12_P=R(??) -> _E12=${_E12_P:1}0f
_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p _E12_P=0R(?) -> _E12=${_E12_P:1}00f
_E12_P=([1-9])R(?) -> _E12=$_E12_P:1.${_E12_P:2}p
# remove leading and trailing zeroes # remove leading and trailing zeroes

7
boom/manu/Makefile.common
View File

@ -4,7 +4,7 @@ UC_NAME = $(shell echo $(NAME) | tr [a-z] [A-Z])
EQU = $(shell ../../boom-config equ) EQU = $(shell ../../boom-config equ)
.PHONY: all test sane .PHONY: all test spotless sane
all: $(NAME).chr all: $(NAME).chr
@ -17,12 +17,15 @@ test:
LIMIT = sed '1{x;s/.*/--- $(1) ---/p;x;};6{s/.*/.../;q;}' LIMIT = sed '1{x;s/.*/--- $(1) ---/p;x;};6{s/.*/.../;q;}'
MALFORMED = @grep '\<T=$(2)\>' $(NAME).chr | \ MALFORMED = @grep '\<T=$(2)\>' $(NAME).chr | \
grep -v '\<$(3)=[0-9][0-9.]*[fnpumkMG]\?$(4)\>' | \ grep -v '\<$(3)=\(0R\|[1-9][0-9.]*[fnpumkMG]\?$(4)\)\>' | \
$(call LIMIT,$(1)) $(call LIMIT,$(1))
ABSENT = @grep '\<T=$(2)\>' $(NAME).chr | grep -v '\<$(3)=' | \ ABSENT = @grep '\<T=$(2)\>' $(NAME).chr | grep -v '\<$(3)=' | \
$(call LIMIT,$(1)) $(call LIMIT,$(1))
spotless:
rm -f $(NAME).chr
sane: sane:
@# general @# general

1
boom/manu/stackpole/stackpole.gen
View File

@ -39,6 +39,7 @@ RNCP* -> T=R {
# Adjust multipliers # Adjust multipliers
_R=R(???) -> _R=${_R:1}m
_R=(*)R(*) -> _R=0$_R:1.$_R:2 _R=(*)R(*) -> _R=0$_R:1.$_R:2
_R=(*)K(*) -> _R=$_R:1.${_R:2}k _R=(*)K(*) -> _R=$_R:1.${_R:2}k
_R=(*)M(*) -> _R=$_R:1.${_R:2}M _R=(*)M(*) -> _R=$_R:1.${_R:2}M