Fixed build issues with test programs, added sendserial and rs232wrapper

Author: Alastair M. Robinson

Makefile.am

@@ -13,11 +13,12 @@ check_PROGRAMS = dirtreetest jpegscan jpegcheck \
 				composite imgsrctest \
 				combotest tabui \
 				printqueuetest stpuitest debugtest errorqueuetest \
-				smartptrtest imgsinktest
+				smartptrtest imgsinktest sendserial
 
 
 bin_PROGRAMS = threadtest gprintertest mkthumbnail profileuitest pvtest configtest mmmenugfx misctest
 
+sendserial_SOURCES = sendserial.cpp
 misctest_SOURCES = misctest.cpp
 mmmenugfx_SOURCES = mmmenugfx.cpp
 configtest_SOURCES = configtest.cpp

combotest.cpp

@@ -4,9 +4,9 @@
 
 #include <gtk/gtk.h>
 
+#include "config.h"
 #include "miscwidgets/simplecombo.h"
 #include "breakhandler.h"
-#include "config.h"
 #include "gettext.h"
 #define _(x) gettext(x)
 

errorqueuetest.cpp

@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include "config.h"
 #include "miscwidgets/errordialogqueue.h"
 
 

imgsrctest.cpp

@@ -34,20 +34,22 @@ class ImageSource_RainbowSweep : public ImageSource
 {
 	public:
 	ImageSource_RainbowSweep(int width,int height)
-		: ImageSource(width,height,IS_TYPE_RGB)
-	{
-		randomaccess=true;
-		MakeRowBuffer();
+		: ImageSource(width,height,IS_TYPE_RGB)
+	{
+		randomaccess=true;
+		MakeRowBuffer();
 	}
-	~ImageSource_RainbowSweep()
+
+	~ImageSource_RainbowSweep()
 	{
 	}
 
 	ISDataType *GetRow(int row)
 	{
-		if(currentrow==row)
-			return(rowbuffer);
-		double a=row;
+		if(currentrow==row)
+			return(rowbuffer);
+
+		double a=row;
 		a/=height;
 
 		for(int x=0;x<width;++x)
@@ -80,9 +82,9 @@ class ImageSource_RainbowSweep : public ImageSource
 			rowbuffer[x*3+1]=EIGHTTOIS(g);
 			rowbuffer[x*3+2]=EIGHTTOIS(b);
 		}
-		
-		currentrow=row;
-		return(rowbuffer);
+		
+		currentrow=row;
+		return(rowbuffer);
 	}
 };
 
@@ -105,7 +107,7 @@ int main(int argc,char **argv)
 }
 #endif
 
-#if 1
+#if 0
 
 class Test : public ConfigFile, public ProfileManager
 {
@@ -510,3 +512,34 @@ int main(int argc,char **argv)
 }
 #endif
 
+
+int main(int argc,char **argv)
+{
+	try
+	{
+		if(argc<2)
+			return(0);
+		ImageSource *is=ISLoadImage(argv[1]);
+		cerr << "File has " << is->samplesperpixel << " spp"<< std::endl;
+		for(int y=0;y<is->height;++y)
+		{
+			ISDataType *row=is->GetRow(y);
+			for(int x=0;x<is->width;++x)
+			{
+				ISDataType r,g,b;
+				r=*row++;
+				g=*row++;
+				b=*row++;
+				int out=(r&0xf800)|((g>>5)&0x0Fe0)|((b>>11)&0x1f);
+				putc(out>>8,stdout);
+				putc(out&255,stdout);
+			}
+		}
+	}
+	catch(const char *err)
+	{
+		cerr << "Error: " << err << endl;
+	}
+	return(0);
+}
+

sendserial.cpp

@@ -0,0 +1,106 @@
+#include <iostream>
+
+#include <getopt.h>
+
+#include "rs232wrapper.h"
+#include "binaryblob.h"
+
+#include "debug.h"
+
+#include "config.h"
+
+class SendSerial_Options
+{
+	public:
+	SendSerial_Options(int argc,char **argv) : serdevice("/dev/ttyUSB0")
+	{
+		ParseOptions(argc,argv);
+	}
+	void ParseOptions(int argc,char **argv)
+	{
+		static struct option long_options[] =
+		{
+			{"help",no_argument,NULL,'h'},
+			{"version",no_argument,NULL,'v'},
+			{"serdevice",required_argument,NULL,'s'},
+			{"debug",required_argument,NULL,'d'},
+			{0, 0, 0, 0}
+		};
+
+		while(1)
+		{
+			int c;
+			c = getopt_long(argc,argv,"hvs:d:",long_options,NULL);
+			if(c==-1)
+				break;
+			switch (c)
+			{
+				case 'h':
+					printf("Usage: %s [options] image1 [image2] ... \n",argv[0]);
+					printf("\t -h --help\t\tdisplay this message\n");
+					printf("\t -v --version\t\tdisplay version\n");
+					printf("\t -s --serdevice\t\tspecify device node for serial comms\n");
+					printf("\t -d --debug\t\tset debug level (0 for errors only, 4 for verbose output)\n");
+					throw 0;
+					break;
+				case 'v':
+					printf("%s\n",PACKAGE_STRING);
+					throw 0;
+					break;
+				case 's':
+					serdevice=optarg;
+					break;
+				case 'd':
+					Debug.SetLevel(DebugLevel(atoi(optarg)));
+					break;
+			}
+		}
+	}
+	protected:
+	std::string serdevice;
+	std::string watchdir;
+	bool wait;
+};
+
+
+class SerialStream : public SendSerial_Options, public RS232Wrapper
+{
+	public:
+	SerialStream(int argc,char **argv) : SendSerial_Options(argc,argv), RS232Wrapper(serdevice)
+	{
+	}
+	~SerialStream()
+	{
+	}
+	void SendFile(const char *fn)
+	{
+		BinaryBlob blob(fn);
+		size_t l=blob.GetSize();
+		char *p=blob.GetPointer();
+		Write(p,l);
+	}
+};
+
+
+int main(int argc,char **argv)
+{
+	Debug.SetLevel(TRACE);
+
+	try
+	{
+		SerialStream stream(argc,argv);
+		for(int i=optind;i<argc;++i)
+			stream.SendFile(argv[i]);
+		return(0);
+	}
+	catch(const char *err)
+	{
+		Debug[ERROR] << "Error: " << err << std::endl;
+	}
+	catch(int rc)
+	{
+		return(rc);
+	}
+	return(0);
+}
+

smartptrtest.cpp

@@ -1,6 +1,10 @@
 #include <iostream>
 #include <cstring>
 #include <memory>
+#include <cstdlib>
+
+#include "config.h"
+
 #include "debug.h"
 #include "thread.h"
 

stpuitest.cpp

@@ -1,5 +1,7 @@
 #include <iostream>
 
+#include "config.h"
+
 #include "gutenprint/gutenprint.h"
 #include "stpui_widgets/stpui_optionbook.h"
 #include "stpui_widgets/stpui_queue.h"

support/Makefile.am

@@ -57,7 +57,9 @@ libsupport_la_SOURCES =	\
 	debug.cpp	\
 	debug.h	\
 	util.cpp \
-	util.h
+	util.h \
+	\
+	rs232wrapper.h
 
 libsupport_la_LDFLAGS = -static