Floppy-rb232 0.2.2 → 0.2.3

data/extconf.rb

@@ -1,2 +1,5 @@
 require 'mkmf'
+
+$CFLAGS = '-Wall ' + $CFLAGS
+
 create_makefile('rb232', 'src')

data/lib/rb232/text_protocol.rb

@@ -37,13 +37,21 @@ module RB232
       @reader_thread = Thread.new {
         buffer = ""
         while (@stop == false)
-          buffer += @port.read_string(1)
-          messages = buffer.split(@separator,3)
-          if messages.size > 1
-            changed
-            notify_observers(messages[0])
-            buffer = ""
-          end
+          new_string = ""
+          # Read in as much data as possible
+          begin
+            new_string = @port.read_string(255)
+            if (new_string.size > 0)
+              buffer += new_string
+              messages = buffer.split(@separator,2)
+              if messages.size > 1
+                changed
+                notify_observers(messages[0])
+                buffer = messages[1] || ""
+              end
+            end
+          end while (new_string.size > 0 && @stop == false)
+          sleep(0.5)
         end
       }
     end
@@ -56,4 +64,4 @@ module RB232
 
   end
 
-end
+end

data/src/port.c

@@ -3,6 +3,7 @@
 
 #include <fcntl.h>
 #include <termios.h>
+#include <unistd.h>
 
 /* Module and class handles */
 VALUE RB232 = Qnil;
@@ -40,6 +41,8 @@ VALUE rb232_port_data_free(void* p) {
     /* Free memory */
     free(port_data->port_name);
     free(port_data);
+    /* Done */
+    return Qnil;
 }
 
 /*
@@ -67,7 +70,7 @@ VALUE rb232_port_initialize_with_options(VALUE self, VALUE port, VALUE options)
     port_data->parity = rbx_bool_from_hash_or_default(options, ID2SYM(rb_intern("parity")), FALSE);
     port_data->stop_bits = rbx_int_from_hash_or_default(options, ID2SYM(rb_intern("stop_bits")), 1);
     /* Open the serial port */
-    port_data->port_handle = open(port_data->port_name, O_RDWR | O_NOCTTY);
+    port_data->port_handle = open(port_data->port_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
     if (port_data->port_handle < 0) {
         rb_raise(rb_eArgError, "couldn't open the specified port");
     }
@@ -251,8 +254,10 @@ int rb232_port_read(VALUE self, char* buffer, VALUE count) {
 }
 
 /*
- * Read _count_ raw byte values from the port.
- * Returns an array of values. Useful for binary protocols.
+ * Read up to _count_ raw byte values from the port.
+ * Returns an array of values. If no data is currently available, a zero-length
+ * array will be returned.
+ * Useful for binary protocols.
  * call-seq:
  *   read_bytes(count)
  *
@@ -265,11 +270,14 @@ VALUE rb232_port_read_bytes(VALUE self, VALUE count) {
     for (i=0; i<bytes_read; i++) {
         rb_ary_push(data, INT2NUM(buffer[i]));
     }
+    return data;
 }
 
 /*
- * Read _count_ characters from the port.
- * Returns a string. Useful for text-based protocols.
+ * Read up to _count_ characters from the port.
+ * Returns a string. If no data is currently available, an empty string will be 
+ * returned.
+ * Useful for text-based protocols.
  * call-seq:
  *   read_string(count)
  *
@@ -277,6 +285,7 @@ VALUE rb232_port_read_bytes(VALUE self, VALUE count) {
 VALUE rb232_port_read_string(VALUE self, VALUE count) {
     char buffer[256];
     int bytes_read = rb232_port_read(self, buffer, count);
+    if (bytes_read < 1) bytes_read = 0;
     buffer[bytes_read] = 0;
     return rb_str_new2(buffer);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-rb232
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2008-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: []