[Libphidget-cvs-commits] CVS: libphidget/src/examples phidget_cpp.cc,1.11,1.12

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	phidget_cpp.cc 
Log Message:
TextLCD doesn't automatically turn on or off now.  example program has more features and a few bug fixes


Index: phidget_cpp.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/examples/phidget_cpp.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** phidget_cpp.cc	15 Dec 2002 23:41:55 -0000	1.11
--- phidget_cpp.cc	16 Dec 2002 04:54:56 -0000	1.12
***************
*** 334,360 ****
  }
  
- void sendText(const string & parm)
- {
- 	CTextLCD text(workingUID);
- 
- 	printf("Sending text to %s\n", parm.c_str());
- 
- 	text.sendText(parm.c_str(),0,0);
- 
- 	sleep(1);
- }
- 
  void help()
  {
  	printf("Arguments:\n\n");
! 	printf("     -l (default)       list all phidets \n");
! 	printf("     -u {UID}           set the working UID\n");
! 	printf("     -q                 query the working UID\n");
! 	printf("     -h                 help\n");
! 	printf("     -p {percent}       adjust the position of a servo referenced by UID\n");
! 	printf("     -t {string}        send a string to a Text LCD phidget\n");
! 	printf("     -do {id} {on/off}  turn digital output ID on or off\n");
! 	printf("     -di {id}           read digital input ID\n");
! 	printf("     -ai {id}           read analog input ID\n");
  	printf("\n");
  }
--- 334,351 ----
  }
  
  void help()
  {
  	printf("Arguments:\n\n");
! 	printf("     -l (default)              list all phidets \n");
! 	printf("     -u {UID}                  set the working UID\n");
! 	printf("     -q                        query the working UID\n");
! 	printf("     -h                        help\n");
! 	printf("     -p {percent}              adjust the position of a servo referenced by UID\n");
! 	printf("     -t {row} {col} {string}   send a string to a Text LCD phidget\n");
! 	printf("     -do {id} {on/off}         turn digital output ID on or off\n");
! 	printf("     -di {id}                  read digital input ID\n");
! 	printf("     -ai {id}                  read analog input ID\n");
! 	printf("     -ton                      text display on\n");
! 	printf("     -toff                     text display on\n");
  	printf("\n");
  }
***************
*** 380,408 ****
  		return (processArgs(argn - 2, argv + 2));
  	} else 
! 	if (arg == "-q")
  	{
  		query();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-h")
  	{
  		help();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-l")
  	{
  		phidgets_ls();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-t")
  	{
! 		if (argn < 2)
!     			throw runtime_error("Expected argument after -t");
! 		string parm = argv[1];
  
! 		sendText(parm);
! 		return (processArgs(argn - 2, argv + 2));
  	} else
! 	if (arg == "-p")
  	{
  		if (argn < 2)
--- 371,420 ----
  		return (processArgs(argn - 2, argv + 2));
  	} else 
! 	if (arg == "-q")		// query
  	{
  		query();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-h")		// help
  	{
  		help();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-l")		// list all phidgets
  	{
  		phidgets_ls();
  		return (processArgs(argn - 1, argv + 1));
  	} else 
! 	if (arg == "-t")		// Send text
  	{
! 		if (argn < 4)
!     			throw runtime_error("Expected arguments after -t");
! 		int row=atoi(argv[1]);
! 		int col=atoi(argv[2]);
! 		string parm = argv[3];
  
! 		{
! 			CTextLCD text(workingUID);
! 			text.sendText(parm.c_str(),row,col);
! 		}
! 		return (processArgs(argn - 4, argv + 4));
  	} else
! 	if (arg == "-ton")
! 	{
! 		{
! 			CTextLCD text(workingUID);
! 			text.on();
! 		}
! 		return (processArgs(argn - 1, argv + 1));
! 	} else
! 	if (arg == "-toff")
! 	{
! 		{
! 			CTextLCD text(workingUID);
! 			text.off();
! 		}
! 		return (processArgs(argn - 1, argv + 1));
! 	} else
! 	if (arg == "-p")		// percentage to move servo
  	{
  		if (argn < 2)
***************
*** 413,417 ****
  		return (processArgs(argn - 2, argv + 2));
  	} else
! 	if (arg == "-do")
  	{
  		if (argn < 3)
--- 425,429 ----
  		return (processArgs(argn - 2, argv + 2));
  	} else
! 	if (arg == "-do")		// digital output
  	{
  		if (argn < 3)
***************
*** 421,438 ****
  		string value= argv[2];
  
! 		CInterfaceKit kit(workingUID);
! 		CDigitalOut *out=kit.digitalOut(id);
  
! 		if (value=="on")
! 			out->value(true);
! 		else
! 		if (value=="off")
! 			out->value(false);
! 		else
! 			throw runtime_error("Invalid state to set output");
  
  		return (processArgs(argn - 3, argv + 3));
  	} else
! 	if (arg == "-di")
  	{
  		if (argn < 2)
--- 433,452 ----
  		string value= argv[2];
  
! 		{
! 			CInterfaceKit kit(workingUID);
! 			CDigitalOut *out=kit.digitalOut(id);
  
! 			if (value=="on")
! 				out->value(true);
! 			else
! 			if (value=="off")
! 				out->value(false);
! 			else
! 				throw runtime_error("Invalid state to set output");
! 		}
  
  		return (processArgs(argn - 3, argv + 3));
  	} else
! 	if (arg == "-di")		// Digital input
  	{
  		if (argn < 2)
***************
*** 441,453 ****
  		int id= atoi(argv[1]);
  
! 		CInterfaceKit kit(workingUID);
! 		CDigitalIn *in=kit.digitalIn(id);
  
! 		kit.update();
! 		printf("Value:%d\n",in->value());
  
  		return (processArgs(argn - 2, argv + 2));
  	} else
! 	if (arg == "-ai")
  	{
  		if (argn < 2)
--- 455,469 ----
  		int id= atoi(argv[1]);
  
! 		{
! 			CInterfaceKit kit(workingUID);
! 			CDigitalIn *in=kit.digitalIn(id);
  
! 			kit.update();
! 			printf("%d\n",in->value());
! 		}
  
  		return (processArgs(argn - 2, argv + 2));
  	} else
! 	if (arg == "-ai")		// analog input
  	{
  		if (argn < 2)
***************
*** 456,464 ****
  		int id= atoi(argv[1]);
  
! 		CInterfaceKit kit(workingUID);
! 		CAnalogIn *in=kit.analogIn(id);
  
! 		kit.update();
! 		printf("Value:%f\n",in->value());
  
  		return (processArgs(argn - 2, argv + 2));
--- 472,482 ----
  		int id= atoi(argv[1]);
  
! 		{
! 			CInterfaceKit kit(workingUID);
! 			CAnalogIn *in=kit.analogIn(id);
  
! 			kit.update();
! 			printf("%f\n",in->value());
! 		}
  
  		return (processArgs(argn - 2, argv + 2));
***************
*** 467,475 ****
  	throw runtime_error("Invalid argument:" + arg);
  
- 	/*
- 	printf("     -do {id} {on/off}  turn digital output ID on or off\n");
- 	printf("     -di {id}           read digital input ID\n");
- 	printf("     -ai {id}           read analog input ID\n");
- 	*/
  }
  
--- 485,488 ----
***************
*** 484,496 ****
  		adjusted_version[strlen(revision)-11-2]=0;
  
- 		// What we are
- 		printf("phidgets: a command line interface utility\n");
- 
- 		// Get the version number
- 		printf("Version %s\n",adjusted_version);
  
  		// No arguments
  		if (argn <= 1) 
  		{
      			phidgets_ls();
      			return (0);
--- 497,510 ----
  		adjusted_version[strlen(revision)-11-2]=0;
  
  
  		// No arguments
  		if (argn <= 1) 
  		{
+ 			// What we are
+ 			printf("phidgets: a command line interface utility\n");
+ 
+ 			// Get the version number
+ 			printf("Version %s\n",adjusted_version);
+ 
      			phidgets_ls();
      			return (0);