ssd1306: Add support for SH1106 and SH1107 (#104)

* Add support for SH1106 Chip
* Add support for SH1107 Chip
* Expand example w/ Geometric drawing examples.
* Cleanup code to use constants.

Author: gsexton

ssd1306/doc.go

@@ -2,17 +2,18 @@
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
-// Package ssd1306 controls a 128x64 monochrome OLED display via a SSD1306
-// controller.
+// Package ssd1306 controls a monochrome OLED display via a SSD1306, SH1106,
+// or SH1107 controller. The driver automatically detects the variant and
+// adjusts accordingly.
 //
 // The driver does differential updates: it only sends modified pixels for the
 // smallest rectangle, to economize bus bandwidth. This is especially important
 // when using I²C as the bus default speed (often 100kHz) is slow enough to
 // saturate the bus at less than 10 frames per second.
 //
-// The SSD1306 is a write-only device. It can be driven on either I²C or SPI
-// with 4 wires. Changing between protocol is likely done through resistor
-// soldering, for boards that support both.
+// The device can be driven on either I²C or SPI with 4 wires. Changing
+// between protocol is likely done through resistor soldering, for boards that
+// support both.
 //
 // Some boards expose a RES / Reset pin. If present, it must be normally be
 // High. When set to Low (Ground), it enables the reset circuitry. It can be
@@ -25,11 +26,22 @@
 // # Datasheets
 //
 // Product page:
+//
+// # SSD1306
+//
 // http://www.solomon-systech.com/en/product/display-ic/oled-driver-controller/ssd1306/
 //
 // https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
 //
 // "DM-OLED096-624": https://drive.google.com/file/d/0B5lkVYnewKTGaEVENlYwbDkxSGM/view
 //
-// "ssd1306": https://drive.google.com/file/d/0B5lkVYnewKTGYzhyWWp0clBMR1E/view
+// # SH1106
+//
+// https://cdn.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
+//
+// # SH1107
+//
+// https://www.adafruit.com/product/5297
+//
+// https://www.displayfuture.com/Display/datasheet/controller/SH1107.pdf
 package ssd1306

ssd1306/example_test.go

@@ -5,8 +5,14 @@
 package ssd1306_test
 
 import (
+	"flag"
+	"fmt"
 	"image"
+	"image/color"
+	"image/draw"
 	"log"
+	"math"
+	"time"
 
 	"periph.io/x/conn/v3/i2c/i2creg"
 	"periph.io/x/devices/v3/ssd1306"
@@ -19,35 +25,80 @@ func Example() {
 	if _, err := host.Init(); err != nil {
 		log.Fatal(err)
 	}
-
+	var width = flag.Int("width", 128, "Display Width")
+	var height = flag.Int("height", 64, "Display Height")
+	flag.Parse()
 	// Use i2creg I²C bus registry to find the first available I²C bus.
 	b, err := i2creg.Open("")
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer b.Close()
-
-	dev, err := ssd1306.NewI2C(b, &ssd1306.DefaultOpts)
+	opts := ssd1306.DefaultOpts
+	opts.W = *width
+	opts.H = *height
+	if opts.H == 32 {
+		opts.Sequential = true
+	}
+	dev, err := ssd1306.NewI2C(b, &opts)
 	if err != nil {
-		log.Fatalf("failed to initialize ssd1306: %v", err)
+		log.Fatalf("failed to initialize display: %s", err.Error())
 	}
+	fmt.Printf("device=%s\n", dev.String())
 
-	// Draw on it.
 	img := image1bit.NewVerticalLSB(dev.Bounds())
 	// Note: this code is commented out so periph does not depend on:
 	//    "golang.org/x/image/font"
 	//    "golang.org/x/image/font/basicfont"
 	//    "golang.org/x/image/math/fixed"
 	//
-	// f := basicfont.Face7x13
-	// drawer := font.Drawer{
-	// 	Dst:  img,
-	// 	Src:  &image.Uniform{image1bit.On},
-	// 	Face: f,
-	// 	Dot:  fixed.P(0, img.Bounds().Dy()-1-f.Descent),
-	// }
-	// drawer.DrawString("Hello from periph!")
+	// Draw on it.
+	/*
+		f := basicfont.Face7x13
+		drawer := font.Drawer{
+			Dst: img,
+			Src: &image.Uniform{image1bit.On},
+
+			Face: f,
+			Dot:  fixed.P(0, img.Bounds().Dy()-1-f.Descent),
+		}
+		drawer.DrawString("Hello from periph!")
+		_ = dev.Draw(dev.Bounds(), img, image.Point{})
+		time.Sleep(5 * time.Second)
+	*/
+
+	white := color.RGBA{255, 255, 255, 255}
+	black := color.RGBA{0, 0, 0, 255}
+	colors := []color.RGBA{white, black}
+
+	rectNum := 0
+	// Draw some nested rectangles
+	for w, h := opts.W, opts.H; w > 0 && h > 0; w, h = w-4, h-4 {
+		rect := image.Rect(0, 0, w, h)
+		draw.Draw(img, rect.Add(image.Point{X: rectNum * 2, Y: rectNum * 2}), &image.Uniform{colors[rectNum%2]}, image.Point{}, draw.Src)
+		rectNum += 1
+	}
+
 	if err := dev.Draw(dev.Bounds(), img, image.Point{}); err != nil {
 		log.Fatal(err)
 	}
+	time.Sleep(5 * time.Second)
+
+	// Draw a Sine Wave
+	_ = dev.Invert(true)
+	img = image1bit.NewVerticalLSB(dev.Bounds())
+	img.DrawHLine(0, opts.W, opts.H>>1-1, image1bit.On)
+	img.DrawVLine(0, opts.H, opts.W>>1-1, image1bit.On)
+	angle := float64(0)
+	angleStep := float64((4 * math.Pi) / float64(opts.W))
+	scale := float64((opts.H >> 1) - 4)
+	for step := opts.W - 1; step >= 0; step -= 1 {
+		y := int(float64(math.Sin(angle)*scale)) + opts.H>>1
+		img.SetBit(step, y, image1bit.On)
+		angle += angleStep
+	}
+	_ = dev.Draw(dev.Bounds(), img, image.Point{})
+	time.Sleep(10 * time.Second)
+
+	_ = dev.Halt()
 }

ssd1306/image1bit/image1bit.go

@@ -143,6 +143,20 @@ func (i *VerticalLSB) SetBit(x, y int, b Bit) {
 	}
 }
 
+// Draw a horizontal line from start to end at ypos
+func (i *VerticalLSB) DrawHLine(start, end, ypos int, b Bit) {
+	for x := start; x < end; x++ {
+		i.SetBit(x, ypos, b)
+	}
+}
+
+// Draw a vertical line from start to end at xpos
+func (i *VerticalLSB) DrawVLine(start, end, xpos int, b Bit) {
+	for y := start; y < end; y++ {
+		i.SetBit(xpos, y, b)
+	}
+}
+
 /*
 // SubImage returns an image representing the portion of the image p visible
 // through r. The returned value shares pixels with the original image.