Pd-cvs March 2007

pd-cvs@lists.iem.at

15 participants
137 discussions

externals/grh/PDContainer/src h_deque.cpp, 1.3, 1.4 h_list.cpp, 1.3, 1.4 h_map.cpp, 1.3, 1.4 h_multimap.cpp, 1.3, 1.4 h_multiset.cpp, 1.3, 1.4 h_prioqueue.cpp, 1.4, 1.5 h_queue.cpp, 1.2, 1.3 h_set.cpp, 1.3, 1.4 h_stack.cpp, 1.2, 1.3 h_vector.cpp, 1.3, 1.4
by Georg Holzmann 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals/grh/PDContainer/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13129 Modified Files: h_deque.cpp h_list.cpp h_map.cpp h_multimap.cpp h_multiset.cpp h_prioqueue.cpp h_queue.cpp h_set.cpp h_stack.cpp h_vector.cpp Log Message: fix to support Pd-Extended and also the old buildsystem Index: h_multiset.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_multiset.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_multiset.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_multiset.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 206,210 **** } ! extern "C" void h_multiset_setup(void) { // the object class --- 206,215 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_multiset_setup(void) { // the object class *************** *** 245,246 **** --- 250,256 ---- class_addmethod(h_multiset_class, (t_method)h_multiset_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_multimap.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_multimap.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_multimap.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_multimap.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 336,340 **** } ! extern "C" void h_multimap_setup(void) { h_multimap_class = class_new(gensym("h_multimap"), (t_newmethod)h_multimap_new, --- 336,345 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_multimap_setup(void) { h_multimap_class = class_new(gensym("h_multimap"), (t_newmethod)h_multimap_new, *************** *** 382,383 **** --- 387,394 ---- gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif + Index: h_stack.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_stack.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** h_stack.cpp 7 Jan 2007 23:17:45 -0000 1.2 --- h_stack.cpp 1 Mar 2007 18:06:58 -0000 1.3 *************** *** 137,141 **** } ! extern "C" void h_stack_setup(void) { // the object class --- 137,146 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_stack_setup(void) { // the object class *************** *** 164,165 **** --- 169,175 ---- class_addmethod(h_stack_class, (t_method)h_stack_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_prioqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_prioqueue.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** h_prioqueue.cpp 9 Jan 2007 21:02:19 -0000 1.4 --- h_prioqueue.cpp 1 Mar 2007 18:06:58 -0000 1.5 *************** *** 217,221 **** } ! extern "C" void h_prioqueue_setup(void) { // the object class --- 217,226 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_prioqueue_setup(void) { // the object class *************** *** 249,250 **** --- 254,260 ---- class_addmethod(h_prioqueue_class, (t_method)h_prioqueue_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_deque.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_deque.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_deque.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_deque.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 539,543 **** } ! extern "C" void h_deque_setup(void) { // the object class --- 539,549 ---- } ! ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_deque_setup(void) { // the object class *************** *** 603,604 **** --- 609,615 ---- class_addmethod(h_deque_class, (t_method)h_deque_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_queue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_queue.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** h_queue.cpp 7 Jan 2007 23:17:45 -0000 1.2 --- h_queue.cpp 1 Mar 2007 18:06:58 -0000 1.3 *************** *** 137,141 **** } ! extern "C" void h_queue_setup(void) { // the object class --- 137,146 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_queue_setup(void) { // the object class *************** *** 164,165 **** --- 169,175 ---- class_addmethod(h_queue_class, (t_method)h_queue_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_vector.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_vector.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_vector.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_vector.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 457,461 **** } ! extern "C" void h_vector_setup(void) { // the object class --- 457,466 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_vector_setup(void) { // the object class *************** *** 489,493 **** class_addmethod(h_vector_class, (t_method)h_vector_get_namespace, gensym("getnamespace"), A_DEFFLOAT, 0); ! class_addmethod(h_vector_class, (t_method)h_vector_print, gensym("getall"), A_DEFFLOAT, 0); class_addmethod(h_vector_class, (t_method)h_vector_print, --- 494,498 ---- class_addmethod(h_vector_class, (t_method)h_vector_get_namespace, gensym("getnamespace"), A_DEFFLOAT, 0); ! class_addmethod(h_vector_class, (t_method)h_vector_getall, gensym("getall"), A_DEFFLOAT, 0); class_addmethod(h_vector_class, (t_method)h_vector_print, *************** *** 513,514 **** --- 518,524 ---- class_addmethod(h_vector_class, (t_method)h_vector_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_list.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_list.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_list.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_list.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 394,398 **** } ! extern "C" void h_list_setup(void) { // the object class --- 394,403 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_list_setup(void) { // the object class *************** *** 467,468 **** --- 472,478 ---- class_addmethod(h_list_class, (t_method)h_list_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_map.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_map.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_map.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_map.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 339,343 **** } ! extern "C" void h_map_setup(void) { // the object class --- 339,348 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_map_setup(void) { // the object class *************** *** 385,386 **** --- 390,396 ---- class_addmethod(h_map_class, (t_method)h_map_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif Index: h_set.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_set.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_set.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_set.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 206,210 **** } ! extern "C" void h_set_setup(void) { // the object class --- 206,215 ---- } ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_set_setup(void) { // the object class *************** *** 245,246 **** --- 250,256 ---- class_addmethod(h_set_class, (t_method)h_set_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif

1 0

externals Makefile,1.130,1.131
by Georg Holzmann 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11923 Modified Files: Makefile Log Message: fix for pdcontainer Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** Makefile 25 Jan 2007 20:53:01 -0000 1.130 --- Makefile 1 Mar 2007 18:03:50 -0000 1.131 *************** *** 2251,2255 **** $(PDCONTAINER_OBJ) : %.o : %.cpp ! $(CXX) $(CXXFLAGS) $(PDCONTAINER_INCLUDE) -o "$*.o" -c "$*.cpp" pdcontainer_install: pdcontainer --- 2251,2255 ---- $(PDCONTAINER_OBJ) : %.o : %.cpp ! $(CXX) $(CXXFLAGS) -DPDCONTAINER_SINGLE_OBJECT $(PDCONTAINER_INCLUDE) -o "$*.o" -c "$*.cpp" pdcontainer_install: pdcontainer

1 0

externals/iem/iemgui pd_start.bat,1.1,1.2
by musil 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals/iem/iemgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22641/iem/iemgui Modified Files: pd_start.bat Log Message: Index: pd_start.bat =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemgui/pd_start.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pd_start.bat 14 Dec 2006 19:41:02 -0000 1.1 --- pd_start.bat 1 Mar 2007 17:06:37 -0000 1.2 *************** *** 7,11 **** set PD_OPTIONS=-font 10 set PD_PATH=-path C:/Programme/pd/externs/iemlib_R1.16/iemabs -path C:/Programme/pd/externs/iemlib_R1.16/lib -path C:/Programme/pd/externs/zexy ! set PD_LIB=-lib iemlib1 -lib iemlib2 -lib iem_delay -lib zexy --- 7,11 ---- set PD_OPTIONS=-font 10 set PD_PATH=-path C:/Programme/pd/externs/iemlib_R1.16/iemabs -path C:/Programme/pd/externs/iemlib_R1.16/lib -path C:/Programme/pd/externs/zexy ! set PD_LIB=-lib iemlib1 -lib iemlib2 -lib iemgui -lib zexy

1 0

externals/iem/iemgui/help cube_sphere-help.pd,1.1,1.2
by musil 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals/iem/iemgui/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22263/iem/iemgui/help Modified Files: cube_sphere-help.pd Log Message: add new method "vis index state" Index: cube_sphere-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemgui/help/cube_sphere-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cube_sphere-help.pd 14 Dec 2006 19:41:02 -0000 1.1 --- cube_sphere-help.pd 1 Mar 2007 17:05:28 -0000 1.2 *************** *** 1,3 **** ! #N canvas 33 0 924 718 10; #X obj 42 118 r to_GUI; #X floatatom 493 53 5 20 500 0 - - -; --- 1,3 ---- ! #N canvas 33 0 928 718 10; #X obj 42 118 r to_GUI; #X floatatom 493 53 5 20 500 0 - - -; *************** *** 493,497 **** #X connect 8 0 6 0; #X connect 9 0 7 1; ! #X restore 715 525 pd colors; #X text 9 11 cube_sphere; #X obj 42 139 cube_sphere 5 222 50 354 0 250684 347 194 195567 229 --- 493,497 ---- #X connect 8 0 6 0; #X connect 9 0 7 1; ! #X restore 811 397 pd colors; #X text 9 11 cube_sphere; #X obj 42 139 cube_sphere 5 222 50 354 0 250684 347 194 195567 229 *************** *** 568,571 **** --- 568,586 ---- ; #X text 120 47 equator is 0 degree; + #X obj 642 369 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 + 1; + #X msg 642 440 \; to_GUI vis 2 \$1; + #X obj 642 423 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 + 1; + #X obj 642 477 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X obj 642 531 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X obj 642 585 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X msg 642 386 \; to_GUI vis 1 \$1; + #X msg 642 494 \; to_GUI vis 3 \$1; + #X msg 642 548 \; to_GUI vis 4 \$1; + #X msg 642 602 \; to_GUI vis 5 \$1; #X connect 0 0 18 0; #X connect 1 0 20 0; *************** *** 614,615 **** --- 629,635 ---- #X connect 59 1 58 0; #X connect 67 0 68 0; + #X connect 87 0 93 0; + #X connect 89 0 88 0; + #X connect 90 0 94 0; + #X connect 91 0 95 0; + #X connect 92 0 96 0;

1 0

autobuild: pd-main macosx104-powerpc 2007-03-01 03.15.05
by pd＠macosx104-powerpc.idmi.poly.edu 01 Mar '07

01 Mar '07

_sleep referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _socket referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _strcspn referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _task_get_special_port referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_terminate referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _vsnprintf referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _write referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _AudioConvertNanosToHostTime referenced from Jack expected to be defined in /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio _pthread_create referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_info referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_policy_set referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib collect2: ld returned 1 exit status /usr/bin/ld: for architecture ppc /usr/bin/ld: warning multiple definitions of symbol _jack_error s_audio_jack.o definition of _jack_error in section (__TEXT,__text) /Library/Frameworks/Jack.framework/Jack(single module) definition of _jack_error lipo: can't open input file: /var/tmp//ccxqm9PI.out (No such file or directory) make[2]: *** [../bin/pd] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

externals/hardware/arduino arduino.pd,1.21,1.22
by Hans-Christoph Steiner 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals/hardware/arduino In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24020 Modified Files: arduino.pd Log Message: analog input is kind of working; pinMode is working; digital output is working; things are timer driven now Index: arduino.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/arduino.pd,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** arduino.pd 22 Feb 2007 06:16:43 -0000 1.21 --- arduino.pd 1 Mar 2007 05:39:48 -0000 1.22 *************** *** 1,3 **** ! #N canvas 602 43 640 372 10; #X obj 377 9 import hardware flatspace iemlib mapping; #X text 321 336 released under the GNU GPL; --- 1,3 ---- ! #N canvas 365 27 652 384 10; #X obj 377 9 import hardware flatspace iemlib mapping; #X text 321 336 released under the GNU GPL; *************** *** 5,17 **** #X obj 61 297 outlet; #X obj 544 297 outlet; ! #N canvas 382 102 653 373 command 0; #X obj 24 7 inlet; #X obj 281 289 outlet; #X obj 210 93 clip 0 1; #X obj 210 114 int; ! #N canvas 729 244 487 295 digital-out 0; #X obj 26 12 inlet; #X obj 218 219 outlet; - #X msg 404 92 229; #X obj 181 137 trigger bang float; #X obj 97 172 float; --- 5,16 ---- #X obj 61 297 outlet; #X obj 544 297 outlet; ! #N canvas 405 22 673 393 command 0; #X obj 24 7 inlet; #X obj 281 289 outlet; #X obj 210 93 clip 0 1; #X obj 210 114 int; ! #N canvas 729 244 495 303 digital-out 0; #X obj 26 12 inlet; #X obj 218 219 outlet; #X obj 181 137 trigger bang float; #X obj 97 172 float; *************** *** 22,81 **** #X obj 181 115 bytemask -----; #X obj 27 115 bytemask ---------; ! #X connect 0 0 5 0; ! #X connect 2 0 1 0; ! #X connect 3 0 4 0; ! #X connect 3 1 7 0; ! #X connect 4 0 1 0; ! #X connect 5 0 8 0; ! #X connect 5 1 2 0; ! #X connect 6 0 4 0; ! #X connect 6 1 7 0; ! #X connect 7 0 1 0; ! #X connect 8 0 10 0; ! #X connect 8 1 10 1; ! #X connect 8 2 10 2; ! #X connect 8 3 10 3; ! #X connect 8 4 10 4; ! #X connect 8 5 10 5; ! #X connect 8 6 10 6; ! #X connect 8 7 9 0; ! #X connect 8 8 9 1; ! #X connect 8 9 9 2; ! #X connect 8 10 9 3; ! #X connect 8 11 9 4; ! #X connect 8 12 9 5; ! #X connect 8 13 9 6; ! #X connect 9 0 3 0; ! #X connect 10 0 6 0; ! #X restore 377 118 pd digital-out; ! #N canvas 49 547 528 335 pinMode 0; ! #X obj 60 11 inlet; ! #X obj 175 275 outlet; ! #X obj 175 87 unpack float float; ! #X obj 175 176 +; ! #X obj 175 197 + 130; ! #X obj 296 126 * 70; ! #X text 222 198 input commands = 130-143; ! #X text 334 127 output commands = 200-213; ! #X msg 61 229 151; ! #X obj 60 48 trigger bang anything; ! #X obj 61 182 float; ! #X text 142 86 pin#; ! #X text 312 87 mode; ! #X text 89 229 send 151/ENABLE_DIGITAL_INPUT whenever a pin is set ! to input; ! #X obj 61 202 select 0; ! #X connect 0 0 9 0; #X connect 2 0 3 0; ! #X connect 2 1 5 0; ! #X connect 2 1 10 1; ! #X connect 3 0 4 0; ! #X connect 4 0 1 0; ! #X connect 5 0 3 1; ! #X connect 8 0 1 0; ! #X connect 9 0 10 0; ! #X connect 9 1 2 0; ! #X connect 10 0 14 0; ! #X connect 14 0 8 0; #X restore 280 93 pd pinMode; #X obj 139 133 + 160; --- 21,81 ---- #X obj 181 115 bytemask -----; #X obj 27 115 bytemask ---------; ! #X msg 404 92 144; ! #X connect 0 0 4 0; #X connect 2 0 3 0; ! #X connect 2 1 6 0; ! #X connect 3 0 1 0; ! #X connect 4 0 7 0; ! #X connect 4 1 10 0; ! #X connect 5 0 3 0; ! #X connect 5 1 6 0; ! #X connect 6 0 1 0; ! #X connect 7 0 9 0; ! #X connect 7 1 9 1; ! #X connect 7 2 9 2; ! #X connect 7 3 9 3; ! #X connect 7 4 9 4; ! #X connect 7 5 9 5; ! #X connect 7 6 9 6; ! #X connect 7 7 8 0; ! #X connect 7 8 8 1; ! #X connect 7 9 8 2; ! #X connect 7 10 8 3; ! #X connect 7 11 8 4; ! #X connect 7 12 8 5; ! #X connect 7 13 8 6; ! #X connect 8 0 2 0; ! #X connect 9 0 5 0; ! #X connect 10 0 1 0; ! #X restore 377 118 pd digital-out; ! #N canvas 310 221 536 343 pinMode 0; ! #X obj 190 11 inlet; ! #X obj 289 307 outlet; ! #X obj 60 91 unpack float float; ! #X text 27 90 pin#; ! #X text 177 92 mode; ! #X obj 60 146 moses 128; ! #X obj 165 144 select 0; ! #X msg 165 167 0; ! #X msg 210 167 1; ! #X text 54 125 do bounds checking to be safe; ! #X obj 190 35 trigger list bang; ! #X msg 289 256 244; ! #X obj 138 254 float; ! #X obj 36 202 trigger bang float; ! #X connect 0 0 10 0; ! #X connect 2 0 5 0; ! #X connect 2 1 6 0; ! #X connect 5 0 13 0; ! #X connect 6 0 7 0; ! #X connect 6 1 8 0; ! #X connect 7 0 12 1; ! #X connect 8 0 12 1; ! #X connect 10 0 2 0; ! #X connect 10 1 11 0; ! #X connect 11 0 1 0; ! #X connect 12 0 1 0; ! #X connect 13 0 12 0; ! #X connect 13 1 1 0; #X restore 280 93 pd pinMode; #X obj 139 133 + 160; *************** *** 184,190 **** #X text 306 1 raw input; #X text 57 1 processed input; - #X obj 61 136 comport \$1 115200; #X obj 410 88 loadbang; ! #N canvas 0 22 454 304 report 0; #X obj 95 26 inlet; #X obj 97 186 print [arduino]; --- 184,189 ---- #X text 306 1 raw input; #X text 57 1 processed input; #X obj 410 88 loadbang; ! #N canvas 0 22 458 308 report 0; #X obj 95 26 inlet; #X obj 97 186 print [arduino]; *************** *** 205,209 **** #X restore 231 113 pd report firmware version; #X text 335 299 DEBUG/RAW data (this will change); ! #N canvas 72 70 439 393 make 0; #X obj 79 6 inlet; #X obj 184 337 outlet; --- 204,208 ---- #X restore 231 113 pd report firmware version; #X text 335 299 DEBUG/RAW data (this will change); ! #N canvas 72 70 443 397 make 0; #X obj 79 6 inlet; #X obj 184 337 outlet; *************** *** 366,370 **** #X connect 11 0 1 0; #X restore 62 199 pd make lists; ! #N canvas 0 22 454 304 check 0; #X obj 47 62 inlet; #X obj 47 88 route version; --- 365,369 ---- #X connect 11 0 1 0; #X restore 62 199 pd make lists; ! #N canvas 0 22 501 245 check 0; #X obj 47 62 inlet; #X obj 47 88 route version; *************** *** 373,376 **** --- 372,377 ---- ; #X obj 47 131 select 1; + #X text 102 132 <-- this sets the firmware version this is compatible + with; #X connect 0 0 1 0; #X connect 1 0 2 0; *************** *** 379,390 **** #X restore 92 242 pd check version; #X text 10 337 (C) Copyright 2006 Free Software Foundation; #X connect 2 0 5 0; ! #X connect 5 0 9 0; ! #X connect 6 0 9 0; ! #X connect 9 0 4 0; ! #X connect 9 0 14 0; ! #X connect 9 1 12 0; ! #X connect 10 0 11 0; ! #X connect 12 0 5 0; ! #X connect 14 0 15 0; ! #X connect 14 0 3 0; --- 380,392 ---- #X restore 92 242 pd check version; #X text 10 337 (C) Copyright 2006 Free Software Foundation; + #X obj 61 136 comport \$1 57600; #X connect 2 0 5 0; ! #X connect 5 0 16 0; ! #X connect 6 0 16 0; ! #X connect 9 0 10 0; ! #X connect 11 0 5 0; ! #X connect 13 0 14 0; ! #X connect 13 0 3 0; ! #X connect 16 0 4 0; ! #X connect 16 0 13 0; ! #X connect 16 1 11 0;

1 0

externals/hardware/arduino/Pd_firmware Pd_firmware.pde, 1.24, 1.25 Makefile, 1.3, 1.4 press.wav, 1.1, NONE
by Hans-Christoph Steiner 01 Mar '07

01 Mar '07

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24020/Pd_firmware Modified Files: Pd_firmware.pde Makefile Removed Files: press.wav Log Message: analog input is kind of working; pinMode is working; digital output is working; things are timer driven now --- press.wav DELETED --- Index: Pd_firmware.pde =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware/Pd_firmware.pde,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Pd_firmware.pde 22 Feb 2007 06:16:43 -0000 1.24 --- Pd_firmware.pde 1 Mar 2007 05:39:49 -0000 1.25 *************** *** 43,48 **** /* * TODO: debug hardware PWM - * TODO: convert all non-frequent messages to SysEx (version, pinMode, report enable, etc) - * TODO: convert to MIDI protocol using SysEx for longer messages * TODO: add pulseOut functionality for servos * TODO: add software PWM for servos, etc (servo.h or pulse.h) --- 43,46 ---- *************** *** 53,56 **** --- 51,55 ---- * rangefinders or servos) * TODO: add "pinMode all 0/1" command + * TODO: try using PIND to get all digitalIns at once * TODO: add cycle markers to mark start of analog, digital, pulseIn, and PWM * TODO: use Program Control to load stored profiles from EEPROM *************** *** 59,72 **** /* cvs version: $Id$ */ ! /*========================================================================== * MESSAGE FORMATS ! *==========================================================================*/ ! /*---------------------------------------------------------------------------- * MAPPING DATA TO MIDI * * This protocol uses the MIDI message format, but does not use the whole ! * protocol. Most of the command mappings here will not make sense in terms ! * of MIDI controllers and synths. * * MIDI format: http://www.harmony-central.com/MIDI/Doc/table1.html --- 58,73 ---- /* cvs version: $Id$ */ ! /*============================================================================== * MESSAGE FORMATS ! *============================================================================*/ ! /* ----------------------------------------------------------------------------- * MAPPING DATA TO MIDI * * This protocol uses the MIDI message format, but does not use the whole ! * protocol. Most of the command mappings here will not be directly usable in ! * terms of MIDI controllers and synths. It should co-exist with MIDI without ! * trouble and can be parsed by standard MIDI interpreters. Just some of the ! * message data is used differently. * * MIDI format: http://www.harmony-central.com/MIDI/Doc/table1.html *************** *** 88,103 **** /* proposed extensions using SysEx * ! * type SysEx start command data bytes SysEx stop ! * --------------------------------------------------------------------------- ! * pulse I/O 0xF0 0xA0 five 7-bit chunks, LSB first 0xF7 ! * shiftOut 0xF0 0xB0 */ ! /*---------------------------------------------------------------------------- * DATA MESSAGES */ /* two byte digital data format ! * ---------------------- ! * 0 digital data, 0x90-0x9F, (x & 0x0F) to get port base number * 1 digital pins 0-6 bitmask * 2 digital pins 7-13 bitmask --- 89,104 ---- /* proposed extensions using SysEx * ! * type SysEx start command data bytes SysEx stop ! * ----------------------------------------------------------------------------- ! * pulse I/O 0xF0 0xA0 five 7-bit chunks, LSB first 0xF7 ! * shiftOut 0xF0 0xF5 dataPin; clockPin; 7-bit LSB; 7-bit MSB 0xF7 */ ! /* ----------------------------------------------------------------------------- * DATA MESSAGES */ /* two byte digital data format ! * ---------------------------- ! * 0 digital data, 0x90-0x9F, (MIDI NoteOn, but different data usage) * 1 digital pins 0-6 bitmask * 2 digital pins 7-13 bitmask *************** *** 105,118 **** /* analog 14-bit data format ! * ---------------------- ! * 0 analog pin, 0xE0-0xEF, (x & 0x0F) for pin number * 1 analog least significant 7 bits * 2 analog most significant 7 bits */ /* pulseIn/Out (uses 32-bit value) ! * ---------------------- ! * 0 START_SYSEX (0xF0) ! * 1 pulseIn (0xFD) * 2 bits 0-6 (least significant byte) * 3 bits 7-13 --- 106,127 ---- /* analog 14-bit data format ! * ------------------------- ! * 0 analog pin, 0xE0-0xEF, (MIDI Pitch Wheel) * 1 analog least significant 7 bits * 2 analog most significant 7 bits */ + /* version report format + * Send a single byte 0xF9, Arduino will reply with: + * ------------------------------------------------- + * 0 version report header (0xF9) (MIDI Undefined) + * 1 minor version (0-127) + * 2 major version (0-127) + */ + /* pulseIn/Out (uses 32-bit value) ! * ------------------------------- ! * 0 START_SYSEX (0xF0) (MIDI System Exclusive) ! * 1 pulseIn/Out (0xA0-0xAF) * 2 bits 0-6 (least significant byte) * 3 bits 7-13 *************** *** 120,139 **** * 5 bits 21-27 * 6 bits 28-34 (most significant byte) ! * 7 END_SYSEX (0xF7) */ ! /* version report format ! * Send a single byte 0xF9, Arduino will reply with: ! * ---------------------- ! * 0 version report header (0xF9) (MIDI Undefined) ! * 1 minor version (0-127) ! * 2 major version (0-127) */ ! /*---------------------------------------------------------------------------- * CONTROL MESSAGES */ /* set digital pin mode ! * ---------------------- * 1 set digital pin mode (0xF4) (MIDI Undefined) * 2 pin number (0-127) --- 129,151 ---- * 5 bits 21-27 * 6 bits 28-34 (most significant byte) ! * 7 END_SYSEX (0xF7) (MIDI End of SysEx - EOX) */ ! /* shiftIn/Out (uses 8-bit value) ! * ------------------------------ ! * 0 START_SYSEX (0xF0) ! * 1 shiftOut (0xF5) ! * 2 dataPin (0-127) ! * 3 clockPin (0-127) ! * 4 bits 0-6 (least significant byte) ! * 5 bit 7 (most significant bit) ! * 6 END_SYSEX (0xF7) */ ! /* ----------------------------------------------------------------------------- * CONTROL MESSAGES */ /* set digital pin mode ! * -------------------- * 1 set digital pin mode (0xF4) (MIDI Undefined) * 2 pin number (0-127) *************** *** 142,146 **** /* toggle analogIn reporting by pin ! * ---------------------- * 0 toggle digitalIn reporting (0xC0-0xCF) (MIDI Program Change) * 1 disable(0)/enable(non-zero) --- 154,158 ---- /* toggle analogIn reporting by pin ! * -------------------------------- * 0 toggle digitalIn reporting (0xC0-0xCF) (MIDI Program Change) * 1 disable(0)/enable(non-zero) *************** *** 148,152 **** /* toggle digitalIn reporting by port pairs ! * ---------------------- * 0 toggle digitalIn reporting (0xD0-0xDF) (MIDI Aftertouch) * 1 disable(0)/enable(non-zero) --- 160,164 ---- /* toggle digitalIn reporting by port pairs ! * ---------------------------------------- * 0 toggle digitalIn reporting (0xD0-0xDF) (MIDI Aftertouch) * 1 disable(0)/enable(non-zero) *************** *** 158,164 **** */ ! /*========================================================================== * MACROS ! *==========================================================================*/ /* Version numbers for the protocol. The protocol is still changing, so these --- 170,176 ---- */ ! /*============================================================================== * MACROS ! *============================================================================*/ /* Version numbers for the protocol. The protocol is still changing, so these *************** *** 170,174 **** /* total number of pins currently supported */ ! #define TOTAL_ANALOG_PINS 16 #define TOTAL_DIGITAL_PINS 14 --- 182,186 ---- /* total number of pins currently supported */ ! #define TOTAL_ANALOG_PINS 6 #define TOTAL_DIGITAL_PINS 14 *************** *** 188,194 **** #define SYSTEM_RESET 0xFF // reset from MIDI ! /*========================================================================== * GLOBAL VARIABLES ! *==========================================================================*/ // maximum number of post-command data bytes (non-SysEx) --- 200,211 ---- #define SYSTEM_RESET 0xFF // reset from MIDI ! /*============================================================================== * GLOBAL VARIABLES ! *============================================================================*/ ! ! // circular buffer for receiving bytes from the serial port ! #define RINGBUFFER_MAX 64 // must be a power of 2 ! byte ringBuffer[RINGBUFFER_MAX]; ! byte readPosition=0, writePosition=0; // maximum number of post-command data bytes (non-SysEx) *************** *** 199,205 **** byte storedInputData[MAX_DATA_BYTES] = {0,0}; // multi-byte data ! /* this int serves as a bit-wise array to store pin status ! * 0 = INPUT, 1 = OUTPUT */ ! int digitalPinStatus = 0; /* this byte stores the status off whether PWM is on or not --- 216,225 ---- byte storedInputData[MAX_DATA_BYTES] = {0,0}; // multi-byte data ! byte previousDigitalInputHighByte = 0; ! byte previousDigitalInputLowByte = 0; ! byte digitalInputHighByte = 0; ! byte digitalInputLowByte = 0; ! unsigned int digitalPinStatus = 65535;// bit-wise array to store pin status 0=INPUT, 1=OUTPUT ! /* this byte stores the status off whether PWM is on or not *************** *** 209,220 **** /* bit-wise array to store pin reporting */ ! unsigned int analogPinsToReport = 65536; ! /*========================================================================== * FUNCTIONS ! *==========================================================================*/ ! /* ------------------------------------------------------------------------- * output digital bytes received from the serial port */ --- 229,253 ---- /* bit-wise array to store pin reporting */ ! unsigned int analogPinsToReport = 65535; + /* for reading analogIns */ + byte analogPin = 0; + int analogData; + /* interrupt variables */ + volatile int int_counter = 0; // ms counter for scheduling ! /*============================================================================== * FUNCTIONS ! *============================================================================*/ ! /* ----------------------------------------------------------------------------- ! * output the version message to the serial port ! */ ! void printVersion() { ! Serial.print(REPORT_VERSION, BYTE); ! Serial.print(MINOR_VERSION, BYTE); ! Serial.print(MAJOR_VERSION, BYTE); ! } ! /* ----------------------------------------------------------------------------- * output digital bytes received from the serial port */ *************** *** 224,227 **** --- 257,261 ---- int twoBytesForPorts; + // this should be converted to use PORTs twoBytesForPorts = pin0_6 + (pin7_13 << 7); for(i=0; i<14; ++i) { *************** *** 233,237 **** } ! /* ------------------------------------------------------------------------- * processInput() is called whenever a byte is available on the * Arduino's serial port. This is where the commands are handled. --- 267,271 ---- } ! /* ----------------------------------------------------------------------------- * processInput() is called whenever a byte is available on the * Arduino's serial port. This is where the commands are handled. *************** *** 239,243 **** void processInput(int inputData) { int command, channel; ! // a few commands have byte(s) of data following the command if( (waitForData > 0) && (inputData < 128) ) { --- 273,277 ---- void processInput(int inputData) { int command, channel; ! // a few commands have byte(s) of data following the command if( (waitForData > 0) && (inputData < 128) ) { *************** *** 251,258 **** break; case DIGITAL_MESSAGE: ! outputDigitalBytes(storedInputData[1], storedInputData[0]); ! break; case SET_DIGITAL_PIN_MODE: ! setPinMode(storedInputData[1], storedInputData[0]); break; case REPORT_ANALOG_PIN: --- 285,294 ---- break; case DIGITAL_MESSAGE: ! outputDigitalBytes(storedInputData[1], storedInputData[0]); // (LSB, MSB) ! break; case SET_DIGITAL_PIN_MODE: ! setPinMode(storedInputData[1], storedInputData[0]); // (pin#, mode) ! //if(storedInputData[0] == INPUT) // enable input if set to INPUT ! // TODO: enable REPORT_DIGITAL_PORTS break; case REPORT_ANALOG_PIN: *************** *** 262,266 **** } executeMultiByteCommand = 0; ! } } else { // remove channel info from command byte if less than 0xF0 --- 298,302 ---- } executeMultiByteCommand = 0; ! } } else { // remove channel info from command byte if less than 0xF0 *************** *** 286,292 **** break; case REPORT_VERSION: ! Serial.print(REPORT_VERSION, BYTE); ! Serial.print(MINOR_VERSION, BYTE); ! Serial.print(MAJOR_VERSION, BYTE); break; } --- 322,326 ---- break; case REPORT_VERSION: ! printVersion(); break; } *************** *** 295,299 **** ! /* ------------------------------------------------------------------------- * this function checks to see if there is data waiting on the serial port * then processes all of the stored data --- 329,333 ---- ! /* ----------------------------------------------------------------------------- * this function checks to see if there is data waiting on the serial port * then processes all of the stored data *************** *** 305,313 **** */ void checkForInput() { ! if(Serial.available()) ! processInput( Serial.read() ); } ! // ------------------------------------------------------------------------- /* this function sets the pin mode to the correct state and sets the relevant * bits in the two bit-arrays that track Digital I/O and PWM status --- 339,347 ---- */ void checkForInput() { ! while(Serial.available()) ! processInput( Serial.read() ); } ! // ----------------------------------------------------------------------------- /* this function sets the pin mode to the correct state and sets the relevant * bits in the two bit-arrays that track Digital I/O and PWM status *************** *** 317,320 **** --- 351,355 ---- digitalPinStatus = digitalPinStatus &~ (1 << pin); pwmStatus = pwmStatus &~ (1 << pin); + digitalWrite(pin,LOW); // turn off pin before switching to INPUT pinMode(pin,INPUT); } *************** *** 332,356 **** } ! // ========================================================================= // used for flashing the pin for the version number void pin13strobe(int count, int onInterval, int offInterval) { byte i; for(i=0; i<count; i++) { digitalWrite(13,1); delay(onInterval); digitalWrite(13,0); - delay(offInterval); } } ! /*========================================================================== * SETUP() ! *==========================================================================*/ void setup() { byte i; // TODO: load state from EEPROM here ! Serial.begin(115200); // 9600, 14400, 38400, 57600, 115200 /* TODO: send digital inputs here, if enabled, to set the initial state on the --- 367,413 ---- } ! // ============================================================================= // used for flashing the pin for the version number void pin13strobe(int count, int onInterval, int offInterval) { byte i; + pinMode(13, OUTPUT); for(i=0; i<count; i++) { + delay(offInterval); digitalWrite(13,1); delay(onInterval); digitalWrite(13,0); } } ! // ----------------------------------------------------------------------------- ! /* handle timer interrupts - Arduino runs at 16 Mhz, so we have 1000 Overflows ! * per second... 1/ ((16000000 / 64) / 256) = 1 / 1000 */ ! ISR(TIMER2_OVF_vect) { ! int_counter++; ! }; ! ! /*============================================================================== * SETUP() ! *============================================================================*/ void setup() { byte i; // TODO: load state from EEPROM here ! Serial.begin(57600); // 9600, 14400, 38400, 57600, 115200 ! ! /* set up timer interrupt */ ! //Timer2 Settings: Timer Prescaler /64, ! TCCR2 |= (1<<CS22); ! TCCR2 &= ~((1<<CS21) | (1<<CS20)); ! // Use normal mode ! TCCR2 &= ~((1<<WGM21) | (1<<WGM20)); ! // Use internal clock - external clock not used in Arduino ! ASSR |= (0<<AS2); ! //Timer2 Overflow Interrupt Enable ! TIMSK |= (1<<TOIE2) | (0<<OCIE2); ! // RESET_TIMER2; ! sei(); ! /* TODO: send digital inputs here, if enabled, to set the initial state on the *************** *** 370,373 **** --- 427,432 ---- pin13strobe(10,5,20); // separator, a quick burst delay(1000); + printVersion(); + for(i=0; i<TOTAL_DIGITAL_PINS; ++i) { setPinMode(i,OUTPUT); *************** *** 375,399 **** } ! /*========================================================================== * LOOP() ! *==========================================================================*/ void loop() { ! int i; // counter for analog pins ! int analogData; ! ! checkForInput(); ! /* get analog in, for the number enabled */ ! for(i=0; i<TOTAL_ANALOG_PINS; ++i) { ! checkForInput(); ! //if( analogPinsToReport & (1 << i) ) { ! analogData = analogRead(i); ! /* These two bytes get converted back into the whole number on host. ! Highest bits should be zeroed so the 8th bit doesn't get set */ ! checkForInput(); ! Serial.print(ANALOG_MESSAGE + i, BYTE); ! Serial.print(analogData % 128, BYTE); // mod by 32 for the small byte ! Serial.print(analogData >> 7, BYTE); // shift high bits into output byte //} ! checkForInput(); } } --- 434,472 ---- } ! /*============================================================================== * LOOP() ! *============================================================================*/ void loop() { ! ! /* DIGITALREAD - as fast as possible, check for changes and output them to the ! * FTDI buffer using serialWrite) */ ! ! // this should use _SFR_IO8() ! ! if(int_counter > 3) { ! ! ! /* SERIALREAD - Serial.read() uses a 128 byte circular buffer, so handle all ! * serialReads at once, i.e. empty the buffer */ ! checkForInput(); ! ! /* SEND FTDI WRITE BUFFER - make sure that the FTDI buffer doesn't go over 60 ! * bytes. use a timer to sending an event character every 4 ms to trigger the ! * buffer to dump. */ ! ! /* ANALOGREAD - right after the event character, do all of the analogReads(). ! * These only need to be done every 4ms. */ ! // for(analogPin=0;analogPin<TOTAL_ANALOG_PINS;analogPin++) { ! for(analogPin=0;analogPin<2;analogPin++) { ! //if( analogPinsToReport & (1 << analogPin) ) { ! analogData = analogRead(analogPin); ! Serial.print(ANALOG_MESSAGE + analogPin, BYTE); ! // These two bytes converted back into the 10-bit value on host ! Serial.print(analogData & 127, BYTE); // same as analogData % 128 ! Serial.print(analogData >> 7, BYTE); ! analogPin = (analogPin++) % TOTAL_ANALOG_PINS; //} ! } ! int_counter = 0; // reset ms counter } } Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 28 Feb 2007 04:10:41 -0000 1.3 --- Makefile 1 Mar 2007 05:39:49 -0000 1.4 *************** *** 96,100 **** AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex AVRDUDE_FLAGS = -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \ ! -b $(UPLOAD_RATE) # Program settings --- 96,100 ---- AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex AVRDUDE_FLAGS = -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \ ! -b $(UPLOAD_RATE) -q -V # Program settings *************** *** 124,128 **** # Default target. all: build ! qtplay press.wav make upload --- 124,128 ---- # Default target. all: build ! say "press the button" make upload *************** *** 232,236 **** etags: make etags_`uname -s` ! etags applet/*.cpp \ $(ARDUINO_SRC)/*.[ch] \ $(ARDUINO_SRC)/*.cpp \ --- 232,236 ---- etags: make etags_`uname -s` ! etags *.pde \ $(ARDUINO_SRC)/*.[ch] \ $(ARDUINO_SRC)/*.cpp \

1 0

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 March 2007