From 26b4f5c3858e45e33d8a7cb7d41f6fe7218eee05 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Tue, 19 May 2020 12:09:19 -0300 Subject: [PATCH] Adapted to kicad-automation-scripts 1.3.x --- kiplot/kiplot.py | 8 ++++---- kiplot/misc.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kiplot/kiplot.py b/kiplot/kiplot.py index ff04d7ec..bc2da771 100644 --- a/kiplot/kiplot.py +++ b/kiplot/kiplot.py @@ -196,8 +196,8 @@ class Plotter(object): exit(misc.BOM_ERROR) def _run_drc(self, brd_file, ignore_unconnected, check_zone_fills): - check_script(misc.CMD_PCBNEW_RUN_DRC, misc.URL_PCBNEW_RUN_DRC, '1.1.0') - cmd = [misc.CMD_PCBNEW_RUN_DRC, brd_file, self.cfg.outdir] + check_script(misc.CMD_PCBNEW_RUN_DRC, misc.URL_PCBNEW_RUN_DRC, '1.3.1') + cmd = [misc.CMD_PCBNEW_RUN_DRC, 'run_drc', brd_file, self.cfg.outdir] # If we are in verbose mode enable debug in the child if logger.getEffectiveLevel() <= logging.DEBUG: cmd.insert(1, '-vv') @@ -584,7 +584,7 @@ class Plotter(object): def _do_pcb_print(self, board, plot_ctrl, output, brd_file): check_script(misc.CMD_PCBNEW_PRINT_LAYERS, - misc.URL_PCBNEW_PRINT_LAYERS, '1.1.2') + misc.URL_PCBNEW_PRINT_LAYERS, '1.3.1') to = output.options.type_options # Verify the inner layers layer_cnt = board.GetCopperLayerCount() @@ -597,7 +597,7 @@ class Plotter(object): "Inner layer {} is not valid for this board" .format(layer.layer)) outdir = plot_ctrl.GetPlotOptions().GetOutputDirectory() - cmd = [misc.CMD_PCBNEW_PRINT_LAYERS, + cmd = [misc.CMD_PCBNEW_PRINT_LAYERS, 'export', '--output_name', to.output_name, brd_file, outdir] if logger.getEffectiveLevel() <= logging.DEBUG: diff --git a/kiplot/misc.py b/kiplot/misc.py index 8017ca26..4a715137 100644 --- a/kiplot/misc.py +++ b/kiplot/misc.py @@ -19,9 +19,9 @@ PLOT_ERROR = 14 CMD_EESCHEMA_DO = 'eeschema_do' URL_EESCHEMA_DO = 'https://github.com/INTI-CMNB/kicad-automation-scripts' -CMD_PCBNEW_RUN_DRC = 'pcbnew_run_drc' +CMD_PCBNEW_RUN_DRC = 'pcbnew_do' URL_PCBNEW_RUN_DRC = URL_EESCHEMA_DO -CMD_PCBNEW_PRINT_LAYERS = 'pcbnew_print_layers' +CMD_PCBNEW_PRINT_LAYERS = 'pcbnew_do' URL_PCBNEW_PRINT_LAYERS = URL_EESCHEMA_DO CMD_KIBOM = 'KiBOM_CLI.py' URL_KIBOM = 'https://github.com/INTI-CMNB/KiBoM'