Pd-cvs May 2006

pd-cvs@lists.iem.at

12 participants
138 discussions

externals/zexy/src 0x260x260x7e.c, 1.4, 1.5 0x2e.c, 1.4, 1.5 0x3c0x7e.c, 1.5, 1.6 0x3d0x3d0x7e.c, 1.5, 1.6 0x3e0x7e.c, 1.4, 1.5 0x7c0x7c0x7e.c, 1.5, 1.6 fifop.c, 1.12, 1.13 glue.c, 1.5, 1.6 length.c, 1.6, 1.7 lifop.c, 1.10, 1.11 lister.c, 1.6, 1.7 multiline~.c, 1.4, 1.5 operating_system.c, 1.5, 1.6 prime.c, 1.5, 1.6 regex.c, 1.5, 1.6 sort.c, 1.6, 1.7 strcmp.c, 1.6, 1.7 symbol2list.c, 1.6, 1.7 urn.c, 1.4, 1.5 wrap.c, 1.6, 1.7 zexyconf.h, 1.1, 1.2
by IOhannes m zmölnig 19 May '06

19 May '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17006 Modified Files: 0x260x260x7e.c 0x2e.c 0x3c0x7e.c 0x3d0x3d0x7e.c 0x3e0x7e.c 0x7c0x7c0x7e.c fifop.c glue.c length.c lifop.c lister.c multiline~.c operating_system.c prime.c regex.c sort.c strcmp.c symbol2list.c urn.c wrap.c zexyconf.h Log Message: rudimentary help-messages on receiving "help" Index: 0x7c0x7c0x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x7c0x7c0x7e.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 0x7c0x7c0x7e.c 5 Apr 2006 11:27:26 -0000 1.5 --- 0x7c0x7c0x7e.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 244,247 **** --- 244,252 ---- } + static void oror_tilde_help(t_object*x) + { + post("\n%c &&~\t\t:: logical OR operation on 2 signals", HEARTSYMBOL); + } + void setup_0x7c0x7c0x7e(void) { *************** *** 250,254 **** --- 255,261 ---- class_addmethod(oror_tilde_class, (t_method)oror_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(oror_tilde_class, t_oror_tilde, x_f); + class_addmethod (oror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(oror_tilde_class, gensym("zexy/sigbinops+")); + scalaroror_tilde_class = class_new(gensym("||~"), 0, 0, sizeof(t_scalaroror_tilde), 0, 0); *************** *** 256,260 **** --- 263,269 ---- class_addmethod(scalaroror_tilde_class, (t_method)scalaroror_tilde_dsp, gensym("dsp"), 0); + class_addmethod (oror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalaroror_tilde_class, gensym("zexy/sigbinops+")); + zexy_register("||~"); } Index: sort.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sort.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sort.c 5 Apr 2006 11:27:26 -0000 1.6 --- sort.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 140,143 **** --- 140,147 ---- } + static void sort_help(t_sort*x) + { + post("\n%c sort\t\t:: sort a list of numbers", HEARTSYMBOL); + } void sort_setup(void) { *************** *** 147,150 **** --- 151,155 ---- class_addlist (sort_class, sort_list); class_addmethod (sort_class, (t_method)sort_dir, gensym("direction"), A_DEFFLOAT, 0); + class_addmethod(sort_class, (t_method)sort_help, gensym("help"), A_NULL); class_sethelpsymbol(sort_class, gensym("zexy/sort")); Index: 0x3c0x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x3c0x7e.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 0x3c0x7e.c 5 Apr 2006 11:27:26 -0000 1.5 --- 0x3c0x7e.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 229,232 **** --- 229,236 ---- dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, n); } + static void lt_tilde_help(t_object*x) + { + post("\n%c <~\t\t:: compare 2 signals", HEARTSYMBOL); + } void setup_0x3c0x7e(void) *************** *** 236,240 **** --- 240,246 ---- class_addmethod(lt_tilde_class, (t_method)lt_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(lt_tilde_class, t_lt_tilde, x_f); + class_addmethod (lt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(lt_tilde_class, gensym("zexy/sigbinops+")); + scalarlt_tilde_class = class_new(gensym("<~"), 0, 0, sizeof(t_scalarlt_tilde), 0, 0); *************** *** 242,245 **** --- 248,252 ---- class_addmethod(scalarlt_tilde_class, (t_method)scalarlt_tilde_dsp, gensym("dsp"), 0); + class_addmethod (lt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalarlt_tilde_class, gensym("zexy/sigbinops+")); zexy_register("<~"); Index: 0x3e0x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x3e0x7e.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 0x3e0x7e.c 5 Apr 2006 11:27:26 -0000 1.4 --- 0x3e0x7e.c 19 May 2006 14:04:32 -0000 1.5 *************** *** 229,232 **** --- 229,238 ---- dsp_add(scalargt_tilde_perf8, 4, in, &x->x_g, out, n); } + + static void gt_tilde_help(t_object*x) + { + post("\n%c >~\t\t:: compare 2 signals", HEARTSYMBOL); + } + void setup_0x3e0x7e(void) { *************** *** 235,239 **** --- 241,247 ---- class_addmethod(gt_tilde_class, (t_method)gt_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(gt_tilde_class, t_gt_tilde, x_f); + class_addmethod (gt_tilde_class, (t_method)gt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(gt_tilde_class, gensym("zexy/sigbinops+")); + scalargt_tilde_class = class_new(gensym(">~"), 0, 0, sizeof(t_scalargt_tilde), 0, 0); *************** *** 241,245 **** --- 249,255 ---- class_addmethod(scalargt_tilde_class, (t_method)scalargt_tilde_dsp, gensym("dsp"), 0); + class_addmethod (gt_tilde_class, (t_method)gt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalargt_tilde_class, gensym("zexy/sigbinops+")); + zexy_register(">~"); } Index: regex.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/regex.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** regex.c 5 Apr 2006 11:27:26 -0000 1.5 --- regex.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 234,237 **** --- 234,241 ---- } + static void regex_help(t_regex*x) + { + post("\n%c regex\t\t:: test the input whether it matches a regular expression", HEARTSYMBOL); + } void regex_setup(void) *************** *** 243,246 **** --- 247,251 ---- class_addmethod (regex_class, (t_method)regex_regex, gensym("regex"), A_GIMME, 0); + class_addmethod(regex_class, (t_method)regex_help, gensym("help"), A_NULL); class_sethelpsymbol(regex_class, gensym("zexy/regex")); zexy_register("regex"); Index: lister.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lister.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lister.c 5 Apr 2006 11:27:26 -0000 1.6 --- lister.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 72,75 **** --- 72,81 ---- } + + static void mypdlist_help(t_mypdlist*x) + { + post("\n%c lister\t\t:: basic list storage (use pd>=0.39 for real [list] objects)", HEARTSYMBOL); + } + void lister_setup(void) { *************** *** 84,87 **** --- 90,94 ---- class_addmethod (mypdlist_class, (t_method)mypdlist_secondlist, gensym("lst2"), A_GIMME, 0); + class_addmethod(mypdlist_class, (t_method)mypdlist_help, gensym("help"), A_NULL); class_sethelpsymbol(mypdlist_class, gensym("zexy/lister")); zexy_register("lister"); Index: wrap.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/wrap.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wrap.c 5 Apr 2006 11:27:26 -0000 1.6 --- wrap.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 69,72 **** --- 69,77 ---- } + static void wrap_help(t_wrap*x) + { + post("\n%c wrap\t\t:: wrap a float between to boundaries", HEARTSYMBOL); + } + void wrap_setup(void) { wrap_class = class_new(gensym("wrap"), *************** *** 77,80 **** --- 82,86 ---- class_addfloat (wrap_class, wrap_float); class_addmethod(wrap_class, (t_method)wrap_set, gensym("set"), A_GIMME, 0); + class_addmethod(wrap_class, (t_method)wrap_help, gensym("help"), A_NULL); class_sethelpsymbol(wrap_class, gensym("zexy/wrap")); zexy_register("wrap"); Index: zexyconf.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexyconf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zexyconf.h 27 Jan 2006 13:02:05 -0000 1.1 --- zexyconf.h 19 May 2006 14:04:32 -0000 1.2 *************** *** 1,16 **** ! /* this is a zexyconf.h for windows ! * on unix-derivatives (linux, os-X,...) this file should be overwritten by configure ! * via the template zexyconf.h.in ! * ! * if you cannot use configure to re-generate this file, make sure all the defines ! * are set correctly ! */ ! /* Define if you have the <regex.h> header file. */ ! #undef HAVE_REGEX_H /* Define if you have the <alloca.h> header file. */ ! #undef HAVE_ALLOCA_H /* define if you want parallelport-support (direct access to the port address) */ --- 1,9 ---- ! /* zexyconf.h. Generated by configure. */ /* Define if you have the <regex.h> header file. */ ! #define HAVE_REGEX_H 1 /* Define if you have the <alloca.h> header file. */ ! #define HAVE_ALLOCA_H 1 /* define if you want parallelport-support (direct access to the port address) */ *************** *** 18,25 **** /* define if you have the <linux/ppdev.h> header file. ! * (for parport _device_ support) ! * you need Z_WANT_LPT for this to have an effect ! */ ! #undef HAVE_LINUX_PPDEV_H --- 11,18 ---- /* define if you have the <linux/ppdev.h> header file. ! * (for parport _device_ support) ! * you need Z_WANT_LPT for this to have an effect ! */ ! #define HAVE_LINUX_PPDEV_H 1 Index: symbol2list.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/symbol2list.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** symbol2list.c 5 Apr 2006 11:27:26 -0000 1.6 --- symbol2list.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 151,156 **** static void symbol2list_free(t_symbol2list *x) { ! ZEXY_USEVAR(x); } --- 151,159 ---- static void symbol2list_free(t_symbol2list *x) + {} + + static void symbol2list_help(t_symbol2list*x) { ! post("\n%c symbol2list\t:: split a symbol into a list of atoms", HEARTSYMBOL); } *************** *** 164,167 **** --- 167,171 ---- class_addbang (symbol2list_class, symbol2list_bang); class_addmethod (symbol2list_class, (t_method)symbol2list_delimiter, gensym(""), A_SYMBOL, 0); + class_addmethod(symbol2list_class, (t_method)symbol2list_help, gensym("help"), A_NULL); class_sethelpsymbol(symbol2list_class, gensym("zexy/symbol2list")); Index: 0x260x260x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x260x260x7e.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 0x260x260x7e.c 5 Apr 2006 11:27:26 -0000 1.4 --- 0x260x260x7e.c 19 May 2006 14:04:32 -0000 1.5 *************** *** 268,271 **** --- 268,276 ---- } + static void andand_tilde_help(t_object*x) + { + post("\n%c &&~\t\t:: logical AND operation on 2 signals", HEARTSYMBOL); + } + void setup_0x260x260x7e(void) { *************** *** 274,278 **** --- 279,286 ---- class_addmethod(andand_tilde_class, (t_method)andand_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(andand_tilde_class, t_andand_tilde, x_f); + class_addmethod (andand_tilde_class, (t_method)andand_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(andand_tilde_class, gensym("zexy/sigbinops+")); + + scalarandand_tilde_class = class_new(gensym("&&~"), 0, 0, sizeof(t_scalarandand_tilde), 0, 0); *************** *** 280,283 **** --- 288,292 ---- class_addmethod(scalarandand_tilde_class, (t_method)scalarandand_tilde_dsp, gensym("dsp"), 0); + class_addmethod (scalarandand_tilde_class, (t_method)andand_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalarandand_tilde_class, gensym("zexy/sigbinops+")); Index: multiline~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/multiline~.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** multiline~.c 5 Apr 2006 11:27:26 -0000 1.4 --- multiline~.c 19 May 2006 14:04:32 -0000 1.5 *************** *** 249,252 **** --- 249,256 ---- + static void mline_help(t_mline*x) + { + post("\n%c multiline~\t:: ramped multiplication of multiple signals", HEARTSYMBOL); + } void multiline_tilde_setup(void) *************** *** 261,264 **** --- 265,269 ---- class_addmethod(mline_class, (t_method)mline_stop, gensym("stop"), 0); + class_addmethod (mline_class, (t_method)mline_help, gensym("help"), A_NULL); class_sethelpsymbol(mline_class, gensym("zexy/multiline~")); zexy_register("multiline_tilde"); Index: fifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/fifop.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** fifop.c 5 Apr 2006 11:27:26 -0000 1.12 --- fifop.c 19 May 2006 14:04:32 -0000 1.13 *************** *** 205,208 **** --- 205,215 ---- outlet_float(x->x_infout, (t_float)x->counter); } + + static void fifop_help(t_fifop*x) + { + post("\n%c fifop\t\t:: a First-In-First-Out queue with priorities", HEARTSYMBOL); + } + + static void fifop_free(t_fifop *x) { *************** *** 258,261 **** --- 265,269 ---- class_addlist (fifop_class, fifop_list); class_addmethod (fifop_class, (t_method)fifop_query, gensym("info"), A_NULL); + class_addmethod (fifop_class, (t_method)fifop_help, gensym("help"), A_NULL); class_sethelpsymbol(fifop_class, gensym("zexy/fifop")); Index: lifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lifop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lifop.c 5 Apr 2006 11:27:26 -0000 1.10 --- lifop.c 19 May 2006 14:04:32 -0000 1.11 *************** *** 232,236 **** return (x); } ! void lifop_setup(void) { --- 232,239 ---- return (x); } ! static void lifop_help(t_lifop*x) ! { ! post("\n%c lifop\t\t:: a Last-In-First-Out queue with priorities", HEARTSYMBOL); ! } void lifop_setup(void) { *************** *** 241,244 **** --- 244,248 ---- class_addlist (lifop_class, lifop_list); class_addmethod (lifop_class, (t_method)lifop_query, gensym("info"), A_NULL); + class_addmethod (lifop_class, (t_method)lifop_help, gensym("help"), A_NULL); class_sethelpsymbol(lifop_class, gensym("zexy/lifop")); Index: prime.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/prime.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** prime.c 25 Jan 2006 16:27:08 -0000 1.5 --- prime.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 64,67 **** --- 64,73 ---- } + static void prime_help(t_prime*x) + { + post("\n%c prime\t\t:: test whether a given number is prime", HEARTSYMBOL); + } + + void prime_setup(void) { prime_class = class_new(gensym("prime"), *************** *** 71,74 **** --- 77,81 ---- class_addfloat(prime_class, prime_float); + class_addmethod(prime_class, (t_method)prime_help, gensym("help"), A_NULL); zexy_register("prime"); } Index: operating_system.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/operating_system.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** operating_system.c 5 Apr 2006 11:27:26 -0000 1.5 --- operating_system.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 38,41 **** --- 38,42 ---- static void operating_system_bang(t_operating_system *x) { + /* LATER think about querying the version of the system at runtime! */ t_symbol *s=gensym("unknown"); #ifdef __linux__ *************** *** 56,59 **** --- 57,65 ---- } + static void operating_system_help(t_operating_system*x) + { + post("\n%c operating_system\t:: get the current operating system", HEARTSYMBOL); + } + void operating_system_setup(void) { *************** *** 62,65 **** --- 68,72 ---- class_addbang (operating_system_class, operating_system_bang); + class_addmethod(operating_system_class, (t_method)operating_system_help, gensym("help"), A_NULL); class_sethelpsymbol(operating_system_class, gensym("zexy/operating_system")); zexy_register("operating_system"); Index: strcmp.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/strcmp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** strcmp.c 5 Apr 2006 11:27:26 -0000 1.6 --- strcmp.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 153,156 **** --- 153,162 ---- + static void strcmp_help(t_strcmp*x) + { + post("\n%c strcmp\t\t:: compare to lists as strings", HEARTSYMBOL); + } + + void strcmp_setup(void) { *************** *** 167,171 **** class_addsymbol(strcmp_proxy_class, strcmp_proxy_symbol); class_addlist(strcmp_proxy_class, strcmp_proxy_list); ! class_sethelpsymbol(strcmp_class, gensym("zexy/strcmp")); zexy_register("strcmp"); --- 173,177 ---- class_addsymbol(strcmp_proxy_class, strcmp_proxy_symbol); class_addlist(strcmp_proxy_class, strcmp_proxy_list); ! class_addmethod(strcmp_class, (t_method)strcmp_help, gensym("help"), A_NULL); class_sethelpsymbol(strcmp_class, gensym("zexy/strcmp")); zexy_register("strcmp"); Index: 0x2e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x2e.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 0x2e.c 5 Apr 2006 11:27:26 -0000 1.4 --- 0x2e.c 19 May 2006 14:04:32 -0000 1.5 *************** *** 149,152 **** --- 149,157 ---- } + static void scalmul_help(t_scalmul*x) + { + post("\n%c .\t\t:: scalar multiplication (in-product)", HEARTSYMBOL); + } + void setup_0x2e(void) { *************** *** 155,161 **** --- 160,169 ---- class_addlist(scalmul_class, scalmul_lst); class_addmethod (scalmul_class, (t_method)scalmul_lst2, gensym(""), A_GIMME, 0); + class_addmethod(scalmul_class, (t_method)scalmul_help, gensym("help"), A_NULL); + scalmul_scal_class = class_new(gensym("."), 0, (t_method)scalmul_free, sizeof(t_scalmul), 0, 0); class_addlist(scalmul_scal_class, scalmul_lst); + class_addmethod(scalmul_scal_class, (t_method)scalmul_help, gensym("help"), A_NULL); class_sethelpsymbol(scalmul_class, gensym("zexy/scalarmult")); Index: urn.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/urn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** urn.c 5 Apr 2006 11:27:26 -0000 1.4 --- urn.c 19 May 2006 14:04:32 -0000 1.5 *************** *** 139,142 **** --- 139,147 ---- } + static void urn_help(t_urn*x) + { + post("\n%c urn\t\t:: generate randum numbers without repetition", HEARTSYMBOL); + } + void urn_setup(void) { *************** *** 149,152 **** --- 154,158 ---- class_addmethod(urn_class, (t_method)urn_seed, gensym("seed"), A_DEFFLOAT, 0); + class_addmethod(urn_class, (t_method)urn_help, gensym("help"), A_NULL); class_sethelpsymbol(urn_class, gensym("zexy/urn")); Index: glue.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/glue.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** glue.c 5 Apr 2006 11:27:26 -0000 1.5 --- glue.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 105,108 **** --- 105,113 ---- } + static void glue_help(t_glue*x) + { + post("\n%c glue\t\t:: glue together 2 lists (like [list append])", HEARTSYMBOL); + } + void glue_setup(void) { *************** *** 112,115 **** --- 117,121 ---- class_addmethod (glue_class, (t_method)glue_lst2, gensym(""), A_GIMME, 0); class_addbang(glue_class, glue_bang); + class_addmethod (glue_class, (t_method)glue_help, gensym("help"), 0); class_sethelpsymbol(glue_class, gensym("zexy/glue")); Index: length.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/length.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** length.c 5 Apr 2006 11:27:26 -0000 1.6 --- length.c 19 May 2006 14:04:32 -0000 1.7 *************** *** 20,24 **** static t_class *length_class; - typedef struct _length { --- 20,23 ---- Index: 0x3d0x3d0x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x3d0x3d0x7e.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 0x3d0x3d0x7e.c 5 Apr 2006 11:27:26 -0000 1.5 --- 0x3d0x3d0x7e.c 19 May 2006 14:04:32 -0000 1.6 *************** *** 228,231 **** --- 228,235 ---- } + static void eq_tilde_help(t_object*x) + { + post("\n%c &&~\t\t:: test 2 signals for equality", HEARTSYMBOL); + } void setup_0x3d0x3d0x7e(void) { *************** *** 234,238 **** --- 238,244 ---- class_addmethod(eq_tilde_class, (t_method)eq_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(eq_tilde_class, t_eq_tilde, x_f); + class_addmethod (eq_tilde_class, (t_method)eq_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(eq_tilde_class, gensym("zexy/sigbinops+")); + scalareq_tilde_class = class_new(gensym("==~"), 0, 0, sizeof(t_scalareq_tilde), 0, 0); *************** *** 240,244 **** --- 246,252 ---- class_addmethod(scalareq_tilde_class, (t_method)scalareq_tilde_dsp, gensym("dsp"), 0); + class_addmethod (eq_tilde_class, (t_method)eq_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalareq_tilde_class, gensym("zexy/sigbinops+")); + zexy_register("==~"); }

1 0

externals/pureunity Makefile,1.1,1.2
by IOhannes m zmölnig 19 May '06

19 May '06

Update of /cvsroot/pure-data/externals/pureunity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31686 Modified Files: Makefile Log Message: made the PD-variable overwritable via "export"; this way, we don't have to mirror matju's filesystem Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pureunity/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 9 Jan 2006 05:04:19 -0000 1.1 --- Makefile 19 May 2006 13:19:34 -0000 1.2 *************** *** 1,5 **** ! #PD = /home/matju/pd_0_38_4/bin/pd ! PD = /home/matju/pd_devel_0_39_und/bin/pd ! #PD = pd PDFLAGS = -lib pureunity -noaudio -path generics -path specifics PDFLAGS += -lib gridflow --- 1,5 ---- ! # if you don't want the standard pd, set the PD-variable before doing "make" ! # e.g. "PD=/home/matju/pd_devel_0_39_und/bin/pd make" ! PD ?= pd PDFLAGS = -lib pureunity -noaudio -path generics -path specifics PDFLAGS += -lib gridflow

1 0

[PD-cvs] externals/hardware/arduino/Pd_firmware Pd_firmware.pde, 1.1, 1.2
by Hans-Christoph Steiner 19 May '06

19 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22275/Pd_firmware Modified Files: Pd_firmware.pde Log Message: worked out 2-way protocol, everything seems to work from Pd; the data sending is commented out, but it should still work... Index: Pd_firmware.pde =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware/Pd_firmware.pde,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pd_firmware.pde 18 May 2006 20:24:18 -0000 1.1 --- Pd_firmware.pde 19 May 2006 12:54:11 -0000 1.2 *************** *** 1,111 **** ! /* Pd_firmware ! * ------------------ ! * ! * ! * It was designed to work with the Pd patch of the same ! * name in: Help -> Browser -> examples -> hardware ! * ! * (cleft) 2006 Hans-Christoph Steiner ! * @author: Hans-Christoph Steiner ! * @date: 2006-03-10 ! * @location: Polytechnic University, Brooklyn, New York, USA ! */ ! ! /* ! * Pduino protocol ! * =============== ! * data: 0-127 control: 128-255 ! * ! * Pd->Arduino commands ! * -------------------- ! * 150 - next byte sets PWM0 value ! * 151 - next byte sets PWM1 value ! * 152 - next byte sets PWM2 value ! * 200-213 - set digital pin 0-13 to input ! * 220-233 - set digital pin 0-13 to output ! * ! * ! * Pd->Arduino byte cycle ! * ---------------------- ! * 0 cycle marker (255/11111111) ! * 1 digitalOut 0-6 bitmask ! * 2 digitalOut 7-13 bitmask ! * ! * Arduino->Pd byte cycle ! * ---------------------- ! * 0 digitalIn 0-6 bitmask ! * 1 digitalIn 7-13 bitmask ! * 2 analogIn0 byte0 ! * 3 analogIn0 byte1 ! * 4 analogIn1 byte0 ! * 5 analogIn1 byte1 ! * 6 analogIn2 byte0 ! * 7 analogIn2 byte1 ! * 8 analogIn3 byte0 ! * 9 analogIn3 byte1 ! * 10 analogIn4 byte0 ! * 11 analogIn4 byte1 ! * 12 analogIn5 byte0 ! * 13 analogIn5 byte1 ! * 14 cycle marker (255/11111111) ! * ! * ! * TX RX ! * ----------------------- ! * ! */ ! ! /* ! * CAUTION!! Be careful with the Serial Monitor, it could freeze ! * your computer with this firmware running! It outputs data ! * without a delay() so its very fast. ! */ ! ! ! byte i; ! ! // this int serves as an array of bits to store pin status ! int digitalPinStatus; ! ! byte analogPin; ! int analogData; ! ! void outputDigital(byte startPin) { ! byte digitalPin; ! byte digitalPinBit; ! byte digitalOutputByte; ! byte digitalData; ! for(i=0;i<7;++i) ! { ! digitalPin = i+startPin; ! digitalPinBit = 2^digitalPin; ! // only read the pin if its set to input ! if(digitalPinStatus & digitalPinBit) ! digitalData = digitalRead(digitalPin); ! else ! digitalData = 0; ! digitalOutputByte = digitalOutputByte + (2^(i+1-startPin)*digitalData); ! } ! printByte(digitalOutputByte); ! } ! ! void setup() { ! beginSerial(9600); ! } ! ! void loop() { ! // read all digital pins ! outputDigital(0); ! outputDigital(7); ! /* ! * get analog in ! */ ! analogData = analogRead(analogPin); ! // these two bytes get converted back into the whole number in Pd ! printByte(analogData / 32); // div by 32 for the big byte ! printByte(analogData % 32); // mod by 32 for the small byte ! ++analogPin; ! if (analogPin > 5) analogPin = 0; ! /* end with the cycle marker */ ! printByte(255); ! } --- 1,224 ---- ! /* Pd_firmware ! * ------------------ ! * ! * ! * It was designed to work with the Pd patch of the same ! * name in: Help -> Browser -> examples -> hardware ! * ! * (cleft) 2006 Hans-Christoph Steiner ! * @author: Hans-Christoph Steiner ! * @date: 2006-03-10 ! * @location: Polytechnic University, Brooklyn, New York, USA ! */ ! ! /* ! * Pduino protocol ! * =============== ! * data: 0-127 control: 128-255 ! * ! * Pd->Arduino commands ! * -------------------- ! * 200-213 - set digital pin 0-13 to output ! * 214-227 - set digital pin 0-13 to input ! * 230 - next byte sets PWM0 value ! * 231 - next byte sets PWM1 value ! * 232 - next byte sets PWM2 value ! * ! * ! * Pd->Arduino byte cycle ! * ---------------------- ! * 0 cycle marker (255/11111111) ! * 1 digitalOut 0-6 bitmask ! * 2 digitalOut 7-13 bitmask ! * ! * Arduino->Pd byte cycle ! * ---------------------- ! * 0 digitalIn 0-6 bitmask ! * 1 digitalIn 7-13 bitmask ! * 2 analogIn0 byte0 ! * 3 analogIn0 byte1 ! * 4 analogIn1 byte0 ! * 5 analogIn1 byte1 ! * 6 analogIn2 byte0 ! * 7 analogIn2 byte1 ! * 8 analogIn3 byte0 ! * 9 analogIn3 byte1 ! * 10 analogIn4 byte0 ! * 11 analogIn4 byte1 ! * 12 analogIn5 byte0 ! * 13 analogIn5 byte1 ! * 14 cycle marker (255/11111111) ! * ! * ! * TX RX ! * ----------------------- ! * ! */ ! ! /* ! * CAUTION!! Be careful with the Serial Monitor, it could freeze ! * your computer with this firmware running! It outputs data ! * without a delay() so its very fast. ! */ ! ! #define TOTAL_DIGITAL_PINS 14 ! ! byte i; ! ! // this flag says that the next serial input will be data, not control ! boolean waitForData = 0; ! ! /* this int serves as an array of bits to store pin status ! * 0 = INPUT, 1 = OUTPUT ! */ ! int digitalPinStatus; ! ! byte analogPin; ! int analogData; ! ! // ------------------------------------------------------------------------- ! void outputDigital(byte startPin) { ! byte digitalPin; ! byte digitalPinBit; ! byte digitalOutputByte; ! byte digitalData; ! for(i=0;i<7;++i) ! { ! digitalPin = i+startPin; ! digitalPinBit = OUTPUT << digitalPin; ! // only read the pin if its set to input ! if(digitalPinStatus & digitalPinBit) { ! digitalData = 0; // pin set to OUTPUT, don't read ! } ! else { ! digitalData = digitalRead(digitalPin); ! } ! digitalOutputByte = digitalOutputByte + (2^(i+1-startPin)*digitalData); ! } ! printByte(digitalOutputByte); ! } ! ! // ------------------------------------------------------------------------- ! void setPinMode(int pin, int mode) { ! pinMode(pin,mode); ! if(mode == INPUT) { ! digitalPinStatus = digitalPinStatus &~ (1 << pin); ! } ! if(mode == OUTPUT) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! } ! } ! ! // ------------------------------------------------------------------------- ! void checkForInput() { ! if(serialAvailable()) { ! while(serialAvailable()) { ! processInput(serialRead()); ! } ! } ! } ! ! // ------------------------------------------------------------------------- ! void processInput(int inputData) { ! if (waitForData > 0) { ! // the PWM commands (230-232) have a byte of data following the command ! analogWrite(waitForData,inputData); ! waitForData = 0; ! } ! else { ! switch (inputData) { ! case 200: ! case 201: ! case 202: ! case 203: ! case 204: ! case 205: ! case 206: ! case 207: ! case 208: ! case 209: ! case 210: ! case 211: ! case 212: ! case 213: ! setPinMode(inputData-200,OUTPUT); ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! break; ! case 214: ! case 215: ! case 216: ! case 217: ! case 218: ! case 219: ! case 220: ! case 221: ! case 222: ! case 223: ! case 224: ! case 225: ! case 226: ! case 227: ! setPinMode(inputData-214,INPUT); ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! break; ! case 230: ! case 231: ! case 232: ! // set waitForData to the PWM pin number ! waitForData = inputData - 221; ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! printByte(inputData); ! break; ! case 255: ! break; ! } ! } ! } ! ! // ========================================================================= ! ! // ------------------------------------------------------------------------- ! void setup() { ! beginSerial(9600); ! for(i=0; i<TOTAL_DIGITAL_PINS; ++i) { ! setPinMode(i,INPUT); ! } ! } ! ! // ------------------------------------------------------------------------- ! void loop() { ! // read all digital pins ! outputDigital(0); ! outputDigital(7); ! /* ! * get analog in ! */ ! /* ! for(analogPin=0; analogPin<5; ++analogPin) ! { ! analogData = analogRead(analogPin); ! // these two bytes get converted back into the whole number in Pd ! printByte(analogData >> 7); // bitshift the big stuff into the output byte ! printByte(analogData % 128); // mod by 32 for the small byte ! } ! */ ! // ++analogPin; ! // if (analogPin > 5) analogPin = 0; ! /* end with the cycle marker */ ! // bitshift the big stuff into the output byte ! printByte(digitalPinStatus >> 7); ! // clear the 8th bit before truncating to a byte for small byte ! printByte(digitalPinStatus % 128); ! ! checkForInput(); ! ! printByte(255); ! }

1 0

externals/hardware/arduino arduino.pd,NONE,1.1
by Hans-Christoph Steiner 19 May '06

19 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22275 Added Files: arduino.pd Log Message: worked out 2-way protocol, everything seems to work from Pd; the data sending is commented out, but it should still work... --- NEW FILE: arduino.pd --- #N canvas 375 1 618 657 10; #X obj 478 -14 import cyclone zexy; #X obj 9 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 8191 256; #X obj 110 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 27606 256; #X text 239 179 On Mac OS X \, set this to the right value:; #X msg 179 158 open \$1; #X text 12 101 You might need to select another port \, check the Pd window to see if it connected successfully:; #N canvas 162 133 530 380 serin 0; #X obj 120 61 cnv 15 15 15 empty \$0-number-canvas 2 4 7 0 14 -233017 -1 0; #X obj 200 225 s \$0-number-canvas; #X obj 60 61 hradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 -1 2; #X obj 59 147 outlet; #X obj 60 13 inlet; #X msg 200 202 label \$1; #X obj 200 180 makefilename %d; #X obj 59 108 float; #X connect 2 0 7 0; #X connect 4 0 2 0; #X connect 5 0 1 0; #X connect 6 0 5 0; #X connect 7 0 3 0; #X connect 7 0 6 0; #X coords 0 -1 1 1 76 17 1 60 60; #X restore 179 135 pd serin; #X text 260 136 serial port #; #X text 278 620 released under the GNU GPL; #X text 64 605 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> ; #X obj 211 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 0 256; #X obj 312 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 0 256; #X obj 413 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 0 256; #X obj 179 246 spigot; #X obj 229 248 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X msg 239 158 close; #X obj 64 570 print --------------------; #N canvas 630 546 462 312 alternate 0; #X obj 87 8 inlet; #X obj 151 244 outlet; #X obj 319 247 outlet; #X obj 159 197 spigot; #X obj 319 191 spigot; #X obj 158 57 trigger anything bang; #X obj 196 152 abs; #X floatatom 212 198 5 0 0 0 - - -; #X obj 356 147 abs; #X msg 295 77 1; #X obj 196 173 float; #X obj 355 168 float; #X obj 86 34 route reset; #X obj 356 128 -; #X obj 196 133 -; #X obj 15 35 loadbang; #X obj 86 54 bang; #X msg 73 82 1; #X msg 103 82 0; #X connect 0 0 12 0; #X connect 3 0 1 0; #X connect 4 0 2 0; #X connect 5 0 3 0; #X connect 5 0 4 0; #X connect 5 1 9 0; #X connect 6 0 10 0; #X connect 8 0 11 0; #X connect 9 0 13 0; #X connect 9 0 14 0; #X connect 10 0 3 1; #X connect 10 0 7 0; #X connect 10 0 14 1; #X connect 11 0 4 1; #X connect 11 0 13 1; #X connect 12 0 16 0; #X connect 12 1 5 0; #X connect 13 0 8 0; #X connect 14 0 6 0; #X connect 15 0 18 0; #X connect 15 0 17 0; #X connect 16 0 18 0; #X connect 16 0 17 0; #X connect 17 0 14 1; #X connect 18 0 13 1; #X restore 258 345 pd alternate; #X msg 179 299 reset; #X obj 297 304 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 321 386 +; #X obj 321 407 trigger bang float; #X obj 329 539 pack symbol float; #X obj 311 517 makefilename \$0-%c; #X msg 330 562 \; \$1 \$2; #X obj 18 57 receive \$0-A; #X obj 9 5 receive \$0-B; #X obj 110 5 receive \$0-C; #X obj 211 5 receive \$0-D; #X obj 312 5 receive \$0-E; #X obj 413 5 receive \$0-F; #X obj 311 463 +; #X obj 339 463 float; #X msg 340 442 0; #X msg 311 442 1; #X obj 311 493 + 64; #X obj 3 525 spigot; #X obj 41 497 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 439 335 gate 4; #X obj 430 359 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 448 359 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 467 359 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 486 359 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 477 314 metro 400; #X obj 478 294 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 406 261 float; #X obj 449 261 + 1; #X obj 406 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 492 259 bang; #X msg 425 227 1; #X obj 406 283 moses 5; #X obj 179 273 select 255; #X msg 243 197 devicename /dev/tty.usbserial-1913; #X obj 124 373 spigot; #X obj 162 345 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X obj 121 398 select 255; #X obj 510 25 nbx 6 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 14 -3754 -1 -1 0 256; #X obj 510 5 receive \$0-G; #X obj 179 225 comport 0 9600; #X obj 398 53 hradio 15 1 0 14 empty empty empty 0 -6 0 8 -262144 -1 -1 0; #X obj 375 54 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 394 126 +; #X obj 375 100 * 14; #X obj 394 147 + 200; #X floatatom 480 100 5 0 0 0 - - -; #X obj 398 72 t b f; #X obj 143 430 tolist; #X obj 146 538 print; #X obj 146 519 list; #X obj 170 452 list-len; #X obj 170 472 change; #X obj 40 369 spigot; #X obj 78 341 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 37 394 select 255; #X obj 66 422 print; #X obj 172 493 bang; #X obj 337 365 * 128; #N canvas 295 269 586 307 decode 1; #X obj 241 26 inlet; #X obj 46 189 & 1; #X obj 72 189 & 2; #X obj 98 189 & 4; #X obj 46 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 72 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 2 ; #X obj 98 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 4 ; #X obj 124 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 8 8; #X obj 150 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 16; #X obj 182 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 32; #X obj 215 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 64; #X obj 248 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 128 128; #X obj 287 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 256; #X obj 326 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 512; #X obj 365 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1024 1024; #X obj 409 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 2048; #X obj 453 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 2; #X obj 499 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 4; #X obj 124 189 & 8; #X obj 150 189 & 16; #X obj 182 189 & 32; #X obj 215 189 & 64; #X obj 248 189 & 128; #X obj 287 189 & 256; #X obj 326 189 & 512; #X obj 365 189 & 1024; #X obj 409 189 & 2048; #X obj 453 189 & 4096; #X obj 499 189 & 8192; #X connect 0 0 1 0; #X connect 0 0 2 0; #X connect 0 0 3 0; #X connect 0 0 18 0; #X connect 0 0 19 0; #X connect 0 0 20 0; #X connect 0 0 21 0; #X connect 0 0 22 0; #X connect 0 0 23 0; #X connect 0 0 24 0; #X connect 0 0 25 0; #X connect 0 0 26 0; #X connect 0 0 27 0; #X connect 0 0 28 0; #X connect 1 0 4 0; #X connect 2 0 5 0; #X connect 3 0 6 0; #X connect 18 0 7 0; #X connect 19 0 8 0; #X connect 20 0 9 0; #X connect 21 0 10 0; #X connect 22 0 11 0; #X connect 23 0 12 0; #X connect 24 0 13 0; #X connect 25 0 14 0; #X connect 26 0 15 0; #X connect 27 0 16 0; #X connect 28 0 17 0; #X restore 34 133 pd decode buttons; #X msg 66 164 230 \, 128; #X msg 66 191 231 \, 64; #X msg 67 213 232 \, 32; #X connect 4 0 58 0; #X connect 6 0 4 0; #X connect 13 0 51 0; #X connect 14 0 13 1; #X connect 15 0 58 0; #X connect 17 0 20 0; #X connect 17 1 76 0; #X connect 18 0 17 0; #X connect 18 0 33 0; #X connect 19 0 17 0; #X connect 20 0 21 0; #X connect 21 0 34 0; #X connect 21 1 22 1; #X connect 22 0 24 0; #X connect 23 0 22 0; #X connect 25 0 36 0; #X connect 25 0 77 0; #X connect 26 0 1 0; #X connect 27 0 2 0; #X connect 31 0 32 0; #X connect 31 0 35 0; #X connect 32 0 31 1; #X connect 33 0 32 0; #X connect 34 0 31 0; #X connect 35 0 23 0; #X connect 36 0 16 0; #X connect 37 0 36 1; #X connect 38 0 39 0; #X connect 38 1 40 0; #X connect 38 2 41 0; #X connect 38 3 42 0; #X connect 43 0 38 1; #X connect 44 0 43 0; #X connect 45 0 50 0; #X connect 46 0 45 1; #X connect 47 0 45 0; #X connect 48 0 49 0; #X connect 49 0 45 0; #X connect 50 0 46 0; #X connect 50 0 38 0; #X connect 50 1 48 0; #X connect 51 0 18 0; #X connect 51 1 17 0; #X connect 52 0 58 0; #X connect 53 0 55 0; #X connect 54 0 53 1; #X connect 55 0 66 1; #X connect 55 1 66 0; #X connect 57 0 56 0; #X connect 58 0 13 0; #X connect 58 0 53 0; #X connect 58 0 71 0; #X connect 59 0 65 0; #X connect 60 0 62 0; #X connect 61 0 63 0; #X connect 62 0 61 0; #X connect 63 0 64 0; #X connect 63 0 58 0; #X connect 65 0 62 0; #X connect 65 1 61 1; #X connect 66 0 68 1; #X connect 66 0 69 0; #X connect 68 0 67 0; #X connect 69 0 70 0; #X connect 70 0 75 0; #X connect 71 0 73 0; #X connect 72 0 71 1; #X connect 73 0 16 0; #X connect 73 1 74 0; #X connect 75 0 68 0; #X connect 76 0 20 1; #X connect 78 0 58 0; #X connect 79 0 58 0; #X connect 80 0 58 0;

1 0

externals/hardware/arduino README,NONE,1.1
by Hans-Christoph Steiner 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9813 Added Files: README Log Message: first sketch of Pd-controlled firmware --- NEW FILE: README --- The code in the examples patch are example patches that match the included examples in the Arduino package. Pd_firmware is a Arduino firmware where you can control everything from Pd, so you don't need to program in Arduino.

1 0

externals/hardware/arduino/Pd_firmware Pd_firmware.pde, NONE, 1.1
by Hans-Christoph Steiner 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9813/Pd_firmware Added Files: Pd_firmware.pde Log Message: first sketch of Pd-controlled firmware --- NEW FILE: Pd_firmware.pde --- /* Pd_firmware * ------------------ * * * It was designed to work with the Pd patch of the same * name in: Help -> Browser -> examples -> hardware * * (cleft) 2006 Hans-Christoph Steiner * @author: Hans-Christoph Steiner * @date: 2006-03-10 * @location: Polytechnic University, Brooklyn, New York, USA */ /* * Pduino protocol * =============== * data: 0-127 control: 128-255 * * Pd->Arduino commands * -------------------- * 150 - next byte sets PWM0 value * 151 - next byte sets PWM1 value * 152 - next byte sets PWM2 value * 200-213 - set digital pin 0-13 to input * 220-233 - set digital pin 0-13 to output * * * Pd->Arduino byte cycle * ---------------------- * 0 cycle marker (255/11111111) * 1 digitalOut 0-6 bitmask * 2 digitalOut 7-13 bitmask * * Arduino->Pd byte cycle * ---------------------- * 0 digitalIn 0-6 bitmask * 1 digitalIn 7-13 bitmask * 2 analogIn0 byte0 * 3 analogIn0 byte1 * 4 analogIn1 byte0 * 5 analogIn1 byte1 * 6 analogIn2 byte0 * 7 analogIn2 byte1 * 8 analogIn3 byte0 * 9 analogIn3 byte1 * 10 analogIn4 byte0 * 11 analogIn4 byte1 * 12 analogIn5 byte0 * 13 analogIn5 byte1 * 14 cycle marker (255/11111111) * * * TX RX * ----------------------- * */ /* * CAUTION!! Be careful with the Serial Monitor, it could freeze * your computer with this firmware running! It outputs data * without a delay() so its very fast. */ byte i; // this int serves as an array of bits to store pin status int digitalPinStatus; byte analogPin; int analogData; void outputDigital(byte startPin) { byte digitalPin; byte digitalPinBit; byte digitalOutputByte; byte digitalData; for(i=0;i<7;++i) { digitalPin = i+startPin; digitalPinBit = 2^digitalPin; // only read the pin if its set to input if(digitalPinStatus & digitalPinBit) digitalData = digitalRead(digitalPin); else digitalData = 0; digitalOutputByte = digitalOutputByte + (2^(i+1-startPin)*digitalData); } printByte(digitalOutputByte); } void setup() { beginSerial(9600); } void loop() { // read all digital pins outputDigital(0); outputDigital(7); /* * get analog in */ analogData = analogRead(analogPin); // these two bytes get converted back into the whole number in Pd printByte(analogData / 32); // div by 32 for the big byte printByte(analogData % 32); // mod by 32 for the small byte ++analogPin; if (analogPin > 5) analogPin = 0; /* end with the cycle marker */ printByte(255); }

1 0

[PD-cvs] externals/hardware/arduino/examples PD_inputs_to_PD.pd, 1.3, 1.4 PD_send_potentiometer.pd, 1.3, 1.4 PD_two_potentiometers.pd, 1.2, 1.3
by Hans-Christoph Steiner 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9106 Modified Files: PD_inputs_to_PD.pd PD_send_potentiometer.pd PD_two_potentiometers.pd Log Message: fixed serial port fixer to have more ports and to start at 0, like [comport] Index: PD_inputs_to_PD.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/examples/PD_inputs_to_PD.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PD_inputs_to_PD.pd 11 Mar 2006 02:04:52 -0000 1.3 --- PD_inputs_to_PD.pd 18 May 2006 20:22:59 -0000 1.4 *************** *** 1,3 **** ! #N canvas 1030 43 584 697 10; #X obj 480 668 import zexy; #X obj 21 78 nbx 4 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 --- 1,3 ---- ! #N canvas 429 31 592 705 10; #X obj 480 668 import zexy; #X obj 21 78 nbx 4 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 *************** *** 14,22 **** -241291 -1 -1 0 256; #X obj 21 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 0 256; #X obj 122 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 0 256; #X obj 223 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 0 256; #X text 160 241 On Mac OS X \, set this to the right value:; #X msg 100 220 open \$1; --- 14,22 ---- -241291 -1 -1 0 256; #X obj 21 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 403 256; #X obj 122 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 387 256; #X obj 223 132 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 410 256; #X text 160 241 On Mac OS X \, set this to the right value:; #X msg 100 220 open \$1; *************** *** 32,55 **** #X text 16 5 This patch works with the example Arduino firmware of the same name.; - #N canvas 162 133 526 376 serin 0; - #X obj 120 61 cnv 15 15 15 empty \$0-number-canvas 1 4 7 0 14 -233017 - -1 0; - #X obj 200 225 s \$0-number-canvas; - #X obj 60 61 hradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 - -1 0; - #X obj 60 108 + 1; - #X obj 59 147 outlet; - #X obj 60 13 inlet; - #X msg 200 202 label \$1; - #X obj 200 180 makefilename %d; - #X connect 2 0 3 0; - #X connect 3 0 4 0; - #X connect 3 0 7 0; - #X connect 5 0 2 0; - #X connect 6 0 1 0; - #X connect 7 0 6 0; - #X coords 0 -1 1 1 76 17 1 60 60; - #X restore 100 197 pd serin; - #X text 181 198 serial port #; #X msg 164 259 devicename /dev/tty.usbserial-191; #X obj 265 551 +; --- 32,35 ---- *************** *** 91,127 **** #X text 67 660 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> ; #X connect 11 0 12 0; #X connect 12 0 19 0; #X connect 18 0 12 0; ! #X connect 19 1 35 0; ! #X connect 21 0 11 0; ! #X connect 23 0 12 0; ! #X connect 24 0 25 1; ! #X connect 24 0 29 0; ! #X connect 25 0 33 1; ! #X connect 26 0 24 0; ! #X connect 26 1 27 0; ! #X connect 27 0 28 0; ! #X connect 28 0 24 1; ! #X connect 29 0 27 1; ! #X connect 30 0 27 1; ! #X connect 32 0 33 0; ! #X connect 33 0 34 0; ! #X connect 35 0 45 0; ! #X connect 35 1 47 0; ! #X connect 36 0 7 0; ! #X connect 37 0 8 0; ! #X connect 38 0 9 0; ! #X connect 39 0 2 0; ! #X connect 40 0 1 0; ! #X connect 41 0 3 0; ! #X connect 42 0 4 0; ! #X connect 43 0 5 0; ! #X connect 44 0 6 0; ! #X connect 45 0 46 0; ! #X connect 46 0 26 0; ! #X connect 47 0 48 1; ! #X connect 47 1 48 0; ! #X connect 47 2 30 0; ! #X connect 47 2 25 0; ! #X connect 48 0 32 0; --- 71,127 ---- #X text 67 660 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> ; + #N canvas 162 133 562 412 serin 0; + #X obj 220 101 cnv 13 14 13 empty \$0-number-canvas 1 4 7 0 14 -233017 + -1 0; + #X obj 241 251 s \$0-number-canvas; + #X obj 100 100 hradio 15 1 0 8 empty empty empty 0 -6 0 8 -225271 -1 + -1 1; + #X obj 100 173 outlet; + #X obj 101 39 inlet; + #X msg 241 228 label \$1; + #X obj 241 206 makefilename %d; + #X obj 101 134 float; + #X connect 2 0 7 0; + #X connect 4 0 2 0; + #X connect 5 0 1 0; + #X connect 6 0 5 0; + #X connect 7 0 3 0; + #X connect 7 0 6 0; + #X coords 0 -1 1 1 136 15 1 100 100; + #X restore 100 198 pd serin; + #X text 240 199 serial port #; #X connect 11 0 12 0; #X connect 12 0 19 0; #X connect 18 0 12 0; ! #X connect 19 1 33 0; ! #X connect 21 0 12 0; ! #X connect 22 0 23 1; ! #X connect 22 0 27 0; ! #X connect 23 0 31 1; ! #X connect 24 0 22 0; ! #X connect 24 1 25 0; ! #X connect 25 0 26 0; ! #X connect 26 0 22 1; ! #X connect 27 0 25 1; ! #X connect 28 0 25 1; ! #X connect 30 0 31 0; ! #X connect 31 0 32 0; ! #X connect 33 0 43 0; ! #X connect 33 1 45 0; ! #X connect 34 0 7 0; ! #X connect 35 0 8 0; ! #X connect 36 0 9 0; ! #X connect 37 0 2 0; ! #X connect 38 0 1 0; ! #X connect 39 0 3 0; ! #X connect 40 0 4 0; ! #X connect 41 0 5 0; ! #X connect 42 0 6 0; ! #X connect 43 0 44 0; ! #X connect 44 0 24 0; ! #X connect 45 0 46 1; ! #X connect 45 1 46 0; ! #X connect 45 2 28 0; ! #X connect 45 2 23 0; ! #X connect 46 0 30 0; ! #X connect 58 0 11 0; Index: PD_send_potentiometer.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/examples/PD_send_potentiometer.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PD_send_potentiometer.pd 11 Mar 2006 02:04:52 -0000 1.3 --- PD_send_potentiometer.pd 18 May 2006 20:22:59 -0000 1.4 *************** *** 1,3 **** ! #N canvas 66 362 502 362 10; #X text 151 136 On Mac OS X \, set this to the right value:; #X obj 101 196 comport 1 9600; --- 1,3 ---- ! #N canvas 625 217 510 370 10; #X text 151 136 On Mac OS X \, set this to the right value:; #X obj 101 196 comport 1 9600; *************** *** 7,32 **** #X msg 155 153 devicename /dev/tty.usbserial-191; #X obj 100 229 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 0 256; ! #N canvas 162 133 518 368 serin 0; ! #X obj 160 101 cnv 15 15 15 empty \$0-number-canvas 1 4 7 0 14 -233017 ! -1 0; ! #X obj 241 251 s \$0-number-canvas; ! #X obj 100 101 hradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 ! -1 0; ! #X obj 101 134 + 1; ! #X obj 100 173 outlet; ! #X obj 101 39 inlet; ! #X msg 241 228 label \$1; ! #X obj 241 206 makefilename %d; ! #X connect 2 0 3 0; ! #X connect 3 0 4 0; ! #X connect 3 0 7 0; ! #X connect 5 0 2 0; ! #X connect 6 0 1 0; ! #X connect 7 0 6 0; ! #X coords 0 -1 1 1 76 17 1 100 100; ! #X restore 101 75 pd serin; #X msg 101 100 open \$1; - #X text 182 76 serial port #; #X text 28 -6 This patch works with the example Arduino firmware of the same name.; --- 7,12 ---- #X msg 155 153 devicename /dev/tty.usbserial-191; #X obj 100 229 nbx 6 16 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 14 ! -3754 -1 -1 10 256; #X msg 101 100 open \$1; #X text 28 -6 This patch works with the example Arduino firmware of the same name.; *************** *** 38,44 **** #X text 33 323 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> ; #X connect 1 0 5 0; #X connect 3 0 1 0; #X connect 4 0 1 0; ! #X connect 6 0 7 0; ! #X connect 7 0 1 0; --- 18,44 ---- #X text 33 323 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> ; + #N canvas 162 133 562 412 serin 0; + #X obj 220 101 cnv 13 14 13 empty \$0-number-canvas 0 4 7 0 14 -233017 + -1 0; + #X obj 241 251 s \$0-number-canvas; + #X obj 100 100 hradio 15 1 0 8 empty empty empty 0 -6 0 8 -225271 -1 + -1 0; + #X obj 100 173 outlet; + #X obj 101 39 inlet; + #X msg 241 228 label \$1; + #X obj 241 206 makefilename %d; + #X obj 101 134 float; + #X connect 2 0 7 0; + #X connect 4 0 2 0; + #X connect 5 0 1 0; + #X connect 6 0 5 0; + #X connect 7 0 3 0; + #X connect 7 0 6 0; + #X coords 0 -1 1 1 136 15 1 100 100; + #X restore 101 78 pd serin; + #X text 241 79 serial port #; #X connect 1 0 5 0; #X connect 3 0 1 0; #X connect 4 0 1 0; ! #X connect 6 0 1 0; ! #X connect 11 0 6 0; Index: PD_two_potentiometers.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/examples/PD_two_potentiometers.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PD_two_potentiometers.pd 11 Mar 2006 02:04:52 -0000 1.2 --- PD_two_potentiometers.pd 18 May 2006 20:22:59 -0000 1.3 *************** *** 1,3 **** ! #N canvas 1102 74 533 633 10; #X obj 431 598 import zexy; #X text 127 139 On Mac OS X \, set this to the right value:; --- 1,3 ---- ! #N canvas 747 74 537 637 10; #X obj 431 598 import zexy; #X text 127 139 On Mac OS X \, set this to the right value:; *************** *** 8,33 **** #X msg 131 156 devicename /dev/tty.usbserial-191; #X obj 110 496 nbx 4 20 -1e+37 1e+37 0 0 empty empty Analog_in_0 -15 ! 30 1 14 -3754 -1 -1 0 256; ! #N canvas 162 133 518 368 serin 0; ! #X obj 160 101 cnv 15 15 15 empty \$0-number-canvas 1 4 7 0 14 -233017 -1 0; #X obj 241 251 s \$0-number-canvas; ! #X obj 100 101 hradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 -1 0; - #X obj 101 134 + 1; #X obj 100 173 outlet; #X obj 101 39 inlet; #X msg 241 228 label \$1; #X obj 241 206 makefilename %d; ! #X connect 2 0 3 0; ! #X connect 3 0 4 0; ! #X connect 3 0 7 0; ! #X connect 5 0 2 0; ! #X connect 6 0 1 0; #X connect 7 0 6 0; ! #X coords 0 -1 1 1 76 17 1 100 100; #X restore 77 78 pd serin; #X msg 77 103 open \$1; ! #X text 158 79 serial port #; #X text 4 -3 This patch works with the example Arduino firmware of the same name.; --- 8,33 ---- #X msg 131 156 devicename /dev/tty.usbserial-191; #X obj 110 496 nbx 4 20 -1e+37 1e+37 0 0 empty empty Analog_in_0 -15 ! 30 1 14 -3754 -1 -1 406 256; ! #N canvas 162 133 562 412 serin 0; ! #X obj 220 101 cnv 13 14 13 empty \$0-number-canvas 0 4 7 0 14 -233017 -1 0; #X obj 241 251 s \$0-number-canvas; ! #X obj 100 100 hradio 15 1 0 8 empty empty empty 0 -6 0 8 -225271 -1 -1 0; #X obj 100 173 outlet; #X obj 101 39 inlet; #X msg 241 228 label \$1; #X obj 241 206 makefilename %d; ! #X obj 101 134 float; ! #X connect 2 0 7 0; ! #X connect 4 0 2 0; ! #X connect 5 0 1 0; ! #X connect 6 0 5 0; ! #X connect 7 0 3 0; #X connect 7 0 6 0; ! #X coords 0 -1 1 1 136 15 1 100 100; #X restore 77 78 pd serin; #X msg 77 103 open \$1; ! #X text 217 79 serial port #; #X text 4 -3 This patch works with the example Arduino firmware of the same name.; *************** *** 54,58 **** #X obj 156 267 select B A; #X obj 209 495 nbx 4 20 -1e+37 1e+37 0 0 empty empty Analog_in_1 -15 ! 30 1 14 -3754 -1 -1 0 256; #X text 227 606 released under the GNU GPL; #X text 13 591 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> --- 54,58 ---- #X obj 156 267 select B A; #X obj 209 495 nbx 4 20 -1e+37 1e+37 0 0 empty empty Analog_in_1 -15 ! 30 1 14 -3754 -1 -1 3.70039e+18 256; #X text 227 606 released under the GNU GPL; #X text 13 591 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at>

1 0

externals/hardware/arduino/Pd_firmware - New directory
by Hans-Christoph Steiner 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27742/Pd_firmware Log Message: Directory /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware added to the repository

1 0

externals/hcs usbhid.c,1.1,1.2 usbhid-help.pd,1.1,1.2
by Hans-Christoph Steiner 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2426 Modified Files: usbhid.c usbhid-help.pd Log Message: lots of string bullshit, reports name now Index: usbhid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/usbhid-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usbhid-help.pd 18 May 2006 12:00:47 -0000 1.1 --- usbhid-help.pd 18 May 2006 16:00:46 -0000 1.2 *************** *** 1,3 **** ! #N canvas 338 93 593 471 10; #X obj 111 373 usbhid; #X msg 125 14 bang; --- 1,3 ---- ! #N canvas 338 93 597 475 10; #X obj 111 373 usbhid; #X msg 125 14 bang; *************** *** 11,18 **** #X text 233 258 GARBAGE FOR TESTING; #X msg 250 292 set read 1 30 word 1 31 1 38; - #X msg 205 182 set read 1 30 1 31 12 38; #X msg 198 142 print; #X msg 177 78 open 1149 16392; #X text 298 78 Gravis/Destroyer Tiltpad; #X connect 0 0 4 0; #X connect 0 1 5 0; --- 11,18 ---- #X text 233 258 GARBAGE FOR TESTING; #X msg 250 292 set read 1 30 word 1 31 1 38; #X msg 198 142 print; #X msg 177 78 open 1149 16392; #X text 298 78 Gravis/Destroyer Tiltpad; + #X msg 205 182 set read 1 30 1 31; #X connect 0 0 4 0; #X connect 0 1 5 0; *************** *** 24,26 **** #X connect 11 0 0 0; #X connect 12 0 0 0; ! #X connect 13 0 0 0; --- 24,26 ---- #X connect 11 0 0 0; #X connect 12 0 0 0; ! #X connect 14 0 0 0; Index: usbhid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/usbhid.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usbhid.c 18 May 2006 12:00:47 -0000 1.1 --- usbhid.c 18 May 2006 16:00:46 -0000 1.2 *************** *** 1,5 **** /* --------------------------------------------------------------------------*/ /* */ ! /* Pd interface to the USB HID API using libhid */ /* Written by Hans-Christoph Steiner <hans(a)at.or.at> */ /* */ --- 1,5 ---- /* --------------------------------------------------------------------------*/ /* */ ! /* Pd interface to the USB HID API using libhid, which is built on libusb */ /* Written by Hans-Christoph Steiner <hans(a)at.or.at> */ /* */ *************** *** 35,39 **** */ ! /* NOTE: included from libusb/usbi.h. UGLY, i know, but so is libusb! */ struct usb_dev_handle { int fd; --- 35,41 ---- */ ! /* NOTE: included from libusb/usbi.h. UGLY, i know, but so is libusb! ! * this struct doesn't seem to be defined in usb.h, only prototyped ! */ struct usb_dev_handle { int fd; *************** *** 57,61 **** t_int usbhid_instance_count; ! char *hid_id[32]; /* FIXME: 32 devices MAX */ t_int hid_id_count; --- 59,64 ---- t_int usbhid_instance_count; ! #define HID_ID_MAX 32 ! char *hid_id[HID_ID_MAX]; /* FIXME: 32 devices MAX */ t_int hid_id_count; *************** *** 87,92 **** - - /*------------------------------------------------------------------------------ * LOCAL DEFINES --- 90,93 ---- *************** *** 101,108 **** --- 102,113 ---- static t_class *usbhid_class; + /* for USB strings */ + #define STRING_BUFFER_LENGTH 256 + #define SEND_PACKET_LENGTH 1 #define RECEIVE_PACKET_LENGTH 6 #define PATH_LENGTH 3 + /*------------------------------------------------------------------------------ * SUPPORT FUNCTIONS *************** *** 114,118 **** */ static bool device_iterator (struct usb_dev_handle const* usbdev, void* custom, ! unsigned int len) { bool ret = false; --- 119,123 ---- */ static bool device_iterator (struct usb_dev_handle const* usbdev, void* custom, ! unsigned int length) { bool ret = false; *************** *** 122,126 **** /* only here to prevent the unused warning */ /* TODO remove */ ! len = *((unsigned long*)custom); /* Obtain the device's full path */ --- 127,131 ---- /* only here to prevent the unused warning */ /* TODO remove */ ! length = *((unsigned long*)custom); /* Obtain the device's full path */ *************** *** 139,147 **** hid_id[i] = (char *) malloc(strlen(usbdev->device->filename) + strlen(usbdev->bus->dirname) ); sprintf(hid_id[i], "%s/%s", usbdev->bus->dirname, usbdev->device->filename); - post("bus %s device %s: %d %d", - usbdev->bus->dirname, - usbdev->device->filename, - usbdev->device->descriptor.idVendor, - usbdev->device->descriptor.idProduct); } else /* device already seen */ --- 144,147 ---- *************** *** 154,160 **** --- 154,172 ---- && usbdev->device->config && usbdev->device->config->interface->altsetting->bInterfaceClass == USB_CLASS_HID) + { + + post("bus %s device %s: %d %d", + usbdev->bus->dirname, + usbdev->device->filename, + usbdev->device->descriptor.idVendor, + usbdev->device->descriptor.idProduct); ret = true; + } + else + { ret = false; + } + return ret; *************** *** 165,175 **** * serial number. */ ! /* static bool match_serial_number(struct usb_dev_handle* usbdev, void* custom, unsigned int len) */ /* { */ /* bool ret; */ ! /* char* buffer = (char*)malloc(len); */ /* usb_get_string_simple(usbdev, usb_device(usbdev)->descriptor.iSerialNumber, */ ! /* buffer, len); */ ! /* ret = strncmp(buffer, (char*)custom, len) == 0; */ /* free(buffer); */ /* return ret; */ --- 177,187 ---- * serial number. */ ! /* static bool match_serial_number(struct usb_dev_handle* usbdev, void* custom, unsigned int length) */ /* { */ /* bool ret; */ ! /* char* buffer = (char*)malloc(length); */ /* usb_get_string_simple(usbdev, usb_device(usbdev)->descriptor.iSerialNumber, */ ! /* buffer, length); */ ! /* ret = strncmp(buffer, (char*)custom, length) == 0; */ /* free(buffer); */ /* return ret; */ *************** *** 178,186 **** /* -------------------------------------------------------------------------- */ ! /* static HIDInterface* get_device_by_number(t_int device_number) */ /* { */ ! /* HIDInterface* return_hid; */ ! /* return return_hid; */ /* } */ --- 190,201 ---- /* -------------------------------------------------------------------------- */ ! /* static bool get_device_by_number(struct usb_dev_handle* usbdev, */ ! /* void* custom, */ ! /* unsigned int length) */ /* { */ ! /* bool ret; */ ! ! /* return ret; */ /* } */ *************** *** 209,212 **** --- 224,285 ---- + static t_int get_device_string(HIDInterface *hidif, char *device_string) + { + int length; + t_int ret = 0; + char buffer[STRING_BUFFER_LENGTH]; + + if ( !hid_is_opened(hidif) ) + return(0); + + if (hidif->device->descriptor.iManufacturer) { + length = usb_get_string_simple(hidif->dev_handle, + hidif->device->descriptor.iManufacturer, + buffer, + STRING_BUFFER_LENGTH); + if (length > 0) + { + strncat(device_string, buffer, STRING_BUFFER_LENGTH - strlen(device_string)); + strncat(device_string, " ",1); + ret = 1; + } + else + { + post("(unable to fetch manufacturer string)"); + } + } + + if (hidif->device->descriptor.iProduct) { + length = usb_get_string_simple(hidif->dev_handle, + hidif->device->descriptor.iProduct, + buffer, + STRING_BUFFER_LENGTH); + if (length > 0) + { + strncat(device_string, buffer, STRING_BUFFER_LENGTH - strlen(device_string)); + strncat(device_string, " ",1); + ret = 1; + } + else + { + post("(unable to fetch product string)"); + } + } + + if (hidif->device->descriptor.iSerialNumber) { + length = usb_get_string_simple(hidif->dev_handle, + hidif->device->descriptor.iSerialNumber, + buffer, + STRING_BUFFER_LENGTH); + if (length > 0) + strncat(device_string, buffer, STRING_BUFFER_LENGTH - strlen(device_string)); + else + post("(unable to fetch product string)"); + } + + return ret; + } + + /*------------------------------------------------------------------------------ * IMPLEMENTATION *************** *** 217,220 **** --- 290,294 ---- { DEBUG(post("usbhid_open");); + char string_buffer[STRING_BUFFER_LENGTH]; HIDInterfaceMatcher matcher = { (unsigned short)vendor_id, *************** *** 227,231 **** { x->x_hid_return = hid_force_open(x->x_hidinterface, 0, &matcher, 3); ! if (x->x_hid_return != HID_RET_SUCCESS) { error("[usbhid] hid_force_open failed with return code %d\n", x->x_hid_return); } --- 301,311 ---- { x->x_hid_return = hid_force_open(x->x_hidinterface, 0, &matcher, 3); ! if (x->x_hid_return == HID_RET_SUCCESS) ! { ! if (get_device_string(x->x_hidinterface,string_buffer)) ! post("[usbhid]: opened %s",string_buffer); ! } ! else ! { error("[usbhid] hid_force_open failed with return code %d\n", x->x_hid_return); } *************** *** 240,244 **** DEBUG(post("usbhid_read");); /* int const PATH_IN[PATH_LENGTH] = { 0xffa00001, 0xffa00002, 0xffa10003 }; */ ! int const PATH_OUT[PATH_LENGTH] = { 0x00010030, 0x00010031, 0x00010038 }; char packet[RECEIVE_PACKET_LENGTH]; --- 320,324 ---- DEBUG(post("usbhid_read");); /* int const PATH_IN[PATH_LENGTH] = { 0xffa00001, 0xffa00002, 0xffa10003 }; */ ! int const PATH_OUT[2] = { 0x00010030, 0x00010031 }; char packet[RECEIVE_PACKET_LENGTH]; *************** *** 252,256 **** x->x_hid_return = hid_get_input_report(x->x_hidinterface, PATH_OUT, ! PATH_LENGTH, packet, RECEIVE_PACKET_LENGTH); --- 332,336 ---- x->x_hid_return = hid_get_input_report(x->x_hidinterface, PATH_OUT, ! 2, packet, RECEIVE_PACKET_LENGTH); *************** *** 258,266 **** error("[usbhid] hid_get_input_report failed with return code %d\n", x->x_hid_return); ! /* } */ } /* -------------------------------------------------------------------------- */ /* set the HID packet for which elements to read */ --- 338,347 ---- error("[usbhid] hid_get_input_report failed with return code %d\n", x->x_hid_return); ! /* } */ } + /* -------------------------------------------------------------------------- */ /* set the HID packet for which elements to read */ *************** *** 328,331 **** --- 409,414 ---- { DEBUG(post("usbhid_close");); + t_int ret; + char string_buffer[STRING_BUFFER_LENGTH]; /* just to be safe, stop it first */ *************** *** 334,342 **** if ( hid_is_opened(x->x_hidinterface) ) { x->x_hid_return = hid_close(x->x_hidinterface); if (x->x_hid_return == HID_RET_SUCCESS) ! post("[usbhid] closed device %d",x->x_device_number); else error("[usbhid] could not close %d, error #%d",x->x_device_number,x->x_hid_return); } } --- 417,430 ---- if ( hid_is_opened(x->x_hidinterface) ) { + ret = get_device_string(x->x_hidinterface,string_buffer); x->x_hid_return = hid_close(x->x_hidinterface); if (x->x_hid_return == HID_RET_SUCCESS) ! { ! if (ret) post("[usbhid]: closed %s",string_buffer); ! } else + { error("[usbhid] could not close %d, error #%d",x->x_device_number,x->x_hid_return); + } } } *************** *** 348,352 **** DEBUG(post("usbhid_print");); t_int i; ! t_atom event_data[3]; for ( i = 0 ; ( hid_id[i] != NULL ) ; i++ ) --- 436,441 ---- DEBUG(post("usbhid_print");); t_int i; ! char string_buffer[STRING_BUFFER_LENGTH]; ! /* t_atom event_data[3]; */ for ( i = 0 ; ( hid_id[i] != NULL ) ; i++ ) *************** *** 355,358 **** --- 444,450 ---- post("hid_id[%d]: %s",i,hid_id[i]); } + if (get_device_string(x->x_hidinterface,string_buffer)) + post("%s is currently open",string_buffer); + /* SETSYMBOL(event_data, gensym(type)); /\* type *\/ */ /* SETSYMBOL(event_data + 1, gensym(code)); /\* code *\/ */ *************** *** 413,424 **** /* hid_write_library_config(stdout); */ ! /* hid_set_debug(HID_DEBUG_NOTRACES); */ ! // hid_set_debug(HID_DEBUG_NONE); ! /* hid_set_debug(HID_DEBUG_ALL); */ ! hid_set_debug_stream(stderr); hid_set_usb_debug(0); /* data init */ ! for (i = 0 ; i < 32 ; i++) hid_id[i] = NULL; --- 505,516 ---- /* hid_write_library_config(stdout); */ ! //hid_set_debug(HID_DEBUG_NONE); ! hid_set_debug(HID_DEBUG_NOTRACES); ! //hid_set_debug(HID_DEBUG_ALL); ! hid_set_debug_stream(stdout); hid_set_usb_debug(0); /* data init */ ! for (i = 0 ; i < HID_ID_MAX ; i++) hid_id[i] = NULL;

1 0

externals/jasch_lib/detox detox.c,1.2,1.3
by /*j 18 May '06

18 May '06

Update of /cvsroot/pure-data/externals/jasch_lib/detox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv757 Modified Files: detox.c Log Message: Index: detox.c =================================================================== RCS file: /cvsroot/pure-data/externals/jasch_lib/detox/detox.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** detox.c 18 May 2006 15:45:34 -0000 1.2 --- detox.c 18 May 2006 15:56:45 -0000 1.3 *************** *** 1 **** ! /*__________________________________________________________________________ detox á extract value/content from tag-structured symbol Copyright (C) 2003 jan schacher 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA revised tree output 20040712 initial build 200300502 pd-port 20060506 ____________________________________________________________________________*/ #include "m_pd.h" #include <string.h> #include <stdlib.h> #include <ctype.h> #include <locale.h> #define VERSION "1.2" #define CLIP(x,a,b) (x)=(x)<(a)?(a):(x)>(b)?(b):(x) typedef struct _detox { t_object ob; t_atom t_tree[257], t_attrpair[2]; t_atom t_comp, t_blip; long t_treecount; short t_debug; short t_mode; void *s_outlet, *s_outlet2, *s_outlet3, *s_outlet4; } t_detox; t_symbol *ps_nothing; void *detox_class; void *detox_new(t_symbol *s, long argc, t_atom *argv); void detox_free(t_detox *x); void detox_reset(t_detox *x); void detox_debug(t_detox *x, float f); void detox_mode(t_detox *x, float f); void detox_anything(t_detox *x, t_symbol *s, long argc, t_atom *argv); long clip(long in, long min, long max); void version(t_detox *x); void detox_setup(void) { detox_class = class_new(gensym("detox"), (t_newmethod)detox_new, (t_method)detox_free, sizeof(t_detox), 0, A_GIMME, 0); class_addsymbol(detox_class, (t_method)detox_anything); // class_addmethod(detox_class, (t_method)detox_anything, gensym("anything"), A_GIMME,0); class_addmethod(detox_class, (t_method)detox_debug, gensym("debug"), A_FLOAT, 0); class_addmethod(detox_class, (t_method)detox_mode, gensym("mode"), A_FLOAT, 0); class_addmethod(detox_class, (t_method)detox_reset, gensym("reset"), 0); class_addmethod(detox_class, (t_method)version, gensym("version"), 0); post(". detox . jasch . "__DATE__" "); ps_nothing = gensym(""); } void *detox_new(t_symbol *s, long argc, t_atom *argv) { t_detox *x = (t_detox *)pd_new(detox_class); x->s_outlet = outlet_new(&x->ob, NULL); x->s_outlet2 = outlet_new(&x->ob, NULL); x->s_outlet3 = outlet_new(&x->ob, NULL); x->s_outlet4 = outlet_new(&x->ob, gensym("float")); x->t_treecount = 0; x->t_debug = 0; if((argc >= 1)&&(argv[0].a_type == A_FLOAT)){ if(argv[0].a_w.w_float == 0){ x->t_mode = 0; }else{ x->t_mode = 1; } }else{ x->t_mode = 1; } x->t_debug = 0; if(x->t_debug) post("mode is %ld", x->t_mode); return (x); } void detox_reset(t_detox *x) { short i; x->t_treecount = 0; for(i=0;i<256; i++) x->t_tree[i].a_w.w_symbol = ps_nothing; } void detox_debug(t_detox *x, float f) { if(f == 0.0){ x->t_debug = 0; }else if(f != 0){ x->t_debug = 1; } } void detox_mode(t_detox *x, float f) { if(f == 0.0){ x->t_mode = 0; }else if(f != 0){ x->t_mode = 1; } } void detox_anything(t_detox *x, t_symbol *s, long argc, t_atom *argv) { t_atom *outlist, *comp, *attrpair; char local[1024], local2[1024]; char temp[1024]; char tempstring[2]; char *ptr, *ptr2, *ptr3, *ptr4, *ptr5; long i, j, k, last, len, len2, tempcount = 0, pos = 0; short tagtype = 0; // 0 = closed, 1 = open, 2 = closing short outsize = 0; long quotetype = 0; short attrpresent = 0; i = 0; strcpy(tempstring, " "); outlist = x->t_tree; attrpair = x->t_attrpair; x->t_attrpair[0].a_type = A_SYMBOL; x->t_attrpair[1].a_type = A_SYMBOL; if(s->s_name == "debug"){ x->t_debug = CLIP(argv[0].a_w.w_float, 0, 1); return; } strcpy(local2, s->s_name); last = strlen(local2); // test for tag if(x->t_debug) post("input is %s", s->s_name); k=0; while(isspace(local2[k])){ // remove whitespace/tab/cr/linefeed k++; } if(x->t_debug) post("k is %ld, last is %ld", k, last); for(i=k, j=0; i<last; i++, j++){ // remove whitespace/tab/cr/linefeed local[j] = local2[i]; } local[j] = 0; // terminate string if((local[0] != '<') || (local[j-1] != '>')){ tagtype = 0; // not a well formed tag if(x->t_debug) post("tagtype 0"); goto content; } if((local[1] == '?') || (local[1] == '!')){ tagtype = 4; // this might be a metatag if(x->t_debug) post("tagtype 4"); goto content; } ptr = strchr(local, '/'); // is it a closing tag ? if(x->t_debug) post("ptr contains %s", s->s_name); if(ptr == NULL){ // we have new open tag tagtype = 2; if(x->t_debug) post("tagtype 2"); }else if((local[1] == '/')){ // is it at beginning tagtype = 3; if(x->t_debug) post("tagtype 3"); }else if(local[1] != '/'){ // is it elsewhere if(x->t_debug) post("tagtype 1"); tagtype = 1; } switch(tagtype){ case 1: // closed tag :: add temporarily to tree ptr = strchr(local, '>'); ptr2 = strchr(local, ' '); if(ptr2 != NULL) *ptr2 = 0; if(ptr != NULL){ *ptr = 0; }else{ return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 1), len-1); local[len-1] = 0; ptr5 = local; x->t_blip.a_type = A_SYMBOL; x->t_blip.a_w.w_symbol = gensym(ptr5); tempcount = 1; break; case 2: // opening tag :: add to tree, increment count ptr2 = strchr(local, ' '); if(ptr2 != NULL){ *ptr2 = 0; if(x->t_debug) post("inside opening tag w/ whitespace, %s", local); }else{ local[strlen(local) - 1] = 0; // local[strlen(ptr2) -1] = 0; if(x->t_debug) post("inside opening tag no whitespace, %s", local); // return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 1), len-1); if(x->t_debug) post("ptr5 is %s", ptr5); local[len-1] = 0; ptr5 = local; x->t_tree[x->t_treecount].a_type = A_SYMBOL; x->t_tree[x->t_treecount].a_w.w_symbol = gensym(ptr5); x->t_treecount++; x->t_treecount = clip(x->t_treecount, 0, 255); break; case 3: // closing tag :: remove from tree, decrement count ptr2 = strchr(local, '>'); if(ptr2 != NULL){ *ptr2 = 0; }else{ return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 2), len-2); local[len-2] = 0; ptr5 = local; x->t_comp.a_type = A_SYMBOL; x->t_comp.a_w.w_symbol = gensym(ptr5); if(x->t_comp.a_w.w_symbol->s_name == x->t_tree[x->t_treecount-1].a_w.w_symbol->s_name){ x->t_treecount -= 1; x->t_treecount = clip(x->t_treecount, 0, 255); }else{ outlet_float(x->s_outlet4, 3); outlet_float(x->s_outlet3, -1); return; } break; } content: outlet_float(x->s_outlet4, tagtype); if(tagtype == 0) return; if(x->t_treecount > 0){ if(tempcount){ outsize = x->t_treecount + 1; x->t_tree[outsize-1] = x->t_blip; }else{ outsize = x->t_treecount; } outlet_list(x->s_outlet3, 0L, outsize, outlist); // ouput tree }else if(x->t_treecount == 0){ if(tempcount){ outlet_anything(x->s_outlet3, x->t_blip.a_w.w_symbol, 0, NULL); // ouput tree }else{ outlet_float(x->s_outlet3, 0); // ouput tree } } strcpy(local, s->s_name); ptr = strchr(local, '>'); // parse content between enclosing tags <tag>blah</tag> if(ptr == NULL) goto onward; *ptr = 0; ++ptr; ptr2 = strchr(ptr, '<'); if(ptr2 == NULL) goto onward; *ptr2 = 0; outlet_anything(x->s_outlet2, gensym(ptr), 0, NULL); onward: strcpy(local, s->s_name); // get full buffer again switch(x->t_mode){ case 0: // the old way of attribute parsing (mode 0) if(x->t_debug) post("content: before strtok %s", local); ptr = strtok(local,tempstring); while (ptr != NULL){ ptr3 = strchr(ptr, '"'); if(ptr3 != NULL){ *ptr3 = 0; ++ptr3; ptr4 = strchr(ptr3, '"'); *ptr4 = 0; outlet_anything(x->s_outlet, gensym(ptr3), 0, NULL); if(x->t_debug) post("content: after strtok %s", ptr); } ptr = strtok(NULL, tempstring); } break; case 1: // the new way of attribute parsing (mode 1) ptr = local; if(strcspn(ptr, "=\"\'") == strlen(ptr)) break; // no attr-chars found, bail ouit ptr = strchr(local, 32); // find first whitespace if(ptr == NULL) break; // no whitespace found bail attr_loop: while((ptr[0] == ' ') && (ptr != NULL)) ptr++; // find next non-whitespace char ptr2 = ptr; while(!((ptr2[0] == ' ')||(ptr2[0] == '=')) && (ptr2 != NULL)) ptr2++; // find next non-white or not equal-sign len = strlen(ptr) - strlen(ptr2); strncpy(temp, ptr, len); // copy into temp-buffer temp[len] = 0; // terminate temp_buffer attrpair[0].a_type = A_SYMBOL; attrpair[0].a_w.w_symbol = gensym(temp); // put into output symbol ptr = ptr2; while(!((ptr[0] == '\'') || (ptr[0] == '\"')) && (ptr != NULL)){ // move until single or double quote ptr++; quotetype = ptr[0]; } ptr2 = ++ptr; while((ptr2[0] != quotetype) && (ptr2 != NULL)) ptr2++; len = strlen(ptr) - strlen(ptr2); strncpy(temp, ptr, len); temp[len] = 0; attrpair[1].a_type = A_SYMBOL; attrpair[1].a_w.w_symbol = gensym(temp); outlet_anything(x->s_outlet, x->t_attrpair[0].a_w.w_symbol, 1, &x->t_attrpair[1]); ptr = ++ptr2; while((ptr[0] == ' ')&&(ptr != NULL)){ ptr++; } // find next non-whitespace char if((ptr[0] == '/') || (ptr[0] == '>') || (ptr[0] == '?') || (ptr == NULL)){ // if char is "/" or ">" or "?" bail out break; }else{ goto attr_loop; } break; } } void detox_free(t_detox *x) { // notify_free((t_object *)x); } long clip(long in, long min, long max) { return in < min? min: (in > max? max : in); } void version(t_detox *x) { post("á detox á jasch - version " VERSION" compiled "__DATE__" "__TIME__ ); } \ No newline at end of file --- 1 ---- ! /*__________________________________________________________________________ detox á extract value/content from tag-structured symbol Copyright (C) 2003 - 2006 jan schacher 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA revised tree output 20040712 initial build 200300502 pd-port 20060506 ____________________________________________________________________________*/ #include "m_pd.h" #include <string.h> #include <stdlib.h> #include <ctype.h> #include <locale.h> #define VERSION "1.2" #define CLIP(x,a,b) (x)=(x)<(a)?(a):(x)>(b)?(b):(x) typedef struct _detox { t_object ob; t_atom t_tree[257], t_attrpair[2]; t_atom t_comp, t_blip; long t_treecount; short t_debug; short t_mode; void *s_outlet, *s_outlet2, *s_outlet3, *s_outlet4; } t_detox; t_symbol *ps_nothing; void *detox_class; void *detox_new(t_symbol *s, long argc, t_atom *argv); void detox_free(t_detox *x); void detox_reset(t_detox *x); void detox_debug(t_detox *x, float f); void detox_mode(t_detox *x, float f); void detox_anything(t_detox *x, t_symbol *s, long argc, t_atom *argv); long clip(long in, long min, long max); void version(t_detox *x); void detox_setup(void) { detox_class = class_new(gensym("detox"), (t_newmethod)detox_new, (t_method)detox_free, sizeof(t_detox), 0, A_GIMME, 0); class_addsymbol(detox_class, (t_method)detox_anything); // class_addmethod(detox_class, (t_method)detox_anything, gensym("anything"), A_GIMME,0); class_addmethod(detox_class, (t_method)detox_debug, gensym("debug"), A_FLOAT, 0); class_addmethod(detox_class, (t_method)detox_mode, gensym("mode"), A_FLOAT, 0); class_addmethod(detox_class, (t_method)detox_reset, gensym("reset"), 0); class_addmethod(detox_class, (t_method)version, gensym("version"), 0); post(". detox . jasch . "__DATE__" "); ps_nothing = gensym(""); } void *detox_new(t_symbol *s, long argc, t_atom *argv) { t_detox *x = (t_detox *)pd_new(detox_class); x->s_outlet = outlet_new(&x->ob, NULL); x->s_outlet2 = outlet_new(&x->ob, NULL); x->s_outlet3 = outlet_new(&x->ob, NULL); x->s_outlet4 = outlet_new(&x->ob, gensym("float")); x->t_treecount = 0; x->t_debug = 0; if((argc >= 1)&&(argv[0].a_type == A_FLOAT)){ if(argv[0].a_w.w_float == 0){ x->t_mode = 0; }else{ x->t_mode = 1; } }else{ x->t_mode = 1; } x->t_debug = 0; if(x->t_debug) post("mode is %ld", x->t_mode); return (x); } void detox_reset(t_detox *x) { short i; x->t_treecount = 0; for(i=0;i<256; i++) x->t_tree[i].a_w.w_symbol = ps_nothing; } void detox_debug(t_detox *x, float f) { if(f == 0.0){ x->t_debug = 0; }else if(f != 0){ x->t_debug = 1; } } void detox_mode(t_detox *x, float f) { if(f == 0.0){ x->t_mode = 0; }else if(f != 0){ x->t_mode = 1; } } void detox_anything(t_detox *x, t_symbol *s, long argc, t_atom *argv) { t_atom *outlist, *comp, *attrpair; char local[1024], local2[1024]; char temp[1024]; char tempstring[2]; char *ptr, *ptr2, *ptr3, *ptr4, *ptr5; long i, j, k, last, len, len2, tempcount = 0, pos = 0; short tagtype = 0; // 0 = closed, 1 = open, 2 = closing short outsize = 0; long quotetype = 0; short attrpresent = 0; i = 0; strcpy(tempstring, " "); outlist = x->t_tree; attrpair = x->t_attrpair; x->t_attrpair[0].a_type = A_SYMBOL; x->t_attrpair[1].a_type = A_SYMBOL; if(s->s_name == "debug"){ x->t_debug = CLIP(argv[0].a_w.w_float, 0, 1); return; } strcpy(local2, s->s_name); last = strlen(local2); // test for tag if(x->t_debug) post("input is %s", s->s_name); k=0; while(isspace(local2[k])){ // remove whitespace/tab/cr/linefeed k++; } if(x->t_debug) post("k is %ld, last is %ld", k, last); for(i=k, j=0; i<last; i++, j++){ // remove whitespace/tab/cr/linefeed local[j] = local2[i]; } local[j] = 0; // terminate string if((local[0] != '<') || (local[j-1] != '>')){ tagtype = 0; // not a well formed tag if(x->t_debug) post("tagtype 0"); goto content; } if((local[1] == '?') || (local[1] == '!')){ tagtype = 4; // this might be a metatag if(x->t_debug) post("tagtype 4"); goto content; } ptr = strchr(local, '/'); // is it a closing tag ? if(x->t_debug) post("ptr contains %s", s->s_name); if(ptr == NULL){ // we have new open tag tagtype = 2; if(x->t_debug) post("tagtype 2"); }else if((local[1] == '/')){ // is it at beginning tagtype = 3; if(x->t_debug) post("tagtype 3"); }else if(local[1] != '/'){ // is it elsewhere if(x->t_debug) post("tagtype 1"); tagtype = 1; } switch(tagtype){ case 1: // closed tag :: add temporarily to tree ptr = strchr(local, '>'); ptr2 = strchr(local, ' '); if(ptr2 != NULL) *ptr2 = 0; if(ptr != NULL){ *ptr = 0; }else{ return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 1), len-1); local[len-1] = 0; ptr5 = local; x->t_blip.a_type = A_SYMBOL; x->t_blip.a_w.w_symbol = gensym(ptr5); tempcount = 1; break; case 2: // opening tag :: add to tree, increment count ptr2 = strchr(local, ' '); if(ptr2 != NULL){ *ptr2 = 0; if(x->t_debug) post("inside opening tag w/ whitespace, %s", local); }else{ local[strlen(local) - 1] = 0; // local[strlen(ptr2) -1] = 0; if(x->t_debug) post("inside opening tag no whitespace, %s", local); // return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 1), len-1); if(x->t_debug) post("ptr5 is %s", ptr5); local[len-1] = 0; ptr5 = local; x->t_tree[x->t_treecount].a_type = A_SYMBOL; x->t_tree[x->t_treecount].a_w.w_symbol = gensym(ptr5); x->t_treecount++; x->t_treecount = clip(x->t_treecount, 0, 255); break; case 3: // closing tag :: remove from tree, decrement count ptr2 = strchr(local, '>'); if(ptr2 != NULL){ *ptr2 = 0; }else{ return; } len = strlen(local); ptr5 = (char *)memmove((local + 0),(local + 2), len-2); local[len-2] = 0; ptr5 = local; x->t_comp.a_type = A_SYMBOL; x->t_comp.a_w.w_symbol = gensym(ptr5); if(x->t_comp.a_w.w_symbol->s_name == x->t_tree[x->t_treecount-1].a_w.w_symbol->s_name){ x->t_treecount -= 1; x->t_treecount = clip(x->t_treecount, 0, 255); }else{ outlet_float(x->s_outlet4, 3); outlet_float(x->s_outlet3, -1); return; } break; } content: outlet_float(x->s_outlet4, tagtype); if(tagtype == 0) return; if(x->t_treecount > 0){ if(tempcount){ outsize = x->t_treecount + 1; x->t_tree[outsize-1] = x->t_blip; }else{ outsize = x->t_treecount; } outlet_list(x->s_outlet3, 0L, outsize, outlist); // ouput tree }else if(x->t_treecount == 0){ if(tempcount){ outlet_anything(x->s_outlet3, x->t_blip.a_w.w_symbol, 0, NULL); // ouput tree }else{ outlet_float(x->s_outlet3, 0); // ouput tree } } strcpy(local, s->s_name); ptr = strchr(local, '>'); // parse content between enclosing tags <tag>blah</tag> if(ptr == NULL) goto onward; *ptr = 0; ++ptr; ptr2 = strchr(ptr, '<'); if(ptr2 == NULL) goto onward; *ptr2 = 0; outlet_anything(x->s_outlet2, gensym(ptr), 0, NULL); onward: strcpy(local, s->s_name); // get full buffer again switch(x->t_mode){ case 0: // the old way of attribute parsing (mode 0) if(x->t_debug) post("content: before strtok %s", local); ptr = strtok(local,tempstring); while (ptr != NULL){ ptr3 = strchr(ptr, '"'); if(ptr3 != NULL){ *ptr3 = 0; ++ptr3; ptr4 = strchr(ptr3, '"'); *ptr4 = 0; outlet_anything(x->s_outlet, gensym(ptr3), 0, NULL); if(x->t_debug) post("content: after strtok %s", ptr); } ptr = strtok(NULL, tempstring); } break; case 1: // the new way of attribute parsing (mode 1) ptr = local; if(strcspn(ptr, "=\"\'") == strlen(ptr)) break; // no attr-chars found, bail ouit ptr = strchr(local, 32); // find first whitespace if(ptr == NULL) break; // no whitespace found bail attr_loop: while((ptr[0] == ' ') && (ptr != NULL)) ptr++; // find next non-whitespace char ptr2 = ptr; while(!((ptr2[0] == ' ')||(ptr2[0] == '=')) && (ptr2 != NULL)) ptr2++; // find next non-white or not equal-sign len = strlen(ptr) - strlen(ptr2); strncpy(temp, ptr, len); // copy into temp-buffer temp[len] = 0; // terminate temp_buffer attrpair[0].a_type = A_SYMBOL; attrpair[0].a_w.w_symbol = gensym(temp); // put into output symbol ptr = ptr2; while(!((ptr[0] == '\'') || (ptr[0] == '\"')) && (ptr != NULL)){ // move until single or double quote ptr++; quotetype = ptr[0]; } ptr2 = ++ptr; while((ptr2[0] != quotetype) && (ptr2 != NULL)) ptr2++; len = strlen(ptr) - strlen(ptr2); strncpy(temp, ptr, len); temp[len] = 0; attrpair[1].a_type = A_SYMBOL; attrpair[1].a_w.w_symbol = gensym(temp); outlet_anything(x->s_outlet, x->t_attrpair[0].a_w.w_symbol, 1, &x->t_attrpair[1]); ptr = ++ptr2; while((ptr[0] == ' ')&&(ptr != NULL)){ ptr++; } // find next non-whitespace char if((ptr[0] == '/') || (ptr[0] == '>') || (ptr[0] == '?') || (ptr == NULL)){ // if char is "/" or ">" or "?" bail out break; }else{ goto attr_loop; } break; } } void detox_free(t_detox *x) { // notify_free((t_object *)x); } long clip(long in, long min, long max) { return in < min? min: (in > max? max : in); } void version(t_detox *x) { post("á detox á jasch - version " VERSION" compiled "__DATE__" "__TIME__ ); } \ No newline at end of file

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2006