oled-control 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c496a83d860309cdefd939cff54744d546ee3a9
-  data.tar.gz: 20260794cf74b80a183303d7ea79cf467082e86c
+  metadata.gz: e775137c40f4aa32848dfc96daaa21d080b13a64
+  data.tar.gz: 4d3976367e2133f52dedced9e7972b59bbd8af08
 SHA512:
-  metadata.gz: 5f99bf7fb85a8edb3badce29b6885ab3be3a96d52577e08207a39d8908246571b0b84c20c96d23d4c70579ad8e99636bf5bc331fb0661cd6240a04673b9919a2
-  data.tar.gz: e802e762c16ac8723e868a389e43874829ee05d8d537d5de1bd4fe540b7894495b420273481c1ba08ef6c61cc5cb01f9e4ad55f116918abbba966336db67146d
+  metadata.gz: 763f6a112a2a2dc42f9e3d82e9988afe87a889e1ca23136d2bd6bba77c1e677db0c6917aa1e7ab788dee3d885531ac2765a3e39305e907f986fefee310d472d0
+  data.tar.gz: 3544ed8545d58fb5781f8ad614c222b0fde6cd160715c69d7dc4d43e3055a279a53a1b4699404ec50607c3e363679c715db152f92b4109e522dc22b25601ebf6

data/ext/oled-control/extconf.rb

@@ -2,4 +2,6 @@ require 'mkmf'
 
 have_library('i2c-dev')
 
+$CFLAGS += " -std=c99"
+
 create_makefile('oled-control/oled_control')

data/ext/oled-control/main.c

@@ -68,7 +68,7 @@ void test_display() {
 
 int main() {
     configure_display("/dev/i2c-1", 0x3c);
-    init_display();
+    init_display(0x06);
     test_display();
     return 0;
 }

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

@@ -24,14 +24,15 @@ static VALUE write_string(VALUE self, VALUE str) {
     return Qtrue;
 }
 
-static VALUE init(VALUE self, VALUE i2cbus, VALUE i2caddress) {
+static VALUE init(VALUE self, VALUE i2cbus, VALUE i2caddress, VALUE orientation) {
     const char *bus = RSTRING_PTR(i2cbus);
     uint8_t a = NUM2UINT(i2caddress);
+    uint8_t o = NUM2UINT(orientation);
 
     if(!configure_display(bus, a))
         rb_raise(rb_eRuntimeError, "can't detect display! Bus/address wrong?");
 
-    if(!init_display())
+    if(!init_display(o))
         rb_raise(rb_eRuntimeError, "failure initializing display");
 
     return Qtrue;
@@ -60,6 +61,27 @@ static VALUE disable(VALUE self) {
     return Qtrue;
 }
 
+static VALUE create_character(VALUE self, VALUE position, VALUE chardata) {
+    uint8_t data[8];
+    Check_Type(chardata, T_ARRAY);
+    Check_Type(position, T_FIXNUM);
+
+    uint8_t pos = NUM2UINT(position);
+    int len = RARRAY_LEN(chardata);
+    if((len > 8) || (len < 8)) {
+        rb_raise(rb_eRuntimeError, "error: array must be exactly of size 8");
+        return Qnil;
+    } else {
+        for(int i=0; i<8; i++)
+            data[i] = rb_ary_entry(chardata, i);
+    }
+    if(!create_custom_character(pos, data)) {
+        rb_raise(rb_eRuntimeError, "error creating custom character");
+        return Qnil;
+    }
+    return Qtrue;
+}
+
 static VALUE send_command(VALUE self, VALUE command) {
     uint8_t  cmd = NUM2UINT(command);
     if(!send_cmd(cmd)) {
@@ -94,8 +116,9 @@ void Init_oled_control(void) {
     rb_define_method(klass, "set_contrast", set_contrast, 1);
     rb_define_method(klass, "enable", enable, 0);
     rb_define_method(klass, "disable", disable, 0);
+    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, "init", init, 2);
+    rb_define_protected_method(klass, "init", init, 3);
 }

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

@@ -91,7 +91,23 @@ int configure_display(const char* bus, uint8_t address) {
     return configured;
 }
 
-int init_display() {
+int create_custom_character(uint8_t pos, uint8_t map[]) {
+    pos &= 0x7;
+    if(!i2c_write_byte(CMD, 0x40 | (pos << 3)))
+        return FALSE;
+
+    usleep(30);
+    int result;
+    for (int i=0; i<8; i++) {
+        result = i2c_write_byte(DATA, map[i] >> 1);
+        if(!result)
+            break;
+        usleep(40);
+    }
+    return result;
+}
+
+int init_display(uint8_t orientation) {
     if(!configured)
         return FALSE;
 
@@ -124,7 +140,7 @@ int init_display() {
     i2c_write_byte(CMD, 0x78) &&
     i2c_write_byte(CMD, 0x28) &&
     i2c_write_byte(CMD, 0x2a) &&
-    i2c_write_byte(CMD, 0x06) && // entry mode (move cursor right, don’t shift display)
+    i2c_write_byte(CMD, orientation) &&
     i2c_write_byte(CMD, 0x28) &&
     i2c_write_byte(CMD, 0x01) &&
     i2c_write_byte(CMD, 0x80) &&

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

@@ -31,7 +31,8 @@ int display_enable();
 int display_disable();
 int send_cmd(uint8_t cmd);
 int send_raw_cmd(uint8_t cmd);
+int create_custom_character(uint8_t pos, uint8_t map[]);
 int configure_display(const char* bus, uint8_t address);
-int init_display();
+int init_display(uint8_t orientation);
 
 #endif //OLED_CONTROL_OLED_CONTROL_H

data/lib/oled-control/oled.rb

@@ -46,7 +46,12 @@ class OLED
         0xE3 => 0x61, # ã -> a
         0xC3 => 0x41, # Ã -> A
     }
-    self.init(i2c_bus, i2c_address)
+    orientation = if @flipped
+                    FLIPPED
+                  else
+                    NORMAL
+                  end
+    self.init(i2c_bus, i2c_address, orientation)
   end
 
   def clear_row(row)
@@ -71,6 +76,10 @@ class OLED
     end
   end
 
+  def raw_write(str)
+    self.write_string(str);
+  end
+
   def write(str)
     unless str.is_a?(String)
       str = str.to_s

metadata

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