oled-control 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e775137c40f4aa32848dfc96daaa21d080b13a64
-  data.tar.gz: 4d3976367e2133f52dedced9e7972b59bbd8af08
+  metadata.gz: 6ef89f0ae721f6a29e325cdd5d199b753b491c13
+  data.tar.gz: a9b4f40492ec195919a67c047374e13ad98902de
 SHA512:
-  metadata.gz: 763f6a112a2a2dc42f9e3d82e9988afe87a889e1ca23136d2bd6bba77c1e677db0c6917aa1e7ab788dee3d885531ac2765a3e39305e907f986fefee310d472d0
-  data.tar.gz: 3544ed8545d58fb5781f8ad614c222b0fde6cd160715c69d7dc4d43e3055a279a53a1b4699404ec50607c3e363679c715db152f92b4109e522dc22b25601ebf6
+  metadata.gz: d80555c9096337a726bab1d64eae0bc061009633f452468cd405e0ca16d276a3255539c2530d800b7d579c83d6927a1837e6d89fbdcc8edbdf01b6100575195d
+  data.tar.gz: fbd3bf62f01f7611cae76cc81da193c278691c4e40f6e55ecdc8b56d4568fb4656dd63b82936c2c40aa29b8565a0cf5b6406d68178c5dfa20337d6f17bdb05cf

data/ext/oled-control/oled-control-gem.c

@@ -16,9 +16,10 @@ static VALUE set_cursor(VALUE self, VALUE col, VALUE row) {
     return Qtrue;
 }
 
-static VALUE write_string(VALUE self, VALUE str) {
+static VALUE write_string(VALUE self, VALUE str, VALUE len) {
     const char *s = RSTRING_PTR(str);
-    if(!i2c_write_bytes(DATA, s))
+    size_t length = NUM2SIZET(len);
+    if(!i2c_write_n_bytes(DATA, s, length))
         rb_raise(rb_eRuntimeError, "unable to write string to display");
 
     return Qtrue;
@@ -119,6 +120,6 @@ void Init_oled_control(void) {
     rb_define_method(klass, "create_character", create_character, 2);
     rb_define_protected_method(klass, "send_command", send_command, 1);
     rb_define_protected_method(klass, "send_raw_command", send_raw_command, 1);
-    rb_define_protected_method(klass, "write_string", write_string, 1);
+    rb_define_protected_method(klass, "write_string", write_string, 2);
     rb_define_protected_method(klass, "init", init, 3);
 }

data/ext/oled-control/oled-control.c

@@ -19,12 +19,15 @@ int i2c_write_byte(uint8_t reg, uint8_t data) {
 }
 
 int i2c_write_bytes(uint8_t reg, const char* data) {
-    size_t len = sizeof(uint8_t) + strlen(data);
-    // allocate room for reg + data + trailing null character:
-    char *buf = calloc(1, len+1);
+    return i2c_write_n_bytes(reg, data, strlen(data));
+}
+
+int i2c_write_n_bytes(uint8_t reg, const char* data, size_t length) {
+    size_t len = sizeof(uint8_t) + length;
+    char *buf = calloc(1, len);
     memcpy(&buf[0], &reg, 1);
-    memcpy(&buf[1], data, strlen(data));
-    // write the reg + data, minus the trailing null character
+    memcpy(&buf[1], data, length);
+
     if(write(i2c_bus_handle, buf, len) != len) {
         fprintf(stderr, "Write to device failed\n");
         free(buf);

data/ext/oled-control/oled-control.h

@@ -24,6 +24,7 @@
 
 int i2c_write_byte(uint8_t reg, uint8_t data);
 int i2c_write_bytes(uint8_t reg, const char* data);
+int i2c_write_n_bytes(uint8_t reg, const char* data, size_t length);
 int set_cursor_position(uint8_t col, uint8_t row);
 int clear_display();
 int set_contrast_level(uint8_t level);

data/lib/oled-control/oled.rb

@@ -38,6 +38,12 @@ class OLED
         0xA3 => 0xA1, # £
         0xFA => 0xEA, # ú
         0xDA => 0xE5, # Ú
+        0x5B => 0xFA, # [
+        0x5D => 0xFC, # ]
+        0x7B => 0xFD, # {
+        0x7D => 0xFF, # }
+        0xE8 => 0xA4, # è
+        0xC8 => 0xC4, # È
         # unsupported characters are mapped to closest match
         0xEF => 0x69, # ï -> i
         0xCF => 0x49, # Ï -> I
@@ -77,7 +83,7 @@ class OLED
   end
 
   def raw_write(str)
-    self.write_string(str);
+    self.write_string(str, str.size);
   end
 
   def write(str)
@@ -87,6 +93,7 @@ class OLED
     iso_string = str.encode('iso-8859-1')
     encoded_string = []
     iso_string.each_byte{|b| encoded_string << (@character_conversion[b.ord].nil? ? b.ord : @character_conversion[b.ord]) }
-    self.write_string(encoded_string.pack("c*"))
+    result = encoded_string.pack("c*")
+    self.write_string(result, result.size)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oled-control
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christian Lønaas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Gem for SSD1311 based 20x4 OLED display
 email: christian.lonaas@discombobulator.org