Pd-cvs June 2008

pd-cvs@lists.iem.at

14 participants
221 discussions

SF.net SVN: pure-data: [10117] trunk/externals/iem/dmx512/README.txt
by zmoelnig＠users.sourceforge.net 30 Jun '08

30 Jun '08

Revision: 10117 http://pure-data.svn.sourceforge.net/pure-data/?rev=10117&view=rev Author: zmoelnig Date: 2008-06-30 03:45:57 -0700 (Mon, 30 Jun 2008) Log Message: ----------- ... Modified Paths: -------------- trunk/externals/iem/dmx512/README.txt Modified: trunk/externals/iem/dmx512/README.txt =================================================================== --- trunk/externals/iem/dmx512/README.txt 2008-06-28 21:32:30 UTC (rev 10116) +++ trunk/externals/iem/dmx512/README.txt 2008-06-30 10:45:57 UTC (rev 10117) @@ -57,7 +57,10 @@ the next time you load a dmx-driver if you have problems, try plugging your device out and in again +if you don't care for a clean setup, you could also just grant everyone read/write permissions. +this might be a security risk. + C. compiling the Pd-objects =========================== so now it is time to get the Pd-objects going. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-puredyne debian-testing-i386 2008-06-29 06.31.02
by pd＠debian-testing-i386.idmi.poly.edu 29 Jun '08

29 Jun '08

/home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/main.cpp:573: warning: unused parameter 'result' /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/main.cpp: In constructor 'RPCMethod::RPCMethod(const char*, RPCServer*, RPCServer::Message::Msg, const char*)': /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/main.cpp:703: warning: 'RPCMethod::srvmsg' will be initialized after /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/main.cpp:702: warning: 'std::string RPCMethod::helptext' /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/main.cpp:662: warning: when initialized here g++ -DPD -O2 -mcpu=i686 -march=i386 -I/home/pd/auto-build/pd-puredyne/pd/src -Wall -W -ggdb -I/home/pd/auto-build/pd-puredyne/Gem/src -I/home/pd/auto-build/pd-puredyne/externals/pdp/include -DUNIX -Dunix -fPIC -I/home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src -o "/home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o" -c "/home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp" `-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead. /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::readHeader()': /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:312: error: 'strncasecmp' was not declared in this scope /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:314: error: 'strncmp' was not declared in this scope /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::parseResponse(XmlRpc::XmlRpcValue&)': /home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:397: warning: suggest parentheses around && within || make[2]: *** [/home/pd/auto-build/pd-puredyne/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o] Error 1 make[2]: Leaving directory `/home/pd/auto-build/pd-puredyne/externals' make[1]: *** [externals_install] Error 2 make[1]: Leaving directory `/home/pd/auto-build/pd-puredyne/packages' make: *** [install] Error 2 upload specs linux_make . deb Uploading /home/pd/auto-build/pd-puredyne/packages/linux_make/./Pd*.deb ls: cannot access /home/pd/auto-build/pd-puredyne/packages/linux_make/./Pd*.deb: No such file or directory

1 0

autobuild: pd-main+libs debian-testing-i386 2008-06-29 06.31.02
by pd＠debian-testing-i386.idmi.poly.edu 29 Jun '08

29 Jun '08

/home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/main.cpp:573: warning: unused parameter 'result' /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/main.cpp: In constructor 'RPCMethod::RPCMethod(const char*, RPCServer*, RPCServer::Message::Msg, const char*)': /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/main.cpp:703: warning: 'RPCMethod::srvmsg' will be initialized after /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/main.cpp:702: warning: 'std::string RPCMethod::helptext' /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/main.cpp:662: warning: when initialized here g++ -DPD -O2 -mcpu=i686 -march=i386 -I/home/pd/auto-build/pd-main+libs/pd/src -Wall -W -ggdb -I/home/pd/auto-build/pd-main+libs/Gem/src -I/home/pd/auto-build/pd-main+libs/externals/pdp/include -DUNIX -Dunix -fPIC -I/home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src -o "/home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o" -c "/home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp" `-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead. /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::readHeader()': /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:312: error: 'strncasecmp' was not declared in this scope /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:314: error: 'strncmp' was not declared in this scope /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::parseResponse(XmlRpc::XmlRpcValue&)': /home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:397: warning: suggest parentheses around && within || make[2]: *** [/home/pd/auto-build/pd-main+libs/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o] Error 1 make[2]: Leaving directory `/home/pd/auto-build/pd-main+libs/externals' make[1]: *** [externals_install] Error 2 make[1]: Leaving directory `/home/pd/auto-build/pd-main+libs/packages' make: *** [install] Error 2 upload specs linux_make . deb Uploading /home/pd/auto-build/pd-main+libs/packages/linux_make/./Pd*.deb ls: cannot access /home/pd/auto-build/pd-main+libs/packages/linux_make/./Pd*.deb: No such file or directory

1 0

autobuild: pd-extended debian-testing-i386 2008-06-29 06.31.02
by pd＠debian-testing-i386.idmi.poly.edu 29 Jun '08

29 Jun '08

/home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/main.cpp: In function 'void xmlrpc_setup()': /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/main.cpp:800: warning: deprecated conversion from string constant to 'char*' /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/main.cpp:805: warning: deprecated conversion from string constant to 'char*' g++ -DPD -O2 -mtune=i686 -march=i386 -I/home/pd/auto-build/pd-extended/pd/src -Wall -W -ggdb -DUNIX -Dunix -fPIC -I/home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src -o "/home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o" -c "/home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp" /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::readHeader()': /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:312: error: 'strncasecmp' was not declared in this scope /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:314: error: 'strncmp' was not declared in this scope /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp: In member function 'virtual bool XmlRpc::XmlRpcClient::parseResponse(XmlRpc::XmlRpcValue&)': /home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.cpp:397: warning: suggest parentheses around && within || make[2]: *** [/home/pd/auto-build/pd-extended/externals/iem/iemxmlrpc/xmlrpc++/src/XmlRpcClient.o] Error 1 make[2]: Leaving directory `/home/pd/auto-build/pd-extended/externals' make[1]: *** [externals_install] Error 2 make[1]: Leaving directory `/home/pd/auto-build/pd-extended/packages' make: *** [install] Error 2 ls: cannot access /home/pd/auto-build/pd-extended/packages/linux_make/./Pd*.deb: No such file or directory upload specs linux_make . deb Uploading Unexpected local arg: debian If arg is a remote file/dir, prefix it with a colon (:). rsync error: syntax or usage error (code 1) at main.c(1225) [receiver=3.0.2]

1 0

autobuild: pd-extended macosx104-powerpc 2008-06-29 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 29 Jun '08

29 Jun '08

/dev/disk1s2 Apple_HFS /Volumes/Pd-extended install -p /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/manuals/Pd/ReadMe.html "/Volumes/Pd-extended" ln -s /Applications /Volumes/Pd-extended/Applications install -d "/Volumes/Pd-extended/.background" install -p background.png "/Volumes/Pd-extended/.background/" install -p DS_Store "/Volumes/Pd-extended/.DS_Store" install -p VolumeIcon.icns "/Volumes/Pd-extended/.VolumeIcon.icns" /Developer/Tools/SetFile -a C /Volumes/Pd-extended/.VolumeIcon.icns \ /Volumes/Pd-extended chmod -R a-w "/Volumes/Pd-extended/Pd-extended.app/Contents/Resources/doc" hdiutil detach `mount | grep Pd-extended | cut -d ' ' -f 1` hdiutil: couldn't unmount "disk1" - error 49153 make: *** [dmg] Error 1 ls: /Users/pd/auto-build/pd-extended/packages/darwin_app/./Pd*.dmg: No such file or directory upload specs darwin_app . dmg Uploading ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync: connection unexpectedly closed (4 bytes received so far) [receiver] rsync error: error in rsync protocol data stream (code 12) at /SourceCache/rsync/rsync-24.1/rsync/io.c(359)

1 0

SF.net SVN: pure-data: [10116] trunk/externals
by eighthave＠users.sourceforge.net 28 Jun '08

28 Jun '08

Revision: 10116 http://pure-data.svn.sourceforge.net/pure-data/?rev=10116&view=rev Author: eighthave Date: 2008-06-28 14:32:30 -0700 (Sat, 28 Jun 2008) Log Message: ----------- - the sixaxis external now builds with Pd-extended, and outputs the raw accelerometer data - for the rest of the data, use [hid] or [hidio] they happily coexist Modified Paths: -------------- trunk/externals/Makefile trunk/externals/io/sixaxis/sixaxis-help.pd trunk/externals/io/sixaxis/sixaxis.c Added Paths: ----------- trunk/externals/io/sixaxis/Makefile Modified: trunk/externals/Makefile =================================================================== --- trunk/externals/Makefile 2008-06-28 16:08:02 UTC (rev 10115) +++ trunk/externals/Makefile 2008-06-28 21:32:30 UTC (rev 10116) @@ -138,7 +138,7 @@ LIB_TARGETS += hid pdp pidip gem2pdp aka.wiiremote iem16 apple else # GNU/Linux, BSD, IRIX, etc. - LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude tclpd pdvjtools + LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude tclpd pdvjtools sixaxis endif endif @@ -2284,6 +2284,40 @@ #------------------------------------------------------------------------------# +# SIXAXIS +SIXAXIS_NAME=io +SIXAXIS_OBJECTS = $(externals_src)/io/sixaxis/sixaxis.c +sixaxis: $(SIXAXIS_OBJECTS:.c=.$(EXTENSION)) + +sixaxis_install: sixaxis + install -d $(objectsdir)/$(SIXAXIS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(SIXAXIS_NAME) \ + --author "Hans-Christoph Steiner" \ + --description "supports the Sony SIXAXIS controller's accelerometer" \ + --license "GNU GPL" \ + --version "0.1" + install -p $(SIXAXIS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(SIXAXIS_NAME) + install -d $(helpdir)/$(SIXAXIS_NAME) + install -p $(externals_src)/io/sixaxis/*.pd \ + $(helpdir)/$(SIXAXIS_NAME) +# install -d $(manualsdir)/$(SIXAXIS_NAME) +# install -p $(externals_src)/io/sixaxis/manual.txt \ +# $(manualsdir)/$(SIXAXIS_NAME) +# install -d $(readmesdir) +# install -p $(externals_src)/io/sixaxis/README \ +# $(readmesdir)/$(SIXAXIS_NAME).txt +# install -d $(examplesdir)/$(SIXAXIS_NAME) +# install -p $(externals_src)/io/sixaxis/examples/*.pd \ +# $(examplesdir)/$(SIXAXIS_NAME) + +sixaxis_clean: + -rm -f -- $(SIXAXIS_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(SIXAXIS_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/io/sixaxis/*.bak + -rm -f -- $(externals_src)/io/sixaxis/*.*~ + + +#------------------------------------------------------------------------------# # SMLIB SMLIB_NAME=smlib # exclude SMlib.c since its just for the compiled library Added: trunk/externals/io/sixaxis/Makefile =================================================================== --- trunk/externals/io/sixaxis/Makefile (rev 0) +++ trunk/externals/io/sixaxis/Makefile 2008-06-28 21:32:30 UTC (rev 10116) @@ -0,0 +1,17 @@ +TARGET := $(shell pwd | sed 's|.*/$.*$$$|\1|') +EXTERNALS_ROOT := $(shell pwd | sed 's|^$/.*externals$.*|\1|') + +default: + make -C $(EXTERNALS_ROOT) $(TARGET) + +install: + make -C $(EXTERNALS_ROOT) $(TARGET)_install + +clean: + make -C $(EXTERNALS_ROOT) $(TARGET)_clean + +test_locations: + make -C $(EXTERNALS_ROOT) test_locations + +etags: + etags *.[ch] ~/code/pure-data/trunk/pd/src/*.[ch] /usr/include/*.h /usr/include/sys/*.h Modified: trunk/externals/io/sixaxis/sixaxis-help.pd =================================================================== --- trunk/externals/io/sixaxis/sixaxis-help.pd 2008-06-28 16:08:02 UTC (rev 10115) +++ trunk/externals/io/sixaxis/sixaxis-help.pd 2008-06-28 21:32:30 UTC (rev 10116) @@ -1,22 +1,7 @@ -#N canvas 292 101 633 730 10; -#X obj 129 267 sixaxis /dev/hidraw0; -#X obj 107 178 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; -#X obj 18 178 metro 20; -#X obj 18 156 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; -#X msg 38 156 stop; -#X obj 107 129 key; -#X obj 2 2 cnv 15 550 25 empty empty sixaxis 20 12 1 16 -228992 -66577 +#N canvas 197 95 565 482 10; +#X obj -71 5 cnv 15 550 25 empty empty sixaxis 20 12 1 16 -228992 -66577 0; -#X text 10 44 [sixaxis] outputs raw events from the Linux Event system. -It is used for access the output of various Human Interface Devices -\, like mice \, joysticks \, tablets \, etc.; -#X text 26 105 bang to get an update when polling is stopped.; -#X obj 107 149 sel 98; -#X text 153 149 <- (type 'b' for a bang); -#X obj 182 372 pddp/print; -#N canvas 743 25 411 235 see 0; +#N canvas 746 51 411 235 see 0; #N canvas 108 318 543 264 route 0; #X obj 27 14 inlet; #X obj 72 226 outlet; @@ -55,102 +40,88 @@ #X connect 17 8 13 0; #X connect 17 9 15 0; #X restore 117 70 pd route info; -#X obj 81 96 tgl 15 0 empty empty open 0 -6 0 8 -262144 -1 -1 1 1; +#X obj 221 96 tgl 15 0 empty empty open 0 -6 0 8 -262144 -1 -1 1 1 +; #X obj 110 22 inlet; #X obj 123 43 print info; -#X symbolatom 304 93 0 0 0 0 productID - -; -#X symbolatom 304 112 0 0 0 0 vendorID - -; -#X symbolatom 304 151 0 0 0 0 transport - -; -#X symbolatom 304 171 0 0 0 0 manufacturer - -; -#X symbolatom 186 192 0 0 0 0 product - -; -#X floatatom 97 140 5 0 0 0 device - -; -#X floatatom 97 162 5 0 0 0 poll - -; -#X symbolatom 304 131 0 0 0 0 type - -; -#X floatatom 97 182 5 0 0 0 total - -; +#X floatatom 156 140 5 0 0 0 device - -; +#X floatatom 156 162 5 0 0 0 poll - -; +#X floatatom 156 182 5 0 0 0 total - -; #X connect 0 0 1 0; -#X connect 0 1 9 0; -#X connect 0 2 10 0; -#X connect 0 3 12 0; -#X connect 0 4 8 0; -#X connect 0 5 7 0; -#X connect 0 6 6 0; -#X connect 0 7 11 0; -#X connect 0 8 5 0; -#X connect 0 9 4 0; +#X connect 0 1 4 0; +#X connect 0 2 5 0; +#X connect 0 3 6 0; #X connect 2 0 0 0; #X connect 2 0 3 0; -#X restore 246 297 pd see device info; -#X obj 130 210 tgl 30 0 empty empty empty 17 7 0 10 -4034 -1 -1 0 1 +#X restore 82 239 pd see device info; +#X obj -7 181 tgl 30 0 empty empty empty 17 7 0 10 -4034 -1 -1 0 1 ; -#X msg 179 222 info; -#X obj 181 348 spigot; -#X obj 216 328 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 -1; -#X obj 249 334 spigot; -#X obj 282 327 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 -1; -#X obj 250 354 print RAW; -#X obj 61 416 route position speed acceleration accelerometer; -#X obj 341 445 print WARNING_UNSUPPORTED_MESSAGES; -#X obj 43 528 unpack 0 0 0; -#X floatatom 31 549 7 0 0 0 - - -; -#X floatatom 77 549 7 0 0 0 - - -; -#X floatatom 123 549 7 0 0 0 - - -; -#X obj 77 484 unpack 0 0 0; -#X floatatom 65 505 7 0 0 0 - - -; -#X floatatom 111 505 7 0 0 0 - - -; -#X floatatom 157 505 7 0 0 0 - - -; -#X obj 197 461 unpack 0 0 0; -#X floatatom 185 482 7 0 0 0 - - -; -#X floatatom 231 482 7 0 0 0 - - -; -#X floatatom 277 482 7 0 0 0 - - -; -#X obj 252 513 track_min; -#X obj 325 517 track_max; -#X floatatom 324 539 9 0 0 0 - - -; -#X floatatom 252 539 9 0 0 0 - - -; -#X obj 22 573 track_min; -#X obj 95 577 track_max; -#X floatatom 94 599 9 0 0 0 - - -; -#X floatatom 22 599 9 0 0 0 - - -; -#X msg 176 551 bang; -#X msg 232 217 close; -#X connect 0 0 15 0; -#X connect 0 0 17 0; -#X connect 0 0 20 0; -#X connect 0 1 12 0; -#X connect 1 0 0 0; -#X connect 2 0 0 0; -#X connect 3 0 2 0; -#X connect 4 0 2 0; -#X connect 5 0 9 0; -#X connect 9 0 1 0; -#X connect 13 0 0 0; -#X connect 14 0 0 0; -#X connect 15 0 11 0; -#X connect 16 0 15 1; -#X connect 17 0 19 0; -#X connect 18 0 17 1; -#X connect 20 0 22 0; -#X connect 20 1 26 0; -#X connect 20 2 30 0; -#X connect 20 4 21 0; -#X connect 22 0 23 0; -#X connect 22 1 24 0; -#X connect 22 1 39 0; -#X connect 22 1 38 0; -#X connect 22 2 25 0; -#X connect 26 0 27 0; -#X connect 26 1 28 0; -#X connect 26 2 29 0; -#X connect 30 0 31 0; -#X connect 30 1 32 0; -#X connect 30 1 35 0; -#X connect 30 1 34 0; -#X connect 30 2 33 0; -#X connect 34 0 37 0; -#X connect 35 0 36 0; -#X connect 38 0 41 0; -#X connect 39 0 40 0; -#X connect 42 0 39 2; -#X connect 42 0 38 2; -#X connect 43 0 0 0; +#X msg 89 188 info; +#X msg 48 171 close; +#X obj -20 406 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5904 1; +#X obj 120 406 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 8699 1; +#X obj 260 406 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5152 1; +#X obj 43 276 route accelerometer; +#X obj 43 308 route x y z; +#X msg 43 151 open 4; +#N canvas 162 133 570 420 serin 0; +#X obj 286 61 cnv 15 30 15 empty \$0-open-canvas 4 4 8 0 14 -233017 +-1 0; +#X obj 60 61 hradio 15 1 1 15 empty empty empty 0 -6 0 8 -225271 -1 +-1 4; +#X obj 60 13 inlet; +#X msg 200 202 label \$1; +#X obj 200 180 makefilename %d; +#X obj 59 108 int; +#X obj 59 337 outlet; +#X msg 201 306 set \$1 \$2; +#X obj 59 266 trigger bang anything; +#X obj 201 286 list; +#X msg 60 210 open \$1; +#X obj 200 225 send \$0-open-canvas; +#X connect 1 0 5 0; +#X connect 2 0 1 0; +#X connect 3 0 11 0; +#X connect 4 0 3 0; +#X connect 5 0 4 0; +#X connect 5 0 10 0; +#X connect 7 0 6 0; +#X connect 8 0 6 0; +#X connect 8 1 9 0; +#X connect 9 0 7 0; +#X connect 10 0 8 0; +#X coords 0 -1 1 1 257 17 1 60 60; +#X restore 43 129 pd serin; +#X obj 257 375 mapping/autoscale; +#X obj 117 375 mapping/autoscale; +#X obj -23 375 mapping/autoscale; +#X obj 43 216 sixaxis; +#N canvas 6 77 450 300 more 0; +#X text -17 56 By default \, [sixaxis] uses /dev/hidraw? for the device +name to get data from. You can override it using the [devname( message +\, like this:; +#X msg 30 154 devname /dev/my/strange/custom/hidraw; +#X restore -15 444 pd more on device names; +#X text -63 44 This objectclass supports getting accelerometer data +from the Sony SIXAXIS controller. Use this in conjuction with [hid] +to get all of the data from the SIXAXIS; +#X obj -59 83 pddp/pddplink http://www.pabr.org/sixlinux/sixlinux.en.html +-text Using the PlayStation 3 controller in Bluetooth mode with Linux +; +#X connect 2 0 15 0; +#X connect 3 0 15 0; +#X connect 4 0 15 0; +#X connect 8 0 9 0; +#X connect 9 0 14 0; +#X connect 9 1 13 0; +#X connect 9 2 12 0; +#X connect 10 0 15 0; +#X connect 11 0 10 0; +#X connect 12 0 7 0; +#X connect 13 0 6 0; +#X connect 14 0 5 0; +#X connect 15 0 8 0; +#X connect 15 1 1 0; Modified: trunk/externals/io/sixaxis/sixaxis.c =================================================================== --- trunk/externals/io/sixaxis/sixaxis.c 2008-06-28 16:08:02 UTC (rev 10115) +++ trunk/externals/io/sixaxis/sixaxis.c 2008-06-28 21:32:30 UTC (rev 10116) @@ -4,15 +4,16 @@ #include <unistd.h> #include <sys/time.h> #include <stdio.h> +#include <stdlib.h> #include <errno.h> #include "m_pd.h" -#define DEBUG(x) -//#define DEBUG(x) x +//#define DEBUG(x) +#define DEBUG(x) x #define DEFAULT_DELAY 10 -#define SIXAXIS_DEVICE "/dev/hidraw0" +#define SIXAXIS_DEVNAME "/dev/hidraw" static char *version = "$Revision: 1.1 $"; @@ -30,14 +31,15 @@ }; /* pre-generated symbols */ -static t_symbol *ps_open, *ps_device, *ps_poll, *ps_total, *ps_range; +static t_symbol *ps_open, *ps_device, *ps_poll, *ps_total, *ps_range, *ps_devname; +static t_symbol *ps_x, *ps_y, *ps_z; static t_symbol *ps_accelerometer, *ps_acceleration, *ps_speed, *ps_position; /* mostly for status querying */ static unsigned short device_count; /* previous state for calculating position, speed, acceleration */ -static struct sixaxis_state prev; +//static struct sixaxis_state prev; /*------------------------------------------------------------------------------ * CLASS DEF @@ -47,7 +49,6 @@ typedef struct _sixaxis { t_object x_obj; t_int x_fd; - t_symbol *x_devname; t_clock *x_clock; short x_device_number; short x_instance; @@ -96,6 +97,21 @@ output_status(x, ps_total, device_count); } +static short get_device_number_from_arguments(int argc, t_atom *argv) +{ + short device_number = -1; + t_symbol *first_argument; + + if(argc == 1) + { + first_argument = atom_getsymbolarg(0,argc,argv); + if(first_argument == &s_) + { // single float arg means device # + device_number = (short) atom_getfloatarg(0,argc,argv); + } + } + return device_number; +} /*------------------------------------------------------------------------------ * CLASS METHODS */ @@ -121,40 +137,90 @@ if(x->x_fd < 0) return; close(x->x_fd); - post("[sixaxis] closed %s",x->x_devname->s_name); + post("[sixaxis] closed %s%d", SIXAXIS_DEVNAME, x->x_device_number); x->x_device_open = 0; output_open_status(x); } -static int sixaxis_open(t_sixaxis *x, t_symbol *s) +static t_int sixaxis_open_device(t_sixaxis *x, short device_number) { - DEBUG(post("sixaxis_open");); + DEBUG(post("sixaxis_open_device");); - sixaxis_close(x); + char block_device[FILENAME_MAX]; - /* set obj device name to parameter - * otherwise set to default - */ - if (s != &s_) - x->x_devname = s; - - /* open device */ - if (x->x_devname) { - /* open the device read-only, non-exclusive */ - x->x_fd = open(x->x_devname->s_name, O_RDONLY | O_NONBLOCK); - /* test if device open */ - if (x->x_fd > -1 ) { + x->x_fd = -1; + + if(device_number < 0) + { + pd_error(x,"[sixaxis] invalid device number: %d (must be 0 or greater)" + , device_number); + return EXIT_FAILURE; + } + + x->x_device_number = device_number; + snprintf(block_device, FILENAME_MAX, "%s%d", SIXAXIS_DEVNAME, x->x_device_number); + + /* open the device read-only, non-exclusive */ + x->x_fd = open(block_device, O_RDONLY | O_NONBLOCK); + /* test if device open */ + if(x->x_fd < 0 ) + { + pd_error(x,"[sixaxis] open %s failed",block_device); + x->x_fd = -1; + return EXIT_FAILURE; + } + post ("[sixaxis] opened device %d (%s)", x->x_device_number, block_device); + + return EXIT_SUCCESS; +} + +/* sixaxis_open behavoir + * current state action + * --------------------------------------- + * closed / same device open + * open / same device no action + * closed / different device open + * open / different device close, open + */ +static void sixaxis_open(t_sixaxis *x, t_symbol *s, int argc, t_atom *argv) +{ + DEBUG(post("sixaxis_open");); + short new_device_number = get_device_number_from_arguments(argc, argv); +// t_int started = x->x_started; // store state to restore after device is opened + + if (new_device_number < 0) + { + pd_error(x,"[sixaxis] invalid device number: %d (must be 0 or greater)", + new_device_number); + return; + } + /* check whether we have to close previous device */ + if (x->x_device_open && new_device_number != x->x_device_number) + { + sixaxis_close(x); + } + /* no device open, so open one now */ + if (!x->x_device_open) + { + if(sixaxis_open_device(x, new_device_number) == EXIT_SUCCESS) + { x->x_device_open = 1; - output_open_status(x); - return 1; - } else { - pd_error(x, "[sixaxis] open %s failed", x->x_devname->s_name); - x->x_fd = -1; - x->x_device_open = 0; - output_open_status(x); + x->x_device_number = new_device_number; + /* restore the polling state so that when I [tgl] is used to + * start/stop [sixaxis], the [tgl]'s state will continue to + * accurately reflect [sixaxis]'s state */ + post("[sixaxis] set device# to %d",new_device_number); + output_device_number(x); } + else + { + x->x_device_number = -1; + pd_error(x, "[sixaxis] can not open device %d",new_device_number); + } } - return 0; + + /* always output open result so you can test for success in Pd space */ + output_open_status(x); } static void sixaxis_read(t_sixaxis *x) @@ -165,57 +231,66 @@ // if ( nr < 0 ) { perror("read(stdin)"); exit(1); } // if ( nr != 48 ) { fprintf(stderr, "Unsupported report\n"); exit(1); } - struct timeval tv; - if ( gettimeofday(&tv, NULL) ) { - perror("gettimeofday"); - return; - } - x->x_sixaxis_state.time = tv.tv_sec + tv.tv_usec*1e-6; - x->x_sixaxis_state.ax = x->buf[40]<<8 | x->buf[41]; - x->x_sixaxis_state.ay = x->buf[42]<<8 | x->buf[43]; - x->x_sixaxis_state.az = x->buf[44]<<8 | x->buf[45]; - if ( ! prev.time ) { - prev.time = x->x_sixaxis_state.time; - prev.ax = x->x_sixaxis_state.ax; - prev.ay = x->x_sixaxis_state.ay; - prev.az = x->x_sixaxis_state.az; - } - double dt = x->x_sixaxis_state.time - prev.time; - double rc_dd = 2.0; // Time constant for highpass filter on acceleration - double alpha_dd = rc_dd / (rc_dd+dt); - x->x_sixaxis_state.ddx = alpha_dd*(prev.ddx + (x->x_sixaxis_state.ax-prev.ax)*0.01); - x->x_sixaxis_state.ddy = alpha_dd*(prev.ddy + (x->x_sixaxis_state.ay-prev.ay)*0.01); - x->x_sixaxis_state.ddz = alpha_dd*(prev.ddz - (x->x_sixaxis_state.az-prev.az)*0.01); - double rc_d = 2.0; // Time constant for highpass filter on speed - double alpha_d = rc_d / (rc_d+dt); - x->x_sixaxis_state.dx = alpha_d*(prev.dx + x->x_sixaxis_state.ddx*dt); - x->x_sixaxis_state.dy = alpha_d*(prev.dy + x->x_sixaxis_state.ddy*dt); - x->x_sixaxis_state.dz = alpha_d*(prev.dz + x->x_sixaxis_state.ddz*dt); - double rc = 1.0; // Time constant for highpass filter on position - double alpha = rc / (rc+dt); - x->x_sixaxis_state.x = alpha*(prev.x + x->x_sixaxis_state.dx*dt); - x->x_sixaxis_state.y = alpha*(prev.y + x->x_sixaxis_state.dy*dt); - x->x_sixaxis_state.z = alpha*(prev.z + x->x_sixaxis_state.dz*dt); +/* struct timeval tv; */ +/* if ( gettimeofday(&tv, NULL) ) { */ +/* perror("gettimeofday"); */ +/* return; */ +/* } */ +/* x->x_sixaxis_state.time = tv.tv_sec + tv.tv_usec*1e-6; */ +/* x->x_sixaxis_state.ax = x->buf[40]<<8 | x->buf[41]; */ +/* x->x_sixaxis_state.ay = x->buf[42]<<8 | x->buf[43]; */ +/* x->x_sixaxis_state.az = x->buf[44]<<8 | x->buf[45]; */ +/* if ( ! prev.time ) { */ +/* prev.time = x->x_sixaxis_state.time; */ +/* prev.ax = x->x_sixaxis_state.ax; */ +/* prev.ay = x->x_sixaxis_state.ay; */ +/* prev.az = x->x_sixaxis_state.az; */ +/* } */ +/* double dt = x->x_sixaxis_state.time - prev.time; */ +/* double rc_dd = 2.0; // Time constant for highpass filter on acceleration */ +/* double alpha_dd = rc_dd / (rc_dd+dt); */ +/* x->x_sixaxis_state.ddx = alpha_dd*(prev.ddx + (x->x_sixaxis_state.ax-prev.ax)*0.01); */ +/* x->x_sixaxis_state.ddy = alpha_dd*(prev.ddy + (x->x_sixaxis_state.ay-prev.ay)*0.01); */ +/* x->x_sixaxis_state.ddz = alpha_dd*(prev.ddz - (x->x_sixaxis_state.az-prev.az)*0.01); */ +/* double rc_d = 2.0; // Time constant for highpass filter on speed */ +/* double alpha_d = rc_d / (rc_d+dt); */ +/* x->x_sixaxis_state.dx = alpha_d*(prev.dx + x->x_sixaxis_state.ddx*dt); */ +/* x->x_sixaxis_state.dy = alpha_d*(prev.dy + x->x_sixaxis_state.ddy*dt); */ +/* x->x_sixaxis_state.dz = alpha_d*(prev.dz + x->x_sixaxis_state.ddz*dt); */ +/* double rc = 1.0; // Time constant for highpass filter on position */ +/* double alpha = rc / (rc+dt); */ +/* x->x_sixaxis_state.x = alpha*(prev.x + x->x_sixaxis_state.dx*dt); */ +/* x->x_sixaxis_state.y = alpha*(prev.y + x->x_sixaxis_state.dy*dt); */ +/* x->x_sixaxis_state.z = alpha*(prev.z + x->x_sixaxis_state.dz*dt); */ /* raw accelerometer data */ - SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ax); - SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ay); - SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.az); - outlet_anything(x->x_data_outlet, ps_accelerometer, 3, x->x_output_atoms); - /* acceleration data */ - SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ddx); - SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ddy); - SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.ddz); - outlet_anything(x->x_data_outlet, ps_acceleration, 3, x->x_output_atoms); - /* speed data */ - SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.dx); - SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.dy); - SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.dz); - outlet_anything(x->x_data_outlet, ps_speed, 3, x->x_output_atoms); - /* position data */ - SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.x); - SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.y); - SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.z); - outlet_anything(x->x_data_outlet, ps_position, 3, x->x_output_atoms); + SETSYMBOL(x->x_output_atoms, ps_x); + SETFLOAT(x->x_output_atoms + 1, x->buf[40]<<8 | x->buf[41]); + outlet_anything(x->x_data_outlet, ps_accelerometer, 2, x->x_output_atoms); + SETSYMBOL(x->x_output_atoms, ps_y); + SETFLOAT(x->x_output_atoms + 1, x->buf[42]<<8 | x->buf[43]); + outlet_anything(x->x_data_outlet, ps_accelerometer, 2, x->x_output_atoms); + SETSYMBOL(x->x_output_atoms, ps_z); + SETFLOAT(x->x_output_atoms + 1, x->buf[44]<<8 | x->buf[45]); + outlet_anything(x->x_data_outlet, ps_accelerometer, 2, x->x_output_atoms); +/* SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ax); */ +/* SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ay); */ +/* SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.az); */ +/* outlet_anything(x->x_data_outlet, ps_accelerometer, 3, x->x_output_atoms); */ +/* /\* acceleration data *\/ */ +/* SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ddx); */ +/* SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ddy); */ +/* SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.ddz); */ +/* outlet_anything(x->x_data_outlet, ps_acceleration, 3, x->x_output_atoms); */ +/* /\* speed data *\/ */ +/* SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.dx); */ +/* SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.dy); */ +/* SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.dz); */ +/* outlet_anything(x->x_data_outlet, ps_speed, 3, x->x_output_atoms); */ +/* /\* position data *\/ */ +/* SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.x); */ +/* SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.y); */ +/* SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.z); */ +/* outlet_anything(x->x_data_outlet, ps_position, 3, x->x_output_atoms); */ } if(x->x_started) { clock_delay(x->x_clock, x->x_delay); @@ -240,28 +315,15 @@ void sixaxis_start(t_sixaxis* x) { DEBUG(post("sixaxis_start");); - + + if(!x->x_device_open) { + sixaxis_open_device(x, x->x_device_number); + } if (x->x_fd > -1 && !x->x_started) { clock_delay(x->x_clock, DEFAULT_DELAY); post("sixaxis: polling started"); x->x_started = 1; - } else { - post("You need to set a input device (i.e /dev/input/event0)"); } - - if(x->x_device_number > -1) - { - if(!x->x_device_open) - { - sixaxis_open(x,x->x_devname); - } - if(!x->x_started) - { - clock_delay(x->x_clock, x->x_delay); - x->x_started = 1; - } - } - } static void sixaxis_float(t_sixaxis* x, t_floatarg f) @@ -286,7 +348,7 @@ close(x->x_fd); } -static void *sixaxis_new(t_symbol *s) +static void *sixaxis_new(t_symbol *s, int argc, t_atom *argv) { t_sixaxis *x = (t_sixaxis *)pd_new(sixaxis_class); @@ -299,17 +361,16 @@ x->x_read_ok = 1; x->x_started = 0; x->x_delay = DEFAULT_DELAY; - x->x_devname = gensym(SIXAXIS_DEVICE); + if(argc > 0) + x->x_device_number = get_device_number_from_arguments(argc, argv); + else + x->x_device_number = 0; x->x_clock = clock_new(x, (t_method)sixaxis_read); - /* create standard hidio-style outlets */ + /* create standard "io"-style outlets */ x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_status_outlet = outlet_new(&x->x_obj, 0); - - /* set to the value from the object argument, if that exists */ - if (s != &s_) - x->x_devname = s; return (x); } @@ -320,14 +381,14 @@ sixaxis_class = class_new(gensym("sixaxis"), (t_newmethod)sixaxis_new, (t_method)sixaxis_free, - sizeof(t_sixaxis), 0, A_DEFSYM, 0); + sizeof(t_sixaxis), 0, A_GIMME, 0); /* add inlet datatype methods */ class_addfloat(sixaxis_class,(t_method) sixaxis_float); class_addbang(sixaxis_class,(t_method) sixaxis_read); /* add inlet message methods */ - class_addmethod(sixaxis_class,(t_method) sixaxis_open,gensym("open"),A_DEFFLOAT,0); + class_addmethod(sixaxis_class,(t_method) sixaxis_open,gensym("open"),A_GIMME,0); class_addmethod(sixaxis_class,(t_method) sixaxis_close,gensym("close"),0); class_addmethod(sixaxis_class,(t_method) sixaxis_info,gensym("info"),0); @@ -337,7 +398,13 @@ ps_poll = gensym("poll"); ps_total = gensym("total"); ps_range = gensym("range"); + ps_devname = gensym("devname"); + ps_accelerometer = gensym("accelerometer"); + ps_x = gensym("x"); + ps_y = gensym("y"); + ps_z = gensym("z"); + ps_acceleration = gensym("acceleration"); ps_speed = gensym("speed"); ps_position = gensym("position"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [10115] trunk/externals/io
by eighthave＠users.sourceforge.net 28 Jun '08

28 Jun '08

Revision: 10115 http://pure-data.svn.sourceforge.net/pure-data/?rev=10115&view=rev Author: eighthave Date: 2008-06-28 09:08:02 -0700 (Sat, 28 Jun 2008) Log Message: ----------- first somewhat 'working' version of the objectclass to get data from the Sony SIXAXIS accelerometer Added Paths: ----------- trunk/externals/io/sixaxis/ trunk/externals/io/sixaxis/sixaxis-help.pd trunk/externals/io/sixaxis/sixaxis.c Added: trunk/externals/io/sixaxis/sixaxis-help.pd =================================================================== --- trunk/externals/io/sixaxis/sixaxis-help.pd (rev 0) +++ trunk/externals/io/sixaxis/sixaxis-help.pd 2008-06-28 16:08:02 UTC (rev 10115) @@ -0,0 +1,156 @@ +#N canvas 292 101 633 730 10; +#X obj 129 267 sixaxis /dev/hidraw0; +#X obj 107 178 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 18 178 metro 20; +#X obj 18 156 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X msg 38 156 stop; +#X obj 107 129 key; +#X obj 2 2 cnv 15 550 25 empty empty sixaxis 20 12 1 16 -228992 -66577 +0; +#X text 10 44 [sixaxis] outputs raw events from the Linux Event system. +It is used for access the output of various Human Interface Devices +\, like mice \, joysticks \, tablets \, etc.; +#X text 26 105 bang to get an update when polling is stopped.; +#X obj 107 149 sel 98; +#X text 153 149 <- (type 'b' for a bang); +#X obj 182 372 pddp/print; +#N canvas 743 25 411 235 see 0; +#N canvas 108 318 543 264 route 0; +#X obj 27 14 inlet; +#X obj 72 226 outlet; +#X obj 19 226 outlet; +#X obj 172 226 outlet; +#X obj 222 204 symbol; +#X obj 222 226 outlet; +#X obj 272 204 symbol; +#X obj 272 226 outlet; +#X obj 322 204 symbol; +#X obj 322 226 outlet; +#X obj 372 204 symbol; +#X obj 372 226 outlet; +#X obj 122 225 outlet; +#X obj 422 204 symbol; +#X obj 422 226 outlet; +#X obj 472 204 symbol; +#X obj 472 226 outlet; +#X obj 26 63 route open device poll total product manufacturer transport +type vendorID productID; +#X connect 0 0 17 0; +#X connect 4 0 5 0; +#X connect 6 0 7 0; +#X connect 8 0 9 0; +#X connect 10 0 11 0; +#X connect 13 0 14 0; +#X connect 15 0 16 0; +#X connect 17 0 2 0; +#X connect 17 1 1 0; +#X connect 17 2 12 0; +#X connect 17 3 3 0; +#X connect 17 4 4 0; +#X connect 17 5 6 0; +#X connect 17 6 8 0; +#X connect 17 7 10 0; +#X connect 17 8 13 0; +#X connect 17 9 15 0; +#X restore 117 70 pd route info; +#X obj 81 96 tgl 15 0 empty empty open 0 -6 0 8 -262144 -1 -1 1 1; +#X obj 110 22 inlet; +#X obj 123 43 print info; +#X symbolatom 304 93 0 0 0 0 productID - -; +#X symbolatom 304 112 0 0 0 0 vendorID - -; +#X symbolatom 304 151 0 0 0 0 transport - -; +#X symbolatom 304 171 0 0 0 0 manufacturer - -; +#X symbolatom 186 192 0 0 0 0 product - -; +#X floatatom 97 140 5 0 0 0 device - -; +#X floatatom 97 162 5 0 0 0 poll - -; +#X symbolatom 304 131 0 0 0 0 type - -; +#X floatatom 97 182 5 0 0 0 total - -; +#X connect 0 0 1 0; +#X connect 0 1 9 0; +#X connect 0 2 10 0; +#X connect 0 3 12 0; +#X connect 0 4 8 0; +#X connect 0 5 7 0; +#X connect 0 6 6 0; +#X connect 0 7 11 0; +#X connect 0 8 5 0; +#X connect 0 9 4 0; +#X connect 2 0 0 0; +#X connect 2 0 3 0; +#X restore 246 297 pd see device info; +#X obj 130 210 tgl 30 0 empty empty empty 17 7 0 10 -4034 -1 -1 0 1 +; +#X msg 179 222 info; +#X obj 181 348 spigot; +#X obj 216 328 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 249 334 spigot; +#X obj 282 327 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 250 354 print RAW; +#X obj 61 416 route position speed acceleration accelerometer; +#X obj 341 445 print WARNING_UNSUPPORTED_MESSAGES; +#X obj 43 528 unpack 0 0 0; +#X floatatom 31 549 7 0 0 0 - - -; +#X floatatom 77 549 7 0 0 0 - - -; +#X floatatom 123 549 7 0 0 0 - - -; +#X obj 77 484 unpack 0 0 0; +#X floatatom 65 505 7 0 0 0 - - -; +#X floatatom 111 505 7 0 0 0 - - -; +#X floatatom 157 505 7 0 0 0 - - -; +#X obj 197 461 unpack 0 0 0; +#X floatatom 185 482 7 0 0 0 - - -; +#X floatatom 231 482 7 0 0 0 - - -; +#X floatatom 277 482 7 0 0 0 - - -; +#X obj 252 513 track_min; +#X obj 325 517 track_max; +#X floatatom 324 539 9 0 0 0 - - -; +#X floatatom 252 539 9 0 0 0 - - -; +#X obj 22 573 track_min; +#X obj 95 577 track_max; +#X floatatom 94 599 9 0 0 0 - - -; +#X floatatom 22 599 9 0 0 0 - - -; +#X msg 176 551 bang; +#X msg 232 217 close; +#X connect 0 0 15 0; +#X connect 0 0 17 0; +#X connect 0 0 20 0; +#X connect 0 1 12 0; +#X connect 1 0 0 0; +#X connect 2 0 0 0; +#X connect 3 0 2 0; +#X connect 4 0 2 0; +#X connect 5 0 9 0; +#X connect 9 0 1 0; +#X connect 13 0 0 0; +#X connect 14 0 0 0; +#X connect 15 0 11 0; +#X connect 16 0 15 1; +#X connect 17 0 19 0; +#X connect 18 0 17 1; +#X connect 20 0 22 0; +#X connect 20 1 26 0; +#X connect 20 2 30 0; +#X connect 20 4 21 0; +#X connect 22 0 23 0; +#X connect 22 1 24 0; +#X connect 22 1 39 0; +#X connect 22 1 38 0; +#X connect 22 2 25 0; +#X connect 26 0 27 0; +#X connect 26 1 28 0; +#X connect 26 2 29 0; +#X connect 30 0 31 0; +#X connect 30 1 32 0; +#X connect 30 1 35 0; +#X connect 30 1 34 0; +#X connect 30 2 33 0; +#X connect 34 0 37 0; +#X connect 35 0 36 0; +#X connect 38 0 41 0; +#X connect 39 0 40 0; +#X connect 42 0 39 2; +#X connect 42 0 38 2; +#X connect 43 0 0 0; Added: trunk/externals/io/sixaxis/sixaxis.c =================================================================== --- trunk/externals/io/sixaxis/sixaxis.c (rev 0) +++ trunk/externals/io/sixaxis/sixaxis.c 2008-06-28 16:08:02 UTC (rev 10115) @@ -0,0 +1,345 @@ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/time.h> +#include <stdio.h> +#include <errno.h> + +#include "m_pd.h" + +#define DEBUG(x) +//#define DEBUG(x) x + +#define DEFAULT_DELAY 10 +#define SIXAXIS_DEVICE "/dev/hidraw0" + +static char *version = "$Revision: 1.1 $"; + +/*------------------------------------------------------------------------------ + * GLOBAL DECLARATIONS + */ + +/* hidraw data format */ +struct sixaxis_state { + double time; + int ax, ay, az; // Raw accelerometer data + double ddx, ddy, ddz; // Acceleration + double dx, dy, dz; // Speed + double x, y, z; // Position +}; + +/* pre-generated symbols */ +static t_symbol *ps_open, *ps_device, *ps_poll, *ps_total, *ps_range; +static t_symbol *ps_accelerometer, *ps_acceleration, *ps_speed, *ps_position; + +/* mostly for status querying */ +static unsigned short device_count; + +/* previous state for calculating position, speed, acceleration */ +static struct sixaxis_state prev; + +/*------------------------------------------------------------------------------ + * CLASS DEF + */ +static t_class *sixaxis_class; + +typedef struct _sixaxis { + t_object x_obj; + t_int x_fd; + t_symbol *x_devname; + t_clock *x_clock; + short x_device_number; + short x_instance; + t_int x_device_open; + int x_read_ok; + int x_started; + int x_delay; + unsigned char buf[128]; + struct sixaxis_state x_sixaxis_state; + t_atom x_output_atoms[3]; + t_outlet *x_data_outlet; + t_outlet *x_status_outlet; +} t_sixaxis; + + + +/*------------------------------------------------------------------------------ + * SUPPORT FUNCTIONS + */ + +static void output_status(t_sixaxis *x, t_symbol *selector, t_float output_value) +{ + t_atom *output_atom = (t_atom *)getbytes(sizeof(t_atom)); + SETFLOAT(output_atom, output_value); + outlet_anything( x->x_status_outlet, selector, 1, output_atom); + freebytes(output_atom,sizeof(t_atom)); +} + +static void output_open_status(t_sixaxis *x) +{ + output_status(x, ps_open, x->x_device_open); +} + +static void output_device_number(t_sixaxis *x) +{ + output_status(x, ps_device, x->x_device_number); +} + +static void output_poll_time(t_sixaxis *x) +{ + output_status(x, ps_poll, x->x_delay); +} + +static void output_device_count(t_sixaxis *x) +{ + output_status(x, ps_total, device_count); +} + +/*------------------------------------------------------------------------------ + * CLASS METHODS + */ + +void sixaxis_stop(t_sixaxis* x) +{ + DEBUG(post("sixaxis_stop");); + + if (x->x_fd >= 0 && x->x_started) { + clock_unset(x->x_clock); + post("sixaxis: polling stopped"); + x->x_started = 0; + } +} + +static void sixaxis_close(t_sixaxis *x) +{ + DEBUG(post("sixaxis_close");); + +/* just to be safe, stop it first */ + sixaxis_stop(x); + + if(x->x_fd < 0) + return; + close(x->x_fd); + post("[sixaxis] closed %s",x->x_devname->s_name); + x->x_device_open = 0; + output_open_status(x); +} + +static int sixaxis_open(t_sixaxis *x, t_symbol *s) +{ + DEBUG(post("sixaxis_open");); + + sixaxis_close(x); + + /* set obj device name to parameter + * otherwise set to default + */ + if (s != &s_) + x->x_devname = s; + + /* open device */ + if (x->x_devname) { + /* open the device read-only, non-exclusive */ + x->x_fd = open(x->x_devname->s_name, O_RDONLY | O_NONBLOCK); + /* test if device open */ + if (x->x_fd > -1 ) { + x->x_device_open = 1; + output_open_status(x); + return 1; + } else { + pd_error(x, "[sixaxis] open %s failed", x->x_devname->s_name); + x->x_fd = -1; + x->x_device_open = 0; + output_open_status(x); + } + } + return 0; +} + +static void sixaxis_read(t_sixaxis *x) +{ + if(x->x_fd < 0) + return; + if(read(x->x_fd, &(x->buf), sizeof(x->buf)) > -1) { +// if ( nr < 0 ) { perror("read(stdin)"); exit(1); } +// if ( nr != 48 ) { fprintf(stderr, "Unsupported report\n"); exit(1); } + + struct timeval tv; + if ( gettimeofday(&tv, NULL) ) { + perror("gettimeofday"); + return; + } + x->x_sixaxis_state.time = tv.tv_sec + tv.tv_usec*1e-6; + x->x_sixaxis_state.ax = x->buf[40]<<8 | x->buf[41]; + x->x_sixaxis_state.ay = x->buf[42]<<8 | x->buf[43]; + x->x_sixaxis_state.az = x->buf[44]<<8 | x->buf[45]; + if ( ! prev.time ) { + prev.time = x->x_sixaxis_state.time; + prev.ax = x->x_sixaxis_state.ax; + prev.ay = x->x_sixaxis_state.ay; + prev.az = x->x_sixaxis_state.az; + } + double dt = x->x_sixaxis_state.time - prev.time; + double rc_dd = 2.0; // Time constant for highpass filter on acceleration + double alpha_dd = rc_dd / (rc_dd+dt); + x->x_sixaxis_state.ddx = alpha_dd*(prev.ddx + (x->x_sixaxis_state.ax-prev.ax)*0.01); + x->x_sixaxis_state.ddy = alpha_dd*(prev.ddy + (x->x_sixaxis_state.ay-prev.ay)*0.01); + x->x_sixaxis_state.ddz = alpha_dd*(prev.ddz - (x->x_sixaxis_state.az-prev.az)*0.01); + double rc_d = 2.0; // Time constant for highpass filter on speed + double alpha_d = rc_d / (rc_d+dt); + x->x_sixaxis_state.dx = alpha_d*(prev.dx + x->x_sixaxis_state.ddx*dt); + x->x_sixaxis_state.dy = alpha_d*(prev.dy + x->x_sixaxis_state.ddy*dt); + x->x_sixaxis_state.dz = alpha_d*(prev.dz + x->x_sixaxis_state.ddz*dt); + double rc = 1.0; // Time constant for highpass filter on position + double alpha = rc / (rc+dt); + x->x_sixaxis_state.x = alpha*(prev.x + x->x_sixaxis_state.dx*dt); + x->x_sixaxis_state.y = alpha*(prev.y + x->x_sixaxis_state.dy*dt); + x->x_sixaxis_state.z = alpha*(prev.z + x->x_sixaxis_state.dz*dt); + /* raw accelerometer data */ + SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ax); + SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ay); + SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.az); + outlet_anything(x->x_data_outlet, ps_accelerometer, 3, x->x_output_atoms); + /* acceleration data */ + SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.ddx); + SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.ddy); + SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.ddz); + outlet_anything(x->x_data_outlet, ps_acceleration, 3, x->x_output_atoms); + /* speed data */ + SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.dx); + SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.dy); + SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.dz); + outlet_anything(x->x_data_outlet, ps_speed, 3, x->x_output_atoms); + /* position data */ + SETFLOAT(x->x_output_atoms, x->x_sixaxis_state.x); + SETFLOAT(x->x_output_atoms + 1, x->x_sixaxis_state.y); + SETFLOAT(x->x_output_atoms + 2, x->x_sixaxis_state.z); + outlet_anything(x->x_data_outlet, ps_position, 3, x->x_output_atoms); + } + if(x->x_started) { + clock_delay(x->x_clock, x->x_delay); + } +} +// double ddx, ddy, ddz; // Acceleration +// double dx, dy, dz; // Speed +// double x, y, z; // Position + +/* Actions */ + +static void sixaxis_info(t_sixaxis *x) +{ + output_open_status(x); + output_device_number(x); + output_device_count(x); + output_poll_time(x); +// TODO output ranges for sixaxis +// output_element_ranges(x); +} + +void sixaxis_start(t_sixaxis* x) +{ + DEBUG(post("sixaxis_start");); + + if (x->x_fd > -1 && !x->x_started) { + clock_delay(x->x_clock, DEFAULT_DELAY); + post("sixaxis: polling started"); + x->x_started = 1; + } else { + post("You need to set a input device (i.e /dev/input/event0)"); + } + + if(x->x_device_number > -1) + { + if(!x->x_device_open) + { + sixaxis_open(x,x->x_devname); + } + if(!x->x_started) + { + clock_delay(x->x_clock, x->x_delay); + x->x_started = 1; + } + } + +} + +static void sixaxis_float(t_sixaxis* x, t_floatarg f) +{ + DEBUG(post("sixaxis_float");); + + if (f > 0) + sixaxis_start(x); + else + sixaxis_stop(x); +} + +/* setup functions */ +static void sixaxis_free(t_sixaxis* x) +{ + DEBUG(post("sixaxis_free");); + + if (x->x_fd < 0) return; + + sixaxis_stop(x); + clock_free(x->x_clock); + close(x->x_fd); +} + +static void *sixaxis_new(t_symbol *s) +{ + t_sixaxis *x = (t_sixaxis *)pd_new(sixaxis_class); + + DEBUG(post("sixaxis_new");); + + post("[sixaxis] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); + + /* init vars */ + x->x_fd = -1; + x->x_read_ok = 1; + x->x_started = 0; + x->x_delay = DEFAULT_DELAY; + x->x_devname = gensym(SIXAXIS_DEVICE); + + x->x_clock = clock_new(x, (t_method)sixaxis_read); + + /* create standard hidio-style outlets */ + x->x_data_outlet = outlet_new(&x->x_obj, 0); + x->x_status_outlet = outlet_new(&x->x_obj, 0); + + /* set to the value from the object argument, if that exists */ + if (s != &s_) + x->x_devname = s; + + return (x); +} + +void sixaxis_setup(void) +{ + DEBUG(post("sixaxis_setup");); + sixaxis_class = class_new(gensym("sixaxis"), + (t_newmethod)sixaxis_new, + (t_method)sixaxis_free, + sizeof(t_sixaxis), 0, A_DEFSYM, 0); + + /* add inlet datatype methods */ + class_addfloat(sixaxis_class,(t_method) sixaxis_float); + class_addbang(sixaxis_class,(t_method) sixaxis_read); + + /* add inlet message methods */ + class_addmethod(sixaxis_class,(t_method) sixaxis_open,gensym("open"),A_DEFFLOAT,0); + class_addmethod(sixaxis_class,(t_method) sixaxis_close,gensym("close"),0); + class_addmethod(sixaxis_class,(t_method) sixaxis_info,gensym("info"),0); + + /* pre-generate often used symbols */ + ps_open = gensym("open"); + ps_device = gensym("device"); + ps_poll = gensym("poll"); + ps_total = gensym("total"); + ps_range = gensym("range"); + ps_accelerometer = gensym("accelerometer"); + ps_acceleration = gensym("acceleration"); + ps_speed = gensym("speed"); + ps_position = gensym("position"); +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [10114] trunk/externals/nusmuk/tab/tabosc4aa~.c
by nusmuk＠users.sourceforge.net 27 Jun '08

27 Jun '08

Revision: 10114 http://pure-data.svn.sourceforge.net/pure-data/?rev=10114&view=rev Author: nusmuk Date: 2008-06-27 02:59:50 -0700 (Fri, 27 Jun 2008) Log Message: ----------- Modified Paths: -------------- trunk/externals/nusmuk/tab/tabosc4aa~.c Modified: trunk/externals/nusmuk/tab/tabosc4aa~.c =================================================================== --- trunk/externals/nusmuk/tab/tabosc4aa~.c 2008-06-26 20:57:26 UTC (rev 10113) +++ trunk/externals/nusmuk/tab/tabosc4aa~.c 2008-06-27 09:59:50 UTC (rev 10114) @@ -143,13 +143,13 @@ #if 1 while (n--) { - t_sample frac, a, b, c, d, cminusb, temp, filter_out; + t_sample frac, a, b, c, d, cminusb, temp, sum, filter_out; - temp = 0; - for (i=0;i<8;i++) + sum = 0; + for (i=0;i<4;i++) { tf.tf_d = dphase; - dphase += *in/8 * conv; + dphase += *in/4 * conv; addr = tab + (tf.tf_i[HIOFFSET] & mask); tf.tf_i[HIOFFSET] = normhipart; frac = tf.tf_d - UNITBIT32; @@ -168,15 +168,16 @@ // temp = cut_filter(x, temp); // t_sample filter_out; - filter_out = 0.0147491 * temp + 0.0294982 * x->x_last_in + 0.0147491 * x->x_prev_in + 1.60425 * x->x_last_out - 0.663244 * x->x_prev_out; + filter_out = 0.0603297 * temp + 0.120659 * x->x_last_in + 0.0603297 * x->x_prev_in + 1.1565 * x->x_last_out - 0.397817 * x->x_prev_out; x->x_prev_in = x->x_last_in; x->x_last_in = temp; x->x_prev_out = x->x_last_out; x->x_last_out = filter_out; + sum += filter_out; } - *out++ = filter_out; + *out++ = sum/4; *in++; } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [10113] trunk/externals/io/hidio
by eighthave＠users.sourceforge.net 26 Jun '08

26 Jun '08

Revision: 10113 http://pure-data.svn.sourceforge.net/pure-data/?rev=10113&view=rev Author: eighthave Date: 2008-06-26 13:57:26 -0700 (Thu, 26 Jun 2008) Log Message: ----------- ported some of the recent bugfixes from [hid]: - in hidio_get_events(), test code before type since code is more likely to fail, therefore saving comparing the one that succeeds a lot - removed [print( message and replaced it with [devices( and [elements( - fixed min/max getting bug (I forgot to include the &my_id struct) - implemented get_device_number_by_id() - removed extra copies of write functions Modified Paths: -------------- trunk/externals/io/hidio/hidio-help.pd trunk/externals/io/hidio/hidio_linux.c Modified: trunk/externals/io/hidio/hidio-help.pd =================================================================== --- trunk/externals/io/hidio/hidio-help.pd 2008-06-26 20:27:43 UTC (rev 10112) +++ trunk/externals/io/hidio/hidio-help.pd 2008-06-26 20:57:26 UTC (rev 10113) @@ -1,4 +1,4 @@ -#N canvas 207 22 843 580 10; +#N canvas 213 77 843 580 10; #X floatatom 27 445 5 0 0 0 - - -; #X floatatom 83 445 5 0 0 0 - - -; #X obj 191 164 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 25 @@ -16,7 +16,7 @@ #X text 266 557 released under the GNU GPL; #X text 472 544 $Revision: 1.6 $$Date: 2007-07-26 07:31:38 $; #X text 473 557 $Author: eighthave $; -#X text 425 33 !!! This software is very much alpha \, so any aspect +#X text 425 34 !!! This software is very much alpha \, so any aspect of it could change without notice !!!; #X obj 9 510 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1 ; @@ -174,7 +174,7 @@ #X connect 16 0 5 0; #X connect 17 0 5 0; #X restore 203 59 pd open by device type; -#N canvas 88 102 470 320 open 0; +#N canvas 94 154 470 320 open 0; #X text 217 82 Gravis/Destroyer Tiltpad; #X msg 76 81 open 0x047D 0x4008; #X msg 73 53 open 0x046d 0xc01d; @@ -184,9 +184,12 @@ IDs (it is not case sensitive):; #X text 221 111 Overtone CUI v1.0; #X msg 80 110 open 0x1043 0x0015; +#X msg 84 139 open 0x06a3 0xff12; +#X text 222 137 Saitek Cyborgforce; #X connect 1 0 4 0; #X connect 2 0 4 0; #X connect 7 0 4 0; +#X connect 8 0 4 0; #X restore 174 37 pd open by vendor/product ID; #X msg 285 329 key e 0 0; #X text 49 543 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> Modified: trunk/externals/io/hidio/hidio_linux.c =================================================================== --- trunk/externals/io/hidio/hidio_linux.c 2008-06-26 20:27:43 UTC (rev 10112) +++ trunk/externals/io/hidio/hidio_linux.c 2008-06-26 20:57:26 UTC (rev 10113) @@ -139,10 +139,9 @@ - -void hidio_print_element_list(t_hidio *x) +void hidio_elements(t_hidio *x) { - debug_post(LOG_DEBUG,"hidio_print_element_list"); + debug_post(LOG_DEBUG,"hidio_elements"); unsigned long element_bitmask[EV_MAX][NBITS(KEY_MAX)]; // char event_type_string[256]; // char event_code_string[256]; @@ -263,9 +262,9 @@ } -void hidio_print_device_list(void) +void hidio_devices(t_hidio *x) { - debug_post(LOG_DEBUG,"hidio_print_device_list"); + debug_post(LOG_DEBUG,"hidio_devices"); int i,fd; char device_output_string[MAXPDSTRING] = "Unknown"; char dev_handle_name[MAXPDSTRING] = "/dev/input/event0"; @@ -307,77 +306,79 @@ t_hid_element *new_element = NULL; t_int i, j; + if( x->x_fd < 0 ) + return; + element_count[x->x_device_number] = 0; - if( x->x_fd ) - { - /* get bitmask representing supported elements (axes, keys, etc.) */ - memset(element_bitmask, 0, sizeof(element_bitmask)); - if( ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), element_bitmask[0]) < 0 ) - perror("[hidio] error: evdev ioctl: element_bitmask"); - memset(abs_bitmask, 0, sizeof(abs_bitmask)); - if( ioctl(x->x_fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), abs_bitmask) < 0 ) - perror("[hidio] error: evdev ioctl: abs_bitmask"); - for( i = 1; i < EV_MAX; i++ ) - { - if(test_bit(i, element_bitmask[0])) - { - /* get bitmask representing supported button types */ - ioctl(x->x_fd, EVIOCGBIT(i, KEY_MAX), element_bitmask[i]); - /* cycle through all possible event codes (axes, keys, etc.) - * testing to see which are supported. - * i = i j = j - */ - for(j = 0; j < KEY_MAX; j++) - { - new_element = getbytes(sizeof(t_hid_element)); - if( (i == EV_ABS) && (test_bit(j, abs_bitmask)) ) - { - /* this means that the bit is set in the axes list */ - if(ioctl(x->x_fd, EVIOCGABS(j), &abs_features)) - perror("evdev EVIOCGABS ioctl"); - new_element->min = abs_features.minimum; - new_element->max = abs_features.maximum; - } - else - { - new_element->min = 0; - new_element->max = 0; - } - if(test_bit(j, element_bitmask[i])) - { - new_element->linux_type = i; /* the int from linux/input.h */ - new_element->type = gensym(ev[i] ? ev[i] : "?"); /* the symbol */ - new_element->linux_code = j; - if((i == EV_KEY) && (j >= BTN_MISC) && (j < KEY_OK) ) - { - new_element->name = hidio_convert_linux_buttons_to_numbers(j); - } - else - { - new_element->name = gensym(event_names[i][j] ? event_names[i][j] : "?"); - } - if( i == EV_REL ) - new_element->relative = 1; - else - new_element->relative = 0; - SETSYMBOL(new_element->output_message, new_element->name); - SETFLOAT(new_element->output_message + 1, new_element->instance); - // fill in the t_hid_element struct here - post("x->x_device_number: %d element_count[]: %d", - x->x_device_number, element_count[x->x_device_number]); - post("linux_type/linux_code: %d/%d type/name: %s/%s max: %d min: %d ", - new_element->linux_type, new_element->linux_code, - new_element->type->s_name, new_element->name->s_name, - new_element->max, new_element->min); - post("\tpolled: %d relative: %d", - new_element->polled, new_element->relative); - element[x->x_device_number][element_count[x->x_device_number]] = new_element; - ++element_count[x->x_device_number]; - } - } - } - } - } + + /* get bitmask representing supported elements (axes, keys, etc.) */ + memset(element_bitmask, 0, sizeof(element_bitmask)); + if( ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), element_bitmask[0]) < 0 ) + perror("[hidio] error: evdev ioctl: element_bitmask"); + memset(abs_bitmask, 0, sizeof(abs_bitmask)); + if( ioctl(x->x_fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), abs_bitmask) < 0 ) + perror("[hidio] error: evdev ioctl: abs_bitmask"); + for( i = 1; i < EV_MAX; i++ ) + { + if(test_bit(i, element_bitmask[0])) + { + /* get bitmask representing supported elements */ + ioctl(x->x_fd, EVIOCGBIT(i, KEY_MAX), element_bitmask[i]); + /* cycle through all possible event codes (axes, keys, etc.) + * testing to see which are supported. + */ + for(j = 0; j < KEY_MAX; j++) + { + if(test_bit(j, element_bitmask[i])) + { + new_element = getbytes(sizeof(t_hid_element)); + if( (i == EV_ABS) && (j < ABS_MAX) && (test_bit(j, abs_bitmask)) ) + { + if(ioctl(x->x_fd, EVIOCGABS(j), &abs_features) < 0) + { + post("[hidio]: EVIOCGABS ioctl error for element: 0x%03x", j, j); + perror("[hidio]: EVIOCGABS ioctl error:"); + } + new_element->min = abs_features.minimum; + new_element->max = abs_features.maximum; + } + else + { + new_element->min = 0; + new_element->max = 0; + } + new_element->linux_type = i; /* the int from linux/input.h */ + new_element->type = gensym(ev[i] ? ev[i] : "?"); /* the symbol */ + new_element->linux_code = j; + if((i == EV_KEY) && (j >= BTN_MISC) && (j < KEY_OK) ) + { + new_element->name = hidio_convert_linux_buttons_to_numbers(j); + } + else + { + new_element->name = gensym(event_names[i][j] ? event_names[i][j] : "?"); + } + if( i == EV_REL ) + new_element->relative = 1; + else + new_element->relative = 0; + SETSYMBOL(new_element->output_message, new_element->name); + SETFLOAT(new_element->output_message + 1, new_element->instance); + // fill in the t_hid_element struct here + post("x->x_device_number: %d element_count[]: %d", + x->x_device_number, element_count[x->x_device_number]); + post("linux_type/linux_code: %d/%d type/name: %s/%s max: %d min: %d ", + new_element->linux_type, new_element->linux_code, + new_element->type->s_name, new_element->name->s_name, + new_element->max, new_element->min); + post("\tpolled: %d relative: %d", + new_element->polled, new_element->relative); + element[x->x_device_number][element_count[x->x_device_number]] = new_element; + ++element_count[x->x_device_number]; + } + } + } + } } /* ------------------------------------------------------------------------------ */ @@ -407,8 +408,8 @@ for( i=0; i < element_count[x->x_device_number]; ++i ) { output_element = element[x->x_device_number][i]; - if( (hidio_input_event.type == output_element->linux_type) && \ - (hidio_input_event.code == output_element->linux_code) ) + if( (hidio_input_event.code == output_element->linux_code) && \ + (hidio_input_event.type == output_element->linux_type) ) { output_element->value = hidio_input_event.value; debug_post(9,"i: %d linux_type: %d linux_code: %d", i, @@ -431,12 +432,6 @@ } -void hidio_print(t_hidio* x) -{ - hidio_print_device_list(); - hidio_print_element_list(x); -} - void hidio_write_packet(void) { debug_post(LOG_DEBUG,"hidio_write_packet"); @@ -582,7 +577,7 @@ char productid_string[7]; t_atom *output_atom = getbytes(sizeof(t_atom)); - ioctl(x->x_fd, EVIOCGID); + ioctl(x->x_fd, EVIOCGID, &my_id); snprintf(vendorid_string,7,"0x%04x", my_id.vendor); SETSYMBOL(output_atom, gensym(vendorid_string)); outlet_anything( x->x_status_outlet, gensym("vendorID"), @@ -601,6 +596,23 @@ short get_device_number_by_id(unsigned short vendor_id, unsigned short product_id) { + int i, fd; + char dev_handle_name[FILENAME_MAX]; + struct input_id my_id; + + for(i=0;i<MAX_DEVICES;++i) + { + snprintf(dev_handle_name, FILENAME_MAX, "/dev/input/event%d", i); + /* open the device read-only, non-exclusive */ + fd = open (dev_handle_name, O_RDONLY | O_NONBLOCK); + /* test if device open */ + if(fd > -1 ) + { + ioctl(fd, EVIOCGID, &my_id); + if( (vendor_id == my_id.vendor) && (product_id == my_id.product) ) + return i; + } + } return -1; } @@ -613,23 +625,6 @@ return -1; } -void hidio_write_event_symbol_int(t_hidio *x, t_symbol *type, t_int code, - t_int instance, t_int value) -{ - debug_post(LOG_DEBUG,"hidio_write_event_symbol_int"); -} -void hidio_write_event_symbols(t_hidio *x, t_symbol *type, t_symbol *code, - t_int instance, t_int value) -{ - debug_post(LOG_DEBUG,"hidio_write_event_symbols"); -} - -void hidio_write_event_ints(t_hidio *x, t_int type, t_int code, - t_int instance, t_int value) -{ - debug_post(LOG_DEBUG,"hidio_write_event_ints"); -} - void hidio_write_event_JMZ(t_hidio *x, t_symbol *type, t_symbol *code, t_float instance, t_float value) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [10112] branches/pd-extended/v0-40/externals/hcs/hid
by eighthave＠users.sourceforge.net 26 Jun '08

26 Jun '08

Revision: 10112 http://pure-data.svn.sourceforge.net/pure-data/?rev=10112&view=rev Author: eighthave Date: 2008-06-26 13:27:43 -0700 (Thu, 26 Jun 2008) Log Message: ----------- - fixed "evdev EVIOCGABS ioctl: Invalid argument" error by only trying the ioctl(EVIOCGABS) on existing elements. This means it is a pretty substantial change in how the code works, but it was necessary to fix the bug. Plus it should make it use a lot less memory and CPU. I just hope it doesn't break anything. Modified Paths: -------------- branches/pd-extended/v0-40/externals/hcs/hid/doc/hid-help.pd branches/pd-extended/v0-40/externals/hcs/hid/hid_linux.c Modified: branches/pd-extended/v0-40/externals/hcs/hid/doc/hid-help.pd =================================================================== --- branches/pd-extended/v0-40/externals/hcs/hid/doc/hid-help.pd 2008-06-26 20:23:24 UTC (rev 10111) +++ branches/pd-extended/v0-40/externals/hcs/hid/doc/hid-help.pd 2008-06-26 20:27:43 UTC (rev 10112) @@ -1,4 +1,4 @@ -#N canvas 202 51 715 555 10; +#N canvas 366 51 715 555 10; #X floatatom 27 439 5 0 0 0 - - -; #X floatatom 83 439 5 0 0 0 - - -; #X floatatom 63 395 6 0 0 0 - - -; Modified: branches/pd-extended/v0-40/externals/hcs/hid/hid_linux.c =================================================================== --- branches/pd-extended/v0-40/externals/hcs/hid/hid_linux.c 2008-06-26 20:23:24 UTC (rev 10111) +++ branches/pd-extended/v0-40/externals/hcs/hid/hid_linux.c 2008-06-26 20:27:43 UTC (rev 10112) @@ -30,8 +30,8 @@ #define NBITS(x) (((x)/BITS_PER_LONG)+1) #define LONG(x) ((x)/BITS_PER_LONG) #define test_bit(bit, array) ((array[LONG(bit)] >> (bit%BITS_PER_LONG)) & 1) +#define ISBITSET(x,i) ((x[i>>3] & (1<<(i&7)))!=0) - /* * from an email from Vojtech: * @@ -297,34 +297,39 @@ t_hid_element *new_element = NULL; t_int i, j; + if( x->x_fd < 0 ) + return; + element_count[x->x_device_number] = 0; - if( x->x_fd ) + + /* get bitmask representing supported elements (axes, keys, etc.) */ + memset(element_bitmask, 0, sizeof(element_bitmask)); + if( ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), element_bitmask[0]) < 0 ) + perror("[hid] error: evdev ioctl: element_bitmask"); + memset(abs_bitmask, 0, sizeof(abs_bitmask)); + if( ioctl(x->x_fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), abs_bitmask) < 0 ) + perror("[hid] error: evdev ioctl: abs_bitmask"); + for( i = 1; i < EV_MAX; i++ ) { - /* get bitmask representing supported elements (axes, keys, etc.) */ - memset(element_bitmask, 0, sizeof(element_bitmask)); - if( ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), element_bitmask[0]) < 0 ) - perror("[hid] error: evdev ioctl: element_bitmask"); - memset(abs_bitmask, 0, sizeof(abs_bitmask)); - if( ioctl(x->x_fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), abs_bitmask) < 0 ) - perror("[hid] error: evdev ioctl: abs_bitmask"); - for( i = 1; i < EV_MAX; i++ ) + if(test_bit(i, element_bitmask[0])) { - if(test_bit(i, element_bitmask[0])) + /* get bitmask representing supported elements */ + ioctl(x->x_fd, EVIOCGBIT(i, KEY_MAX), element_bitmask[i]); + /* cycle through all possible event codes (axes, keys, etc.) + * testing to see which are supported. + */ + for(j = 0; j < KEY_MAX; j++) { - /* get bitmask representing supported button types */ - ioctl(x->x_fd, EVIOCGBIT(i, KEY_MAX), element_bitmask[i]); - /* cycle through all possible event codes (axes, keys, etc.) - * testing to see which are supported. - * i = i j = j - */ - for(j = 0; j < KEY_MAX; j++) + if(test_bit(j, element_bitmask[i])) { - new_element = getbytes(sizeof(t_hid_element)); - if( (i == EV_ABS) && (test_bit(j, abs_bitmask)) ) + new_element = getbytes(sizeof(t_hid_element)); + if( (i == EV_ABS) && (j < ABS_MAX) && (test_bit(j, abs_bitmask)) ) { - /* this means that the bit is set in the axes list */ - if(ioctl(x->x_fd, EVIOCGABS(j), &abs_features)) - perror("evdev EVIOCGABS ioctl"); + if(ioctl(x->x_fd, EVIOCGABS(j), &abs_features) < 0) + { + post("[hid]: EVIOCGABS ioctl error for element: 0x%03x", j, j); + perror("[hid]: EVIOCGABS ioctl error:"); + } new_element->min = abs_features.minimum; new_element->max = abs_features.maximum; } @@ -333,29 +338,26 @@ new_element->min = 0; new_element->max = 0; } - if(test_bit(j, element_bitmask[i])) + new_element->linux_type = i; /* the int from linux/input.h */ + new_element->type = gensym(ev[i] ? ev[i] : "?"); /* the symbol */ + new_element->linux_code = j; + if((i == EV_KEY) && (j >= BTN_MISC) && (j < KEY_OK) ) { - new_element->linux_type = i; /* the int from linux/input.h */ - new_element->type = gensym(ev[i] ? ev[i] : "?"); /* the symbol */ - new_element->linux_code = j; - if((i == EV_KEY) && (j >= BTN_MISC) && (j < KEY_OK) ) - { - new_element->name = hid_convert_linux_buttons_to_numbers(j); - } - else - { - new_element->name = gensym(event_names[i][j] ? event_names[i][j] : "?"); - } - if( i == EV_REL ) - new_element->relative = 1; - else - new_element->relative = 0; - element[x->x_device_number][element_count[x->x_device_number]] = new_element; - ++element_count[x->x_device_number]; + new_element->name = hid_convert_linux_buttons_to_numbers(j); } + else + { + new_element->name = gensym(event_names[i][j] ? event_names[i][j] : "?"); + } + if( i == EV_REL ) + new_element->relative = 1; + else + new_element->relative = 0; + element[x->x_device_number][element_count[x->x_device_number]] = new_element; + ++element_count[x->x_device_number]; } - } - } + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs June 2008