Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6788) +++ trunk/scconfig/Rev.h (revision 6789) @@ -1 +1 @@ -static const int myrev = 6768; +static const int myrev = 6789; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6788) +++ trunk/scconfig/Rev.tab (revision 6789) @@ -1,4 +1,4 @@ -6768 configure new import plugins +6789 configure new import plugins 6735 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup Index: trunk/scconfig/plugins.h =================================================================== --- trunk/scconfig/plugins.h (revision 6788) +++ trunk/scconfig/plugins.h (revision 6789) @@ -49,6 +49,7 @@ plugin_def("import_hyp", "hyperlynx .hyp importer", sdisable, 0) plugin_def("import_mucs", "import mucs routing", sbuildin, 1) plugin_def("import_ltspice", "import ltspice .net+.asc", sdisable, 1) +plugin_def("import_tinycad", "import tinycad .net", sdisable, 1) plugin_header("\nExport plugins:\n") plugin_def("export_gcode", "gcode pcb_exporter", sbuildin, 1) Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 6788) +++ trunk/src/Makefile.dep (revision 6789) @@ -1580,6 +1580,25 @@ ../src_3rd/genvector/gds_char.h obj_all.h flag_str.h polygon.h rtree.h \ layer.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h buffer.h \ search.h rats.h netlist.h route_style.h compat_misc.h +../src_plugins/import_ltspice/ltspice.o: \ + ../src_plugins/import_ltspice/ltspice.c ../config.h \ + ../src_3rd/qparse/qparse.h board.h const.h macro.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_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \ + math_helper.h move.h misc_util.h data.h crosshair.h vtonpoint.h hid.h \ + error.h drc.h buffer.h error.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h compat_misc.h action_helper.h \ + hid_actions.h plugins.h hid.h dolists.h ../src_plugins/import_mucs/mucs.o: ../src_plugins/import_mucs/mucs.c \ ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \ @@ -1643,6 +1662,25 @@ ../src_plugins/import_sch/import_sch_conf.h conf.h misc_util.h \ compat_nls.h compat_misc.h obj_rat.h dolists.h \ ../src_plugins/import_sch/import_sch_conf_fields.h +../src_plugins/import_tinycad/tinycad.o: \ + ../src_plugins/import_tinycad/tinycad.c ../config.h \ + ../src_3rd/qparse/qparse.h board.h const.h macro.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_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ + obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \ + obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ + obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \ + math_helper.h move.h misc_util.h data.h crosshair.h vtonpoint.h hid.h \ + error.h drc.h buffer.h error.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h compat_misc.h action_helper.h \ + hid_actions.h plugins.h hid.h dolists.h ../src_plugins/io_kicad/io_kicad.o: ../src_plugins/io_kicad/io_kicad.c \ ../config.h plugins.h plug_io.h library.h global_typedefs.h pcb_bool.h \ unit.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -3135,6 +3173,8 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/dom_internal.h ../src_3rd/liblihata/tree.h \ ../src_3rd/liblihata/dom.h +../src_3rd/qparse/qparse.o: ../src_3rd/qparse/qparse.c \ + ../src_3rd/qparse/qparse.h action_act.o: action_act.c ../config.h action_helper.h global_typedefs.h \ pcb_bool.h unit.h hid_actions.h hid.h error.h drc.h attrib.h layer.h \ globalconst.h obj_all_list.h obj_arc_list.h obj_common.h \ Index: trunk/src_plugins/import_tinycad/Makefile =================================================================== --- trunk/src_plugins/import_tinycad/Makefile (nonexistent) +++ trunk/src_plugins/import_tinycad/Makefile (revision 6789) @@ -0,0 +1,5 @@ +all: + cd ../../src && $(MAKE) mod_import_tinycad + +clean: + rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/import_tinycad/Plug.tmpasm =================================================================== --- trunk/src_plugins/import_tinycad/Plug.tmpasm (nonexistent) +++ trunk/src_plugins/import_tinycad/Plug.tmpasm (revision 6789) @@ -0,0 +1,8 @@ +put /local/pcb/mod {import_tinycad} +put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_tinycad/tinycad.o @] + +switch /local/pcb/import_tinycad/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_tinycad/README =================================================================== --- trunk/src_plugins/import_tinycad/README (nonexistent) +++ trunk/src_plugins/import_tinycad/README (revision 6789) @@ -0,0 +1,5 @@ +Import the netlist and footprints from a tinycad netlist. + +#state: WIP +#default: disable +#implements: import Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (nonexistent) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 6789) @@ -0,0 +1,144 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * + * tinycad import HID + * pcb-rnd Copyright (C) 2017 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#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 "action_helper.h" +#include "hid_actions.h" +#include "plugins.h" +#include "hid.h" + +static const char *tinycad_cookie = "tinycad 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 tinycad_parse_net(FILE *fn) +{ + char line[1024]; + + pcb_hid_actionl("Netlist", "Freeze", NULL); + pcb_hid_actionl("Netlist", "Clear", NULL); + + while(fgets(line, sizeof(line), fn) != NULL) { + int argc; + char **argv, *s; + + s = line; + ltrim(s); + rtrim(s); + argc = qparse2(s, &argv, QPARSE_DOUBLE_QUOTE | QPARSE_SINGLE_QUOTE); + if ((argc > 1) && (strcmp(argv[0], "NET") == 0)) { + int n; + for(n = 2; n < argc; n++) { +/* pcb_trace("net-add '%s' '%s'\n", argv[1], argv[n]);*/ + pcb_hid_actionl("Netlist", "Add", argv[1], argv[n], NULL); + } + } + } + + pcb_hid_actionl("Netlist", "Sort", NULL); + pcb_hid_actionl("Netlist", "Thaw", NULL); + + return 0; +} + + +static int tinycad_load(const char *fname_net) +{ + FILE *fn; + int ret = 0; + + fn = fopen(fname_net, "r"); + if (fn == NULL) { + pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net); + return -1; + } + + ret = tinycad_parse_net(fn); + + fclose(fn); + return ret; +} + +static const char pcb_acts_LoadtinycadFrom[] = "LoadTinycadFrom(filename)"; +static const char pcb_acth_LoadtinycadFrom[] = "Loads the specified tinycad .net and .asc file - the netlist must be mentor netlist."; +int pcb_act_LoadtinycadFrom(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) +{ + const char *fname = NULL; + static char *default_file = NULL; + + fname = argc ? argv[0] : 0; + + if (!fname || !*fname) { + fname = pcb_gui->fileselect("Load tinycad netlist file...", + "Picks a tinycad netlist file to load.\n", + default_file, ".net", "tinycad", HID_FILESELECT_READ); + if (fname == NULL) + PCB_ACT_FAIL(LoadtinycadFrom); + if (default_file != NULL) { + free(default_file); + default_file = NULL; + } + } + + return tinycad_load(fname); +} + +pcb_hid_action_t tinycad_action_list[] = { + {"LoadtinycadFrom", 0, pcb_act_LoadtinycadFrom, pcb_acth_LoadtinycadFrom, pcb_acts_LoadtinycadFrom} +}; + +PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie) + +static void hid_tinycad_uninit() +{ + pcb_hid_remove_actions_by_cookie(tinycad_cookie); +} + +#include "dolists.h" +pcb_uninit_t hid_import_tinycad_init() +{ + PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie) + return hid_tinycad_uninit; +} Index: trunk/src_plugins/plugins_io.tmpasm =================================================================== --- trunk/src_plugins/plugins_io.tmpasm (revision 6788) +++ trunk/src_plugins/plugins_io.tmpasm (revision 6789) @@ -7,6 +7,7 @@ include {../src_plugins/import_hyp/Plug.tmpasm} include {../src_plugins/import_mucs/Plug.tmpasm} include {../src_plugins/import_ltspice/Plug.tmpasm} +include {../src_plugins/import_tinycad/Plug.tmpasm} include {../src_plugins/export_ps/Plug.tmpasm} include {../src_plugins/export_lpr/Plug.tmpasm}