Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 18661) +++ trunk/scconfig/plugins.h (revision 18662) @@ -64,6 +64,7 @@ plugin_header("\nImport plugins:\n") plugin_def("import_dsn", "specctra .dsn importer", sbuildin, 1) plugin_def("import_edif", "import edif", sbuildin, 1) +plugin_def("import_fpcb_nl", "import freepcb netlist", sbuildin, 1) plugin_def("import_hpgl", "import HP-GL plot files", sbuildin, 1) plugin_def("import_ipcd356", "import IPC-D-356 Netlist", sbuildin, 1) plugin_def("import_ltspice", "import ltspice .net+.asc", sbuildin, 1) Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 18661) +++ trunk/src/Makefile.dep (revision 18662) @@ -1874,6 +1874,31 @@ ../src_3rd/puplug/error.h plug_import.h conf.h pcb-printf.h \ ../src_3rd/liblihata/lihata.h list_conf.h netlist.h route_style.h \ rats_patch.h plug_io.h +../src_plugins/import_fpcb_nl/fpcb_nl.o: \ + ../src_plugins/import_fpcb_nl/fpcb_nl.c ../config.h \ + ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \ + vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \ + obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \ + obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \ + ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \ + ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \ + board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ + ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \ + ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \ + obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \ + rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \ + ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \ + ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \ + vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \ + pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \ + plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \ + ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \ + ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h ../src_plugins/import_hpgl/hpgl.o: ../src_plugins/import_hpgl/hpgl.c \ ../config.h ../src_3rd/libuhpgl/libuhpgl.h ../src_3rd/libuhpgl/parse.h \ ../src_3rd/libuhpgl/libuhpgl.h board.h global_typedefs.h pcb_bool.h \ Index: trunk/src_plugins/import_fpcb_nl/Makefile =================================================================== --- trunk/src_plugins/import_fpcb_nl/Makefile (nonexistent) +++ trunk/src_plugins/import_fpcb_nl/Makefile (revision 18662) @@ -0,0 +1,5 @@ +all: + cd ../../src && $(MAKE) mod_import_fpcb_nl + +clean: + rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/import_fpcb_nl/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_fpcb_nl/Plug.tmpasm (nonexistent) +++ trunk/src_plugins/import_fpcb_nl/Plug.tmpasm (revision 18662) @@ -0,0 +1,8 @@ +put /local/pcb/mod {import_fpcb_nl} +put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_fpcb_nl/fpcb_nl.o @] + +switch /local/pcb/import_fpcb_nl/controls + case {buildin} include /local/pcb/tmpasm/buildin; end; + case {plugin} include /local/pcb/tmpasm/plugin; end; + case {disable} include /local/pcb/tmpasm/disable; end; +end Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (nonexistent) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 18662) @@ -0,0 +1,112 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * + * Freepcb netlist import + * pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: email to pcb-rnd (at) igor2.repo.hu + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + */ + +#include "config.h" + +#include +#include +#include +#include + +#include "board.h" +#include "data.h" +#include "error.h" +#include "pcb-printf.h" +#include "compat_misc.h" +#include "safe_fs.h" + +#include "actions.h" +#include "plugins.h" +#include "hid.h" + +static const char *fpcb_nl_cookie = "fpcb_nl importer"; + +/* remove leading whitespace */ +#define ltrim(s) while(isspace(*s)) s++ + +/* remove trailing newline */ +#define rtrim(s) \ + do { \ + char *end; \ + for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \ + *end = '\0'; \ + } while(0) + +static int fpcb_nl_load(const char *fn) +{ + + return -1; +} + +static const char pcb_acts_LoadFpcbnlFrom[] = "LoadFpcbnlFrom(filename)"; +static const char pcb_acth_LoadFpcbnlFrom[] = "Loads the specified freepcb netlist."; +fgw_error_t pcb_act_LoadFpcbnlFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv) +{ + const char *fname = NULL, *end; + char *fname_asc, *fname_net, *fname_base; + static char *default_file = NULL; + int rs; + + PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); + + if (!fname || !*fname) { + fname = pcb_gui->fileselect("Load freepcb netlist...", + "Picks a freepcb netlist file to load.\n", + default_file, ".net", "freepcb", HID_FILESELECT_READ); + if (fname == NULL) + return 1; + if (default_file != NULL) { + free(default_file); + default_file = NULL; + } + } + + PCB_ACT_IRES(fpcb_nl_load(fname)); + return 0; +} + +pcb_action_t fpcb_nl_action_list[] = { + {"LoadFpcbnlFrom", pcb_act_LoadFpcbnlFrom, pcb_acth_LoadFpcbnlFrom, pcb_acts_LoadFpcbnlFrom} +}; + +PCB_REGISTER_ACTIONS(fpcb_nl_action_list, fpcb_nl_cookie) + +int pplg_check_ver_import_fpcb_nl(int ver_needed) { return 0; } + +void pplg_uninit_import_fpcb_nl(void) +{ + pcb_remove_actions_by_cookie(fpcb_nl_cookie); +} + +#include "dolists.h" +int pplg_init_import_fpcb_nl(void) +{ + PCB_API_CHK_VER; + PCB_REGISTER_ACTIONS(fpcb_nl_action_list, fpcb_nl_cookie) + return 0; +} Index: trunk/src_plugins/import_fpcb_nl/import_fpcb_nl.pup =================================================================== --- trunk/src_plugins/import_fpcb_nl/import_fpcb_nl.pup (nonexistent) +++ trunk/src_plugins/import_fpcb_nl/import_fpcb_nl.pup (revision 18662) @@ -0,0 +1,9 @@ +$class import +$short import freepcb netlist +$long Import the netlist and footprints from freepcb format (exported by e.g. easyeda) +$state WIP +$fmt-native no +$fmt-feature-r import netlist and footprint names from freepcb netlist +$package import-net +default buildin +autoload 1 Index: trunk/src_plugins/plugins_ALL.tmpasm =================================================================== --- trunk/src_plugins/plugins_ALL.tmpasm (revision 18661) +++ trunk/src_plugins/plugins_ALL.tmpasm (revision 18662) @@ -48,6 +48,7 @@ include {../src_plugins/hid_remote/Plug.tmpasm} include {../src_plugins/import_dsn/Plug.tmpasm} include {../src_plugins/import_edif/Plug.tmpasm} +include {../src_plugins/import_fpcb_nl/Plug.tmpasm} include {../src_plugins/import_hpgl/Plug.tmpasm} include {../src_plugins/import_ipcd356/Plug.tmpasm} include {../src_plugins/import_ltspice/Plug.tmpasm}