BlinkenLib

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -20,8 +20,8 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenConv\n"

-          "version 0.5.1 date 2005-12-14\n"

-          "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

+          "version 0.5.2 date 2006-05-10\n"

+          "Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -8,8 +8,15 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#ifdef WIN32

+#include <winsock2.h>

+#include <windows.h>

+typedef WORD uint16_t;

+typedef DWORD uint32_t;

+#else

 #include <stdint.h>

 #include <netinet/in.h>

+#endif

 #include "BlinkenConstants.h"

 #include "BlinkenFrame.h"

@@ -207,12 +214,14 @@ void BlinkenFrameSetPixel( stBlinkenFrame * pFrame, int y, int x, int c, unsigne

 unsigned long BlinkenFrameGetColor( stBlinkenFrame * pFrame, int y, int x )

 {

+  int i;

+

   if( pFrame == NULL ||

       y < 0 || y >= pFrame->height ||

       x < 0 || x >= pFrame->width )

       return 0;

-  int i = x * pFrame->channels;

+  i = x * pFrame->channels;

   if( pFrame->channels == 1 )

     return (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 16 |

@@ -228,14 +237,14 @@ unsigned long BlinkenFrameGetColor( stBlinkenFrame * pFrame, int y, int x )

 void BlinkenFrameSetColor( stBlinkenFrame * pFrame, int y, int x, unsigned long color )

 {

-  int alpha, alpha_, c;

+  int i, alpha, alpha_, c;

   if( pFrame == NULL ||

       y < 0 || y >= pFrame->height ||

       x < 0 || x >= pFrame->width )

       return;

-  int i = x * pFrame->channels;

+  i = x * pFrame->channels;

   alpha = (color >> 24) & 0xFF;

   alpha_ = 255 - alpha;

@@ -513,8 +522,8 @@ int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char *

         return -1;

       ((stBlinkenProtoBlpHdr *)pData)->magic = htonl( BlinkenProtoBlpMagic ); //build header

       ((stBlinkenProtoBlpHdr *)pData)->frameNo = htonl( 0 );

-      ((stBlinkenProtoBlpHdr *)pData)->width = htons( pFrame->width );

-      ((stBlinkenProtoBlpHdr *)pData)->height = htons( pFrame->height );

+      ((stBlinkenProtoBlpHdr *)pData)->width = htons( (uint16_t)pFrame->width );

+      ((stBlinkenProtoBlpHdr *)pData)->height = htons( (uint16_t)pFrame->height );

       i = sizeof( stBlinkenProtoBlpHdr ); //put data into packet

       for( y = 0; y < pFrame->height; y++ )

       {

@@ -533,8 +542,8 @@ int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char *

         return -1;

       ((stBlinkenProtoEblpHdr *)pData)->magic = htonl( BlinkenProtoEblpMagic ); //build header

       ((stBlinkenProtoEblpHdr *)pData)->frameNo = htonl( 0 );

-      ((stBlinkenProtoEblpHdr *)pData)->width = htons( pFrame->width );

-      ((stBlinkenProtoEblpHdr *)pData)->height = htons( pFrame->height );

+      ((stBlinkenProtoEblpHdr *)pData)->width = htons( (uint16_t)pFrame->width );

+      ((stBlinkenProtoEblpHdr *)pData)->height = htons( (uint16_t)pFrame->height );

       i = sizeof( stBlinkenProtoEblpHdr ); //put data into packet

       for( y = 0; y < pFrame->height; y++ )

       {

@@ -554,10 +563,10 @@ int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char *

       if( maxLength < (int)sizeof( stBlinkenProtoMcufHdr ) + pFrame->height * pFrame->width * pFrame->channels ) //buffer too short

         return -1;

       ((stBlinkenProtoMcufHdr *)pData)->magic = htonl( BlinkenProtoMcufMagic ); //build header

-      ((stBlinkenProtoMcufHdr *)pData)->height = htons( pFrame->height );

-      ((stBlinkenProtoMcufHdr *)pData)->width = htons( pFrame->width );

-      ((stBlinkenProtoMcufHdr *)pData)->channels = htons( pFrame->channels );

-      ((stBlinkenProtoMcufHdr *)pData)->maxval = htons( pFrame->maxval );

+      ((stBlinkenProtoMcufHdr *)pData)->height = htons( (uint16_t)pFrame->height );

+      ((stBlinkenProtoMcufHdr *)pData)->width = htons( (uint16_t)pFrame->width );

+      ((stBlinkenProtoMcufHdr *)pData)->channels = htons( (uint16_t)pFrame->channels );

+      ((stBlinkenProtoMcufHdr *)pData)->maxval = htons( (uint16_t)pFrame->maxval );

       i = sizeof( stBlinkenProtoMcufHdr ); //put data into packet

       for( y = 0; y < pFrame->height; y++ )

         for( x = 0, j = 0; x < pFrame->width; x++ )

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -8,11 +8,16 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#ifdef WIN32

+#include <winsock2.h>

+#include <windows.h>

+#else

 #include <unistd.h>

 #include <sys/time.h>

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <sys/select.h>

+#endif

 #include "BlinkenConstants.h"

 #include "BlinkenFrame.h"

@@ -31,6 +36,34 @@ struct sBlinkenMovie

   stBlinkenFrame * * ppFrames;

 };

+#ifdef WIN32

+

+static void msleep( unsigned int ms )

+{

+  Sleep( ms );

+}

+

+static unsigned int get_ms( )

+{

+  return GetTickCount( );

+}

+

+#else

+

+static void msleep( unsigned int ms )

+{

+  usleep( ms * 1000 );

+}

+

+static unsigned int get_ms( )

+{

+  struct timeval tv;

+  gettimeofday( &tv, NULL );

+  return (unsigned int)(tv.tv_usec / 1000 + tv.tv_sec * 1000);

+}

+

+#endif

+

 stBlinkenMovie * BlinkenMovieNew( int height, int width, int channels, int maxval )

 {

   stBlinkenMovie * pMovie;

@@ -603,7 +636,7 @@ stBlinkenMovie * BlinkenMovieLoadBlm( char * pFilename )

       {

         for( x = 0; ; x++ )

         {

-          BlinkenFrameSetPixel( pFrame, y, x, 0, pixel[0] == '1' ? 1 : 0 ); //set pixel

+          BlinkenFrameSetPixel( pFrame, y, x, 0, (unsigned char)(pixel[0] == '1' ? 1 : 0) ); //set pixel

           if( fscanf( pFile, "%1[01]", pixel ) != 1 ) //read next pixel

             break;

         }  

@@ -1407,7 +1440,7 @@ int BlinkenMovieSave( stBlinkenMovie * pMovie, char * pFilename )

   return -1;

 }

-void BlinkenMovieSend( stBlinkenMovie * pMovie, int udpSocket, etBlinkenProto proto )

+void BlinkenMovieSend( stBlinkenMovie * pMovie, SOCKET udpSocket, etBlinkenProto proto )

 //udp socket must be "connected"

 {

   int i, len;

@@ -1418,11 +1451,11 @@ void BlinkenMovieSend( stBlinkenMovie * pMovie, int udpSocket, etBlinkenProto pr

     len = BlinkenFrameToNetwork( pMovie->ppFrames[i], proto, buffer, sizeof( buffer ) );

     if( len > 0 )

       send( udpSocket, buffer, len, 0 );

-    usleep( BlinkenFrameGetDuration( pMovie->ppFrames[i] ) * 1000 );

+    msleep( BlinkenFrameGetDuration( pMovie->ppFrames[i] ) );

   }

 }

-stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto * pProto )

+stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenProto * pProto )

 //udp socket must be "bound" and should be "connected"

 //after timeout ms of no reception, the movie is considered to be complete

 //returns protocol in *pProto if pProto not NULL

@@ -1431,7 +1464,8 @@ stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto

   stBlinkenFrame * pLastFrame, * pFrame;

   etBlinkenProto proto, p;

   fd_set readFds;

-  struct timeval timeo, lastTime, curTime;

+  struct timeval timeo;

+  unsigned int lastTime, curTime;

   char buffer[65536]; //64kB is more than maximum UDP size

   int len;

@@ -1443,6 +1477,7 @@ stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto

   pMovie = NULL;

   proto = BlinkenProtoNone;

   pLastFrame = NULL;

+  lastTime = get_ms( );

   for( ; ; )

   {

     //wait for next frame

@@ -1490,11 +1525,10 @@ stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto

           if( BlinkenMovieAppendFrame( pMovie, pFrame ) == 0 )

           {

             //get current time

-            gettimeofday( &curTime, NULL );

+            curTime = get_ms( );

             //set duration of last frame

             if( pLastFrame != NULL )

-              BlinkenFrameSetDuration( pLastFrame, (curTime.tv_sec - lastTime.tv_sec) * 1000

-                                                 + (curTime.tv_usec - lastTime.tv_usec) / 1000 );

+              BlinkenFrameSetDuration( pLastFrame, curTime - lastTime );

             //remember this frame as last frame appended to movie

             pLastFrame = pFrame;

             pFrame = NULL; //do not free this frame (it was appended)

@@ -1509,11 +1543,10 @@ stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto

   } //for( ; ; )

   //get current time

-  gettimeofday( &curTime, NULL );

+  curTime = get_ms( );

   //set duration of last frame

   if( pLastFrame != NULL )

-    BlinkenFrameSetDuration( pLastFrame, (curTime.tv_sec - lastTime.tv_sec) * 1000

-                                       + (curTime.tv_usec - lastTime.tv_usec) / 1000 );

+    BlinkenFrameSetDuration( pLastFrame, curTime - lastTime );

   //return protocol

   if( pProto != NULL )

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -10,6 +10,13 @@

 #include "BlinkenFrame.h"

+#ifdef WIN32

+#include <winsock2.h>

+#else

+#define SOCKET int

+#define INVALID_SOCKET -1

+#endif

+

 typedef struct sBlinkenMovie stBlinkenMovie;

 stBlinkenMovie * BlinkenMovieNew( int height, int width, int channels, int maxval );

@@ -58,10 +65,10 @@ int BlinkenMovieSaveBml( stBlinkenMovie * pMovie, char * pFilename );

 int BlinkenMovieSaveBbm( stBlinkenMovie * pMovie, char * pFilename );

 int BlinkenMovieSave( stBlinkenMovie * pMovie, char * pFilename );

-void BlinkenMovieSend( stBlinkenMovie * pMovie, int udpSocket, etBlinkenProto proto );

+void BlinkenMovieSend( stBlinkenMovie * pMovie, SOCKET udpSocket, etBlinkenProto proto );

 //udp socket must be "connected"

-stBlinkenMovie * BlinkenMovieReceive( int udpSocket, int timeout, etBlinkenProto * pProto );

+stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenProto * pProto );

 //udp socket must be "bound" and should be "connected"

 //after timeout ms of no reception, the movie is considered to be complete

 //returns protocol in *pProto if pProto not NULL

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -149,7 +149,7 @@ static int serial_settings_set( int fd, int settings )

 //receive frames from socket and output them

 //dev_fd may be -1 for not doing anything with device

 //returns error code (not for device-errors, 0 for success)

-static int recv_and_out( int udpSocket, int dev_fd,

+static int recv_and_out( SOCKET udpSocket, int dev_fd,

                          int * p_device_output_active,

                          unsigned int format_change,

                          unsigned int format_height, unsigned int format_width,

@@ -271,9 +271,9 @@ static int recv_and_out( int udpSocket, int dev_fd,

     if( use_msecs )

     {

       //get time elapsed

-      gettimeofday( &end, NULL );

       int sec, usec;

       unsigned int msec;

+      gettimeofday( &end, NULL );

       sec = end.tv_sec - start.tv_sec;

       usec = end.tv_usec - start.tv_usec;

       if( usec < 0 )

@@ -299,7 +299,7 @@ static int recv_and_out( int udpSocket, int dev_fd,

 //open device and output frames

 //returns error code (not for device-errors, 0 for success)

-static int open_and_output( int udpSocket, char * device,

+static int open_and_output( SOCKET udpSocket, char * device,

                             int * p_device_output_active,

                             int serial_settings_change, int serial_settings,

                             unsigned int format_change,

@@ -347,7 +347,7 @@ static int open_and_output( int udpSocket, char * device,

 //open device and output frames in a loop

 //returns error code (not for device-errors, 0 for success)

-static int open_and_output_loop( int udpSocket, char * device,

+static int open_and_output_loop( SOCKET udpSocket, char * device,

                                  int serial_settings_change, int serial_settings,

                                  int reopen_device, unsigned int reopen_device_ms,

                                  unsigned int format_change,

@@ -396,7 +396,8 @@ static int open_and_output_loop( int udpSocket, char * device,

 int main( int argCnt, char * * args )

 {

-  int i, udpSocket, bound, serial_settings;

+  int i, bound, serial_settings;

+  SOCKET udpSocket;

   etBlinkenProto proto;

   unsigned int format_change, format_height, format_width, format_channels, format_colors;

   unsigned int height, width, channels, colors, reopen_device_ms;

@@ -408,8 +409,8 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenOutput\n"

-          "version 0.5.1 date 2005-12-14\n"

-          "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

+          "version 0.5.2 date 2006-05-10\n"

+          "Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -440,7 +441,7 @@ int main( int argCnt, char * * args )

   //create udp socket

   udpSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );

-  if( udpSocket == -1 )

+  if( udpSocket == INVALID_SOCKET )

   {

     printf( "cannot create UDP socket\n" );

     return -1;

@@ -0,0 +1,603 @@

+/* BlinkenLib

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

+ * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

+ * a blinkenarea.org project

+ */

+

+#include <fcntl.h>

+#include <stdlib.h>

+#include <stdio.h>

+#include <string.h>

+#include <winsock2.h>

+#include <windows.h>

+

+#include "BlinkenLib.h"

+

+//get serial settings from text

+static int serial_settings_parse( char * str )

+{

+  int baud, data, stop;

+  char parity;

+  int set = 0;

+

+  //split and parse settings string

+  if( sscanf( str, "%i,%c,%i,%i", &baud, &parity, &data, &stop ) != 4 )

+    return 0;

+

+  //baud rate

+  if( baud != 300 &&

+	  baud != 600 &&

+      baud != 1200 &&

+      baud != 2400 &&

+      baud != 4800 &&

+      baud != 9600 &&

+      baud != 19200 &&

+      baud != 38400 &&

+      baud != 57600 &&

+      baud != 115200 )

+  {

+    printf( "illegal baudrate: %d\n", baud );

+    return 0;

+  }

+

+  //parity

+  if( parity != 'n' && parity != 'N' &&

+      parity != 'e' && parity != 'E' &&

+      parity != 'o' && parity != 'O' )

+  {

+    printf( "invalid parity: %c\n", parity );

+    return 0;

+  }

+

+  //data bits

+  if( data != 5 &&

+      data != 6 &&

+      data != 7 &&

+      data != 8 )

+  {

+    printf( "illegal number of data bits: %d\n", data );

+    return 0;

+  }

+

+  //stop bits

+  if( stop != 1 &&

+      stop == 2 )

+  {

+    printf( "illegal number of stop bits: %d\n", stop );

+    return 0;

+  }

+

+  //success

+  return 1;

+}

+

+//set serial settings for fd

+static int serial_settings_set( HANDLE hDev, char * settings )

+{

+  DCB PortDcb;

+  COMMTIMEOUTS CommTimeouts;

+

+  //set serial parameters

+  if( ! GetCommState( hDev, &PortDcb ) )

+  {

+    printf( "error getting device comm state: error %u\n", GetLastError( ) );

+    return 0;

+  }

+  if( ! BuildCommDCB( hDev, &PortDcb ) )

+  {

+    printf( "error building comm state: error %u\n", GetLastError( ) );

+    return 0;

+  }

+  if( ! SetCommState( hDev, &PortDcb ) )

+  {

+    printf( "error setting device comm state: error %u\n", GetLastError( ) );

+    return 0;

+  }

+

+  //set timeout parameters

+  //maximum time between arrival of two characters: 10 ms

+  //if this time elapses, read command will return even if buffer is not filled completely

+  CommTimeouts.ReadIntervalTimeout = 10;

+  //disable read timeouts

+  CommTimeouts.ReadTotalTimeoutConstant = 0;

+  CommTimeouts.ReadTotalTimeoutMultiplier = 0;

+  //disable write timeouts

+  CommTimeouts.WriteTotalTimeoutConstant = 0;

+  CommTimeouts.WriteTotalTimeoutMultiplier = 0;

+  if( ! SetCommTimeouts( hDev, &CommTimeouts ) )

+  {

+    printf( "error setting device timeout parameters: error %u\n", GetLastError( ) );

+    return 0;

+  }

+

+  //success

+  return 1;

+}

+

+//receive frames from socket and output them

+//hDev may be INVALID_HANDLE_VALUE for not doing anything with device

+//returns error code (not for device-errors, 0 for success)

+static int recv_and_out( SOCKET udpSocket, HANDLE hDev,

+                         int * p_device_output_active,

+                         unsigned int format_change,

+                         unsigned int format_height, unsigned int format_width,

+                         unsigned int format_channels, unsigned int format_colors,

+                         etBlinkenProto proto,

+                         int use_msecs, unsigned int msecs, int is_serial_device )

+{

+  fd_set readFds, errFds;

+  stBlinkenFrame * pFrame;

+  char buffer[65536]; //64kB is more than maximum UDP size

+  int len, dev_eof;

+  struct timeval timeout, * p_timeout;

+  DWORD DevWrLen, Err, start, end;

+  COMSTAT ComStat;

+

+  dev_eof = 0;

+  for( ; ; )

+  {

+    //wait for next frame

+    FD_ZERO( &readFds );

+    FD_SET( udpSocket, &readFds );

+    FD_ZERO( &errFds );

+    FD_SET( udpSocket, &errFds );

+    if( use_msecs ) //timeout

+    {

+      start = GetTickCount( );

+      timeout.tv_sec = msecs / 1000;

+      timeout.tv_usec = msecs % 1000 * 1000;

+      p_timeout = &timeout;

+    }

+    else

+      p_timeout = NULL;

+    if( select( 0, &readFds, NULL, &errFds, p_timeout ) < 0 ) //error

+    {

+      printf( "error during select: %s\n", strerror( errno ) );

+      return -1;

+    }

+

+    //error on socket

+    if( FD_ISSET( udpSocket, &errFds ) )

+    {

+      printf( "error on socket\n" );

+      return -1;

+    }

+

+    //received frame

+    if( FD_ISSET( udpSocket, &readFds ) )

+    {

+      //fetch data

+      len = recv( udpSocket, buffer, sizeof( buffer ), 0 );

+      if( len < 0 )

+      {

+        printf( "could not read from socket\n" );

+        return -1;

+      }

+      if( len == 0 )

+        return -1;

+

+      //get frame from data

+      pFrame = BlinkenFrameFromNetwork( buffer, len, NULL );

+      if( pFrame != NULL )

+      {

+        //change format

+        if( format_change )

+          BlinkenFrameResize( pFrame, format_height, format_width, format_channels, format_colors - 1 );

+

+        //create output data from frame

+        len = BlinkenFrameToNetwork( pFrame, proto, buffer, sizeof( buffer ) );

+

+        //free frame

+        BlinkenFrameFree( pFrame );

+

+        //output data to device

+        if( hDev != INVALID_HANDLE_VALUE && len > 0 )

+        {

+          if( ! WriteFile( hDev, buffer, len, &DevWrLen, NULL ) || (int)DevWrLen != len )

+          {

+            if( *p_device_output_active )

+              printf( "error writing to device: error %lu\n", GetLastError( ) );

+            break;

+          }

+          //message: output to device was restarted

+          if( ! *p_device_output_active )

+            printf( "restarted output to device...\n" );

+          *p_device_output_active = 1;

+        }

+      }

+	}

+

+	//get state of serial device

+    if( hDev != INVALID_HANDLE_VALUE && is_serial_device )

+	{

+	  ClearCommError( hDev, &Err, &ComStat );

+	  //reception error

+	  if( Err & (CE_BREAK | CE_FRAME | CE_OVERRUN | CE_RXOVER | CE_RXPARITY) )

+	  {

+        if( *p_device_output_active )

+          printf( "error reading from device (comm err=%X)\n", Err );

+        break;

+	  }

+    }

+

+    //using time limit

+    if( use_msecs )

+    {

+      unsigned int msec;

+      //get time elapsed

+	  end = GetTickCount( );

+      msec = end - start;

+      //more than rest of timeout (or exact match)

+      if( msec >= msecs )

+        break;

+      msecs -= msec;

+    }

+

+  } //for( ; ; )

+

+  return 0;

+}

+

+//open device and output frames

+//returns error code (not for device-errors, 0 for success)

+static int open_and_output( SOCKET udpSocket, char * device,

+                            int * p_device_output_active,

+                            int serial_settings_change, char * serial_settings,

+                            unsigned int format_change,

+                            unsigned int format_height, unsigned int format_width,

+                            unsigned int format_channels, unsigned int format_colors,

+                            etBlinkenProto proto )

+{

+  HANDLE hDev;

+  int err;

+

+  //open device

+  hDev = CreateFile( device, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL );

+  if( hDev == INVALID_HANDLE_VALUE )

+  {

+    if( *p_device_output_active )

+      printf( "could not open \"%s\": error %u\n", device, GetLastError( ) );

+    return 0;

+  }

+

+  //setup serial port

+  if( serial_settings_change )

+  {

+    if( ! serial_settings_set( hDev, serial_settings ) )

+    {

+      if( *p_device_output_active )

+        printf( "could not set serial port to \"%s\"\n", serial_settings );

+      CloseHandle( hDev );

+      return 0;

+    }

+  }

+

+  //receive frames and output to device

+  err = recv_and_out( udpSocket, hDev, p_device_output_active,

+                      format_change, format_height, format_width, format_channels, format_colors,

+                      proto, 0, 0, serial_settings_change );

+

+  //close device

+  CloseHandle( hDev );

+

+  return err;

+}

+

+//open device and output frames in a loop

+//returns error code (not for device-errors, 0 for success)

+static int open_and_output_loop( SOCKET udpSocket, char * device,

+                                 int serial_settings_change, char * serial_settings,

+                                 int reopen_device, unsigned int reopen_device_ms,

+                                 unsigned int format_change,

+                                 unsigned int format_height, unsigned int format_width,

+                                 unsigned int format_channels, unsigned int format_colors,

+                                 etBlinkenProto proto )

+{

+  int device_output_active, err;

+

+  printf( "receiving frames and outputting them to \"%s\"...\n", device );

+  device_output_active = 1;

+

+  for( ; ; )

+  {

+

+    //try to open device and output frames

+    err = open_and_output( udpSocket, device,

+                           &device_output_active,

+                           serial_settings_change, serial_settings,

+                           format_change, format_height, format_width, format_channels, format_colors,

+                           proto );

+    if( err != 0 || ! reopen_device )

+      break;

+

+    //output to device stopped

+    if( device_output_active )

+      printf( "output to device stopped...\n" );

+    device_output_active = 0;

+

+    //only fetch data from socket for a short time

+    err = recv_and_out( udpSocket, INVALID_HANDLE_VALUE, &device_output_active,

+                        format_change, format_height, format_width, format_channels, format_colors,

+                        proto, 1, reopen_device_ms, serial_settings_change );

+    if( err != 0 )

+      break;

+

+  }

+

+  //output to device finshed

+  if( device_output_active )

+    printf( "output to device finished...\n" );

+  device_output_active = 0;

+

+  return err;

+}

+

+int main( int argCnt, char * * args )

+{

+  WSADATA WsaData;

+  int i, bound;

+  SOCKET udpSocket;

+  char * serial_settings;

+  etBlinkenProto proto;

+  unsigned int format_change, format_height, format_width, format_channels, format_colors;

+  unsigned int height, width, channels, colors, reopen_device_ms;

+  int serial_settings_change, reopen_device, unblock;

+  char txt[64];

+  unsigned short port;

+  struct sockaddr_in addr;

+  char * device;

+

+  //print info

+  printf( "BlinkenLib - BlinkenOutput\n"

+          "version 0.5.2 date 2006-05-10\n"

+          "Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>\n"

+          "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

+          "a blinkenarea.org project\n\n" );

+

+  //print syntax

+  if( argCnt <= 1 )

+  {

+    printf( "syntax: %s <parameter> [...]\n\n"

+            "parameters:\n"

+            "  -l [<ip>:]<port>\n"

+            "     local address (defaults to 0.0.0.0:2323)\n"

+            "     must occur before -r, may only occur once\n"

+            "  -r <ip>[:<port>]\n"

+            "     remote addess (defaults to every remote address)\n"

+            "  -p [BLP|EBLP|MCUF]\n"

+            "     protocol to output frames in (defaults to MCUF)\n"

+            "  -f <width>x<height>-<channels>/<colors>\n"

+            "     format to output frames in (defaults to no change)\n"

+            "  -d <device>\n"

+            "     device to output frames to (defaults to \"NUL\")\n"

+            "  -s <baud-rate>,<parity>,<data-bits>,<stop-bits>\n"

+            "     settings to use for serial devices (defaults to no change)\n"

+            "  -o <milliseconds>\n"

+            "     reopen device after short time on error (defaults to not reopen)\n"

+            "\n",

+            args[0] );

+    return 0;

+  }

+

+  WSAStartup( 0x0101, &WsaData );

+

+  //create udp socket

+  udpSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );

+  if( udpSocket == INVALID_SOCKET )

+  {

+    printf( "cannot create UDP socket: error %lu\n", WSAGetLastError( ) );

+    WSACleanup( );

+    return -1;

+  }

+  bound = 0;

+

+  //unblock udp socket

+  unblock = 1;

+  if( ioctlsocket( udpSocket, FIONBIO, &unblock ) == SOCKET_ERROR )

+  {

+    printf( "cannot unblock UDP socket: error %lu\n", WSAGetLastError( ) );

+	closesocket( udpSocket );

+    WSACleanup( );

+    return -1;

+  }

+

+  //process parameters

+  proto = BlinkenProtoMcuf;

+  format_change = 0;

+  format_height = 0;

+  format_width = 0;

+  format_channels = 0;

+  format_colors = 0;

+  device = "NUL";

+  serial_settings_change = 0;

+  reopen_device = 0;

+  for( i = 1; i < argCnt; i++ )

+  {

+

+    //local address

+    if( strcmp( args[i], "-l" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )

+        {

+          addr.sin_family = AF_INET;

+          addr.sin_port = htons( port );

+          addr.sin_addr.s_addr = inet_addr( txt );

+          if( bind( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )

+            printf( "could not set local address to \"%s\"\n", args[i] );

+          else

+            bound = 1;

+        }

+        else if( sscanf( args[i], "%hu", &port ) == 1 )

+        {

+          addr.sin_family = AF_INET;

+          addr.sin_port = htons( port );

+          addr.sin_addr.s_addr = htonl( INADDR_ANY );

+          if( bind( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )

+            printf( "could not set local address to \"%s\"\n", args[i] );

+          else

+            bound = 1;

+        }

+        else

+          printf( "invalid local address \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing local address for \"-l\"\n" );

+    }

+

+    //remote address

+    else if( strcmp( args[i], "-r" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )

+        {

+          addr.sin_family = AF_INET;

+          addr.sin_port = htons( port );

+          addr.sin_addr.s_addr = inet_addr( txt );

+          if( connect( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )

+            printf( "could not set remote address to \"%s\"\n", args[i] );

+        }

+        else if( sscanf( args[i], "%32[0-9.]", txt ) == 1 )

+        {

+          addr.sin_family = AF_INET;

+          addr.sin_port = htons( 23230 );

+          addr.sin_addr.s_addr = inet_addr( txt );

+          if( connect( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )

+            printf( "could not set remote address to \"%s\"\n", args[i] );

+        }

+        else

+          printf( "invalid remote address \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing remote address for \"-r\"\n" );

+    }

+

+    //protocol to output frames in

+    else if( strcmp( args[i], "-p" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( stricmp( args[i], "BLP" ) == 0 )

+          proto = BlinkenProtoBlp;

+        else if( stricmp( args[i], "EBLP" ) == 0 )

+          proto = BlinkenProtoEblp;

+        else if( stricmp( args[i], "MCUF" ) == 0 )

+          proto = BlinkenProtoMcuf;

+        else

+          printf( "unknown protocol \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing protocol for \"-p\"\n" );

+    }

+

+    //format to output frames in

+    else if( strcmp( args[i], "-f" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( sscanf( args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors ) == 4 &&

+            width > 0 && width < 1000 && height > 0 && height < 1000 &&

+            channels > 0 && channels < 20 && colors > 1 && colors <= 256 )

+        {

+          format_change = 1;

+          format_height = height;

+          format_width = width;

+          format_channels = channels;

+          format_colors = colors;

+        }

+        else

+          printf( "invalid frame format \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing frame format for \"-r\"\n" );

+    }

+

+    //device to output frames to

+    else if( strcmp( args[i], "-d" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        device = args[i];

+      }

+      else

+        printf( "missing device name for \"-d\"\n" );

+    }

+

+    //settings for serial output devices

+    else if( strcmp( args[i], "-s" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( serial_settings_parse( args[i] ) )

+        {

+          serial_settings_change = 1;

+		  serial_settings = args[i];

+        }

+        else

+          printf( "invalid serial settings \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing serial settings for \"-s\"\n" );

+    }

+

+    //reopen device on error after some time

+    else if( strcmp( args[i], "-o" ) == 0 )

+    {

+      if( i + 1 < argCnt )

+      {

+        i++;

+        if( sscanf( args[i], "%u", &reopen_device_ms ) == 1 && reopen_device_ms >= 1 )

+          reopen_device = 1;

+        else

+          printf( "invalid number of milliseconds \"%s\"\n", args[i] );

+      }

+      else

+        printf( "missing time for \"-o\"\n" );

+    }

+

+    //unknown parameter

+    else

+      printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );

+

+  } //for( i ...

+

+  //try to bind if not bound

+  if( ! bound )

+  {

+    printf( "no local address to receive frames on,\n"

+            "  using default local address \"0.0.0.0:2323\"\n" );

+    addr.sin_family = AF_INET;

+    addr.sin_port = htons( 2323 );

+    addr.sin_addr.s_addr = htonl( INADDR_ANY );

+    if( bind( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) == 0 )

+      bound = 1;

+    else

+    {

+      printf( "could not set local address to \"0.0.0.0:2323\"\n" );

+      closesocket( udpSocket );

+      return -1;

+    }

+  }

+

+  //open device and output frames in a loop

+  open_and_output_loop( udpSocket, device,

+                        serial_settings_change, serial_settings,

+                        reopen_device, reopen_device_ms,

+                        format_change, format_height, format_width, format_channels, format_colors,

+                        proto );

+

+  //close socket

+  closesocket( udpSocket );

+

+  WSACleanup( );

+  return 0;

+}

@@ -1,6 +1,6 @@

 /* BlinkenLib

- * version 0.5.1 date 2005-12-14

- * Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>

+ * version 0.5.2 date 2006-05-10

+ * Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

  */

@@ -8,17 +8,23 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#ifdef WIN32

+#include <winsock2.h>

+#define close closesocket

+#else

 #include <unistd.h>

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

+#endif

 #include "BlinkenLib.h"

 int main( int argCnt, char * * args )

 {

-  int i, udpSocket, bound, val, timeout;

+  int i, bound, val, timeout;

+  SOCKET udpSocket;

   char txt[64];

   unsigned short port;

   struct sockaddr_in addr;

@@ -26,8 +32,8 @@ int main( int argCnt, char * * args )

   //print info

   printf( "BlinkenLib - BlinkenRecv\n"

-          "version 0.5.1 date 2005-12-14\n"

-          "Copyright 2004-2005 Stefan Schuermans <1stein@schuermans.info>\n"

+          "version 0.5.2 date 2006-05-10\n"

+          "Copyright 2004-2006 Stefan Schuermans <1stein@schuermans.info>\n"

           "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"

           "a blinkenarea.org project\n\n" );

@@ -49,11 +55,21 @@ int main( int argCnt, char * * args )

     return 0;

   }

+#ifdef WIN32

+  {

+    WSADATA WsaData;

+    WSAStartup( 0x0101, &WsaData );

+  }

+#endif