Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

externals/hardware/arduino/Pd_firmware Pd_firmware.pde, 1.11, 1.12
by Hans-Christoph Steiner 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26284/Pd_firmware Modified Files: Pd_firmware.pde Log Message: minor cleanups and commenting on the firmware; got Pd code working with new protocol; digital inputs still aren't transmitted/received correctly Index: Pd_firmware.pde =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware/Pd_firmware.pde,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Pd_firmware.pde 24 Aug 2006 05:54:25 -0000 1.11 --- Pd_firmware.pde 24 Aug 2006 14:48:21 -0000 1.12 *************** *** 1,23 **** ! /* Arduino firmware aka Firmata ! * ------------------ * ! * It was designed to work with the Pd object [arduino] ! * which is included in Pd-extended. This firmware could ! * easily be used with other programs like Max/MSP, Processing, ! * or whatever can do serial communications. * ! * (copyleft) 2006 Hans-Christoph Steiner <hans(a)at.or.at> ! * @author: Hans-Christoph Steiner * @date: 2006-05-19 ! * @location: STEIM, Amsterdam, Netherlands */ ! /* TODO ! * ! * - get digitalInput working ! * - add pulseIn functionality ! * - add software PWM for servos, etc ! * - redesign protocol to accomodate boards with more I/Os ! * - add cycle markers to mark start of analog, digital, pulseIn, and PWM */ --- 1,44 ---- ! /* Copyright (C) 2006 Hans-Christoph Steiner ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library 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 ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General ! * Public License along with this library; if not, write to the ! * Free Software Foundation, Inc., 59 Temple Place, Suite 330, ! * Boston, MA 02111-1307 USA ! * ! * ----------------------------- ! * Firmata, the Arduino firmware ! * ----------------------------- * ! * Firmata turns the Arduino into a Plug-n-Play sensorbox, servo ! * controller, and/or PWM motor/lamp controller. * ! * It was originally designed to work with the Pd object [arduino] ! * which is included in Pd-extended. This firmware is intended to ! * work with any host computer software package. It can easily be ! * used with other programs like Max/MSP, Processing, or whatever can ! * do serial communications. ! * ! * @authors: Hans-Christoph Steiner <hans(a)at.or.at> and Jamie Allen <jamie(a)heavyside.net> * @date: 2006-05-19 ! * @location: STEIM, Amsterdam, Netherlands and New York, NY ! * */ ! /* ! * TODO: get digitalInput working ! * TODO: add pulseIn functionality ! * TODO: add software PWM for servos, etc (servo.h or pulse.h) ! * TODO: redesign protocol to accomodate boards with more I/Os ! * TODO: add cycle markers to mark start of analog, digital, pulseIn, and PWM */ *************** *** 30,34 **** /* computer->Arduino commands * -------------------- */ ! /* 128-129 // UNUSED */ #define SET_PIN_ZERO_TO_IN 130 // set digital pin 0 to INPUT #define SET_PIN_ONE_TO_IN 131 // set digital pin 1 to INPUT --- 51,55 ---- /* computer->Arduino commands * -------------------- */ ! /* 128-129 // UNUSED */ #define SET_PIN_ZERO_TO_IN 130 // set digital pin 0 to INPUT #define SET_PIN_ONE_TO_IN 131 // set digital pin 1 to INPUT *************** *** 90,98 **** */ ! /* two byte software PWM data format * ---------------------- ! * 0 get ready for digital input bytes (250/251) * 1 pin # ! * 2 pulse width */ --- 111,119 ---- */ ! /* two byte PWM data format * ---------------------- ! * 0 get ready for digital input bytes (ENABLE_SOFTWARE_PWM/ENABLE_PWM) * 1 pin # ! * 2 duty cycle expressed as 1 byte (255 = 100%) */ *************** *** 117,126 **** */ - /* - * 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 --- 138,141 ---- *************** *** 181,186 **** digitalData = digitalRead(digitalPin); } ! /* the next line probably needs to be re-thought (i.e. it might not work...) since my ! first attempt was miserably wrong. <hans(a)at.or.at> */ transmitByte = transmitByte + ((2^i)*digitalData); } --- 196,201 ---- digitalData = digitalRead(digitalPin); } ! /* the next line probably needs to be re-thought (i.e. it might not work...) since my ! first attempt was miserably wrong. <hans(a)at.or.at> */ transmitByte = transmitByte + ((2^i)*digitalData); } *************** *** 220,237 **** void setSoftPwm (int pin, byte pulsePeriod) { ! byte i; ! /* for(i=0; i<7; ++i) { mask = 1 << i; if(digitalPinStatus & mask) { ! digitalWrite(i, inputData & mask); } ! } ! */ ! //read timer type thing ! //loop through each pin, turn them on if selected ! //softwarePWMStatus ! //check timer type thing against pulsePeriods for each pin ! //throw pin low if expired } --- 235,252 ---- void setSoftPwm (int pin, byte pulsePeriod) { ! byte i; ! /* for(i=0; i<7; ++i) { mask = 1 << i; if(digitalPinStatus & mask) { ! digitalWrite(i, inputData & mask); } ! } ! */ ! //read timer type thing ! //loop through each pin, turn them on if selected ! //softwarePWMStatus ! //check timer type thing against pulsePeriods for each pin ! //throw pin low if expired } *************** *** 241,251 **** void disSoftPwm(int pin) { ! //throw pin low } ! // ------------------------------------------------------------------------- ! /* this function checks to see if there is data waiting on the serial port * then processes all of the stored data */ --- 256,266 ---- void disSoftPwm(int pin) { ! //throw pin low } ! /* ------------------------------------------------------------------------- ! * this function checks to see if there is data waiting on the serial port * then processes all of the stored data */ *************** *** 258,262 **** } ! // ------------------------------------------------------------------------- void processInput(byte inputData) { int i; --- 273,280 ---- } ! /* ------------------------------------------------------------------------- ! * processInput() is called whenever a byte is available on the ! * Arduino's serial port. This is where the commands are handled. ! */ void processInput(byte inputData) { int i; *************** *** 274,290 **** case ENABLE_PWM: case DISABLE_PWM: ! //PWM 0 on the board is PIN 9 ! analogWrite(storedInputData[0] + 9, storedInputData[1]); ! break; case ENABLE_SOFTWARE_PWM: ! setPinMode(storedInputData[0],SOFTPWM); ! setSoftPwm(storedInputData[0], storedInputData[1]); ! break; case DISABLE_SOFTWARE_PWM: ! disSoftPwm(storedInputData[0]); ! break; case SET_SOFTWARE_PWM_FREQ: ! setSoftPwmFreq(storedInputData[0]); ! break; } executeMultiByteCommand = 0; --- 292,308 ---- case ENABLE_PWM: case DISABLE_PWM: ! //PWM 0 on the board is PIN 9 ! analogWrite(storedInputData[0] + 9, storedInputData[1]); ! break; case ENABLE_SOFTWARE_PWM: ! setPinMode(storedInputData[0],SOFTPWM); ! setSoftPwm(storedInputData[0], storedInputData[1]); ! break; case DISABLE_SOFTWARE_PWM: ! disSoftPwm(storedInputData[0]); ! break; case SET_SOFTWARE_PWM_FREQ: ! setSoftPwmFreq(storedInputData[0]); ! break; } executeMultiByteCommand = 0; *************** *** 314,318 **** else { switch (inputData) { ! case SET_PIN_ZERO_TO_IN: case SET_PIN_ONE_TO_IN: case SET_PIN_TWO_TO_IN: --- 332,336 ---- else { switch (inputData) { ! case SET_PIN_ZERO_TO_IN: // set digital pins to INPUT case SET_PIN_ONE_TO_IN: case SET_PIN_TWO_TO_IN: *************** *** 328,334 **** case SET_PIN_TWELVE_TO_IN: case SET_PIN_THIRTEEN_TO_IN: ! setPinMode(inputData - SET_PIN_ZERO_TO_IN, INPUT); ! break; ! case SET_PIN_ZERO_TO_OUT: case SET_PIN_ONE_TO_OUT: case SET_PIN_TWO_TO_OUT: --- 346,352 ---- case SET_PIN_TWELVE_TO_IN: case SET_PIN_THIRTEEN_TO_IN: ! setPinMode(inputData - SET_PIN_ZERO_TO_IN, INPUT); ! break; ! case SET_PIN_ZERO_TO_OUT: // set digital pins to OUTPUT case SET_PIN_ONE_TO_OUT: case SET_PIN_TWO_TO_OUT: *************** *** 344,386 **** case SET_PIN_TWELVE_TO_OUT: case SET_PIN_THIRTEEN_TO_OUT: ! setPinMode(inputData - SET_PIN_ZERO_TO_OUT, OUTPUT); ! break; ! case DISABLE_DIGITAL_INPUTS: // all digital inputs off ! digitalInputsEnabled = false; ! break; ! case ENABLE_DIGITAL_INPUTS: // all digital inputs on ! digitalInputsEnabled = true; ! break; ! case DISABLE_ALL_ANALOG_INS: // analog input off ! case ENABLE_ONE_ANALOG_IN: // analog 0 on ! case ENABLE_TWO_ANALOG_INS: // analog 0,1 on ! case ENABLE_THREE_ANALOG_INS: // analog 0-2 on ! case ENABLE_FOUR_ANALOG_INS: // analog 0-3 on ! case ENABLE_FIVE_ANALOG_INS: // analog 0-4 on ! case ENABLE_SIX_ANALOG_INS: // analog 0-5 on ! analogInputsEnabled = inputData - DISABLE_ALL_ANALOG_INS; ! break; case ENABLE_PWM: ! waitForData = 2; // (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; case DISABLE_PWM: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; case SET_SOFTWARE_PWM_FREQ: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; case ENABLE_SOFTWARE_PWM: ! waitForData = 2; // (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; case DISABLE_SOFTWARE_PWM: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; ! case OUTPUT_TO_DIGITAL_PINS: // bytes to send to digital outputs ! firstInputByte = true; break; } --- 362,404 ---- case SET_PIN_TWELVE_TO_OUT: case SET_PIN_THIRTEEN_TO_OUT: ! setPinMode(inputData - SET_PIN_ZERO_TO_OUT, OUTPUT); ! break; ! case DISABLE_DIGITAL_INPUTS: // all digital inputs off ! digitalInputsEnabled = false; ! break; ! case ENABLE_DIGITAL_INPUTS: // all digital inputs on ! digitalInputsEnabled = true; ! break; ! case DISABLE_ALL_ANALOG_INS: // analog input off ! case ENABLE_ONE_ANALOG_IN: // analog 0 on ! case ENABLE_TWO_ANALOG_INS: // analog 0,1 on ! case ENABLE_THREE_ANALOG_INS: // analog 0-2 on ! case ENABLE_FOUR_ANALOG_INS: // analog 0-3 on ! case ENABLE_FIVE_ANALOG_INS: // analog 0-4 on ! case ENABLE_SIX_ANALOG_INS: // analog 0-5 on ! analogInputsEnabled = inputData - DISABLE_ALL_ANALOG_INS; ! break; case ENABLE_PWM: ! waitForData = 2; // 2 bytes needed (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; case DISABLE_PWM: ! waitForData = 1; // 1 byte needed (pin#) ! executeMultiByteCommand = inputData; ! break; case SET_SOFTWARE_PWM_FREQ: ! waitForData = 1; // 1 byte needed (pin#) ! executeMultiByteCommand = inputData; ! break; case ENABLE_SOFTWARE_PWM: ! waitForData = 2; // 2 bytes needed (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; case DISABLE_SOFTWARE_PWM: ! waitForData = 1; // 1 byte needed (pin#) ! executeMultiByteCommand = inputData; ! break; ! case OUTPUT_TO_DIGITAL_PINS: // bytes to send to digital outputs ! firstInputByte = true; break; } *************** *** 424,428 **** analogData = analogRead(analogPin); // these two bytes get converted back into the whole number in Pd ! // the higher bits should be zeroed so that the 8th bit doesn't get set printByte(analogData >> 7); // bitshift the big stuff into the output byte printByte(analogData % 128); // mod by 32 for the small byte --- 442,446 ---- analogData = analogRead(analogPin); // these two bytes get converted back into the whole number in Pd ! // the higher bits should be zeroed so that the 8th bit doesn't get set printByte(analogData >> 7); // bitshift the big stuff into the output byte printByte(analogData % 128); // mod by 32 for the small byte

1 0

pd/src desire.tk,1.1.2.402,1.1.2.403
by chunlee 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22685 Modified Files: Tag: devel_0_39 desire.tk Log Message: new ddrc write done Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.402 retrieving revision 1.1.2.403 diff -C2 -d -r1.1.2.402 -r1.1.2.403 *** desire.tk 24 Aug 2006 03:39:47 -0000 1.1.2.402 --- desire.tk 24 Aug 2006 14:39:20 -0000 1.1.2.403 *************** *** 5760,5798 **** #set fd [open $cmdline(ddrcfilename) w] set fd [open ~/.ddrc2 w] ! set categories [list color key crosshair bar] ! set classes [list Canvas View Comment Wire FutureWire SelRect] set conf {} - foreach category $categories { - set tmp {} - set x [lsearch -start 0 $ddrc_options $category] - while {$x>=0} { - #puts "[lindex $ddrc_options [expr $x+1]] [lindex $ddrc_options [expr $x+2]]" - lappend tmp [lindex $ddrc_options [expr $x+1]] - lappend tmp [lindex $ddrc_options [expr $x+2]] - set x [lsearch -start [expr $x+1] $ddrc_options $category] - } set class_list {} ! foreach class $classes { ! set tmp2 {} ! set x [lsearch -start 0 $tmp $class] ! while {$x>=0} { ! foreach y [lindex $tmp [expr $x+1]] { ! if {$category != "key"} { ! if {[info exists look($class:$y)]} {set var $look($class:$y);lappend tmp2 [list $y $var]} else {break} ! } else { ! if {[info exists key($class:$y)]} {set var $key($class:$y);lappend tmp2 [list $y $var]} else {break} ! } } set x [lsearch -start [expr $x+1] $tmp $class] ! } ! ! set class_pair [list $class $tmp2] ! lappend class_list $class_pair ! if {$x < 0} {break} ! } ! set cat_pair [list $category $class_list] lappend conf $cat_pair } puts $conf puts $fd $conf --- 5760,5799 ---- #set fd [open $cmdline(ddrcfilename) w] set fd [open ~/.ddrc2 w] ! set LOOK [list color crosshair bar] ! set categories [list $LOOK key]; set categories2 [list look key]; set cat_count 0 ! set classes [list Canvas View Comment Wire FutureWire SelRect Client] set conf {} foreach category $categories { set class_list {} ! set tmp {} ! foreach sub $category { ! set x [lsearch -start 0 $ddrc_options $sub] ! while {$x>=0} { ! lappend tmp [lindex $ddrc_options [expr $x+1]] ! lappend tmp [lindex $ddrc_options [expr $x+2]] ! set x [lsearch -start [expr $x+1] $ddrc_options $sub] } + } + foreach class $classes { + set tmp2 {} + set x [lsearch -start 0 $tmp $class] + while {$x>=0} { + foreach y [lindex $tmp [expr $x+1]] { + if {$sub != "key"} {set str "look($class:$y)" + } else {set str "key($class:$y)"} + if {[info exists $str]} {lappend tmp2 [list $y [set [set str]]]} + } set x [lsearch -start [expr $x+1] $tmp $class] ! } ! if {[llength $tmp2]} { ! set class_pair [list $class $tmp2] ! lappend class_list $class_pair ! } ! } ! set cat_pair [list [lindex $categories2 $cat_count] $class_list] lappend conf $cat_pair + incr cat_count } + set conf [list $conf] puts $conf puts $fd $conf

1 0

externals/mrpeach/midifile midifile-help.pd, NONE, 1.1 midifile.c, NONE, 1.1
by Martin Peach 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/mrpeach/midifile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11082/midifile Added Files: midifile-help.pd midifile.c Log Message: Source for midifile.pd with help patch --- NEW FILE: midifile.c --- /* midifile.c v 1.2: An external for Pure Data that reads and writes MIDI files * Copyright (C) 2005 Martin Peach * * 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 * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Latest version of this file can be found at: * http://puredata.info/Members/martinrp [...1405 lines suppressed...] case 0x90: case 0xA0: case 0xB0: case 0xE0: n += 1; // data bytes break; case 0xC0: case 0xD0:// only one data byte break; } cP += n; } } x->track_chunk[index].track_index = (char *)cP - (char *)x->track_chunk[index].track_data; x->track_chunk[index].delta_time = delta_time; if (delta_time == NO_MORE_ELEMENTS) x->track_chunk[index].total_time = delta_time; else x->track_chunk[index].total_time += delta_time; } /* fin midifile.c */ --- NEW FILE: midifile-help.pd --- #N canvas 364 491 466 316 12; #N canvas 0 0 690 635 midifile_write 0; #X obj 15 2 bng 45 250 50 0 empty empty choose 5 23 0 8 -62784 -260818 -258699; #X text 450 563 Martin Peach \, 2005; #X obj 130 77 tgl 45 0 empty empty record 2 23 0 8 -258699 -241291 -24198 0 1; #X floatatom 125 585 15 0 0 0 tick - -; #X obj 130 206 metro 2; #X floatatom 181 149 15 0 0 0 - - -; #X msg 181 123 2.005; #X msg 267 433 flush; #X obj 275 304 makenote; #X obj 275 334 pack f f; #X msg 251 237 60; #X msg 304 237 127; #X msg 358 237 100; #X floatatom 251 263 5 0 0 0 - - -; #X floatatom 304 263 5 0 0 0 - - -; #X floatatom 358 263 5 0 0 0 - - -; #X obj 275 364 list prepend 144; #X obj 398 325 + 144; #X floatatom 398 301 5 0 0 0 - - -; #X text 447 301 channel; #X text 448 323 note-on; #X msg 17 482 verbose \$1; #X text 5 437 verbosity defaults to 1; #X text 76 14 1: open a file for writing; #X text 199 89 2: start recording; #X text 439 239 3: input MIDI as lists; #X text 317 434 4: stop recording and save the file; #X obj 131 525 midifile; #X obj 15 358 savepanel; #X msg 185 388 240 1 2 3 4 247; #X text 320 388 a sysex message; #X obj 125 555 float; #X msg 15 389 write \$1; #X floatatom 17 456 5 0 0 0 - - -; #X connect 0 0 28 0; #X connect 2 0 4 0; #X connect 4 0 27 0; #X connect 5 0 4 1; #X connect 6 0 5 0; #X connect 7 0 27 0; #X connect 8 0 9 0; #X connect 8 1 9 1; #X connect 9 0 16 0; #X connect 10 0 13 0; #X connect 11 0 14 0; #X connect 12 0 15 0; #X connect 13 0 8 0; #X connect 14 0 8 1; #X connect 15 0 8 2; #X connect 16 0 27 0; #X connect 17 0 16 1; #X connect 18 0 17 0; #X connect 21 0 27 0; #X connect 27 1 31 1; #X connect 27 2 31 0; #X connect 28 0 32 0; #X connect 29 0 27 0; #X connect 31 0 3 0; #X connect 32 0 27 0; #X connect 33 0 21 0; #X restore 76 116 pd midifile_write; #N canvas 388 25 825 783 midifile_read 0; #X obj 102 332 midifile wowo; #X obj 102 285 bng 15 250 50 0 empty empty step 20 10 0 8 -262144 -1 -1; #X obj 29 201 openpanel; #X obj 29 0 bng 45 250 50 0 empty empty choose 5 23 0 8 -62784 -260818 -258699; #X text 525 724 Martin Peach \, 2005; #X obj 166 36 tgl 45 0 empty empty play 10 23 0 8 -24198 -1 -258699 0 1; #X msg 308 279 rewind; #X text 363 278 go to start of file; #X floatatom 151 370 15 0 0 0 tick - -; #X obj 367 176 hradio 15 1 0 16 empty empty track_number 0 -6 0 8 -62784 -241291 -1 0; #X msg 367 197 dump \$1; #X msg 308 253 68050; #X msg 234 129 track \$1; #X obj 234 80 hradio 15 1 0 16 empty empty track_number 0 -6 0 8 -62784 -241291 -1 0; #X obj 166 263 metro 2; #X msg 241 102 -1; #X text 272 101 output all tracks; #X text 212 332 creation arguments: midi_file_name; #X text 305 129 output only this track; #X text 430 196 parse this track to main window; #X msg 519 279 0; #X floatatom 217 206 15 0 0 0 - - -; #X msg 217 180 2.005; #X text 351 252 goto tick 68050; #X floatatom 66 575 5 0 0 0 note - -; #X floatatom 121 606 5 0 0 1 velocity - -; #X obj 31 550 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 201 403 t b b b; #X obj 205 470 float; #X floatatom 205 492 15 0 0 0 last_tick - -; #X text 207 352 bangs at end of file; #X obj 31 423 list split 1; #X obj 76 545 list split 1; #X obj 121 627 / 127; #X floatatom 121 651 5 0 0 0 - - -; #X obj 86 695 send note_amp; #X obj 31 719 send midi_pitch; #X obj 86 672 float; #X obj 31 630 float; #X msg 105 398 144; #X floatatom 106 454 5 0 0 0 - - -; #X obj 31 478 select 144; #X msg 576 291 verbose \$1; #X text 576 247 verbosity defaults to 1; #X text 91 12 1: choose a MIDI file to play; #X text 228 43 2: start playing it; #X obj 297 411 print ****; #X obj 103 108 spigot; #X obj 146 82 tgl 15 0 empty empty empty 0 -6 0 8 -44926 -258699 -258699 0 1; #X text 95 79 loop; #X msg 29 239 read \$1; #X floatatom 576 265 5 0 0 0 - - -; #X connect 0 0 31 0; #X connect 0 1 8 0; #X connect 0 2 27 0; #X connect 0 2 46 0; #X connect 1 0 0 0; #X connect 2 0 50 0; #X connect 3 0 2 0; #X connect 5 0 14 0; #X connect 6 0 0 0; #X connect 8 0 28 1; #X connect 9 0 10 0; #X connect 10 0 0 0; #X connect 11 0 0 0; #X connect 12 0 0 0; #X connect 13 0 12 0; #X connect 14 0 0 0; #X connect 15 0 12 0; #X connect 20 0 0 0; #X connect 21 0 14 1; #X connect 22 0 21 0; #X connect 24 0 38 1; #X connect 25 0 33 0; #X connect 26 0 38 0; #X connect 26 0 37 0; #X connect 27 0 47 0; #X connect 27 1 6 0; #X connect 27 2 5 0; #X connect 27 2 28 0; #X connect 28 0 29 0; #X connect 31 0 41 0; #X connect 31 1 32 0; #X connect 32 0 24 0; #X connect 32 1 25 0; #X connect 33 0 34 0; #X connect 34 0 37 1; #X connect 37 0 35 0; #X connect 38 0 36 0; #X connect 39 0 40 0; #X connect 40 0 41 1; #X connect 41 0 26 0; #X connect 42 0 0 0; #X connect 47 0 5 0; #X connect 48 0 47 1; #X connect 50 0 0 0; #X connect 51 0 42 0; #X restore 76 83 pd midifile_read; #X text 228 234 2006 Martin Peach; #X text 15 10 midifile reads and writes MIDI files.;

1 0

externals/mrpeach/midifile - New directory
by Martin Peach 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/mrpeach/midifile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10712/midifile Log Message: Directory /cvsroot/pure-data/externals/mrpeach/midifile added to the repository

1 0

externals/mrpeach/net tcpclient.c, NONE, 1.1 tcpreceive.c, NONE, 1.1 tcpsend.c, NONE, 1.1 tcpserver.c, NONE, 1.1 udpreceive.c, NONE, 1.1 udpsend.c, NONE, 1.1 x_net_tcp_client.c, 1.1, NONE x_net_tcp_server.c, 1.1, NONE x_net_tcpclient.c, 1.1, NONE x_net_tcpreceive.c, 1.2, NONE x_net_tcpsend.c, 1.2, NONE x_net_tcpserver.c, 1.1, NONE x_net_udpreceive.c, 1.2, NONE x_net_udpsend.c, 1.2, NONE
by Martin Peach 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/mrpeach/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8470 Added Files: tcpclient.c tcpreceive.c tcpsend.c tcpserver.c udpreceive.c udpsend.c Removed Files: x_net_tcp_client.c x_net_tcp_server.c x_net_tcpclient.c x_net_tcpreceive.c x_net_tcpsend.c x_net_tcpserver.c x_net_udpreceive.c x_net_udpsend.c Log Message: Renamed files without x_net_ prefix. Removed extra copies of tcpserver and tcpclient --- x_net_udpsend.c DELETED --- --- x_net_tcpclient.c DELETED --- --- x_net_udpreceive.c DELETED --- --- NEW FILE: tcpsend.c --- /* x_net_tcpsend.c 20060424 Martin Peach did it based on x_net.c. x_net.c header follows: */ /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ /* network */ #include "m_pd.h" #include "s_stuff.h" #ifdef MSW #include <winsock2.h> #else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> #include <stdio.h> #include <string.h> #endif static t_class *tcpsend_class; typedef struct _tcpsend { t_object x_obj; int x_fd; } t_tcpsend; #ifdef MSW __declspec(dllexport) #endif void tcpsend_setup(void); static void tcpsend_free(t_tcpsend *x); static void tcpsend_send(t_tcpsend *x, t_symbol *s, int argc, t_atom *argv); static void tcpsend_disconnect(t_tcpsend *x); static void tcpsend_connect(t_tcpsend *x, t_symbol *hostname, t_floatarg fportno); static void *tcpsend_new(void); static void *tcpsend_new(void) { t_tcpsend *x = (t_tcpsend *)pd_new(tcpsend_class); outlet_new(&x->x_obj, &s_float); x->x_fd = -1; return (x); } static void tcpsend_connect(t_tcpsend *x, t_symbol *hostname, t_floatarg fportno) { struct sockaddr_in server; struct hostent *hp; int sockfd; int portno = fportno; int intarg; if (x->x_fd >= 0) { error("tcpsend: already connected"); return; } /* create a socket */ sockfd = socket(AF_INET, SOCK_STREAM, 0); #ifdef DEBUG fprintf(stderr, "tcpsend_connect: send socket %d\n", sockfd); #endif if (sockfd < 0) { sys_sockerror("tcpsend: socket"); return; } /* connect socket using hostname provided in command line */ server.sin_family = AF_INET; hp = gethostbyname(hostname->s_name); if (hp == 0) { post("tcpsend: bad host?\n"); return; } /* for stream (TCP) sockets, specify "nodelay" */ intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char *)&intarg, sizeof(intarg)) < 0) post("tcpsend: setsockopt (TCP_NODELAY) failed\n"); memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); /* assign client port number */ server.sin_port = htons((u_short)portno); post("tcpsend: connecting to port %d", portno); /* try to connect. */ if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) < 0) { sys_sockerror("tcpsend: connecting stream socket"); sys_closesocket(sockfd); return; } x->x_fd = sockfd; outlet_float(x->x_obj.ob_outlet, 1); } static void tcpsend_disconnect(t_tcpsend *x) { if (x->x_fd >= 0) { sys_closesocket(x->x_fd); x->x_fd = -1; outlet_float(x->x_obj.ob_outlet, 0); post("tcpsend: disconnected"); } } static void tcpsend_send(t_tcpsend *x, t_symbol *s, int argc, t_atom *argv) { static char byte_buf[65536];// arbitrary maximum similar to max IP packet size int i, d; char c; float f, e; char *bp; int length, sent; int result; static double lastwarntime; static double pleasewarn; double timebefore; double timeafter; int late; #ifdef DEBUG post("s: %s", s->s_name); post("argc: %d", argc); #endif for (i = 0; i < argc; ++i) { if (argv[i].a_type == A_FLOAT) { f = argv[i].a_w.w_float; d = (int)f; e = f - d; if (e != 0) { error("tcpsend_send: item %d (%f) is not an integer", i, f); return; } c = (unsigned char)d; if (c != d) { error("tcpsend_send: item %d (%f) is not between 0 and 255", i, f); return; } #ifdef DEBUG post("tcpsend_send: argv[%d]: %d", i, c); #endif byte_buf[i] = c; } else { error("tcpsend_send: item %d is not a float", i); return; } } length = i; if ((x->x_fd >= 0) && (length > 0)) { for (bp = byte_buf, sent = 0; sent < length;) { timebefore = sys_getrealtime(); result = send(x->x_fd, byte_buf, length-sent, 0); timeafter = sys_getrealtime(); late = (timeafter - timebefore > 0.005); if (late || pleasewarn) { if (timeafter > lastwarntime + 2) { post("tcpsend blocked %d msec", (int)(1000 * ((timeafter - timebefore) + pleasewarn))); pleasewarn = 0; lastwarntime = timeafter; } else if (late) pleasewarn += timeafter - timebefore; } if (result <= 0) { sys_sockerror("tcpsend"); tcpsend_disconnect(x); break; } else { sent += result; bp += result; } } } else error("tcpsend: not connected"); } static void tcpsend_free(t_tcpsend *x) { tcpsend_disconnect(x); } #ifdef MSW __declspec(dllexport) #endif void tcpsend_setup(void) { tcpsend_class = class_new(gensym("tcpsend"), (t_newmethod)tcpsend_new, (t_method)tcpsend_free, sizeof(t_tcpsend), 0, 0); class_addmethod(tcpsend_class, (t_method)tcpsend_connect, gensym("connect"), A_SYMBOL, A_FLOAT, 0); class_addmethod(tcpsend_class, (t_method)tcpsend_disconnect, gensym("disconnect"), 0); class_addmethod(tcpsend_class, (t_method)tcpsend_send, gensym("send"), A_GIMME, 0); } /* end x_net_tcpsend.c*/ --- NEW FILE: tcpclient.c --- /* x_net_tcp_client.c Martin Peach 20060508, working version 20060512 */ /* linux version 20060515 */ /* x_net_tcp_client.c is based on netclient: */ /* -------------------------- netclient ------------------------------------- */ /* */ /* Extended 'netsend', connects to 'netserver'. */ /* Uses child thread to connect to server. Thus needs pd0.35-test17 or later. */ /* Written by Olaf Matthes (olaf.matthes(a)gmx.de) */ /* Get source at http://www.akustische-kunst.org/puredata/maxlib/ */ /* */ /* 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. */ /* */ /* Based on PureData by Miller Puckette and others. */ /* */ /* ---------------------------------------------------------------------------- */ //define DEBUG #include "m_pd.h" #include "s_stuff.h" #include <stdio.h> #include <sys/types.h> #include <string.h> #include <pthread.h> #if defined(UNIX) || defined(unix) #include <sys/socket.h> #include <sys/errno.h> #include <netinet/in.h> #include <netdb.h> #include <stdio.h> #include <unistd.h> #define SOCKET_ERROR -1 #else #include <winsock2.h> #endif #define DEFPOLLTIME 20 /* check for input every 20 ms */ static t_class *tcpclient_class; static char objName[] = "tcpclient"; #define MAX_UDP_RECEIVE 65536L // longer than data in maximum UDP packet typedef struct _tcpclient { t_object x_obj; t_clock *x_clock; t_clock *x_poll; t_outlet *x_msgout; t_outlet *x_addrout; t_outlet *x_outconnect; int x_dump; // 1 = hexdump received bytes int x_fd; // the socket char *x_hostname; // address we want to connect to as text int x_connectstate; // 0 = not connected, 1 = connected int x_port; // port we're connected to long x_addr; // address we're connected to as 32bit int t_atom x_addrbytes[4]; // address we're connected to as 4 bytes t_atom x_msgoutbuf[MAX_UDP_RECEIVE]; // received data as float atoms unsigned char x_msginbuf[MAX_UDP_RECEIVE]; // received data as bytes /* multithread stuff */ pthread_t x_threadid; /* id of child thread */ pthread_attr_t x_threadattr; /* attributes of child thread */ } t_tcpclient; static void tcpclient_dump(t_tcpclient *x, t_float dump); static void tcp_client_hexdump(unsigned char *buf, long len); static void tcpclient_tick(t_tcpclient *x); static void *tcpclient_child_connect(void *w); static void tcpclient_connect(t_tcpclient *x, t_symbol *hostname, t_floatarg fportno); static void tcpclient_disconnect(t_tcpclient *x); static void tcpclient_send(t_tcpclient *x, t_symbol *s, int argc, t_atom *argv); static void tcpclient_rcv(t_tcpclient *x); static void tcpclient_poll(t_tcpclient *x); static void *tcpclient_new(t_floatarg udpflag); static void tcpclient_free(t_tcpclient *x); #ifdef MSW __declspec(dllexport) #endif void tcpclient_setup(void); static void tcpclient_dump(t_tcpclient *x, t_float dump) { x->x_dump = (dump == 0)?0:1; } static void tcp_client_hexdump(unsigned char *buf, long len) { #define BYTES_PER_LINE 16 char hexStr[(3*BYTES_PER_LINE)+1]; char ascStr[BYTES_PER_LINE+1]; long i, j, k = 0L; #ifdef DEBUG post("tcp_client_hexdump %d", len); #endif while (k < len) { for (i = j = 0; i < BYTES_PER_LINE; ++i, ++k, j+=3) { if (k < len) { #ifdef MSW sprintf_s(&hexStr[j], 4, "%02X ", buf[k]); sprintf_s(&ascStr[i], 2, "%c", ((buf[k] >= 32) && (buf[k] <= 126))? buf[k]: '.'); #else snprintf(&hexStr[j], 4, "%02X ", buf[k]); snprintf(&ascStr[i], 2, "%c", ((buf[k] >= 32) && (buf[k] <= 126))? buf[k]: '.'); #endif } else { // the last line #ifdef MSW sprintf_s(&hexStr[j], 4, " "); sprintf_s(&ascStr[i], 2, " "); #else snprintf(&hexStr[j], 4, " "); snprintf(&ascStr[i], 2, " "); #endif } } post ("%s%s", hexStr, ascStr); } } static void tcpclient_tick(t_tcpclient *x) { outlet_float(x->x_outconnect, 1); } static void *tcpclient_child_connect(void *w) { t_tcpclient *x = (t_tcpclient*) w; struct sockaddr_in server; struct hostent *hp; int sockfd; if (x->x_fd >= 0) { error("%s_connect: already connected", objName); return (x); } /* create a socket */ sockfd = socket(AF_INET, SOCK_STREAM, 0); #ifdef DEBUG post("%s: send socket %d\n", objName, sockfd); #endif if (sockfd < 0) { sys_sockerror("tcpclient: socket"); return (x); } /* connect socket using hostname provided in command line */ server.sin_family = AF_INET; hp = gethostbyname(x->x_hostname); if (hp == 0) { sys_sockerror("tcpclient: bad host?\n"); return (x); } memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); /* assign client port number */ server.sin_port = htons((u_short)x->x_port); post("%s: connecting socket %d to port %d", objName, sockfd, x->x_port); /* try to connect */ if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) < 0) { sys_sockerror("tcpclient: connecting stream socket"); sys_closesocket(sockfd); return (x); } x->x_fd = sockfd; x->x_addr = ntohl(*(long *)hp->h_addr); /* outlet_float is not threadsafe ! */ // outlet_float(x->x_obj.ob_outlet, 1); x->x_connectstate = 1; /* use callback instead to set outlet */ clock_delay(x->x_clock, 0); return (x); } static void tcpclient_connect(t_tcpclient *x, t_symbol *hostname, t_floatarg fportno) { /* we get hostname and port and pass them on to the child thread that establishes the connection */ x->x_hostname = hostname->s_name; x->x_port = fportno; x->x_connectstate = 0; /* start child thread */ if(pthread_create(&x->x_threadid, &x->x_threadattr, tcpclient_child_connect, x) < 0) post("%s: could not create new thread", objName); } static void tcpclient_disconnect(t_tcpclient *x) { if (x->x_fd >= 0) { sys_closesocket(x->x_fd); x->x_fd = -1; x->x_connectstate = 0; outlet_float(x->x_outconnect, 0); post("%s: disconnected", objName); } else post("%s: not connected", objName); } static void tcpclient_send(t_tcpclient *x, t_symbol *s, int argc, t_atom *argv) { static char byte_buf[65536];// arbitrary maximum similar to max IP packet size int i, d; unsigned char c; float f, e; char *bp; int length, sent; int result; static double lastwarntime; static double pleasewarn; double timebefore; double timeafter; int late; #ifdef DEBUG post("s: %s", s->s_name); post("argc: %d", argc); #endif for (i = 0; i < argc; ++i) { if (argv[i].a_type == A_FLOAT) { f = argv[i].a_w.w_float; d = (int)f; e = f - d; #ifdef DEBUG post("%s: argv[%d]: float:%f int:%d delta:%f", objName, i, f, d, e); #endif if (e != 0) { error("%s_send: item %d (%f) is not an integer", objName, i, f); return; } if ((d < 0) || (d > 255)) { error("%s: item %d (%f) is not between 0 and 255", objName, i, f); return; } c = (unsigned char)d; #ifdef DEBUG post("%s_send: argv[%d]: %d", objName, i, c); #endif byte_buf[i] = c; } else { error("%s_send: item %d is not a float", objName, i); return; } } length = i; if ((x->x_fd >= 0) && (length > 0)) { for (bp = byte_buf, sent = 0; sent < length;) { timebefore = sys_getrealtime(); result = send(x->x_fd, byte_buf, length-sent, 0); timeafter = sys_getrealtime(); late = (timeafter - timebefore > 0.005); if (late || pleasewarn) { if (timeafter > lastwarntime + 2) { post("%s_send blocked %d msec", objName, (int)(1000 * ((timeafter - timebefore) + pleasewarn))); pleasewarn = 0; lastwarntime = timeafter; } else if (late) pleasewarn += timeafter - timebefore; } if (result <= 0) { sys_sockerror("tcpclient_send"); tcpclient_disconnect(x); break; } else { sent += result; bp += result; } } } else error("%s: not connected", objName); } static void tcpclient_rcv(t_tcpclient *x) { int sockfd = x->x_fd; int ret; int i; fd_set readset; fd_set exceptset; struct timeval ztout; if(x->x_connectstate) { /* check if we can read/write from/to the socket */ FD_ZERO(&readset); FD_ZERO(&exceptset); FD_SET(x->x_fd, &readset ); FD_SET(x->x_fd, &exceptset ); ztout.tv_sec = 0; ztout.tv_usec = 0; ret = select(sockfd+1, &readset, NULL, &exceptset, &ztout); if(ret < 0) { error("%s: unable to read from socket", objName); sys_closesocket(sockfd); return; } if(FD_ISSET(sockfd, &readset) || FD_ISSET(sockfd, &exceptset)) { /* read from server */ ret = recv(sockfd, x->x_msginbuf, MAX_UDP_RECEIVE, 0); if(ret > 0) { #ifdef DEBUG x->x_msginbuf[ret] = 0; post("%s: received %d bytes ", objName, ret); #endif if (x->x_dump)tcp_client_hexdump(x->x_msginbuf, ret); for (i = 0; i < ret; ++i) { /* convert the bytes in the buffer to floats in a list */ x->x_msgoutbuf[i].a_w.w_float = (float)x->x_msginbuf[i]; } /* find sender's ip address and output it */ x->x_addrbytes[0].a_w.w_float = (x->x_addr & 0xFF000000)>>24; x->x_addrbytes[1].a_w.w_float = (x->x_addr & 0x0FF0000)>>16; x->x_addrbytes[2].a_w.w_float = (x->x_addr & 0x0FF00)>>8; x->x_addrbytes[3].a_w.w_float = (x->x_addr & 0x0FF); outlet_list(x->x_addrout, &s_list, 4L, x->x_addrbytes); /* send the list out the outlet */ if (ret > 1) outlet_list(x->x_msgout, &s_list, ret, x->x_msgoutbuf); else outlet_float(x->x_msgout, x->x_msgoutbuf[0].a_w.w_float); } else { if (ret < 0) { sys_sockerror("tcpclient: recv"); tcpclient_disconnect(x); } else { post("%s: connection closed for socket %d\n", objName, sockfd); tcpclient_disconnect(x); } } } } else post("%s: not connected", objName); } static void tcpclient_poll(t_tcpclient *x) { if(x->x_connectstate) tcpclient_rcv(x); /* try to read in case we're connected */ clock_delay(x->x_poll, DEFPOLLTIME); /* see you later */ } static void *tcpclient_new(t_floatarg udpflag) { int i; t_tcpclient *x = (t_tcpclient *)pd_new(tcpclient_class); x->x_msgout = outlet_new(&x->x_obj, &s_anything); /* received data */ x->x_addrout = outlet_new(&x->x_obj, &s_list); x->x_outconnect = outlet_new(&x->x_obj, &s_float); /* connection state */ x->x_clock = clock_new(x, (t_method)tcpclient_tick); x->x_poll = clock_new(x, (t_method)tcpclient_poll); x->x_fd = -1; /* convert the bytes in the buffer to floats in a list */ for (i = 0; i < MAX_UDP_RECEIVE; ++i) { x->x_msgoutbuf[i].a_type = A_FLOAT; x->x_msgoutbuf[i].a_w.w_float = 0; } for (i = 0; i < 4; ++i) { x->x_addrbytes[i].a_type = A_FLOAT; x->x_addrbytes[i].a_w.w_float = 0; } x->x_addr = 0L; /* prepare child thread */ if(pthread_attr_init(&x->x_threadattr) < 0) post("%s: warning: could not prepare child thread", objName); if(pthread_attr_setdetachstate(&x->x_threadattr, PTHREAD_CREATE_DETACHED) < 0) post("%s: warning: could not prepare child thread", objName); clock_delay(x->x_poll, 0); /* start polling the input */ return (x); } static void tcpclient_free(t_tcpclient *x) { tcpclient_disconnect(x); clock_free(x->x_poll); clock_free(x->x_clock); } #ifdef MSW __declspec(dllexport) #endif void tcpclient_setup(void) { tcpclient_class = class_new(gensym(objName), (t_newmethod)tcpclient_new, (t_method)tcpclient_free, sizeof(t_tcpclient), 0, A_DEFFLOAT, 0); class_addmethod(tcpclient_class, (t_method)tcpclient_connect, gensym("connect") , A_SYMBOL, A_FLOAT, 0); class_addmethod(tcpclient_class, (t_method)tcpclient_disconnect, gensym("disconnect"), 0); class_addmethod(tcpclient_class, (t_method)tcpclient_send, gensym("send"), A_GIMME, 0); class_addmethod(tcpclient_class, (t_method)tcpclient_rcv, gensym("receive"), 0); class_addmethod(tcpclient_class, (t_method)tcpclient_rcv, gensym("rcv"), 0); class_addmethod(tcpclient_class, (t_method)tcpclient_dump, gensym("dump"), A_FLOAT, 0); } /* end of x_net_tcp.c */ --- NEW FILE: udpsend.c --- /* x_net_udpsend.c 20060424. Martin Peach did it based on x_net.c. x_net.c header follows: */ /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ /* network */ #include "m_pd.h" #include "s_stuff.h" #include <stdio.h> #include <string.h> #ifdef MSW #include <winsock2.h> #else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> #endif static t_class *udpsend_class; typedef struct _udpsend { t_object x_obj; int x_fd; } t_udpsend; #ifdef MSW __declspec(dllexport) #endif void udpsend_setup(void); static void udpsend_free(t_udpsend *x); static void udpsend_send(t_udpsend *x, t_symbol *s, int argc, t_atom *argv); static void udpsend_disconnect(t_udpsend *x); static void udpsend_connect(t_udpsend *x, t_symbol *hostname, t_floatarg fportno); static void *udpsend_new(void); static void *udpsend_new(void) { t_udpsend *x = (t_udpsend *)pd_new(udpsend_class); outlet_new(&x->x_obj, &s_float); x->x_fd = -1; return (x); } static void udpsend_connect(t_udpsend *x, t_symbol *hostname, t_floatarg fportno) { struct sockaddr_in server; struct hostent *hp; int sockfd; int portno = fportno; if (x->x_fd >= 0) { error("udpsend: already connected"); return; } /* create a socket */ sockfd = socket(AF_INET, SOCK_DGRAM, 0); #ifdef DEBUG fprintf(stderr, "udpsend_connect: send socket %d\n", sockfd); #endif if (sockfd < 0) { sys_sockerror("udpsend: socket"); return; } /* connect socket using hostname provided in command line */ server.sin_family = AF_INET; hp = gethostbyname(hostname->s_name); if (hp == 0) { post("udpsend: bad host?\n"); return; } memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); /* assign client port number */ server.sin_port = htons((u_short)portno); post("udpsend: connecting to port %d", portno); /* try to connect. */ if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) < 0) { sys_sockerror("udpsend: connecting stream socket"); sys_closesocket(sockfd); return; } x->x_fd = sockfd; outlet_float(x->x_obj.ob_outlet, 1); } static void udpsend_disconnect(t_udpsend *x) { if (x->x_fd >= 0) { sys_closesocket(x->x_fd); x->x_fd = -1; outlet_float(x->x_obj.ob_outlet, 0); } } static void udpsend_send(t_udpsend *x, t_symbol *s, int argc, t_atom *argv) { static char byte_buf[65536];// arbitrary maximum similar to max IP packet size int i, d; char c; float f, e; char *bp; int length, sent; int result; static double lastwarntime; static double pleasewarn; double timebefore; double timeafter; int late; #ifdef DEBUG post("s: %s", s->s_name); post("argc: %d", argc); #endif for (i = 0; i < argc; ++i) { if (argv[i].a_type == A_FLOAT) { f = argv[i].a_w.w_float; d = (int)f; e = f - d; if (e != 0) { error("udpsend_send: item %d (%f) is not an integer", i, f); return; } c = (unsigned char)d; if (c != d) { error("udpsend_send: item %d (%f) is not between 0 and 255", i, f); return; } #ifdef DEBUG post("udpsend_send: argv[%d]: %d", i, c); #endif byte_buf[i] = c; } else { error("udpsend_send: item %d is not a float", i); return; } } length = i; if ((x->x_fd >= 0) && (length > 0)) { for (bp = byte_buf, sent = 0; sent < length;) { timebefore = sys_getrealtime(); result = send(x->x_fd, byte_buf, length-sent, 0); timeafter = sys_getrealtime(); late = (timeafter - timebefore > 0.005); if (late || pleasewarn) { if (timeafter > lastwarntime + 2) { post("udpsend blocked %d msec", (int)(1000 * ((timeafter - timebefore) + pleasewarn))); pleasewarn = 0; lastwarntime = timeafter; } else if (late) pleasewarn += timeafter - timebefore; } if (result <= 0) { sys_sockerror("udpsend"); udpsend_disconnect(x); break; } else { sent += result; bp += result; } } } else error("udpsend: not connected"); } static void udpsend_free(t_udpsend *x) { udpsend_disconnect(x); } #ifdef MSW __declspec(dllexport) #endif void udpsend_setup(void) { udpsend_class = class_new(gensym("udpsend"), (t_newmethod)udpsend_new, (t_method)udpsend_free, sizeof(t_udpsend), 0, 0); class_addmethod(udpsend_class, (t_method)udpsend_connect, gensym("connect"), A_SYMBOL, A_FLOAT, 0); class_addmethod(udpsend_class, (t_method)udpsend_disconnect, gensym("disconnect"), 0); class_addmethod(udpsend_class, (t_method)udpsend_send, gensym("send"), A_GIMME, 0); } /* end x_net_udpsend.c*/ --- x_net_tcpserver.c DELETED --- --- NEW FILE: tcpserver.c --- /* x_net_tcpserver.c Martin Peach 20060511 working version 20060512 */ /* 20060515 works on linux too... */ /* x_net_tcpserver.c is based on netserver: */ /* -------------------------- netserver ------------------------------------- */ /* */ /* A server for bidirectional communication from within Pd. */ /* Allows to send back data to specific clients connected to the server. */ /* Written by Olaf Matthes <olaf.matthes(a)gmx.de> */ /* Get source at http://www.akustische-kunst.org/puredata/maxlib */ /* */ /* 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. */ /* */ /* Based on PureData by Miller Puckette and others. */ /* */ /* ---------------------------------------------------------------------------- */ //define DEBUG #include "m_pd.h" #include "m_imp.h" #include "s_stuff.h" //#include <sys/types.h> //#include <stdarg.h> //#include <signal.h> //#include <fcntl.h> //#include <errno.h> //#include <string.h> //#include <stdio.h> //#include <pthread.h> #if defined(UNIX) || defined(unix) #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> #include <unistd.h> #include <stdlib.h> #include <sys/time.h> #define SOCKET_ERROR -1 #else //#include <io.h> //#include <fcntl.h> #include <winsock2.h> #endif #define MAX_CONNECT 32 /* maximum number of connections */ #define INBUFSIZE 65536L /* was 4096: size of receiving data buffer */ #define MAX_UDP_RECEIVE 65536L /* longer than data in maximum UDP packet */ /* ----------------------------- tcpserver ------------------------- */ static t_class *tcpserver_class; static t_binbuf *inbinbuf; static char objName[] = "tcpserver"; typedef void (*t_tcpserver_socketnotifier)(void *x); typedef void (*t_tcpserver_socketreceivefn)(void *x, t_binbuf *b); typedef struct _tcpserver_socketreceiver { unsigned char *sr_inbuf; int sr_inhead; int sr_intail; void *sr_owner; t_tcpserver_socketnotifier sr_notifier; t_tcpserver_socketreceivefn sr_socketreceivefn; } t_tcpserver_socketreceiver; typedef struct _tcpserver { t_object x_obj; t_outlet *x_msgout; t_outlet *x_connectout; t_outlet *x_sockout; t_outlet *x_addrout; t_symbol *x_host[MAX_CONNECT]; t_int x_fd[MAX_CONNECT]; u_long x_addr[MAX_CONNECT]; t_tcpserver_socketreceiver *x_sr[MAX_CONNECT]; t_atom x_addrbytes[4]; t_int x_sock_fd; t_int x_connectsocket; t_int x_nconnections; t_atom x_msgoutbuf[MAX_UDP_RECEIVE]; char x_msginbuf[MAX_UDP_RECEIVE]; } t_tcpserver; static t_tcpserver_socketreceiver *tcpserver_socketreceiver_new(void *owner, t_tcpserver_socketnotifier notifier, t_tcpserver_socketreceivefn socketreceivefn); static int tcpserver_socketreceiver_doread(t_tcpserver_socketreceiver *x); static void tcpserver_socketreceiver_read(t_tcpserver_socketreceiver *x, int fd); static void tcpserver_socketreceiver_free(t_tcpserver_socketreceiver *x); static void tcpserver_send(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv); static void tcp_server_send_bytes(int sockfd, t_tcpserver *x, int argc, t_atom *argv); static void tcpserver_client_send(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv); static void tcpserver_broadcast(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv); static void tcpserver_notify(t_tcpserver *x); static void tcpserver_connectpoll(t_tcpserver *x); static void tcpserver_print(t_tcpserver *x); static void *tcpserver_new(t_floatarg fportno); static void tcpserver_free(t_tcpserver *x); #ifdef MSW __declspec(dllexport) #endif void tcpserver_setup(void); static t_tcpserver_socketreceiver *tcpserver_socketreceiver_new(void *owner, t_tcpserver_socketnotifier notifier, t_tcpserver_socketreceivefn socketreceivefn) { t_tcpserver_socketreceiver *x = (t_tcpserver_socketreceiver *)getbytes(sizeof(*x)); if (!x) { error("%s_socketreceiver: unable to allocate %d bytes", objName, sizeof(*x)); } else { x->sr_inhead = x->sr_intail = 0; x->sr_owner = owner; x->sr_notifier = notifier; x->sr_socketreceivefn = socketreceivefn; if (!(x->sr_inbuf = malloc(INBUFSIZE))) { freebytes(x, sizeof(*x)); x = NULL; error("%s_socketreceiver: unable to allocate %d bytes", objName, INBUFSIZE); } } return (x); } /* this is in a separately called subroutine so that the buffer isn't sitting on the stack while the messages are getting passed. */ static int tcpserver_socketreceiver_doread(t_tcpserver_socketreceiver *x) { char messbuf[INBUFSIZE]; char *bp = messbuf; int indx, i; int inhead = x->sr_inhead; int intail = x->sr_intail; unsigned char c; t_tcpserver *y = x->sr_owner; unsigned char *inbuf = x->sr_inbuf; if (intail == inhead) return (0); #ifdef DEBUG post ("%s_socketreceiver_doread: intail=%d inhead=%d", objName, intail, inhead); #endif for (indx = intail, i = 0; indx != inhead; indx = (indx+1)&(INBUFSIZE-1), ++i) { c = *bp++ = inbuf[indx]; y->x_msgoutbuf[i].a_w.w_float = (float)c; } if (i > 1) outlet_list(y->x_msgout, &s_list, i, y->x_msgoutbuf); else outlet_float(y->x_msgout, y->x_msgoutbuf[0].a_w.w_float); // intail = (indx+1)&(INBUFSIZE-1); x->sr_inhead = inhead; x->sr_intail = indx;//intail; return (1); } static void tcpserver_socketreceiver_read(t_tcpserver_socketreceiver *x, int fd) { int readto = (x->sr_inhead >= x->sr_intail ? INBUFSIZE : x->sr_intail-1); int ret, i; t_tcpserver *y = x->sr_owner; y->x_sock_fd = fd; /* the input buffer might be full. If so, drop the whole thing */ if (readto == x->sr_inhead) { post("%s: dropped message", objName); x->sr_inhead = x->sr_intail = 0; readto = INBUFSIZE; } else { ret = recv(fd, x->sr_inbuf + x->sr_inhead, readto - x->sr_inhead, 0); if (ret < 0) { sys_sockerror("tcpserver: recv"); if (x->sr_notifier) (*x->sr_notifier)(x->sr_owner); sys_rmpollfn(fd); sys_closesocket(fd); } else if (ret == 0) { post("%s: connection closed on socket %d", objName, fd); if (x->sr_notifier) (*x->sr_notifier)(x->sr_owner); sys_rmpollfn(fd); sys_closesocket(fd); } else { #ifdef DEBUG post ("%s_socketreceiver_read: ret = %d", objName, ret); #endif x->sr_inhead += ret; if (x->sr_inhead >= INBUFSIZE) x->sr_inhead = 0; /* output client's IP and socket no. */ for(i = 0; i < y->x_nconnections; i++) /* search for corresponding IP */ { if(y->x_fd[i] == y->x_sock_fd) { // outlet_symbol(x->x_connectionip, x->x_host[i]); /* find sender's ip address and output it */ y->x_addrbytes[0].a_w.w_float = (y->x_addr[i] & 0xFF000000)>>24; y->x_addrbytes[1].a_w.w_float = (y->x_addr[i] & 0x0FF0000)>>16; y->x_addrbytes[2].a_w.w_float = (y->x_addr[i] & 0x0FF00)>>8; y->x_addrbytes[3].a_w.w_float = (y->x_addr[i] & 0x0FF); outlet_list(y->x_addrout, &s_list, 4L, y->x_addrbytes); break; } } outlet_float(y->x_sockout, y->x_sock_fd); /* the socket number */ tcpserver_socketreceiver_doread(x); } } } static void tcpserver_socketreceiver_free(t_tcpserver_socketreceiver *x) { if (x != NULL) { free(x->sr_inbuf); freebytes(x, sizeof(*x)); } } /* ---------------- main tcpserver (send) stuff --------------------- */ static void tcp_server_send_bytes(int client, t_tcpserver *x, int argc, t_atom *argv) { static char byte_buf[MAX_UDP_RECEIVE];// arbitrary maximum similar to max IP packet size int i, d; unsigned char c; float f, e; char *bp; int length, sent; int result; static double lastwarntime; static double pleasewarn; double timebefore; double timeafter; int late; int sockfd = x->x_fd[client]; /* process & send data */ if(sockfd >= 0) { for (i = 0; i < argc; ++i) { if (argv[i].a_type == A_FLOAT) { f = argv[i].a_w.w_float; d = (int)f; e = f - d; #ifdef DEBUG post("%s: argv[%d]: float:%f int:%d delta:%f", objName, i, f, d, e); #endif if (e != 0) { error("%s: item %d (%f) is not an integer", objName, i, f); return; } if ((d < 0) || (d > 255)) { error("%s: item %d (%f) is not between 0 and 255", objName, i, f); return; } c = (unsigned char)d; /* make sure it doesn't become negative; this only matters for post() */ #ifdef DEBUG post("%s: argv[%d]: %d", objName, i, c); #endif byte_buf[i] = c; } else { error("%s: item %d is not a float", objName, i); return; } } length = i; if (length > 0) { for (bp = byte_buf, sent = 0; sent < length;) { timebefore = sys_getrealtime(); result = send(sockfd, byte_buf, length-sent, 0); timeafter = sys_getrealtime(); late = (timeafter - timebefore > 0.005); if (late || pleasewarn) { if (timeafter > lastwarntime + 2) { post("%s: send blocked %d msec", objName, (int)(1000 * ((timeafter - timebefore) + pleasewarn))); pleasewarn = 0; lastwarntime = timeafter; } else if (late) pleasewarn += timeafter - timebefore; } if (result <= 0) { sys_sockerror("tcpserver: send"); post("%s: could not send data to client %d", objName, client); break; } else { sent += result; bp += result; } } } } else post("%s: not a valid socket number (%d)", objName, sockfd); } /* send message to client using socket number */ static void tcpserver_send(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv) { int i, sockfd; int client = -1; if(x->x_nconnections < 0) { post("%s: no clients connected", objName); return; } if(argc < 2) { post("%s: nothing to send", objName); return; } /* get socket number of connection (first element in list) */ if(argv[0].a_type == A_FLOAT) { sockfd = atom_getfloatarg(0, argc, argv); for(i = 0; i < x->x_nconnections; i++) /* check if connection exists */ { if(x->x_fd[i] == sockfd) { client = i; /* the client we're sending to */ break; } } if(client == -1) { post("%s: no connection on socket %d", objName, sockfd); return; } } else { post("%s: no socket specified", objName); return; } tcp_server_send_bytes(client, x, argc-1, &argv[1]); } /* send message to client using client number note that the client numbers might change in case a client disconnects! */ /* clients start at 1 but our index starts at 0 */ static void tcpserver_client_send(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv) { int client; if(x->x_nconnections < 0) { post("%s: no clients connected", objName); return; } if(argc < 2) { post("%s: nothing to send", objName); return; } /* get number of client (first element in list) */ if(argv[0].a_type == A_FLOAT) client = atom_getfloatarg(0, argc, argv); else { post("%s: no client specified", objName); return; } if (!((client > 0) && (client < MAX_CONNECT))) { post("%s: client %d out of range [1..%d]", objName, client, MAX_CONNECT); return; } --client;/* zero based index*/ tcp_server_send_bytes(client, x, argc-1, &argv[1]); } /* broadcasts a message to all connected clients */ static void tcpserver_broadcast(t_tcpserver *x, t_symbol *s, int argc, t_atom *argv) { int client; /* enumerate through the clients and send each the message */ for(client = 0; client < x->x_nconnections; client++) /* check if connection exists */ { if(x->x_fd[client] >= 0) { /* socket exists for this client */ tcp_server_send_bytes(client, x, argc, argv); break; } } } /* ---------------- main tcpserver (receive) stuff --------------------- */ static void tcpserver_notify(t_tcpserver *x) { int i, k; /* remove connection from list */ for(i = 0; i < x->x_nconnections; i++) { if(x->x_fd[i] == x->x_sock_fd) { x->x_nconnections--; post("%s: \"%s\" removed from list of clients", objName, x->x_host[i]->s_name); x->x_host[i] = NULL; /* delete entry */ x->x_fd[i] = -1; tcpserver_socketreceiver_free(x->x_sr[i]); x->x_sr[i] = NULL; /* rearrange list now: move entries to close the gap */ for(k = i; k < x->x_nconnections; k++) { x->x_host[k] = x->x_host[k + 1]; x->x_fd[k] = x->x_fd[k + 1]; } } } outlet_float(x->x_connectout, x->x_nconnections); } static void tcpserver_connectpoll(t_tcpserver *x) { struct sockaddr_in incomer_address; int sockaddrl = (int) sizeof( struct sockaddr ); int fd = accept(x->x_connectsocket, (struct sockaddr*)&incomer_address, &sockaddrl); int i; if (fd < 0) post("%s: accept failed", objName); else { t_tcpserver_socketreceiver *y = tcpserver_socketreceiver_new((void *)x, (t_tcpserver_socketnotifier)tcpserver_notify, NULL);/* MP tcpserver_doit isn't used I think...*/ if (!y) { #ifdef MSW closesocket(fd); #else close(fd); #endif return; } sys_addpollfn(fd, (t_fdpollfn)tcpserver_socketreceiver_read, y); x->x_nconnections++; i = x->x_nconnections - 1; x->x_host[i] = gensym(inet_ntoa(incomer_address.sin_addr)); x->x_fd[i] = fd; x->x_sr[i] = y; post("%s: accepted connection from %s on socket %d", objName, x->x_host[i]->s_name, x->x_fd[i]); outlet_float(x->x_connectout, x->x_nconnections); outlet_float(x->x_sockout, x->x_fd[i]); /* the socket number */ x->x_addr[i] = ntohl(incomer_address.sin_addr.s_addr); x->x_addrbytes[0].a_w.w_float = (x->x_addr[i] & 0xFF000000)>>24; x->x_addrbytes[1].a_w.w_float = (x->x_addr[i] & 0x0FF0000)>>16; x->x_addrbytes[2].a_w.w_float = (x->x_addr[i] & 0x0FF00)>>8; x->x_addrbytes[3].a_w.w_float = (x->x_addr[i] & 0x0FF); outlet_list(x->x_addrout, &s_list, 4L, x->x_addrbytes); } } static void tcpserver_print(t_tcpserver *x) { int i; if(x->x_nconnections > 0) { post("%s: %d open connections:", objName, x->x_nconnections); for(i = 0; i < x->x_nconnections; i++) { post(" \"%s\" on socket %d", x->x_host[i]->s_name, x->x_fd[i]); } } else post("%s: no open connections", objName); } static void *tcpserver_new(t_floatarg fportno) { t_tcpserver *x; int i; struct sockaddr_in server; int sockfd, portno = fportno; /* create a socket */ sockfd = socket(AF_INET, SOCK_STREAM, 0); #ifdef DEBUG post("%s: receive socket %d", objName, sockfd); #endif if (sockfd < 0) { sys_sockerror("tcpserver: socket"); return (0); } server.sin_family = AF_INET; server.sin_addr.s_addr = INADDR_ANY; #ifdef IRIX /* this seems to work only in IRIX but is unnecessary in Linux. Not sure what NT needs in place of this. */ if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, 0, 0) < 0) post("setsockopt failed\n"); #endif /* assign server port number */ server.sin_port = htons((u_short)portno); /* name the socket */ if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0) { sys_sockerror("tcpserver: bind"); sys_closesocket(sockfd); return (0); } x = (t_tcpserver *)pd_new(tcpserver_class); x->x_msgout = outlet_new(&x->x_obj, &s_anything); /* 1st outlet for received data */ /* streaming protocol */ if (listen(sockfd, 5) < 0) { sys_sockerror("tcpserver: listen"); sys_closesocket(sockfd); sockfd = -1; } else { sys_addpollfn(sockfd, (t_fdpollfn)tcpserver_connectpoll, x); x->x_connectout = outlet_new(&x->x_obj, &s_float); /* 2nd outlet for number of connected clients */ x->x_sockout = outlet_new(&x->x_obj, &s_float); /* 3rd outlet for socket number of current client */ x->x_addrout = outlet_new(&x->x_obj, &s_list); /* 4th outlet for ip address of current client */ inbinbuf = binbuf_new(); } x->x_connectsocket = sockfd; x->x_nconnections = 0; for(i = 0; i < MAX_CONNECT; i++) { x->x_fd[i] = -1; x->x_sr[i] = NULL; } /* prepare to convert the bytes in the buffer to floats in a list */ for (i = 0; i < MAX_UDP_RECEIVE; ++i) { x->x_msgoutbuf[i].a_type = A_FLOAT; x->x_msgoutbuf[i].a_w.w_float = 0; } for (i = 0; i < 4; ++i) { x->x_addrbytes[i].a_type = A_FLOAT; x->x_addrbytes[i].a_w.w_float = 0; } return (x); } static void tcpserver_free(t_tcpserver *x) { int i; for(i = 0; i < MAX_CONNECT; i++) { if (x->x_fd[i] >= 0) { sys_rmpollfn(x->x_fd[i]); sys_closesocket(x->x_fd[i]); } if (x->x_sr[i] != NULL) tcpserver_socketreceiver_free(x->x_sr[i]); } if (x->x_connectsocket >= 0) { sys_rmpollfn(x->x_connectsocket); sys_closesocket(x->x_connectsocket); } binbuf_free(inbinbuf); } #ifdef MSW __declspec(dllexport) #endif void tcpserver_setup(void) { tcpserver_class = class_new(gensym(objName),(t_newmethod)tcpserver_new, (t_method)tcpserver_free, sizeof(t_tcpserver), 0, A_DEFFLOAT, 0); class_addmethod(tcpserver_class, (t_method)tcpserver_print, gensym("print"), 0); class_addmethod(tcpserver_class, (t_method)tcpserver_send, gensym("send"), A_GIMME, 0); class_addmethod(tcpserver_class, (t_method)tcpserver_client_send, gensym("client"), A_GIMME, 0); class_addmethod(tcpserver_class, (t_method)tcpserver_broadcast, gensym("broadcast"), A_GIMME, 0); } /* end of x_net_tcpserver.c */ --- x_net_tcp_server.c DELETED --- --- NEW FILE: udpreceive.c --- /* x_net_udpreceive.c 20060424. Martin Peach did it based on x_net.c. x_net.c header follows: */ /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ #include "m_pd.h" #include "s_stuff.h" #ifdef MSW #include <winsock2.h> #include <ws2tcpip.h> #else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> #include <stdio.h> #endif /* ----------------------------- udpreceive ------------------------- */ static t_class *udpreceive_class; #define MAX_UDP_RECEIVE 65536L // longer than data in maximum UDP packet typedef struct _udpreceive { t_object x_obj; t_outlet *x_msgout; t_outlet *x_addrout; int x_connectsocket; t_atom x_addrbytes[4]; t_atom x_msgoutbuf[MAX_UDP_RECEIVE]; char x_msginbuf[MAX_UDP_RECEIVE]; } t_udpreceive; #ifdef MSW __declspec(dllexport) #endif void udpreceive_setup(void); static void udpreceive_free(t_udpreceive *x); static void *udpreceive_new(t_floatarg fportno); static void udpreceive_read(t_udpreceive *x, int sockfd); static void udpreceive_read(t_udpreceive *x, int sockfd) { int i, read = 0; struct sockaddr_in from; socklen_t fromlen = sizeof(from); long addr; read = recvfrom(sockfd, x->x_msginbuf, MAX_UDP_RECEIVE, 0, (struct sockaddr *)&from, &fromlen); #ifdef DEBUG post("udpreceive_read: read %lu x->x_connectsocket = %d", read, x->x_connectsocket); #endif /* get the sender's ip */ addr = ntohl(from.sin_addr.s_addr); x->x_addrbytes[0].a_w.w_float = (addr & 0xFF000000)>>24; x->x_addrbytes[1].a_w.w_float = (addr & 0x0FF0000)>>16; x->x_addrbytes[2].a_w.w_float = (addr & 0x0FF00)>>8; x->x_addrbytes[3].a_w.w_float = (addr & 0x0FF); outlet_list(x->x_addrout, &s_list, 4L, x->x_addrbytes); if (read < 0) { sys_sockerror("udpreceive_read"); sys_closesocket(x->x_connectsocket); return; } if (read > 0) { for (i = 0; i < read; ++i) { /* convert the bytes in the buffer to floats in a list */ x->x_msgoutbuf[i].a_w.w_float = (float)x->x_msginbuf[i]; } /* send the list out the outlet */ if (read > 1) outlet_list(x->x_msgout, &s_list, read, x->x_msgoutbuf); else outlet_float(x->x_msgout, x->x_msgoutbuf[0].a_w.w_float); } } static void *udpreceive_new(t_floatarg fportno) { t_udpreceive *x; struct sockaddr_in server; int sockfd, portno = fportno; int intarg, i; /* create a socket */ sockfd = socket(AF_INET, SOCK_DGRAM, 0); #ifdef DEBUG post("udpreceive_new: socket %d port %d", sockfd, portno); #endif if (sockfd < 0) { sys_sockerror("udpreceive: socket"); return (0); } server.sin_family = AF_INET; server.sin_addr.s_addr = INADDR_ANY; /* ask OS to allow another Pd to repoen this port after we close it. */ intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&intarg, sizeof(intarg)) < 0) post("udpreceive: setsockopt (SO_REUSEADDR) failed"); /* assign server port number */ server.sin_port = htons((u_short)portno); /* name the socket */ if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0) { sys_sockerror("udpreceive: bind"); sys_closesocket(sockfd); return (0); } x = (t_udpreceive *)pd_new(udpreceive_class); x->x_msgout = outlet_new(&x->x_obj, &s_anything); x->x_addrout = outlet_new(&x->x_obj, &s_list); x->x_connectsocket = sockfd; /* convert the bytes in the buffer to floats in a list */ for (i = 0; i < MAX_UDP_RECEIVE; ++i) { x->x_msgoutbuf[i].a_type = A_FLOAT; x->x_msgoutbuf[i].a_w.w_float = 0; } for (i = 0; i < 4; ++i) { x->x_addrbytes[i].a_type = A_FLOAT; x->x_addrbytes[i].a_w.w_float = 0; } sys_addpollfn(x->x_connectsocket, (t_fdpollfn)udpreceive_read, x); return (x); } static void udpreceive_free(t_udpreceive *x) { if (x->x_connectsocket >= 0) { sys_rmpollfn(x->x_connectsocket); sys_closesocket(x->x_connectsocket); } } #ifdef MSW __declspec(dllexport) #endif void udpreceive_setup(void) { udpreceive_class = class_new(gensym("udpreceive"), (t_newmethod)udpreceive_new, (t_method)udpreceive_free, sizeof(t_udpreceive), CLASS_NOINLET, A_DEFFLOAT, 0); } /* end x_net_udpreceive.c */ --- NEW FILE: tcpreceive.c --- /* x_net_tcpreceive.c 20060424. Martin Peach did it based on x_net.c. x_net.c header follows: */ /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ #include "m_pd.h" #include "s_stuff.h" #ifdef MSW #include <winsock2.h> #include <ws2tcpip.h> /* for socklen_t */ #else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> #include <stdio.h> #endif /* ----------------------------- tcpreceive ------------------------- */ static t_class *tcpreceive_class; #define MAX_UDP_RECEIVE 65536L // longer than data in maximum UDP packet #define MAX_CONNECTIONS 128 // this is going to cause trouble down the line...:( typedef struct _tcpconnection { long addr; int socket; } t_tcpconnection; typedef struct _tcpreceive { t_object x_obj; t_outlet *x_msgout; t_outlet *x_addrout; t_outlet *x_connectout; int x_connectsocket; int x_nconnections; t_tcpconnection x_connection[MAX_CONNECTIONS]; t_atom x_addrbytes[4]; t_atom x_msgoutbuf[MAX_UDP_RECEIVE]; char x_msginbuf[MAX_UDP_RECEIVE]; } t_tcpreceive; #ifdef MSW __declspec(dllexport) #endif void tcpreceive_setup(void); static void tcpreceive_free(t_tcpreceive *x); static void *tcpreceive_new(t_floatarg fportno); static void tcpreceive_read(t_tcpreceive *x, int sockfd); static void tcpreceive_connectpoll(t_tcpreceive *x); static int tcpreceive_addconnection(t_tcpreceive * x, int fd, long addr); static int tcpreceive_removeconnection(t_tcpreceive * x, int fd); static void tcpreceive_closeall(t_tcpreceive *x); static long tcpreceive_getconnection(t_tcpreceive * x, int fd); static void tcpreceive_read(t_tcpreceive *x, int sockfd) { int i, read = 0; long addr; // read = recvfrom(sockfd, x->x_msginbuf, MAX_UDP_RECEIVE, 0, (struct sockaddr *)&from, &fromlen); read = recv(sockfd, x->x_msginbuf, MAX_UDP_RECEIVE, 0); #ifdef DEBUG post("tcpreceive_read: read %lu x->x_connectsocket = %d", read, x->x_connectsocket); #endif if (read < 0) { sys_sockerror("tcpreceive_read: recv"); sys_rmpollfn(sockfd); sys_closesocket(sockfd); tcpreceive_removeconnection(x, sockfd); outlet_float(x->x_connectout, --x->x_nconnections); } else if (read == 0) { post("tcpreceive: EOF on socket %d\n", sockfd); sys_rmpollfn(sockfd); sys_closesocket(sockfd); tcpreceive_removeconnection(x, sockfd); outlet_float(x->x_connectout, --x->x_nconnections); } else if (read > 0) { for (i = 0; i < read; ++i) { /* convert the bytes in the buffer to floats in a list */ x->x_msgoutbuf[i].a_w.w_float = (float)x->x_msginbuf[i]; } /* find sender's ip address and output it */ addr = tcpreceive_getconnection(x, sockfd); x->x_addrbytes[0].a_w.w_float = (addr & 0xFF000000)>>24; x->x_addrbytes[1].a_w.w_float = (addr & 0x0FF0000)>>16; x->x_addrbytes[2].a_w.w_float = (addr & 0x0FF00)>>8; x->x_addrbytes[3].a_w.w_float = (addr & 0x0FF); outlet_list(x->x_addrout, &s_list, 4L, x->x_addrbytes); /* send the list out the outlet */ if (read > 1) outlet_list(x->x_msgout, &s_list, read, x->x_msgoutbuf); else outlet_float(x->x_msgout, x->x_msgoutbuf[0].a_w.w_float); } } static void *tcpreceive_new(t_floatarg fportno) { t_tcpreceive *x; struct sockaddr_in server; int sockfd, portno = fportno; int intarg, i; /* create a socket */ sockfd = socket(AF_INET, SOCK_STREAM, 0); #ifdef DEBUG post("tcpreceive_new: socket %d port %d", sockfd, portno); #endif if (sockfd < 0) { sys_sockerror("tcpreceive: socket"); return (0); } server.sin_family = AF_INET; server.sin_addr.s_addr = INADDR_ANY; /* ask OS to allow another Pd to repoen this port after we close it. */ intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&intarg, sizeof(intarg)) < 0) post("tcpreceive: setsockopt (SO_REUSEADDR) failed"); /* Stream (TCP) sockets are set NODELAY */ intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); /* assign server port number */ server.sin_port = htons((u_short)portno); /* name the socket */ if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0) { sys_sockerror("tcpreceive: bind"); sys_closesocket(sockfd); return (0); } x = (t_tcpreceive *)pd_new(tcpreceive_class); x->x_msgout = outlet_new(&x->x_obj, &s_anything); x->x_addrout = outlet_new(&x->x_obj, &s_list); x->x_connectout = outlet_new(&x->x_obj, &s_float); /* clear the connection list */ for (i = 0; i < MAX_CONNECTIONS; ++i) { x->x_connection[i].socket = -1; x->x_connection[i].addr = 0L; } /* convert the bytes in the buffer to floats in a list */ for (i = 0; i < MAX_UDP_RECEIVE; ++i) { x->x_msgoutbuf[i].a_type = A_FLOAT; x->x_msgoutbuf[i].a_w.w_float = 0; } for (i = 0; i < 4; ++i) { x->x_addrbytes[i].a_type = A_FLOAT; x->x_addrbytes[i].a_w.w_float = 0; } /* streaming protocol */ if (listen(sockfd, 5) < 0) { sys_sockerror("tcpreceive: listen"); sys_closesocket(sockfd); sockfd = -1; } else { sys_addpollfn(sockfd, (t_fdpollfn)tcpreceive_connectpoll, x); } x->x_connectsocket = sockfd; x->x_nconnections = 0; //udp version... sys_addpollfn(x->x_connectsocket, (t_fdpollfn)tcpreceive_read, x); return (x); } /* tcpreceive_connectpoll checks for incoming connection requests on the original socket */ /* a new socket is assigned */ static void tcpreceive_connectpoll(t_tcpreceive *x) { struct sockaddr_in from; socklen_t fromlen = sizeof(from); long addr; int fd; fd = accept(x->x_connectsocket, (struct sockaddr *)&from, &fromlen); if (fd < 0) post("tcpreceive: accept failed"); else { // t_socketreceiver *y = socketreceiver_new((void *)x, // (t_socketnotifier)tcpreceive_notify, // 0, 0); /* get the sender's ip */ addr = ntohl(from.sin_addr.s_addr); if (tcpreceive_addconnection(x, fd, addr)) { sys_addpollfn(fd, (t_fdpollfn)tcpreceive_read, x); outlet_float(x->x_connectout, ++x->x_nconnections); x->x_addrbytes[0].a_w.w_float = (addr & 0xFF000000)>>24; x->x_addrbytes[1].a_w.w_float = (addr & 0x0FF0000)>>16; x->x_addrbytes[2].a_w.w_float = (addr & 0x0FF00)>>8; x->x_addrbytes[3].a_w.w_float = (addr & 0x0FF); outlet_list(x->x_addrout, &s_list, 4L, x->x_addrbytes); } else { error ("tcpreceive: Too many connections"); sys_closesocket(fd); } } } /* tcpreceive_addconnection tries to add the socket fd to the list */ /* returns 1 on success, else 0 */ static int tcpreceive_addconnection(t_tcpreceive *x, int fd, long addr) { int i; for (i = 0; i < MAX_CONNECTIONS; ++i) { if (x->x_connection[i].socket == -1) { x->x_connection[i].socket = fd; x->x_connection[i].addr = addr; return 1; } } return 0; } /* tcpreceive_closeall closes all open sockets and deletes them from the list */ static void tcpreceive_closeall(t_tcpreceive *x) { int i; for (i = 0; ((i < MAX_CONNECTIONS) && (x->x_nconnections > 0)); ++i) { if (x->x_connection[i].socket != -1) { post ("tcpreceive: closing socket %d", x->x_connection[i].socket); sys_rmpollfn(x->x_connection[i].socket); sys_closesocket(x->x_connection[i].socket); x->x_connection[i].socket = -1; x->x_connection[i].addr = 0L; outlet_float(x->x_connectout, --x->x_nconnections); } } } /* tcpreceive_removeconnection tries to delete the socket fd from the list */ /* returns 1 on success, else 0 */ static int tcpreceive_removeconnection(t_tcpreceive *x, int fd) { int i; for (i = 0; i < MAX_CONNECTIONS; ++i) { if (x->x_connection[i].socket == fd) { x->x_connection[i].socket = -1; x->x_connection[i].addr = 0L; return 1; } } return 0; } /* tcpreceive_getconnection tries to find the socket fd in the list */ /* returns addr on success, else 0 */ static long tcpreceive_getconnection(t_tcpreceive *x, int fd) { int i; for (i = 0; i < MAX_CONNECTIONS; ++i) { if (x->x_connection[i].socket == fd) return x->x_connection[i].addr; } return 0; } static void tcpreceive_free(t_tcpreceive *x) { /* is this ever called? */ if (x->x_connectsocket >= 0) { sys_rmpollfn(x->x_connectsocket); sys_closesocket(x->x_connectsocket); } tcpreceive_closeall(x); } #ifdef MSW __declspec(dllexport) #endif void tcpreceive_setup(void) { tcpreceive_class = class_new(gensym("tcpreceive"), (t_newmethod)tcpreceive_new, (t_method)tcpreceive_free, sizeof(t_tcpreceive), CLASS_NOINLET, A_DEFFLOAT, 0); } /* end x_net_tcpreceive.c */ --- x_net_tcpreceive.c DELETED --- --- x_net_tcp_client.c DELETED --- --- x_net_tcpsend.c DELETED ---

1 0

externals/hardware/arduino arduino-help.pd, 1.8, 1.9 arduino.pd, 1.8, 1.9
by Hans-Christoph Steiner 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/hardware/arduino In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21232 Modified Files: arduino-help.pd arduino.pd Log Message: Jamie Allen's and my cleanups compile and install, but I don't know if they work yet Index: arduino.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/arduino.pd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** arduino.pd 24 Jun 2006 00:43:07 -0000 1.8 --- arduino.pd 24 Aug 2006 05:54:25 -0000 1.9 *************** *** 1,3 **** ! #N canvas 449 224 612 492 10; #X text 414 457 released under the GNU GPL; #X text 9 457 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> --- 1,3 ---- ! #N canvas 158 31 628 508 10; #X text 414 457 released under the GNU GPL; #X text 9 457 (C) Copyright 2006 Hans-Christoph Steiner <hans(a)at.or.at> *************** *** 60,64 **** #X obj 494 241 outlet; #X obj 11 66 comport \$1 9600; ! #N canvas 528 330 562 307 command 0; #X obj 79 8 inlet; #X obj 198 269 outlet; --- 60,64 ---- #X obj 494 241 outlet; #X obj 11 66 comport \$1 9600; ! #N canvas 495 157 582 327 command 0; #X obj 79 8 inlet; #X obj 198 269 outlet; *************** *** 73,81 **** #X msg 5 136 230 \, \$1; #X obj 200 94 clip 0 6; - #X obj 200 135 + 240; #X obj 263 94 clip 0 1; #X obj 263 115 int; ! #X obj 263 137 + 238; ! #N canvas 0 22 458 308 digital-out 0; #X obj 67 20 inlet; #X obj 85 280 outlet; --- 73,79 ---- #X msg 5 136 230 \, \$1; #X obj 200 94 clip 0 6; #X obj 263 94 clip 0 1; #X obj 263 115 int; ! #N canvas 0 22 462 312 digital-out 0; #X obj 67 20 inlet; #X obj 85 280 outlet; *************** *** 84,90 **** #X obj 140 208 & 127; #X obj 140 164 trigger float float bang; - #X msg 303 186 255; #X text 104 89 break up digital-out bitmask; #X obj 140 186 >> 7; #X connect 0 0 2 0; #X connect 2 0 5 0; --- 82,88 ---- #X obj 140 208 & 127; #X obj 140 164 trigger float float bang; #X text 104 89 break up digital-out bitmask; #X obj 140 186 >> 7; + #X msg 303 186 229; #X connect 0 0 2 0; #X connect 2 0 5 0; *************** *** 92,117 **** #X connect 3 0 1 0; #X connect 4 0 1 0; ! #X connect 5 0 8 0; #X connect 5 1 3 0; ! #X connect 5 2 6 0; ! #X connect 6 0 1 0; ! #X connect 8 0 4 0; #X restore 431 94 pd digital-out; #X obj 80 53 route PWM0 PWM1 PWM2 analogIns digitalIns outputMode; ! #N canvas 0 22 466 316 outputMode 0; #X obj 81 11 inlet; #X obj 105 275 outlet; #X obj 81 70 unpack float float; #X obj 105 176 +; ! #X obj 178 126 * 14; ! #X obj 105 197 + 200; #X connect 0 0 2 0; #X connect 2 0 3 0; ! #X connect 2 1 4 0; ! #X connect 3 0 5 0; ! #X connect 4 0 3 1; ! #X connect 5 0 1 0; #X restore 334 94 pd outputMode; ! #X connect 0 0 17 0; #X connect 2 0 8 0; #X connect 3 0 9 0; --- 90,119 ---- #X connect 3 0 1 0; #X connect 4 0 1 0; ! #X connect 5 0 7 0; #X connect 5 1 3 0; ! #X connect 5 2 8 0; ! #X connect 7 0 4 0; ! #X connect 8 0 1 0; #X restore 431 94 pd digital-out; #X obj 80 53 route PWM0 PWM1 PWM2 analogIns digitalIns outputMode; ! #N canvas 133 22 470 320 outputMode 0; #X obj 81 11 inlet; #X obj 105 275 outlet; #X obj 81 70 unpack float float; #X obj 105 176 +; ! #X obj 105 197 + 130; ! #X obj 178 126 * 70; ! #X text 152 198 input commands = 130-143; ! #X text 216 127 output commands = 200-213; #X connect 0 0 2 0; #X connect 2 0 3 0; ! #X connect 2 1 5 0; ! #X connect 3 0 4 0; ! #X connect 4 0 1 0; ! #X connect 5 0 3 1; #X restore 334 94 pd outputMode; ! #X obj 200 135 + 160; ! #X obj 263 137 + 150; ! #X connect 0 0 15 0; #X connect 2 0 8 0; #X connect 3 0 9 0; *************** *** 123,139 **** #X connect 9 0 1 0; #X connect 10 0 1 0; ! #X connect 11 0 12 0; ! #X connect 12 0 1 0; ! #X connect 13 0 14 0; ! #X connect 14 0 15 0; ! #X connect 15 0 1 0; #X connect 16 0 1 0; ! #X connect 17 0 7 0; ! #X connect 17 1 6 0; ! #X connect 17 2 5 0; ! #X connect 17 3 11 0; ! #X connect 17 4 13 0; ! #X connect 17 5 18 0; ! #X connect 17 6 16 0; #X connect 18 0 1 0; #X restore 11 22 pd command processing; --- 125,141 ---- #X connect 9 0 1 0; #X connect 10 0 1 0; ! #X connect 11 0 17 0; ! #X connect 12 0 13 0; ! #X connect 13 0 18 0; ! #X connect 14 0 1 0; ! #X connect 15 0 7 0; ! #X connect 15 1 6 0; ! #X connect 15 2 5 0; ! #X connect 15 3 11 0; ! #X connect 15 4 12 0; ! #X connect 15 5 16 0; ! #X connect 15 6 14 0; #X connect 16 0 1 0; ! #X connect 17 0 1 0; #X connect 18 0 1 0; #X restore 11 22 pd command processing; Index: arduino-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/arduino-help.pd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** arduino-help.pd 24 Jun 2006 00:43:07 -0000 1.8 --- arduino-help.pd 24 Aug 2006 05:54:25 -0000 1.9 *************** *** 1,10 **** ! #N canvas 202 94 654 546 10; #X msg 156 146 open \$1; #N canvas 162 133 534 384 serin 0; ! #X obj 120 61 cnv 15 15 15 empty \$0-number-canvas 3 4 8 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 59 147 outlet; #X obj 60 13 inlet; --- 1,10 ---- ! #N canvas 525 22 658 550 10; #X msg 156 146 open \$1; #N canvas 162 133 534 384 serin 0; ! #X obj 120 61 cnv 15 15 15 empty \$0-number-canvas 1 4 8 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 1; #X obj 59 147 outlet; #X obj 60 13 inlet; *************** *** 29,38 **** 0 1; #X obj 278 29 hradio 15 1 0 14 empty empty empty 0 -6 0 8 -262131 -1 ! -1 0; #X obj 255 30 tgl 15 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 1 ; #X obj 355 292 tgl 15 0 empty empty all 0 -6 0 8 -262144 -1 -1 0 1 ; ! #N canvas 100 289 626 345 decode 0; #X obj 241 26 inlet; #X obj 46 189 & 1; --- 29,38 ---- 0 1; #X obj 278 29 hradio 15 1 0 14 empty empty empty 0 -6 0 8 -262131 -1 ! -1 11; #X obj 255 30 tgl 15 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 1 ; #X obj 355 292 tgl 15 0 empty empty all 0 -6 0 8 -262144 -1 -1 0 1 ; ! #N canvas 100 289 630 349 decode 0; #X obj 241 26 inlet; #X obj 46 189 & 1; *************** *** 110,114 **** 1 10 -225271 -1 -1 0 0; #X msg 64 453 bang; - #X obj 255 274 arduino 3; #X text 387 15 7; #X text 282 15 0; --- 110,113 ---- *************** *** 132,136 **** #X floatatom 430 488 6 0 0 0 - - -; #X text 393 56 how many analogIns to enable:; ! #X obj 405 117 tgl 15 1 empty empty empty 0 -6 0 8 -257472 -1 -1 1 1; #X text 428 116 enable/disable digitalIns; --- 131,135 ---- #X floatatom 430 488 6 0 0 0 - - -; #X text 393 56 how many analogIns to enable:; ! #X obj 405 117 tgl 15 0 empty empty empty 0 -6 0 8 -257472 -1 -1 0 1; #X text 428 116 enable/disable digitalIns; *************** *** 247,251 **** #X text 327 15 3; #X msg 255 71 outputMode \$2 \$1; ! #N canvas 485 91 546 327 sending 0; #X obj 142 285 outlet; #X obj 129 84 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 --- 246,250 ---- #X text 327 15 3; #X msg 255 71 outputMode \$2 \$1; ! #N canvas 485 91 566 347 sending 0; #X obj 142 285 outlet; #X obj 129 84 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 *************** *** 263,267 **** #X obj 231 84 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; - #X obj 168 125 bytemask; #X text 60 11 The 8th bit is not used in the bitmask \, there are 7 bits of digital output values per byte.; --- 262,265 ---- *************** *** 280,358 **** #X obj 402 85 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; - #X obj 339 126 bytemask; #X obj 142 205 pack float float; - #X msg 142 231 255 \, \$1 \, \$2; #X text 143 65 pins 0-6; #X text 330 66 pins 7-13; #X obj 212 164 trigger bang float; ! #X connect 1 0 8 0; ! #X connect 2 0 8 1; ! #X connect 3 0 8 2; ! #X connect 4 0 8 3; ! #X connect 5 0 8 4; ! #X connect 6 0 8 5; ! #X connect 7 0 8 6; ! #X connect 8 0 18 0; ! #X connect 10 0 17 0; ! #X connect 11 0 17 1; ! #X connect 12 0 17 2; ! #X connect 13 0 17 3; ! #X connect 14 0 17 4; ! #X connect 15 0 17 5; ! #X connect 16 0 17 6; ! #X connect 17 0 22 0; ! #X connect 18 0 19 0; ! #X connect 19 0 0 0; ! #X connect 22 0 18 0; ! #X connect 22 1 18 1; #X restore 10 258 pd sending digital outs; ! #X connect 0 0 14 0; #X connect 1 0 0 0; ! #X connect 5 0 14 0; ! #X connect 7 0 45 2; ! #X connect 8 0 55 1; ! #X connect 9 0 55 0; ! #X connect 10 0 45 1; ! #X connect 12 0 19 0; #X connect 13 0 6 0; ! #X connect 14 0 25 0; ! #X connect 14 1 45 0; ! #X connect 18 0 14 0; ! #X connect 19 0 18 0; ! #X connect 20 0 53 0; ! #X connect 21 0 53 0; ! #X connect 22 0 53 0; ! #X connect 23 0 14 0; ! #X connect 24 0 54 0; ! #X connect 25 0 27 0; ! #X connect 26 0 25 1; ! #X connect 27 0 44 0; ! #X connect 27 1 44 1; ! #X connect 27 2 44 2; ! #X connect 27 3 44 3; ! #X connect 27 4 44 4; ! #X connect 27 5 44 5; ! #X connect 27 6 44 6; ! #X connect 28 0 11 0; ! #X connect 28 0 30 0; ! #X connect 28 0 39 0; ! #X connect 28 1 29 0; ! #X connect 32 0 34 0; ! #X connect 34 0 14 0; ! #X connect 35 0 14 0; ! #X connect 36 0 35 0; ! #X connect 39 0 41 0; ! #X connect 40 0 39 1; ! #X connect 42 0 14 1; ! #X connect 44 0 47 0; ! #X connect 44 1 48 0; ! #X connect 44 2 49 0; ! #X connect 44 3 50 0; ! #X connect 44 4 51 0; ! #X connect 44 5 52 0; ! #X connect 44 6 28 0; ! #X connect 53 0 19 1; ! #X connect 54 0 23 0; ! #X connect 55 0 61 0; ! #X connect 61 0 14 0; ! #X connect 62 0 14 0; --- 278,358 ---- #X obj 402 85 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 142 205 pack float float; #X text 143 65 pins 0-6; #X text 330 66 pins 7-13; #X obj 212 164 trigger bang float; ! #X msg 142 231 229 \, \$1 \, \$2; ! #X obj 299 126 mapping/bytemask; ! #X obj 128 125 mapping/bytemask; ! #X connect 1 0 22 0; ! #X connect 2 0 22 1; ! #X connect 3 0 22 2; ! #X connect 4 0 22 3; ! #X connect 5 0 22 4; ! #X connect 6 0 22 5; ! #X connect 7 0 22 6; ! #X connect 9 0 21 0; ! #X connect 10 0 21 1; ! #X connect 11 0 21 2; ! #X connect 12 0 21 3; ! #X connect 13 0 21 4; ! #X connect 14 0 21 5; ! #X connect 15 0 21 6; ! #X connect 16 0 20 0; ! #X connect 19 0 16 0; ! #X connect 19 1 16 1; ! #X connect 20 0 0 0; ! #X connect 21 0 19 0; ! #X connect 22 0 16 0; #X restore 10 258 pd sending digital outs; ! #X obj 255 274 arduino 3; ! #X connect 0 0 62 0; #X connect 1 0 0 0; ! #X connect 5 0 62 0; ! #X connect 7 0 44 2; ! #X connect 8 0 54 1; ! #X connect 9 0 54 0; ! #X connect 10 0 44 1; ! #X connect 12 0 18 0; #X connect 13 0 6 0; ! #X connect 17 0 62 0; ! #X connect 18 0 17 0; ! #X connect 19 0 52 0; ! #X connect 20 0 52 0; ! #X connect 21 0 52 0; ! #X connect 22 0 62 0; ! #X connect 23 0 53 0; ! #X connect 24 0 26 0; ! #X connect 25 0 24 1; ! #X connect 26 0 43 0; ! #X connect 26 1 43 1; ! #X connect 26 2 43 2; ! #X connect 26 3 43 3; ! #X connect 26 4 43 4; ! #X connect 26 5 43 5; ! #X connect 26 6 43 6; ! #X connect 27 0 11 0; ! #X connect 27 0 29 0; ! #X connect 27 0 38 0; ! #X connect 27 1 28 0; ! #X connect 31 0 33 0; ! #X connect 33 0 62 0; ! #X connect 34 0 62 0; ! #X connect 35 0 34 0; ! #X connect 38 0 40 0; ! #X connect 39 0 38 1; ! #X connect 41 0 62 1; ! #X connect 43 0 46 0; ! #X connect 43 1 47 0; ! #X connect 43 2 48 0; ! #X connect 43 3 49 0; ! #X connect 43 4 50 0; ! #X connect 43 5 51 0; ! #X connect 43 6 27 0; ! #X connect 52 0 18 1; ! #X connect 53 0 22 0; ! #X connect 54 0 60 0; ! #X connect 60 0 62 0; ! #X connect 61 0 62 0; ! #X connect 62 0 24 0; ! #X connect 62 1 44 0;

1 0

externals/hardware/arduino/Pd_firmware Pd_firmware.pde, 1.10, 1.11
by Hans-Christoph Steiner 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21232/Pd_firmware Modified Files: Pd_firmware.pde Log Message: Jamie Allen's and my cleanups compile and install, but I don't know if they work yet Index: Pd_firmware.pde =================================================================== RCS file: /cvsroot/pure-data/externals/hardware/arduino/Pd_firmware/Pd_firmware.pde,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Pd_firmware.pde 24 Jun 2006 00:41:17 -0000 1.10 --- Pd_firmware.pde 24 Aug 2006 05:54:25 -0000 1.11 *************** *** 1,329 **** ! /* Pd_firmware aka Pduino ! * ------------------ ! * ! * It was designed to work with the Pd object [arduino] ! * which is included in Pd-extended. This firmware could ! * easily be used with other programs like Max/MSP, Processing, ! * or whatever can do serial communications. ! * ! * (copyleft) 2006 Hans-Christoph Steiner <hans(a)at.or.at> ! * @author: Hans-Christoph Steiner ! * @date: 2006-05-19 ! * @location: STEIM, Amsterdam, Netherlands ! */ ! ! /* TODO ! * ! * - get digitalInput working ! * - add pulseIn functionality ! * - add software PWM for servos, etc ! * - redesign protocol to accomodate boards with more I/Os ! * - add cycle markers to mark start of analog, digital, pulseIn, and PWM ! */ ! ! /* ! * Pduino protocol ! * =============== ! * data: 0-127 ! * control: 128-255 ! * ! * Pd->Arduino commands ! * -------------------- ! * 200-213 - set digital pin 0-13 to INPUT ! * 214-227 - set digital pin 0-13 to OUTPUT ! * 228 - UNUSED ! * 229 - UNUSED ! * 230 - next byte sets PWM0 value ! * 231 - next byte sets PWM1 value ! * 232 - next byte sets PWM2 value ! * 233 - UNUSED ! * 234 - UNUSED ! * 235 - UNUSED ! * 236 - UNUSED ! * 237 - UNUSED ! * 238 - disable all digital inputs ! * 239 - enable all digital inputs ! * 240 - disable all analog inputs ! * 241 - enable 1 analog input (0) ! * 242 - enable 2 analog inputs (0,1) ! * 243 - enable 3 analog inputs (0-2) ! * 244 - enable 4 analog inputs (0-3) ! * 245 - enable 5 analog inputs (0-4) ! * 246 - enable 6 analog inputs (0-5) ! * 255 - cycle marker ! * ! * Pd->Arduino byte cycle ! * ---------------------- ! * 0 start of cycle marker (255/11111111) ! * 1 digitalOut 0-6 bitmask ! * 2 digitalOut 7-13 bitmask ! * ! * Arduino->Pd byte cycle ! * ---------------------- ! * 0 start of cycle marker (255/11111111) ! * 1 digitalIn 0-6 bitmask ! * 2 digitalIn 7-13 bitmask ! * 3 analogIn0 byte0 ! * 4 analogIn0 byte1 ! * 5 analogIn1 byte0 ! * 6 analogIn1 byte1 ! * 7 analogIn2 byte0 ! * 8 analogIn2 byte1 ! * 9 analogIn3 byte0 ! * 10 analogIn3 byte1 ! * 11 analogIn4 byte0 ! * 12 analogIn4 byte1 ! * 13 analogIn5 byte0 ! * 14 analogIn5 byte1 ! */ ! ! /* ! * 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 ! ! // for comparing along with INPUT and OUTPUT ! #define PWM 2 ! ! // this flag says the next serial input will be PWM data ! byte waitForPWMData = 0; ! ! // this flag says the first data byte for the digital outs is next ! boolean firstInputByte = false; ! ! /* this int serves as an array of bits to store pin status ! * 0 = INPUT, 1 = OUTPUT ! */ ! int digitalPinStatus; ! ! /* this byte stores the status off whether PWM is on or not ! * bit 9 = PWM0, bit 10 = PWM1, bit 11 = PWM2 ! * the rest of the bits are unused and should remain 0 ! */ ! int pwmStatus; ! ! boolean digitalInputsEnabled = true; ! byte analogInputsEnabled = 6; ! ! byte analogPin; ! int analogData; ! ! // ------------------------------------------------------------------------- ! void transmitDigitalInput(byte startPin) { ! byte i; ! byte digitalPin; ! byte digitalPinBit; ! byte transmitByte; ! 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 if( (digitalPin >= 9) && (pwmStatus & (1 << digitalPin)) ) { ! digitalData = 0; // pin set to PWM, don't read ! } ! else { ! digitalData = digitalRead(digitalPin); ! } ! /* the next line probably needs to be re-thought (i.e. it might not work...) since my ! first attempt was miserably wrong. <hans(a)at.or.at> */ ! transmitByte = transmitByte + ((2^i)*digitalData); ! } ! printByte(transmitByte); ! } ! ! // ------------------------------------------------------------------------- ! /* 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 ! */ ! void setPinMode(int pin, int mode) { ! if(mode == INPUT) { ! digitalPinStatus = digitalPinStatus &~ (1 << pin); ! pwmStatus = pwmStatus &~ (1 << pin); ! pinMode(pin,INPUT); ! } ! else if(mode == OUTPUT) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! pwmStatus = pwmStatus &~ (1 << pin); ! pinMode(pin,OUTPUT); ! } ! else if( (mode == PWM) && (pin >= 9) && (pin <= 11) ) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! pwmStatus = pwmStatus | (1 << pin); ! pinMode(pin,OUTPUT); ! } ! } ! ! // ------------------------------------------------------------------------- ! /* this function checks to see if there is data waiting on the serial port ! * then processes all of the stored data ! */ ! void checkForInput() { ! if(serialAvailable()) { ! while(serialAvailable()) { ! processInput( (byte)serialRead() ); ! } ! } ! } ! ! // ------------------------------------------------------------------------- ! void processInput(byte inputData) { ! int i; ! int mask; ! ! // the PWM commands (230-232) have a byte of data following the command ! if (waitForPWMData > 0) { ! // printByte(150); ! // printByte(inputData); ! analogWrite(waitForPWMData,inputData); ! waitForPWMData = 0; ! } ! else if(inputData < 128) { ! // printByte(151); ! if(firstInputByte) { ! // printByte(160); ! for(i=0; i<7; ++i) { ! mask = 1 << i; ! //printByte(254); ! //printByte(i); ! //printByte(mask); ! if(digitalPinStatus & mask) { ! digitalWrite(i, inputData & mask); ! //printByte(inputData & mask); ! } ! } ! firstInputByte = false; ! } ! else { ! // printByte(161); ! // output data for pins 7-13 ! for(i=7; i<TOTAL_DIGITAL_PINS; ++i) { ! mask = 1 << i; ! //printByte(254); ! //printByte(i); ! //printByte(mask); ! if( (digitalPinStatus & mask) && !(pwmStatus & mask) ) { ! // inputData is a byte and mask is an int, so align the high part of mask ! digitalWrite(i, inputData & (mask >> 7)); ! //printByte(inputData & (mask >> 7)); ! } ! } ! } ! } ! else { ! // printByte(152); ! // printByte(inputData); ! 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,INPUT); ! 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,OUTPUT); ! break; ! case 230: ! case 231: ! case 232: ! waitForPWMData = inputData - 221; // set waitForPWMData to the PWM pin number ! setPinMode(waitForPWMData, PWM); ! break; ! case 238: // all digital inputs off ! digitalInputsEnabled = false; ! break; ! case 239: // all digital inputs on ! digitalInputsEnabled = true; ! break; ! case 240: // analog input off ! case 241: // analog 0 on ! case 242: // analog 0,1 on ! case 243: // analog 0-2 on ! case 244: // analog 0-3 on ! case 245: // analog 0-4 on ! case 246: // analog 0-5 on ! analogInputsEnabled = inputData - 240; ! break; ! case 255: // incoming digital output bytes ! firstInputByte = true; ! break; ! } ! } ! } ! ! // ========================================================================= ! ! // ------------------------------------------------------------------------- ! void setup() { ! byte i; ! ! beginSerial(9600); ! for(i=0; i<TOTAL_DIGITAL_PINS; ++i) { ! setPinMode(i,INPUT); ! } ! } ! ! // ------------------------------------------------------------------------- ! void loop() { ! checkForInput(); ! ! // read all digital pins, in enabled ! if(digitalInputsEnabled) { ! transmitDigitalInput(0); ! checkForInput(); ! transmitDigitalInput(7); ! checkForInput(); ! } ! else if(analogInputsEnabled) { ! // filler bytes, since the first thing sent is always the digitalInputs ! printByte(0); ! printByte(0); ! checkForInput(); ! } ! ! /* get analog in, for the number enabled ! */ ! for(analogPin=0; analogPin<analogInputsEnabled; ++analogPin) { ! analogData = analogRead(analogPin); ! // these two bytes get converted back into the whole number in Pd ! // the higher bits should be zeroed so that the 8th bit doesn't get set ! printByte(analogData >> 7); // bitshift the big stuff into the output byte ! printByte(analogData % 128); // mod by 32 for the small byte ! checkForInput(); ! } ! ! /* end with the cycle marker, if any of the inputs are enabled */ ! if( digitalInputsEnabled || analogInputsEnabled) { ! printByte(255); ! } ! } --- 1,436 ---- ! /* Arduino firmware aka Firmata ! * ------------------ ! * ! * It was designed to work with the Pd object [arduino] ! * which is included in Pd-extended. This firmware could ! * easily be used with other programs like Max/MSP, Processing, ! * or whatever can do serial communications. ! * ! * (copyleft) 2006 Hans-Christoph Steiner <hans(a)at.or.at> ! * @author: Hans-Christoph Steiner ! * @date: 2006-05-19 ! * @location: STEIM, Amsterdam, Netherlands ! */ ! ! /* TODO ! * ! * - get digitalInput working ! * - add pulseIn functionality ! * - add software PWM for servos, etc ! * - redesign protocol to accomodate boards with more I/Os ! * - add cycle markers to mark start of analog, digital, pulseIn, and PWM ! */ ! ! /* firmata protocol ! * =============== ! * data: 0-127 ! * control: 128-255 ! */ ! ! /* computer->Arduino commands ! * -------------------- */ ! /* 128-129 // UNUSED */ ! #define SET_PIN_ZERO_TO_IN 130 // set digital pin 0 to INPUT ! #define SET_PIN_ONE_TO_IN 131 // set digital pin 1 to INPUT ! #define SET_PIN_TWO_TO_IN 132 // set digital pin 2 to INPUT ! #define SET_PIN_THREE_TO_IN 133 // set digital pin 3 to INPUT ! #define SET_PIN_FOUR_TO_IN 134 // set digital pin 4 to INPUT ! #define SET_PIN_FIVE_TO_IN 135 // set digital pin 5 to INPUT ! #define SET_PIN_SIX_TO_IN 136 // set digital pin 6 to INPUT ! #define SET_PIN_SEVEN_TO_IN 137 // set digital pin 7 to INPUT ! #define SET_PIN_EIGHT_TO_IN 138 // set digital pin 8 to INPUT ! #define SET_PIN_NINE_TO_IN 139 // set digital pin 9 to INPUT ! #define SET_PIN_TEN_TO_IN 140 // set digital pin 10 to INPUT ! #define SET_PIN_ELEVEN_TO_IN 141 // set digital pin 11 to INPUT ! #define SET_PIN_TWELVE_TO_IN 142 // set digital pin 12 to INPUT ! #define SET_PIN_THIRTEEN_TO_IN 143 // set digital pin 13 to INPUT ! /* 144-149 // UNUSED */ ! #define DISABLE_DIGITAL_INPUTS 150 // disable reporting of digital inputs ! #define ENABLE_DIGITAL_INPUTS 151 // enable reporting of digital inputs ! /* 152-159 // UNUSED */ ! #define DISABLE_ALL_ANALOG_INS 160 // disable reporting on all analog ins ! #define ENABLE_ONE_ANALOG_IN 161 // enable reporting for 1 analog in (0) ! #define ENABLE_TWO_ANALOG_INS 162 // enable reporting for 2 analog ins (0,1) ! #define ENABLE_THREE_ANALOG_INS 163 // enable reporting for 3 analog ins (0-2) ! #define ENABLE_FOUR_ANALOG_INS 164 // enable reporting for 4 analog ins (0-3) ! #define ENABLE_FIVE_ANALOG_INS 165 // enable reporting for 5 analog ins (0-4) ! #define ENABLE_SIX_ANALOG_INS 166 // enable reporting for 6 analog ins (0-5) ! /* 167-199 // UNUSED */ ! #define SET_PIN_ZERO_TO_OUT 200 // set digital pin 0 to OUTPUT ! #define SET_PIN_ONE_TO_OUT 201 // set digital pin 1 to OUTPUT ! #define SET_PIN_TWO_TO_OUT 202 // set digital pin 2 to OUTPUT ! #define SET_PIN_THREE_TO_OUT 203 // set digital pin 3 to OUTPUT ! #define SET_PIN_FOUR_TO_OUT 204 // set digital pin 4 to OUTPUT ! #define SET_PIN_FIVE_TO_OUT 205 // set digital pin 5 to OUTPUT ! #define SET_PIN_SIX_TO_OUT 206 // set digital pin 6 to OUTPUT ! #define SET_PIN_SEVEN_TO_OUT 207 // set digital pin 7 to OUTPUT ! #define SET_PIN_EIGHT_TO_OUT 208 // set digital pin 8 to OUTPUT ! #define SET_PIN_NINE_TO_OUT 209 // set digital pin 9 to OUTPUT ! #define SET_PIN_TEN_TO_OUT 210 // set digital pin 10 to OUTPUT ! #define SET_PIN_ELEVEN_TO_OUT 211 // set digital pin 11 to OUTPUT ! #define SET_PIN_TWELVE_TO_OUT 212 // set digital pin 12 to OUTPUT ! #define SET_PIN_THIRTEEN_TO_OUT 213 // set digital pin 13 to OUTPUT ! /* 214-228 // UNUSED */ ! #define OUTPUT_TO_DIGITAL_PINS 229 // next two bytes set digital output data ! /* 230-249 // UNUSED */ ! #define DISABLE_PWM 250 // next byte sets pin # to disable ! #define ENABLE_PWM 251 // next two bytes set pin # and duty cycle ! #define DISABLE_SOFTWARE_PWM 252 // next byte sets pin # to disable ! #define ENABLE_SOFTWARE_PWM 253 // next two bytes set pin # and duty cycle ! #define SET_SOFTWARE_PWM_FREQ 254 // set master frequency for software PWMs ! /* 252-254 // UNUSED */ ! #define INPUT_CYCLE_MARKER 255 // input cycle marker ! ! ! /* two byte digital output data format ! * ---------------------- ! * 0 get ready for digital input bytes (229) ! * 1 digitalOut 0-6 bitmask ! * 2 digitalOut 7-13 bitmask ! */ ! ! /* two byte software PWM data format ! * ---------------------- ! * 0 get ready for digital input bytes (250/251) ! * 1 pin # ! * 2 pulse width ! */ ! ! ! /* Arduino->Computer byte cycle ! * ---------------------- ! * 0 start of cycle marker (255/11111111) ! * 1 digital read from Arduino // 0-6 bitmask ! * 2 digital read from Arduino // 7-13 bitmask ! * 3 analog input pin 0 from Arduino // byte 0 ! * 4 analog input pin 1 from Arduino // byte 1 ! * 5 analog input pin 2 from Arduino // byte 2 ! * 6 analog input pin 3 from Arduino // byte 3 ! * 7 analog input pin 4 from Arduino // byte 4 ! * 8 analog input pin 5 from Arduino // byte 5 ! * 9 analog input pin 6 from Arduino // byte 6 ! * 10 analog input pin 7 from Arduino // byte 10 ! * 11 analog input pin 8 from Arduino // byte 11 ! * 12 analog input pin 9 from Arduino // byte 12 ! * 13 analog input pin 10 from Arduino // byte 13 ! * 14 analog input pin 11 from Arduino // byte 14 ! */ ! ! /* ! * 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 ! ! // for comparing along with INPUT and OUTPUT ! #define PWM 2 ! #define SOFTPWM 3 ! ! // maximum number of post-command data bytes ! #define MAX_DATA_BYTES 2 ! // this flag says the next serial input will be data ! byte waitForData = 0; ! byte executeMultiByteCommand = 0; // command to execute after getting multi-byte data ! byte storedInputData[MAX_DATA_BYTES] = {0,0}; // multi-byte data ! ! // this flag says the first data byte for the digital outs is next ! boolean firstInputByte = false; ! ! /* this int serves as a bit-wise array to store pin status ! * 0 = INPUT, 1 = OUTPUT ! */ ! int digitalPinStatus; ! ! /* this byte stores the status off whether PWM is on or not ! * bit 9 = PWM0, bit 10 = PWM1, bit 11 = PWM2 ! * the rest of the bits are unused and should remain 0 ! */ ! int pwmStatus; ! ! /* this byte stores the status of whether software PWM is on or not */ ! /* 00000010 00000000 means bit 10 is softWarePWM enabled */ ! int softPwmStatus; ! ! boolean digitalInputsEnabled = true; ! byte analogInputsEnabled = 6; ! ! byte analogPin; ! int analogData; ! ! // ------------------------------------------------------------------------- ! void transmitDigitalInput(byte startPin) { ! byte i; ! byte digitalPin; ! byte digitalPinBit; ! byte transmitByte; ! 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 if( (digitalPin >= 9) && (pwmStatus & (1 << digitalPin)) ) { ! digitalData = 0; // pin set to PWM, don't read ! } ! else { ! digitalData = digitalRead(digitalPin); ! } ! /* the next line probably needs to be re-thought (i.e. it might not work...) since my ! first attempt was miserably wrong. <hans(a)at.or.at> */ ! transmitByte = transmitByte + ((2^i)*digitalData); ! } ! printByte(transmitByte); ! } ! ! ! ! // ------------------------------------------------------------------------- ! /* 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 ! */ ! void setPinMode(int pin, int mode) { ! if(mode == INPUT) { ! digitalPinStatus = digitalPinStatus &~ (1 << pin); ! pwmStatus = pwmStatus &~ (1 << pin); ! pinMode(pin,INPUT); ! } ! else if(mode == OUTPUT) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! pwmStatus = pwmStatus &~ (1 << pin); ! pinMode(pin,OUTPUT); ! } ! else if( (mode == PWM) && (pin >= 9) && (pin <= 11) ) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! pwmStatus = pwmStatus | (1 << pin); ! softPwmStatus = softPwmStatus &~ (1 << pin); ! pinMode(pin,OUTPUT); ! } ! else if(mode == SOFTPWM) { ! digitalPinStatus = digitalPinStatus | (1 << pin); ! pwmStatus = pwmStatus &~ (1 << pin); ! softPwmStatus = softPwmStatus | (1 << pin); ! pinMode(pin,OUTPUT); ! } ! } ! ! void setSoftPwm (int pin, byte pulsePeriod) { ! byte i; ! /* for(i=0; i<7; ++i) { ! mask = 1 << i; ! if(digitalPinStatus & mask) { ! digitalWrite(i, inputData & mask); ! } ! } ! */ ! //read timer type thing ! ! //loop through each pin, turn them on if selected ! //softwarePWMStatus ! //check timer type thing against pulsePeriods for each pin ! //throw pin low if expired ! } ! ! void setSoftPwmFreq(byte freq) { ! } ! ! ! void disSoftPwm(int pin) { ! //throw pin low ! ! } ! ! ! // ------------------------------------------------------------------------- ! /* this function checks to see if there is data waiting on the serial port ! * then processes all of the stored data ! */ ! void checkForInput() { ! if(serialAvailable()) { ! while(serialAvailable()) { ! processInput( (byte)serialRead() ); ! } ! } ! } ! ! // ------------------------------------------------------------------------- ! void processInput(byte inputData) { ! int i; ! int mask; ! ! // a few commands have byte(s) of data following the command ! if( waitForData > 0 ) { ! storedInputData[waitForData - 1] = inputData; ! //analogWrite(waitForPWMData,inputData); ! waitForData--; ! } ! else if(executeMultiByteCommand) { ! //we got everything ! switch(executeMultiByteCommand) { ! case ENABLE_PWM: ! case DISABLE_PWM: ! //PWM 0 on the board is PIN 9 ! analogWrite(storedInputData[0] + 9, storedInputData[1]); ! break; ! case ENABLE_SOFTWARE_PWM: ! setPinMode(storedInputData[0],SOFTPWM); ! setSoftPwm(storedInputData[0], storedInputData[1]); ! break; ! case DISABLE_SOFTWARE_PWM: ! disSoftPwm(storedInputData[0]); ! break; ! case SET_SOFTWARE_PWM_FREQ: ! setSoftPwmFreq(storedInputData[0]); ! break; ! } ! executeMultiByteCommand = 0; ! } ! ! else if(inputData < 128) { ! if(firstInputByte) { // ! for(i=0; i<7; ++i) { ! mask = 1 << i; ! if(digitalPinStatus & mask) { ! digitalWrite(i, inputData & mask); ! } ! } ! firstInputByte = false; ! } ! else { // ! // output data for pins 7-13 ! for(i=7; i<TOTAL_DIGITAL_PINS; ++i) { ! mask = 1 << i; ! if( (digitalPinStatus & mask) && !(pwmStatus & mask) && !(softPwmStatus & mask) ) { ! // inputData is a byte and mask is an int, so align the high part of mask ! digitalWrite(i, inputData & (mask >> 7)); ! } ! } ! } ! } ! else { ! switch (inputData) { ! case SET_PIN_ZERO_TO_IN: ! case SET_PIN_ONE_TO_IN: ! case SET_PIN_TWO_TO_IN: ! case SET_PIN_THREE_TO_IN: ! case SET_PIN_FOUR_TO_IN: ! case SET_PIN_FIVE_TO_IN: ! case SET_PIN_SIX_TO_IN: ! case SET_PIN_SEVEN_TO_IN: ! case SET_PIN_EIGHT_TO_IN: ! case SET_PIN_NINE_TO_IN: ! case SET_PIN_TEN_TO_IN: ! case SET_PIN_ELEVEN_TO_IN: ! case SET_PIN_TWELVE_TO_IN: ! case SET_PIN_THIRTEEN_TO_IN: ! setPinMode(inputData - SET_PIN_ZERO_TO_IN, INPUT); ! break; ! case SET_PIN_ZERO_TO_OUT: ! case SET_PIN_ONE_TO_OUT: ! case SET_PIN_TWO_TO_OUT: ! case SET_PIN_THREE_TO_OUT: ! case SET_PIN_FOUR_TO_OUT: ! case SET_PIN_FIVE_TO_OUT: ! case SET_PIN_SIX_TO_OUT: ! case SET_PIN_SEVEN_TO_OUT: ! case SET_PIN_EIGHT_TO_OUT: ! case SET_PIN_NINE_TO_OUT: ! case SET_PIN_TEN_TO_OUT: ! case SET_PIN_ELEVEN_TO_OUT: ! case SET_PIN_TWELVE_TO_OUT: ! case SET_PIN_THIRTEEN_TO_OUT: ! setPinMode(inputData - SET_PIN_ZERO_TO_OUT, OUTPUT); ! break; ! case DISABLE_DIGITAL_INPUTS: // all digital inputs off ! digitalInputsEnabled = false; ! break; ! case ENABLE_DIGITAL_INPUTS: // all digital inputs on ! digitalInputsEnabled = true; ! break; ! case DISABLE_ALL_ANALOG_INS: // analog input off ! case ENABLE_ONE_ANALOG_IN: // analog 0 on ! case ENABLE_TWO_ANALOG_INS: // analog 0,1 on ! case ENABLE_THREE_ANALOG_INS: // analog 0-2 on ! case ENABLE_FOUR_ANALOG_INS: // analog 0-3 on ! case ENABLE_FIVE_ANALOG_INS: // analog 0-4 on ! case ENABLE_SIX_ANALOG_INS: // analog 0-5 on ! analogInputsEnabled = inputData - DISABLE_ALL_ANALOG_INS; ! break; ! case ENABLE_PWM: ! waitForData = 2; // (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; ! case DISABLE_PWM: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; ! case SET_SOFTWARE_PWM_FREQ: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; ! case ENABLE_SOFTWARE_PWM: ! waitForData = 2; // (pin#, dutyCycle) ! executeMultiByteCommand = inputData; ! break; ! case DISABLE_SOFTWARE_PWM: ! waitForData = 1; // pin# ! executeMultiByteCommand = inputData; ! break; ! case OUTPUT_TO_DIGITAL_PINS: // bytes to send to digital outputs ! firstInputByte = true; ! break; ! } ! } ! } ! ! ! // ========================================================================= ! ! // ------------------------------------------------------------------------- ! void setup() { ! byte i; ! ! beginSerial(9600); ! for(i=0; i<TOTAL_DIGITAL_PINS; ++i) { ! setPinMode(i,INPUT); ! } ! } ! ! // ------------------------------------------------------------------------- ! void loop() { ! checkForInput(); ! ! // read all digital pins, in enabled ! if(digitalInputsEnabled) { ! transmitDigitalInput(0); ! checkForInput(); ! transmitDigitalInput(7); ! checkForInput(); ! } ! else if(analogInputsEnabled) { ! // filler bytes, since the first thing sent is always the digitalInputs ! printByte(0); ! printByte(0); ! checkForInput(); ! } ! ! /* get analog in, for the number enabled ! */ ! for(analogPin=0; analogPin<analogInputsEnabled; ++analogPin) { ! analogData = analogRead(analogPin); ! // these two bytes get converted back into the whole number in Pd ! // the higher bits should be zeroed so that the 8th bit doesn't get set ! printByte(analogData >> 7); // bitshift the big stuff into the output byte ! printByte(analogData % 128); // mod by 32 for the small byte ! checkForInput(); ! } ! ! /* end with the cycle marker, if any of the inputs are enabled */ ! if( digitalInputsEnabled || analogInputsEnabled) { ! printByte(255); ! } ! }

1 0

pd/src desire.tk,1.1.2.401,1.1.2.402
by chunlee 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4975 Modified Files: Tag: devel_0_39 desire.tk Log Message: remove some code Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.401 retrieving revision 1.1.2.402 diff -C2 -d -r1.1.2.401 -r1.1.2.402 *** desire.tk 24 Aug 2006 03:38:43 -0000 1.1.2.401 --- desire.tk 24 Aug 2006 03:39:47 -0000 1.1.2.402 *************** *** 5801,5861 **** } - def* ClientPrefsDialog write3 {} { - global ddrc_options ddrc_options_h cmdline look accels key crosshair - #set fd [open $cmdline(ddrcfilename) w] - set check_key {} - set color {} - - foreach {type class name} $ddrc_options { - switch $type { - color { - set str [string tolower $class$name] - set str2 ${str}path - puts " str2 ::: $str2" - set new_color [$@$str2 cget -background] - set l [list $name $new_color] - lappend color [list $class $l] - puts "$color" - #set look($name) $new_color - #set var ${name}path - #set new_color [$@$var cget -background] - #set look($name) $new_color - #puts $fd "$type $name $new_color" - } - key { - foreach item $name { - set var ${item}path - set new_key [$@$var get] - set old_key $key($item) - if {$key($item) != $new_key} { - if {[dict exists $accels $old_key]} { - set cmd [dict get $accels $old_key] - set accels [dict remove $accels $old_key] - dict set accels $new_key $cmd - #puts "$new_key ::: $cmd" - } - } - if {[dict exists $check_key $new_key] && $new_key != ""} { - error "$new_key already assigned" - #dict set check_key $new_key key($item) - } else {dict set check_key $new_key key($item)} - set key($item) $new_key - puts $fd "$type $item $new_key" - } - - } - crosshair { - set crosshair($name) $_($self:$name) - #puts $fd "$type $name $crosshair($name)" - } - bar { - set bar($name) $_($self:$name) - #puts $fd "$type $name $bar($name)" - } - } - } - close $fd - } - def* ClientPrefsDialog write2 {} { global ddrc_options ddrc_options_h cmdline look accels key crosshair --- 5801,5804 ----

1 0

pd/src desire.tk,1.1.2.400,1.1.2.401
by chunlee 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4609 Modified Files: Tag: devel_0_39 desire.tk Log Message: small rendering fixes and the new ClientPrefsDialog write to write the new ddrc format Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.400 retrieving revision 1.1.2.401 diff -C2 -d -r1.1.2.400 -r1.1.2.401 *** desire.tk 23 Aug 2006 22:23:57 -0000 1.1.2.400 --- desire.tk 24 Aug 2006 03:38:43 -0000 1.1.2.401 *************** *** 957,961 **** foreach name $list { if {$name == ""} {$menu add separator; continue} ! if {[llength [array names key $name]]} {set k $key($@_class:$name)} {set k ""} $menu add command -label [say $name] -command "$self $name" \ -accelerator [accel_munge $k] --- 957,964 ---- foreach name $list { if {$name == ""} {$menu add separator; continue} ! #if {[llength [array names key $name]]} {set k $key($@_class:$name); puts "here"} {set k ""} ! if {[info exists key($@_class:$name)]} { ! if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} {set k ""} ! } $menu add command -label [say $name] -command "$self $name" \ -accelerator [accel_munge $k] *************** *** 1007,1011 **** def Menuable ctrlkey {key shift} { - puts "class:: $@_class" global accels set key [if {$shift} {string toupper $key} {string tolower $key}] --- 1010,1013 ---- *************** *** 1787,1791 **** def TextBox text {} {return $text} ! def TextBox draw {} { global font #$self update_size --- 1789,1793 ---- def TextBox text {} {return $text} ! def* TextBox draw {} { global font #$self update_size *************** *** 1854,1870 **** } ! def* TextBox update_size {} { global font set n [string length $@text] set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! #if {[llength [.$(a)canvas.c gettags ${self}TEXT]]} { ! # mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}TEXT] ! # set textwidth [expr (($x2 - $x1)/[$@canvas scale])+$font(padx)] ! #} #if {[llength [.$(a)canvas.c gettags ${self}text]]} { catch { set n [expr [string length [.$(a)canvas.c.${self}text get 1.0 1.end]] -1] mset {x1 y1 w h} [.$(a)canvas.c.${self}text bbox 1.$n] ! set textwidth [expr ($font(padx) + $x1 + ($w * 2)) / [$@canvas scale]] } #} --- 1856,1872 ---- } ! def TextBox update_size {} { global font set n [string length $@text] set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! if {[llength [.$(a)canvas.c gettags ${self}TEXT]]} { ! mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}TEXT] ! set textwidth [expr (($x2 - $x1)/[$@canvas scale])+$font(padx)] ! } #if {[llength [.$(a)canvas.c gettags ${self}text]]} { catch { set n [expr [string length [.$(a)canvas.c.${self}text get 1.0 1.end]] -1] mset {x1 y1 w h} [.$(a)canvas.c.${self}text bbox 1.$n] ! set textwidth [expr ($font(padx) + $x1 + ($w * 2)+$font(padx)+2) / [$@canvas scale]] } #} *************** *** 1921,1925 **** } ! def ObjectBox draw_box {} { global font super --- 1923,1927 ---- } ! def* ObjectBox draw_box {} { global font super *************** *** 1928,1934 **** set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]] set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]] ! $self item BASE rectangle $xya -fill [$self look bg] -width 1 ! $self item BASE1 line $xyb -fill [$self look frame1] -width 1 ! $self item BASE2 line $xyc -fill [$self look frame2] -width 1 .$(a)canvas.c lower ${self}BASE ${self}TEXT } --- 1930,1936 ---- set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]] set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]] ! $self item BASE rectangle $xya -fill [$self look bg] -outline [$self look frame1] -width 1 ! #$self item BASE1 line $xyb -fill [$self look frame1] -width 1 ! #$self item BASE2 line $xyc -fill [$self look frame2] -width 1 .$(a)canvas.c lower ${self}BASE ${self}TEXT } *************** *** 3078,3084 **** for {set i 0} {$i<$n} {incr i} { set onset [expr $x1 + ($xs-([$self look iowidth])) * $i / $nplus] ! set points [list [expr $onset] [expr $y-1] [expr $onset+[$self look iowidth]] $y] switch $which { i {set color [$self look inletfg]} o {set color [$self look outletfg]}} ! $self item [list $which$i $which] rectangle $points -outline $color -fill $color } } --- 3080,3086 ---- for {set i 0} {$i<$n} {incr i} { set onset [expr $x1 + ($xs-([$self look iowidth])) * $i / $nplus] ! set points [list [expr $onset] [expr $y-0] [expr $onset+[$self look iowidth]] [expr $y+0]] switch $which { i {set color [$self look inletfg]} o {set color [$self look outletfg]}} ! $self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1 } } *************** *** 3111,3116 **** if {$port >= $ports} {set port [expr $ports-1]} set p $self$type$port set outline [switch $type {i {concat [$self look outletfg]} o {concat [$self look inletfg]}}] ! $c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b switch $type {i {set tip "inlet $port"} o {set tip "outlet $port"}} if {[$self look tooltip]} {$@canvas show_tooltip $x $y $tip} --- 3113,3119 ---- if {$port >= $ports} {set port [expr $ports-1]} set p $self$type$port + set hilitebox [lmap * [list -3 -3 +3 +3] [$@canvas scale]] set outline [switch $type {i {concat [$self look outletfg]} o {concat [$self look inletfg]}}] ! $c create rectangle [l+ [$c coords $p] $hilitebox] -outline $outline -width 1 -tags ${p}b switch $type {i {set tip "inlet $port"} o {set tip "outlet $port"}} if {[$self look tooltip]} {$@canvas show_tooltip $x $y $tip} *************** *** 5006,5010 **** set v $_($self:$name) ;# bug in objtcl frame $f - puts " f::: $f" label $f.label -text $label set text_color [complement $v] --- 5009,5012 ---- *************** *** 5749,5757 **** --- 5751,5810 ---- } } + + #proc cons {x y} { list $x $y } + #proc car {l} { lindex $l 0} } + #proc cdr {l} { lindex $l 1 } + def* ClientPrefsDialog write {} { global ddrc_options ddrc_options_h cmdline look accels key crosshair #set fd [open $cmdline(ddrcfilename) w] + set fd [open ~/.ddrc2 w] + set categories [list color key crosshair bar] + set classes [list Canvas View Comment Wire FutureWire SelRect] + set conf {} + + foreach category $categories { + set tmp {} + set x [lsearch -start 0 $ddrc_options $category] + while {$x>=0} { + #puts "[lindex $ddrc_options [expr $x+1]] [lindex $ddrc_options [expr $x+2]]" + lappend tmp [lindex $ddrc_options [expr $x+1]] + lappend tmp [lindex $ddrc_options [expr $x+2]] + set x [lsearch -start [expr $x+1] $ddrc_options $category] + } + set class_list {} + foreach class $classes { + set tmp2 {} + set x [lsearch -start 0 $tmp $class] + while {$x>=0} { + foreach y [lindex $tmp [expr $x+1]] { + if {$category != "key"} { + if {[info exists look($class:$y)]} {set var $look($class:$y);lappend tmp2 [list $y $var]} else {break} + } else { + if {[info exists key($class:$y)]} {set var $key($class:$y);lappend tmp2 [list $y $var]} else {break} + } + } + set x [lsearch -start [expr $x+1] $tmp $class] + } + + set class_pair [list $class $tmp2] + lappend class_list $class_pair + if {$x < 0} {break} + } + set cat_pair [list $category $class_list] + lappend conf $cat_pair + } + puts $conf + puts $fd $conf + close $fd + + } + + def* ClientPrefsDialog write3 {} { + global ddrc_options ddrc_options_h cmdline look accels key crosshair + #set fd [open $cmdline(ddrcfilename) w] set check_key {} set color {} + foreach {type class name} $ddrc_options { switch $type { *************** *** 5856,5860 **** } def ClientPrefsDialog init {} { - puts " class:: $@_class" global ddrc_options look key crosshair bar $self read --- 5909,5912 ---- *************** *** 5900,5908 **** #this stores the path to the widget on the gui editor. set @$str2 $which_section.$str.color ! puts " str2::: $@$str2" #set @$name $look($name) #set @$name $look($class:$name) set @$str $look($class:$name) ! puts "$str :::: $look($class:$name)" #$self add $which_section [list [lindex $name 0] color] $self add $which_section [list $str color] --- 5952,5960 ---- #this stores the path to the widget on the gui editor. set @$str2 $which_section.$str.color ! #puts " str2::: $@$str2" #set @$name $look($name) #set @$name $look($class:$name) set @$str $look($class:$name) ! #puts "$str :::: $look($class:$name)" #$self add $which_section [list [lindex $name 0] color] $self add $which_section [list $str color]

1 0

pd/src desire.tk,1.1.2.399,1.1.2.400
by chunlee 24 Aug '06

24 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19007 Modified Files: Tag: devel_0_39 desire.tk Log Message: object width try again Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.399 retrieving revision 1.1.2.400 diff -C2 -d -r1.1.2.399 -r1.1.2.400 *** desire.tk 23 Aug 2006 16:30:40 -0000 1.1.2.399 --- desire.tk 23 Aug 2006 22:23:57 -0000 1.1.2.400 *************** *** 1858,1872 **** set n [string length $@text] set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! if {[llength [.$(a)canvas.c gettags ${self}TEXT]]} { ! mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}TEXT] ! set textwidth [expr (($x2 - $x1)/[$@canvas scale])+$font(padx)] ! } ! if {[llength [.$(a)canvas.c gettags ${self}text]]} { ! #catch { set n [expr [string length [.$(a)canvas.c.${self}text get 1.0 1.end]] -1] mset {x1 y1 w h} [.$(a)canvas.c.${self}text bbox 1.$n] set textwidth [expr ($font(padx) + $x1 + ($w * 2)) / [$@canvas scale]] - #} } #set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] --- 1858,1872 ---- set n [string length $@text] set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! #if {[llength [.$(a)canvas.c gettags ${self}TEXT]]} { ! # mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}TEXT] ! # set textwidth [expr (($x2 - $x1)/[$@canvas scale])+$font(padx)] ! #} ! #if {[llength [.$(a)canvas.c gettags ${self}text]]} { ! catch { set n [expr [string length [.$(a)canvas.c.${self}text get 1.0 1.end]] -1] mset {x1 y1 w h} [.$(a)canvas.c.${self}text bbox 1.$n] set textwidth [expr ($font(padx) + $x1 + ($w * 2)) / [$@canvas scale]] } + #} #set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
47
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 August 2006