rb232 0.2.5 → 0.3.0

data/README

@@ -30,8 +30,8 @@ license, so you can do anything you like with it.
 == STATUS
 
 Currently you can read from a serial port, but not write back. The code is only 
-tested on Linux - other unixes *may* work, Mac OSX *might* be ok, but Windows
-is right out for now. Watch this space for further developments!
+tested on Linux and Snow Leopard - other unixes *may* work, but Windows is right
+ out for now. Watch this space for further developments!
 
 == USAGE
 
@@ -49,6 +49,8 @@ You can provide alternative settings when you create a new port:
                                     :stop_bits => 2,
                                     :hardware_flow_control => true)
 
+Note that OSX doesn't currently have hardware flow control support.
+
 See http://github.com/Floppy/rb232/tree/master/spec/port_spec.rb or RB232::Port
 documentation for more details.
 
@@ -56,4 +58,4 @@ If you are using a simple text protocol over RS232, you can use the
 RB232::TextProtocol class to help you out. It automatically monitors the port
 and splits messages up by detecting separator characters. See 
 http://github.com/Floppy/rb232/tree/master/examples/listen.rb for an example of
-how to use this class.
+how to use this class.

data/src/port.c

@@ -77,63 +77,66 @@ VALUE rb232_port_initialize_with_options(VALUE self, VALUE port, VALUE options)
         rb_raise(rb_eArgError, "couldn't open the specified port");
     }
     /* Set port settings */
+	cfmakeraw(&(port_data->settings));
     port_data->settings.c_cflag = CRTSCTS | CLOCAL | CREAD;
     /* Baud rate */
+	speed_t speed = B0;
     switch (port_data->baud_rate) {
         case 0:
-            port_data->settings.c_cflag |= B0;
+            speed = B0;
             break;
         case 50:
-            port_data->settings.c_cflag |= B50;
+            speed = B50;
             break;
         case 75:
-            port_data->settings.c_cflag |= B75;
+            speed = B75;
             break;
         case 110:
-            port_data->settings.c_cflag |= B110;
+            speed = B110;
             break;
         case 134:
-            port_data->settings.c_cflag |= B134;
+            speed = B134;
             break;
         case 150:
-            port_data->settings.c_cflag |= B150;
+            speed = B150;
             break;
         case 200:
-            port_data->settings.c_cflag |= B200;
+            speed = B200;
             break;
         case 300:
-            port_data->settings.c_cflag |= B300;
+            speed = B300;
             break;
         case 600:
-            port_data->settings.c_cflag |= B600;
+            speed = B600;
             break;
         case 1200:
-            port_data->settings.c_cflag |= B1200;
+            speed = B1200;
             break;
         case 1800:
-            port_data->settings.c_cflag |= B1800;
+            speed = B1800;
             break;
         case 2400:
-            port_data->settings.c_cflag |= B2400;
+            speed = B2400;
             break;
         case 4800:
-            port_data->settings.c_cflag |= B4800;
+            speed = B4800;
             break;
         case 9600:
-            port_data->settings.c_cflag |= B9600;
+            speed = B9600;
             break;
         case 19200:
-            port_data->settings.c_cflag |= B19200;
+            speed = B19200;
             break;
         case 38400:
-            port_data->settings.c_cflag |= B38400;
+            speed = B38400;
             break;
         case 57600:
-            port_data->settings.c_cflag |= B57600;
+            speed = B57600;
             break;
         default:
             rb_raise(rb_eArgError, "baud_rate must be a valid value");
     }
+  	cfsetspeed(&(port_data->settings), speed);
     /* Data bits */
     switch (port_data->data_bits) {
         case 8:
@@ -150,7 +153,7 @@ VALUE rb232_port_initialize_with_options(VALUE self, VALUE port, VALUE options)
             break;
         default:
             rb_raise(rb_eArgError, "data_bits must be 5, 6, 7 or 8");
-    }    
+    }	
     /* Parity */
     if (port_data->parity) port_data->settings.c_cflag |= PARENB;
     /* Stop bits */
@@ -163,8 +166,10 @@ VALUE rb232_port_initialize_with_options(VALUE self, VALUE port, VALUE options)
         default:
             rb_raise(rb_eArgError, "stop_bits must be 1 or 2");
     }
+#ifdef CNEW_RTSCTS
     /* Flow control */
     if (port_data->hardware_flow_control) port_data->settings.c_cflag |= CNEW_RTSCTS;
+#endif
     /* Other settings */
     port_data->settings.c_iflag = IGNPAR | ICRNL;
     port_data->settings.c_oflag = 0;
@@ -301,6 +306,7 @@ VALUE rb232_port_read_bytes(VALUE self, VALUE count) {
  */
 VALUE rb232_port_read_string(VALUE self, VALUE count) {
     char buffer[256];
+    memset(buffer, 0, 256);
     int bytes_read = rb232_port_read(self, buffer, count);
     if (bytes_read < 1) bytes_read = 0;
     buffer[bytes_read] = 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rb232
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Smith