Add OLED library - update tiny wire libraries - add support for all PWM channels and PWM on pin 8

Author: ekettenburg

hardware/digistump/avr/cores/pro/Arduino.h

@@ -103,6 +103,11 @@ int digitalRead(uint8_t);
 int analogRead(uint8_t);
 void analogReference(uint8_t mode);
 void analogWrite(uint8_t, int);
+void pwmWrite(uint8_t, int);
+void pwmConnect(uint8_t);
+void pwmDisconnect(uint8_t);
+void pwmReset(void);
+
 
 unsigned long millis(void);
 unsigned long micros(void);
@@ -160,8 +165,8 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
 #define TIMER1B 4
 #define TIMER1D 5
 
-#define CHANNELA 3; //TIMER1A
-#define CHANNELB 4; //TIMER1B
+#define CHANNELA 3 //TIMER1A
+#define CHANNELB 4 //TIMER1B
 
 #include "pins_arduino.h"
 

hardware/digistump/avr/cores/pro/Stream_old.h

@@ -185,15 +185,15 @@ void analogWrite(uint8_t pin, int val)
     uint8_t timer = digitalPinToTimer(pin);
 
 
-/*
-	if( timer == TIMER0B){
-		// connect pwm to pin on timer 0, channel B
-		sbi(TCCR0A, COM0B1);
-		cbi(TCCR0A, COM0B0);
-		OCR0B = val; // set pwm duty
-	} else
-*/
 
+	if( timer == TIMER0A){
+		// connect pwm to pin 8 on timer 0, channel A
+		sbi(TCCR0A, COM0A1);
+		cbi(TCCR0A, COM0A0);
+    sbi(TCCR0A, WGM01);
+    sbi(TCCR0A, WGM00);
+		OCR0A = val; // set pwm duty
+	} else
 
 	if( timer == TIMER1A){
 		// connect pwm to pin on timer 1, channel A

hardware/digistump/avr/cores/pro/wiring_analog.c

@@ -0,0 +1,52 @@
+CHANGES
+
+
+2015-01-10 (nb)
+
+Fixed and improved initialization. New and improved printing of text. Updated texts.
+
+- Fixed initialization commands.
+- Implemented ssd1306_init more efficiently.
+- New functions ssd1306_send_command_start, ssd1306_send_command_stop.
+- Improved ssd1306_setpos, more efficient.
+- Reimplemented function ssd1306_char_f6x8 as improved ssd1306_char_font6x8 printing single characters only, added new ssd1306_string_font6x8 for printing strings.
+- The font8x16 functions and data moved to another file until properly implemented.
+- Added to the Make file ssd1306xled8x16 file.
+- Updated testing text displayed on the screen.
+
+
+2015-01-10 (nb)
+
+Changed default pins for display, now PB0=SCL and PB1=SDA. Source code reformatting, improvements, edited comments.
+
+- Changed default pins for connecting to the display for consistency with the built-in TWI interface, they are now PB0=SCL and PB1=SDA.
+- Source code, removed redundant initializations of variables.
+- Source code reformatting, edited comments.
+
+
+2015-01-10 (nb)
+
+Fixed some warnings, variables renamed. The font16x16/Chinese stuff moved to other folders.
+
+- Font variable ssd1306xled_font8X16 renamed to ssd1306xled_font8x16 for consistency. TODO: rename "ssd1306xled_font8x16" file as well.
+- Fixed ssd1306_draw_bmp prototype: added "const" to bitmap so it wont't generate warning.
+- Files related to font 16x16 (Chinese) moved to different folders: font16x16cn.h.
+- Functions and other code related to font 16x16 (Chinese) moved to different folders.
+- Source code reformatting, edited comments.
+
+
+2014-10-26 (gs)
+
+Make project compile on gcc-avr - turn static images to consts, and rename include of font16x16cn.h
+
+
+2014-08-13 (nb)
+
+More files added to the repository.
+
+
+2014-08-11 (nb)
+
+Files added to the repository.
+
+

hardware/digistump/avr/libraries/DigisparkOLED/CHANGES.txt

@@ -0,0 +1,231 @@
+/*
+ * SSD1306xLED - Drivers for SSD1306 controlled dot matrix OLED/PLED 128x64 displays
+ *
+ * @created: 2014-08-12
+ * @author: Neven Boyanov
+ *
+ * Source code available at: https://bitbucket.org/tinusaur/ssd1306xled
+ *
+ */
+
+// ----------------------------------------------------------------------------
+
+#include <stdlib.h>
+#include <avr/io.h>
+
+#include <avr/pgmspace.h>
+
+#include "DigisparkOLED.h"
+#include "font6x8.h"
+#include "font8x16.h"
+
+
+
+// ----------------------------------------------------------------------------
+
+// Some code based on "IIC_wtihout_ACK" by http://www.14blog.com/archives/1358
+
+const uint8_t ssd1306_init_sequence [] PROGMEM = {	// Initialization Sequence
+	0xAE,			// Display OFF (sleep mode)
+	0x20, 0b00,		// Set Memory Addressing Mode
+					// 00=Horizontal Addressing Mode; 01=Vertical Addressing Mode;
+					// 10=Page Addressing Mode (RESET); 11=Invalid
+	0xB0,			// Set Page Start Address for Page Addressing Mode, 0-7
+	0xC8,			// Set COM Output Scan Direction
+	0x00,			// ---set low column address
+	0x10,			// ---set high column address
+	0x40,			// --set start line address
+	0x81, 0x3F,		// Set contrast control register
+	0xA1,			// Set Segment Re-map. A0=address mapped; A1=address 127 mapped. 
+	0xA6,			// Set display mode. A6=Normal; A7=Inverse
+	0xA8, 0x3F,		// Set multiplex ratio(1 to 64)
+	0xA4,			// Output RAM to Display
+					// 0xA4=Output follows RAM content; 0xA5,Output ignores RAM content
+	0xD3, 0x00,		// Set display offset. 00 = no offset
+	0xD5,			// --set display clock divide ratio/oscillator frequency
+	0xF0,			// --set divide ratio
+	0xD9, 0x22,		// Set pre-charge period
+	0xDA, 0x12,		// Set com pins hardware configuration		
+	0xDB,			// --set vcomh
+	0x20,			// 0x20,0.77xVcc
+	0x8D, 0x14,		// Set DC-DC enable
+	0xAF			// Display ON in normal mode
+	
+};
+
+uint8_t oledFont, oledX, oledY = 0;
+
+// Program:    5248 bytes
+
+SSD1306Device::SSD1306Device(void){}
+
+
+void SSD1306Device::begin(void)
+{
+	Wire.begin();
+	
+	for (uint8_t i = 0; i < sizeof (ssd1306_init_sequence); i++) {
+		ssd1306_send_command(pgm_read_byte(&ssd1306_init_sequence[i]));
+	}
+	clear();
+}
+
+
+void SSD1306Device::setFont(uint8_t font)
+{
+	oledFont = font;
+}
+
+void SSD1306Device::ssd1306_send_command_start(void) {
+	Wire.beginTransmission(SSD1306);
+	Wire.write(0x00);	// write command
+}
+
+void SSD1306Device::ssd1306_send_command_stop(void) {
+	Wire.endTransmission();
+}
+
+void SSD1306Device::ssd1306_send_data_byte(uint8_t byte)
+{
+	if(Wire.writeAvailable()){
+		ssd1306_send_data_stop();
+		ssd1306_send_data_start();
+	}
+	Wire.write(byte);
+	
+}
+
+void SSD1306Device::ssd1306_send_command(uint8_t command)
+{
+	ssd1306_send_command_start();
+	Wire.write(command);
+	ssd1306_send_command_stop();
+}
+
+void SSD1306Device::ssd1306_send_data_start(void)
+{
+	Wire.beginTransmission(SSD1306);
+	Wire.write(0x40);	//write data
+}
+
+void SSD1306Device::ssd1306_send_data_stop(void)
+{
+	Wire.endTransmission();
+}
+
+void SSD1306Device::setCursor(uint8_t x, uint8_t y)
+{
+	ssd1306_send_command_start();
+	Wire.write(0xb0 + y);
+	Wire.write(((x & 0xf0) >> 4) | 0x10); // | 0x10
+	Wire.write((x & 0x0f) | 0x01); // | 0x01
+	ssd1306_send_command_stop();
+	oledX = x;
+	oledY = y;
+}
+
+void SSD1306Device::clear(void)
+{
+	fill(0x00);
+}
+
+void SSD1306Device::fill(uint8_t fill)
+{
+	uint8_t m,n;
+	for (m = 0; m < 8; m++)
+	{
+		ssd1306_send_command(0xb0 + m);	// page0 - page1
+		ssd1306_send_command(0x00);		// low column start address
+		ssd1306_send_command(0x10);		// high column start address
+		ssd1306_send_data_start();
+		for (n = 0; n < 128; n++)
+		{
+			ssd1306_send_data_byte(fill);
+		}
+		ssd1306_send_data_stop();
+	}
+	setCursor(0, 0);
+}
+
+size_t SSD1306Device::write(byte c) {
+	uint8_t i = 0;
+	uint8_t ci = c - 32;
+	if(c == '\r')
+		return 1;
+	if(c == '\n'){
+		if(oledFont == 0)
+			setCursor(0, oledY+1);
+		else
+			setCursor(0, oledY+2);
+		return 1;
+	}
+
+	if(oledFont == 0){
+		if (oledX > 122)
+		{
+			oledX = 0;
+			oledY++;
+			setCursor(oledX, oledY);
+		}
+		
+		ssd1306_send_data_start();
+		for (i= 0; i < 6; i++)
+		{
+			ssd1306_send_data_byte(pgm_read_byte(&ssd1306xled_font6x8[ci * 6 + i]));
+		}
+		ssd1306_send_data_stop();
+		setCursor(oledX+6, oledY);
+	}
+	else{
+		if (oledX > 120)
+		{
+			oledX = 0;
+			oledY++;
+			setCursor(oledX, oledY);
+		}
+		
+		ssd1306_send_data_start();
+		for (i = 0; i < 8; i++)
+		{
+			Wire.write(pgm_read_byte(&ssd1306xled_font8x16[ci * 16 + i]));
+		}
+		ssd1306_send_data_stop();
+		setCursor(oledX, oledY + 1);
+		ssd1306_send_data_start();
+		for (i = 0; i < 8; i++)
+		{
+			Wire.write(pgm_read_byte(&ssd1306xled_font8x16[ci * 16 + i + 8]));
+		}
+		ssd1306_send_data_stop();
+		setCursor(oledX + 8, oledY - 1);
+
+	}
+	return 1;
+}
+
+
+
+
+void SSD1306Device::bitmap(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, const uint8_t bitmap[])
+{
+	uint16_t j = 0;
+	uint8_t y, x;
+	if (y1 % 8 == 0) y = y1 / 8;
+	else y = y1 / 8 + 1;
+	for (y = y0; y < y1; y++)
+	{
+		setCursor(x0,y);
+		ssd1306_send_data_start();
+		for (x = x0; x < x1; x++)
+		{
+			ssd1306_send_data_byte(pgm_read_byte(&bitmap[j++]));
+		}
+		ssd1306_send_data_stop();
+	}
+	setCursor(0, 0);
+}
+
+
+SSD1306Device oled;
+
+// ----------------------------------------------------------------------------