prepping for release, fixed a couple very minor bugs

svn path=/trunk/externals/hcs/hid/; revision=2276

5 files changed, 49 insertions, 40 deletions

diff --git a/TODO b/TODO
index ae6e39f..22faf66 100644
--- a/TODO
+++ b/TODO
@@ -93,9 +93,17 @@ void hid_post(const char *format, const char *);
 
 
 ==============================================================================
+= device 0 gets events for all available devices
+
+- it might be useful to have device #0 open all available devices and output
+  the events.
+
+==============================================================================
 = mapping object ideas
 
+- log
 
+- exponential
 
 ______________________________________________________________________________
 ------------------------------------------------------------------------------
diff --git a/doc/hid-help.pd b/doc/hid-help.pd
index 4692b04..a3e0b00 100644
--- a/doc/hid-help.pd
+++ b/doc/hid-help.pd
@@ -1,20 +1,20 @@
-#N canvas 148 25 908 628 10;
-#X msg 430 325 rel rel_y -6 1.10049e+09;
+#N canvas 148 25 912 632 10;
+#X msg 430 325 rel rel_x 0 1.63404e+09;
 #X obj 430 304 prepend set;
-#X obj 149 473 route rel_x rel_y;
-#X floatatom 149 493 5 0 0 0 - - -;
-#X floatatom 206 493 5 0 0 0 - - -;
+#X obj 169 458 route rel_x rel_y;
+#X floatatom 169 478 5 0 0 0 - - -;
+#X floatatom 226 478 5 0 0 0 - - -;
 #X msg 148 77 start;
 #X msg 174 96 stop;
 #X floatatom 521 385 12 0 0 1 time - -;
 #X obj 428 365 unpack s s f f;
-#X msg 239 57 open 0;
-#X msg 246 75 open 1;
-#X msg 253 93 open 2;
-#X msg 259 111 open 3;
-#X msg 265 129 open 4;
-#X floatatom 206 454 7 0 0 0 - - -;
-#X floatatom 264 454 7 0 0 0 - - -;
+#X msg 239 37 open 0;
+#X msg 246 55 open 1;
+#X msg 253 73 open 2;
+#X msg 259 91 open 3;
+#X msg 265 109 open 4;
+#X floatatom 226 439 7 0 0 0 - - -;
+#X floatatom 284 439 7 0 0 0 - - -;
 #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 25 25
 ;
 #X floatatom 490 402 12 0 0 1 value - -;
@@ -42,9 +42,9 @@
 #X obj 63 241 spigot;
 #X obj 109 241 tgl 17 0 empty empty console_print 19 9 1 9 -262131
 -1 -1 0 1;
-#X floatatom 289 398 5 0 0 1 ev_syn - -;
-#X obj 262 397 +;
-#X msg 262 377 1;
+#X floatatom 309 383 5 0 0 1 ev_syn - -;
+#X obj 282 382 +;
+#X msg 282 362 1;
 #X msg 336 136 close;
 #X msg 336 113 refresh;
 #X text 397 111 refresh device list;
@@ -53,10 +53,10 @@
 #X text 49 588 (C) Copyright 2004 Hans-Christoph Steiner <hans@at.or.at>
 ;
 #X text 266 602 released under the GNU GPL;
-#X text 472 589 $Revision: 1.10 $$Date: 2004-11-15 04:05:39 $;
+#X text 472 589 $Revision: 1.11 $$Date: 2004-11-15 05:17:45 $;
 #X text 473 602 $Author: eighthave $;
-#X obj 206 433 route abs_x abs_y abs_z;
-#X floatatom 322 454 7 0 0 0 - - -;
+#X obj 226 418 route abs_x abs_y abs_z;
+#X floatatom 342 439 7 0 0 0 - - -;
 #X msg 398 180 poll 20;
 #X msg 336 180 poll 2;
 #X text 332 159 start polling and set the poll delay in ms;
@@ -65,29 +65,29 @@
 #X text 371 56 !!! This software is very much alpha \, so any aspect
 of it could change without notice !!!;
 #X obj 248 225 hid 1;
-#X obj 93 345 route key rel abs syn;
-#X obj 53 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1
+#X obj 113 330 route key rel abs syn;
+#X obj 73 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1
 ;
-#X obj 93 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1
-;
-#X obj 134 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 113 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+1;
+#X obj 154 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 175 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 195 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 216 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 236 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 257 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 277 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 297 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 317 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 338 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 358 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X obj 379 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 399 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
-#X msg 270 149 open 5;
-#X obj 53 519 route btn_0 btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7
+#X msg 270 129 open 5;
+#X obj 73 504 route btn_0 btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7
 btn_8 btn_9;
-#X obj 420 552 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
+#X obj 440 537 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0
 1;
 #X connect 1 0 0 0;
 #X connect 2 0 3 0;
diff --git a/hid.c b/hid.c
index 1bd9390..8718299 100644
--- a/hid.c
+++ b/hid.c
@@ -29,8 +29,8 @@
  * LOCAL DEFINES
  */
 
-//#define DEBUG(x)
-#define DEBUG(x) x 
+#define DEBUG(x)
+//#define DEBUG(x) x 
 
 #define DEFAULT_DELAY 5
 
diff --git a/hid_darwin.c b/hid_darwin.c
index b257b2f..8e904ea 100644
--- a/hid_darwin.c
+++ b/hid_darwin.c
@@ -51,8 +51,8 @@
 
 #include "hid.h"
 
-//#define DEBUG(x)
-#define DEBUG(x) x 
+#define DEBUG(x)
+//#define DEBUG(x) x 
 
 /*==============================================================================
  *  GLOBAL VARS
@@ -115,7 +115,8 @@ void convertDarwinElementToLinuxTypeCode(pRecElement element, char *linux_type,
 			break;
 		case kHIDPage_Button:
 			sprintf(linux_type, "key"); 
-			sprintf(linux_code, "btn_%ld", element->usage); 
+			/* HID Manager button numbers start at 1, [hid] start at 0 */
+			sprintf(linux_code, "btn_%ld", element->usage - 1); 
 			break;
 	}
 }
@@ -173,7 +174,7 @@ t_int hid_build_element_list(t_hid *x)
 	DEBUG(post("[hid] found %d elements:",numElements););
 	
 	post("");
-	post("  TYPE\t\tCODE\tEVENT NAME");
+	post("  TYPE\tCODE\tEVENT NAME");
 	post("-----------------------------------------------------------");
 	for(i=0; i<numElements; i++)
 	{
diff --git a/hid_linux.c b/hid_linux.c
index eb1613a..74b80cc 100644
--- a/hid_linux.c
+++ b/hid_linux.c
@@ -222,7 +222,7 @@ t_int hid_open_device(t_hid *x, t_int device_number)
 		  ioctl(x->x_fd, EVIOCGBIT(event_type, KEY_MAX), bitmask[event_type]);
 		 
 		  post("");
-		  post("  TYPE\t\tCODE\tEVENT NAME");
+		  post("  TYPE\tCODE\tEVENT NAME");
 		  post("-----------------------------------------------------------");
 
 		  /* cycle through all possible event codes (axes, keys, etc.) 
@@ -236,7 +236,7 @@ t_int hid_open_device(t_hid *x, t_int device_number)
 				  {
 					  char hid_code[7];
 					  hid_convert_linux_buttons_to_numbers(event_code,hid_code);
-					  post("  %s\t\t%s\t%s",
+					  post("  %s\t%s\t%s",
 							 ev[event_type] ? ev[event_type] : "?", 
 							 hid_code,
 							 event_names[event_type] ? (event_names[event_type][event_code] ? event_names[event_type][event_code] : "?") : "?");