BlinkenLib

@@ -12,40 +12,103 @@

 #include <BlinkenLib/BlinkenLib.h>

+struct s_serial_settings {

+  char *str; // pointer into argv[]

+  DWORD BaudRate;

+  DWORD fParity : 1;

+  BYTE ByteSize;

+  BYTE Parity;

+  BYTE StopBits;

+};

+

 // get serial settings from text

-static int serial_settings_parse(char *str)

+static int serial_settings_parse(char *str,

+                                 struct s_serial_settings *serial_settings)

 {

   int baud, data, stop;

   char parity;

+  serial_settings->str = str;

+

   // 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) {

+  switch (baud) {

+    case 300:

+      serial_settings->BaudRate = CBR_300;

+      break;

+    case 600:

+      serial_settings->BaudRate = CBR_600;

+      break;

+    case 1200:

+      serial_settings->BaudRate = CBR_1200;

+      break;

+    case 2400:

+      serial_settings->BaudRate = CBR_2400;

+      break;

+    case 4800:

+      serial_settings->BaudRate = CBR_4800;

+      break;

+    case 9600:

+      serial_settings->BaudRate = CBR_9600;

+      break;

+    case 19200:

+      serial_settings->BaudRate = CBR_19200;

+      break;

+    case 57600:

+      serial_settings->BaudRate = CBR_57600;

+      break;

+    case 115200:

+      serial_settings->BaudRate = CBR_115200;

+      break;

+    default:

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

       return 0;

   }

   // parity

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

-      parity != 'e' && parity != 'E' && parity != 'o' && parity != 'O') {

+  switch (parity) {

+    case 'n':

+    case 'N':

+      serial_settings->fParity = 0;

+      serial_settings->Parity = NOPARITY;

+      break;

+    case 'e':

+    case 'E':

+      serial_settings->fParity = 1;

+      serial_settings->Parity = EVENPARITY;

+      break;

+    case 'o':

+    case 'O':

+      serial_settings->fParity = 1;

+      serial_settings->Parity = ODDPARITY;

+      break;

+    default:

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

       return 0;

   }

   // data bits

-  if (data != 5 && data != 6 && data != 7 && data != 8) {

+  switch (data) {

+    case 5:

+    case 6:

+    case 7:

+    case 8:

+      serial_settings->ByteSize = data;

+      break;

+    default:

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

       return 0;

   }

   // stop bits

-  if (stop != 1 && stop == 2) {

+  switch (stop) {

+    case 1:

+      serial_settings->StopBits = ONESTOPBIT;

+      break;

+    case 2:

+      serial_settings->StopBits = TWOSTOPBITS;

+      break;

+    default:

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

       return 0;

   }

@@ -54,7 +117,7 @@ static int serial_settings_parse(char *str)

 }

 // set serial settings for fd

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

+static int serial_settings_set(HANDLE hDev, struct s_serial_settings *settings)

 {

   DCB PortDcb;

   COMMTIMEOUTS CommTimeouts;

@@ -68,7 +131,11 @@ static int serial_settings_set(HANDLE hDev, char *settings)

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

     return 0;

   }

-  (void) settings; // TODO: set PortDcb fields

+  PortDcb.BaudRate = settings->BaudRate;

+  PortDcb.fParity = settings->fParity;

+  PortDcb.ByteSize = settings->ByteSize;

+  PortDcb.Parity = settings->Parity;

+  PortDcb.StopBits = settings->StopBits;

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

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

     return 0;

@@ -208,7 +275,8 @@ static int recv_and_out(SOCKET udpSocket, HANDLE hDev,

 // 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,

+                           int serial_settings_change,

+                           struct s_serial_settings *serial_settings,

                            unsigned int format_change,

                            unsigned int format_height,

                            unsigned int format_width,

@@ -231,7 +299,7 @@ static int open_and_output(SOCKET udpSocket, char *device,

   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);

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

       CloseHandle(hDev);

       return 0;

     }

@@ -252,7 +320,8 @@ static int open_and_output(SOCKET udpSocket, char *device,

 // 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,

+                                struct s_serial_settings *serial_settings,

+                                int reopen_device,

                                 unsigned int reopen_device_ms,

                                 unsigned int format_change,

                                 unsigned int format_height,

@@ -305,7 +374,7 @@ int main(int argCnt, char **args)

   WSADATA WsaData;

   int i, bound;

   SOCKET udpSocket;

-  char *serial_settings;

+  struct s_serial_settings serial_settings = {};

   etBlinkenProto proto;

   unsigned int format_change, format_height, format_width, format_channels,

       format_colors;

@@ -468,9 +537,8 @@ int main(int argCnt, char **args)

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

       if (i + 1 < argCnt) {

         i++;

-        if (serial_settings_parse(args[i])) {

+        if (serial_settings_parse(args[i], &serial_settings)) {

           serial_settings_change = 1;

-          serial_settings = args[i];

         } else

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

       } else

@@ -513,7 +581,7 @@ int main(int argCnt, char **args)

   }

   // open device and output frames in a loop

   open_and_output_loop(udpSocket, device,

-                       serial_settings_change, serial_settings,

+                       serial_settings_change, &serial_settings,

                        reopen_device, reopen_device_ms,

                        format_change, format_height, format_width,

                        format_channels, format_colors, proto);