[Libphidget-cvs-commits] CVS: libphidget/src/libphidget phidget.c,1.32,1.33

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

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

Modified Files:
	phidget.c 
Log Message:
Re-ordered digital output of the 888


Index: phidget.c
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** phidget.c	2 Jul 2003 03:59:10 -0000	1.32
--- phidget.c	2 Jul 2003 04:04:45 -0000	1.33
***************
*** 1648,1661 ****
  			return(_error(err));
  
! 		// This weird ordering was used in the 488 phidget
! 		// so I'm wondering if it is needed for the 888
! 		digital[4]=!((buffer[1] & 1)==1);
! 		digital[5]=!((buffer[1] & 2)==2);
! 		digital[6]=!((buffer[1] & 4)==4);
! 		digital[7]=!((buffer[1] & 8)==8);
! 		digital[3]=!((buffer[1] & 16)==16);
! 		digital[2]=!((buffer[1] & 32)==32);
! 		digital[1]=!((buffer[1] & 64)==64);
! 		digital[0]=!((buffer[1] & 128)==128);
  
  
--- 1648,1659 ----
  			return(_error(err));
  
! 		digital[0]=!((buffer[1] & 1)==1);
! 		digital[1]=!((buffer[1] & 2)==2);
! 		digital[2]=!((buffer[1] & 4)==4);
! 		digital[3]=!((buffer[1] & 8)==8);
! 		digital[4]=!((buffer[1] & 16)==16);
! 		digital[5]=!((buffer[1] & 32)==32);
! 		digital[6]=!((buffer[1] & 64)==64);
! 		digital[7]=!((buffer[1] & 128)==128);
  
  
***************
*** 1702,1709 ****
  
  	12-Bit Sensor values are constructed from the packet as described:
! 	newSensor[4] = ((unsigned char)Data[2] + ((unsigned char)Data[3] & 0x0f) * 256) * 4;
! 	newSensor[5] = ((unsigned char)Data[4] + ((unsigned char)Data[3] & 0xf0) * 16) * 4;
! 	newSensor[6] = ((unsigned char)Data[5] + ((unsigned char)Data[6] & 0x0f) * 256) * 4;
! 	newSensor[7] = ((unsigned char)Data[7] + ((unsigned char)Data[6] & 0xf0) * 16) * 4;
  */
  
--- 1700,1707 ----
  
  	12-Bit Sensor values are constructed from the packet as described:
! 	newSensor[4] = ((unsigned char)Data[2] + ((unsigned char)Data[3] & 0x0f) * 256) ;
! 	newSensor[5] = ((unsigned char)Data[4] + ((unsigned char)Data[3] & 0xf0) * 16) ;
! 	newSensor[6] = ((unsigned char)Data[5] + ((unsigned char)Data[6] & 0x0f) * 256) ;
! 	newSensor[7] = ((unsigned char)Data[7] + ((unsigned char)Data[6] & 0xf0) * 16) ;
  */