[Position][Fixed] Problems when using NET_NAME(n) for a value
Fixes #511
This commit is contained in:
parent
a98b46195c
commit
a398b7b0bc
|
|
@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
- Problems when connection timed-out
|
- Problems when connection timed-out
|
||||||
- Sub PCB separation using annotation method for some edeges and KiCad
|
- Sub PCB separation using annotation method for some edeges and KiCad
|
||||||
versions (#496)
|
versions (#496)
|
||||||
|
- Problems when using NET_NAME(n) for a value (#511)
|
||||||
|
|
||||||
|
|
||||||
## [1.6.3] - 2023-06-26
|
## [1.6.3] - 2023-06-26
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,8 @@ def expand_env(val, env, extra_env, used_extra=None):
|
||||||
replaced = True
|
replaced = True
|
||||||
else:
|
else:
|
||||||
success = False
|
success = False
|
||||||
if var not in reported:
|
# Note: We can't expand NET_NAME(n)
|
||||||
|
if var not in reported and not var.startswith('NET_NAME('):
|
||||||
logger.error('Unable to expand `{}` in `{}`'.format(var, val))
|
logger.error('Unable to expand `{}` in `{}`'.format(var, val))
|
||||||
reported.add(var)
|
reported.add(var)
|
||||||
return val
|
return val
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ from .registrable import RegOutput
|
||||||
from .misc import (PLOT_ERROR, CORRUPTED_PCB, EXIT_BAD_ARGS, CORRUPTED_SCH, version_str2tuple,
|
from .misc import (PLOT_ERROR, CORRUPTED_PCB, EXIT_BAD_ARGS, CORRUPTED_SCH, version_str2tuple,
|
||||||
EXIT_BAD_CONFIG, WRONG_INSTALL, UI_SMD, UI_VIRTUAL, TRY_INSTALL_CHECK, MOD_SMD, MOD_THROUGH_HOLE,
|
EXIT_BAD_CONFIG, WRONG_INSTALL, UI_SMD, UI_VIRTUAL, TRY_INSTALL_CHECK, MOD_SMD, MOD_THROUGH_HOLE,
|
||||||
MOD_VIRTUAL, W_PCBNOSCH, W_NONEEDSKIP, W_WRONGCHAR, name2make, W_TIMEOUT, W_KIAUTO, W_VARSCH,
|
MOD_VIRTUAL, W_PCBNOSCH, W_NONEEDSKIP, W_WRONGCHAR, name2make, W_TIMEOUT, W_KIAUTO, W_VARSCH,
|
||||||
NO_SCH_FILE, NO_PCB_FILE, W_VARPCB, NO_YAML_MODULE, WRONG_ARGUMENTS, FAILED_EXECUTE,
|
NO_SCH_FILE, NO_PCB_FILE, W_VARPCB, NO_YAML_MODULE, WRONG_ARGUMENTS, FAILED_EXECUTE, W_VALMISMATCH,
|
||||||
MOD_EXCLUDE_FROM_POS_FILES, MOD_EXCLUDE_FROM_BOM, MOD_BOARD_ONLY, hide_stderr, W_MAXDEPTH)
|
MOD_EXCLUDE_FROM_POS_FILES, MOD_EXCLUDE_FROM_BOM, MOD_BOARD_ONLY, hide_stderr, W_MAXDEPTH)
|
||||||
from .error import PlotError, KiPlotConfigurationError, config_error
|
from .error import PlotError, KiPlotConfigurationError, config_error
|
||||||
from .config_reader import CfgYamlReader
|
from .config_reader import CfgYamlReader
|
||||||
|
|
@ -296,6 +296,10 @@ def get_board_comps_data(comps):
|
||||||
logger.warning(W_PCBNOSCH + '`{}` component in board, but not in schematic'.format(ref))
|
logger.warning(W_PCBNOSCH + '`{}` component in board, but not in schematic'.format(ref))
|
||||||
continue
|
continue
|
||||||
for c in comps_hash[ref]:
|
for c in comps_hash[ref]:
|
||||||
|
new_value = m.GetValue()
|
||||||
|
if new_value != c.value and '${' not in c.value:
|
||||||
|
logger.warning(f"{W_VALMISMATCH}Value field mismatch for `{ref}` (SCH: `{c.value}` PCB: `{new_value}`)")
|
||||||
|
c.value = new_value
|
||||||
c.bottom = m.IsFlipped()
|
c.bottom = m.IsFlipped()
|
||||||
c.footprint_rot = m.GetOrientationDegrees()
|
c.footprint_rot = m.GetOrientationDegrees()
|
||||||
center = GS.get_center(m)
|
center = GS.get_center(m)
|
||||||
|
|
|
||||||
|
|
@ -286,6 +286,8 @@ W_NEWGROUP = '(W130) '
|
||||||
W_NOTINBOM = '(W131) '
|
W_NOTINBOM = '(W131) '
|
||||||
W_MISSDIR = '(W132) '
|
W_MISSDIR = '(W132) '
|
||||||
W_EXTRAINVAL = '(W133) '
|
W_EXTRAINVAL = '(W133) '
|
||||||
|
W_BADANGLE = '(W134) '
|
||||||
|
W_VALMISMATCH = '(W135) '
|
||||||
# Somehow arbitrary, the colors are real, but can be different
|
# Somehow arbitrary, the colors are real, but can be different
|
||||||
PCB_MAT_COLORS = {'fr1': "937042", 'fr2': "949d70", 'fr3': "adacb4", 'fr4': "332B16", 'fr5': "6cc290"}
|
PCB_MAT_COLORS = {'fr1': "937042", 'fr2': "949d70", 'fr3': "adacb4", 'fr4': "332B16", 'fr5': "6cc290"}
|
||||||
PCB_FINISH_COLORS = {'hal': "8b898c", 'hasl': "8b898c", 'imag': "8b898c", 'enig': "cfb96e", 'enepig': "cfb96e",
|
PCB_FINISH_COLORS = {'hal': "8b898c", 'hasl': "8b898c", 'imag': "8b898c", 'enig': "cfb96e", 'enepig': "cfb96e",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue