libphidget-cvs-commits

[Jack S. <js...@us...>]

Update of /cvsroot/libphidget/libphidget/src/libphidget
In directory sc8-pr-cvs1:/tmp/cvs-serv28636/libphidget

Modified Files:
	phidget.c 
Log Message:
phidget_cpp now shows examples of digital IO and analog input.  Digital IO and Analog input now work in phidget++.  Renumbered the digital inputs in libphidget.  Hope these are correct


Index: phidget.c
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** phidget.c	15 Dec 2002 22:55:25 -0000	1.24
--- phidget.c	15 Dec 2002 23:41:55 -0000	1.25
***************
*** 1389,1400 ****
  		return(_error(err));
  
! 	digital[0]=(buffer[0] & 1)==1;
! 	digital[1]=(buffer[0] & 2)==2;
! 	digital[2]=(buffer[0] & 4)==4;
! 	digital[3]=(buffer[0] & 8)==8;
! 	digital[4]=(buffer[0] & 16)==16;
! 	digital[5]=(buffer[0] & 32)==32;
! 	digital[6]=(buffer[0] & 64)==64;
! 	digital[7]=(buffer[0] & 128)==128;
  
  	analog[0]=((unsigned char)buffer[3]+((unsigned char)buffer[2] & 0x0f) * 256);
--- 1389,1400 ----
  		return(_error(err));
  
! 	digital[4]=!((buffer[0] & 1)==1);
! 	digital[5]=!((buffer[0] & 2)==2);
! 	digital[6]=!((buffer[0] & 4)==4);
! 	digital[7]=!((buffer[0] & 8)==8);
! 	digital[3]=!((buffer[0] & 16)==16);
! 	digital[2]=!((buffer[0] & 32)==32);
! 	digital[1]=!((buffer[0] & 64)==64);
! 	digital[0]=!((buffer[0] & 128)==128);
  
  	analog[0]=((unsigned char)buffer[3]+((unsigned char)buffer[2] & 0x0f) * 256);
***************
*** 1440,1447 ****
  		{
  			// Packet 0
! 			digital[0]=(buffer[0] & 16)==16;
! 			digital[1]=(buffer[0] & 32)==32;
! 			digital[2]=(buffer[0] & 64)==64;
! 			digital[3]=(buffer[0] & 128)==128;
  
  			analog[7]=((unsigned char)buffer[1]+((unsigned char)buffer[2] & 0x0f) * 256);
--- 1440,1447 ----
  		{
  			// Packet 0
! 			digital[4]=!((buffer[0] & 16)==16);
! 			digital[5]=!((buffer[0] & 32)==32);
! 			digital[6]=!((buffer[0] & 64)==64);
! 			digital[7]=!((buffer[0] & 128)==128);
  
  			analog[7]=((unsigned char)buffer[1]+((unsigned char)buffer[2] & 0x0f) * 256);
***************
*** 1453,1460 ****
  		{
  			// Packet 1
! 			digital[4]=(buffer[0] & 16)==16;
! 			digital[5]=(buffer[0] & 32)==32;
! 			digital[6]=(buffer[0] & 64)==64;
! 			digital[7]=(buffer[0] & 128)==128;
  
  			analog[3]=((unsigned char)buffer[1]+((unsigned char)buffer[2] & 0x0f) * 256);
--- 1453,1460 ----
  		{
  			// Packet 1
! 			digital[0]=!((buffer[0] & 16)==16);
! 			digital[1]=!((buffer[0] & 32)==32);
! 			digital[2]=!((buffer[0] & 64)==64);
! 			digital[3]=!((buffer[0] & 128)==128);
  
  			analog[3]=((unsigned char)buffer[1]+((unsigned char)buffer[2] & 0x0f) * 256);