olikraus · Vidou12 · Jul 4, 2015 · Jul 4, 2015 · Jul 4, 2015 · Jul 4, 2015
diff --git a/ChangeLog b/ChangeLog
@@ -154,9 +154,18 @@ u8glib ChangeLog
   * 400KHz option for I2C with U8G_I2C_OPT_FAST available for Due and Uno (Issue 303)
   * I2C support for Arduino Due. 100KHz/400KHz, TWI & TWI1, ACK will be ignored (issue 285)
   * Unifont update (Issue 297)
+2015-07-14	v1.18	  Oliver Kraus <olikraus@gmail.com>
+  * Fixed contrast assignment for SSD1309 and UC1611
+  * Fixed bug in u8g_DrawLine(), Github issue 343 
+  * Fixed bug in u8g_DrawStr90P(), Github issue 331
+  * Support for SSD1306 with 64x48 pixel
+2016-04-05	v1.19		  Oliver Kraus <olikraus@gmail.com>
+  * Fixed contrast (brightness) setting for SH1106 and SSD1306 devices
+  * Fixed compiler warnings
+2016-05-24	v1.20	  Oliver Kraus <olikraus@gmail.com>
+  * Experimental support for LD7032 I2C
+  * HW SPI Support for ATMega128
 
 
 
 
-
-
diff --git a/README.md b/README.md
@@ -1,2 +1,34 @@
 
-# u8glib
+# U8glib
+
+Note: There will be no more development for U8glib. Please use [u8g2](https://github.com/olikraus/u8g2/wiki).
+
+A graphics library with support for many different monochrome displays.
+
+![nhd_oled180.jpg](https://github.com/olikraus/u8glib/wiki/otherpic/nhd_oled180.jpg) ![dogs102_180.jpg](https://github.com/olikraus/u8glib/wiki/otherpic/dogs102_180.jpg)
+
+Left: NHD-2.7-12864 OLED (SSD1325), right: EA DOGS102 LCD (UC1701)
+
+ * [Gallery](https://github.com/olikraus/u8glib/wiki/gallery)
+ * Latest version of U8glib for Arduino is available in the Library Manager 
+ * [Download Arduino Version from Github](https://github.com/olikraus/U8glib_Arduino/releases/latest)
+ * [Bintray](https://bintray.com/olikraus/u8glib) download links:
+  * [U8glib for Arduino](https://bintray.com/olikraus/u8glib/Arduino)
+  * [U8glib for AVR](https://bintray.com/olikraus/u8glib/AVR)
+  * [U8glib for ARM](https://bintray.com/olikraus/u8glib/ARM)
+  * Converter for BDF fonts: [bdf2u8g_101.exe on google drive](https://drive.google.com/folderview?id=0B5b6Dv0wCeCRLWJkYTh2TUlYVDg&usp=sharing).
+ * Supported environments:
+  * [Arduino (ATMEGA and ARM)](http://www.arduino.cc/)
+  * [AVR (ATMEGA)](https://github.com/olikraus/u8glib/wiki/avr)
+  * [ARM (with example for LPC1114)](https://github.com/olikraus/u8glib/wiki/lpc1114)
+ * Library for graphic LCDs and OLEDs
+ * [U8glib documentation and tutorials](https://github.com/olikraus/u8glib/wiki)
+ * Graphical user interface library (GUI) available: [M2tklib](http://code.google.com/p/m2tklib/)
+ * COM interfaces: Software SPI, Hardware SPI, 8Bit parallel
+ * Large number of [fonts](https://github.com/olikraus/u8glib/wiki/fontsize)
+ * Monospaced and proportional fonts 
+ * Mouse-Cursor support
+ * Landscape and portrait mode
+ * Many supported [devices](https://github.com/olikraus/u8glib/wiki/device) (SSD1325, ST7565, ST7920, UC1608, UC1610, UC1701, PCD8544, PCF8812, KS0108, LC7981, SBN1661, SSD1306, SH1106, T6963, LD7032)
+ * Well-defined interface to the device subsystem
+
diff --git a/autoclean.sh b/autoclean.sh
diff --git a/autogen.sh b/autogen.sh
diff --git a/cppsrc/U8glib.h b/cppsrc/U8glib.h
@@ -192,6 +192,7 @@ class U8GLIB : public Print
     u8g_uint_t getStrPixelWidthP(u8g_pgm_uint8_t *s) { return u8g_GetStrPixelWidthP(&u8g, s); }
     u8g_uint_t getStrWidth(const char *s) { return u8g_GetStrWidth(&u8g, s); } 
     u8g_uint_t getStrWidthP(u8g_pgm_uint8_t *s) { return u8g_GetStrWidthP(&u8g, s); }
+    int8_t getGlyphDeltaX(uint8_t requested_encoding) { return u8g_GetGlyphDeltaX(&u8g, requested_encoding); }
 
     void setHardwareBackup(u8g_state_cb backup_cb) { u8g_SetHardwareBackup(&u8g, backup_cb); }
 
@@ -968,6 +969,34 @@ class U8GLIB_SSD1306_128X32_2X : public U8GLIB
       { }
 };
 
+class U8GLIB_SSD1306_64X48 : public U8GLIB 
+{
+  public:
+    U8GLIB_SSD1306_64X48(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_sw_spi, sck, mosi, cs, a0, reset)
+      { }
+    U8GLIB_SSD1306_64X48(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_hw_spi, cs, a0, reset)
+      { }
+    U8GLIB_SSD1306_64X48(uint8_t options = U8G_I2C_OPT_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_i2c, options)
+      { }
+};
+
+class U8GLIB_SSD1306_64X48_2X : public U8GLIB 
+{
+  public:
+    U8GLIB_SSD1306_64X48_2X(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_2x_sw_spi, sck, mosi, cs, a0, reset)
+      { }
+    U8GLIB_SSD1306_64X48_2X(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_2x_hw_spi, cs, a0, reset)
+      { }
+    U8GLIB_SSD1306_64X48_2X(uint8_t options = U8G_I2C_OPT_NONE) 
+      : U8GLIB(&u8g_dev_ssd1306_64x48_2x_i2c, options)
+      { }
+};
+
 
 class U8GLIB_NHD27OLED_GR : public U8GLIB 
 {
@@ -1033,6 +1062,10 @@ class U8GLIB_LD7032_60x32 : public U8GLIB
         uint8_t en, uint8_t cs1, uint8_t di, uint8_t rw = U8G_PIN_NONE, uint8_t reset = U8G_PIN_NONE) 
       : U8GLIB(&u8g_dev_ld7032_60x32_parallel, d0, d1, d2, d3, d4, d5, d6, d7, en, cs1, U8G_PIN_NONE, di, rw, reset)
       { }
+    U8GLIB_LD7032_60x32(uint8_t options = U8G_I2C_OPT_NONE) 
+      : U8GLIB(&u8g_dev_ld7032_60x32_i2c, options)
+      { }
+
 };
 
 

diff --git a/csrc/u8g.h b/csrc/u8g.h
@@ -80,10 +80,14 @@ extern "C" {
 #  if defined(__MSPGCC__)
 /* mspgcc does not have .progmem sections. Use -fdata-sections. */
 #    define U8G_FONT_SECTION(name)
-#  endif
+# endif
 #  if defined(__AVR__)
 #    define U8G_FONT_SECTION(name) U8G_SECTION(".progmem." name)
 #  endif
+#  if defined(__XTENSA__)
+//#    define U8G_FONT_SECTION(name) U8G_SECTION(".irom.text." name)
+#    define U8G_FONT_SECTION(name) U8G_SECTION(".irom0.text" )
+#  endif
 #else
 #  define U8G_NOINLINE
 #  define U8G_PURE
@@ -120,16 +124,26 @@ typedef uint8_t PROGMEM u8g_pgm_uint8_t;
 typedef uint8_t u8g_fntpgm_uint8_t;
 #define u8g_pgm_read(adr) pgm_read_byte_near(adr)
 #define U8G_PSTR(s) ((u8g_pgm_uint8_t *)PSTR(s))
+#endif
 
-#else
-
-#define U8G_PROGMEM
-#define PROGMEM
+#if defined(__XTENSA__)
+#  ifndef PROGMEM
+#    define PROGMEM __attribute__ ((section (".irom0.text")))
+#  endif
+#  define U8G_PROGMEM PROGMEM
 typedef uint8_t u8g_pgm_uint8_t;
 typedef uint8_t u8g_fntpgm_uint8_t;
-#define u8g_pgm_read(adr) (*(const u8g_pgm_uint8_t *)(adr)) 
-#define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s))
+#  define u8g_pgm_read(adr) (*(const u8g_pgm_uint8_t *)(adr)) 
+#  define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s))
+#endif
 
+#ifndef U8G_PROGMEM
+#  define U8G_PROGMEM
+#  define PROGMEM
+typedef uint8_t u8g_pgm_uint8_t;
+typedef uint8_t u8g_fntpgm_uint8_t;
+#  define u8g_pgm_read(adr) (*(const u8g_pgm_uint8_t *)(adr)) 
+#  define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s))
 #endif
 
 /*===============================================================*/
@@ -401,6 +415,7 @@ extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_bw_hw_spi;
 extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_bw_parallel;
 extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_gr_sw_spi;
 extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_gr_hw_spi;
+extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_gr_parallel;
 
 extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_2x_bw_sw_spi;
 extern u8g_dev_t u8g_dev_ssd1325_nhd27oled_2x_bw_hw_spi;
@@ -466,10 +481,20 @@ extern u8g_dev_t u8g_dev_ssd1306_128x32_2x_sw_spi;
 extern u8g_dev_t u8g_dev_ssd1306_128x32_2x_hw_spi;
 extern u8g_dev_t u8g_dev_ssd1306_128x32_2x_i2c;
 
+/* OLED 64x48 Display with SSD1306 Controller */
+extern u8g_dev_t u8g_dev_ssd1306_64x48_sw_spi;
+extern u8g_dev_t u8g_dev_ssd1306_64x48_hw_spi;
+extern u8g_dev_t u8g_dev_ssd1306_64x48_i2c;
+
+extern u8g_dev_t u8g_dev_ssd1306_64x48_2x_sw_spi;
+extern u8g_dev_t u8g_dev_ssd1306_64x48_2x_hw_spi;
+extern u8g_dev_t u8g_dev_ssd1306_64x48_2x_i2c;
+
 /* OLED 60x32 Display with LD7032 Controller */
 extern u8g_dev_t u8g_dev_ld7032_60x32_sw_spi;
 extern u8g_dev_t u8g_dev_ld7032_60x32_hw_spi;
 extern u8g_dev_t u8g_dev_ld7032_60x32_parallel;
+extern u8g_dev_t u8g_dev_ld7032_60x32_i2c;		/* not test and not sure of this works */
 
 /* experimental 65K TFT with st7687 controller */
 extern u8g_dev_t u8g_dev_st7687_c144mvgd_sw_spi;
@@ -675,11 +700,18 @@ uint8_t u8g_com_atmega_st7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val
 uint8_t u8g_com_atmega_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
 uint8_t u8g_com_atmega_parallel_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);    /* u8g_com_atmega_parallel.c */
 
+uint8_t u8g_com_atxmega_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);      /* u8g_com_atxmega_hw_spi.c */
+uint8_t u8g_com_atxmega_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr); /* u8g_com_atxmega_st7920_spi.c */
+
 uint8_t u8g_com_msp430_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);      /* u8g_com_msp430_hw_spi.c */
 
 uint8_t u8g_com_raspberrypi_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);                /* u8g_com_rasperrypi_hw_spi.c */
 uint8_t u8g_com_raspberrypi_ssd_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);		/* u8g_com_raspberrypi_ssd_i2c.c */
 
+uint8_t u8g_com_linux_ssd_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);             /* u8g_com_linux_ssd_i2c.c */
+
+uint8_t u8g_com_psoc5_ssd_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);   /* u8g_com_psoc5_ssd_hw_spi.c */
+uint8_t u8g_com_psoc5_ssd_hw_parallel_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);   /* u8g_com_psoc5_ssd_hw_parallel.c */
 
 /* 
   Translation of system specific com drives to generic com names
@@ -738,7 +770,10 @@ defined(__18CXX) || defined(__PIC32MX)
 #endif
 /* ==== HW SPI, not Arduino ====*/
 #ifndef U8G_COM_HW_SPI
-#if defined(__AVR__)
+#if defined(__AVR_XMEGA__)
+#define U8G_COM_HW_SPI u8g_com_atxmega_hw_spi_fn
+#define U8G_COM_ST7920_HW_SPI u8g_com_atxmega_st7920_hw_spi_fn
+#elif defined(__AVR__)
 #define U8G_COM_HW_SPI u8g_com_atmega_hw_spi_fn
 #define U8G_COM_ST7920_HW_SPI u8g_com_atmega_st7920_hw_spi_fn
 #endif
@@ -833,6 +868,15 @@ defined(__18CXX) || defined(__PIC32MX)
 #define U8G_COM_SSD_I2C u8g_com_raspberrypi_ssd_i2c_fn
 #endif
 #endif
+#ifndef U8G_COM_SSD_I2C
+#if defined(U8G_LINUX)
+#define U8G_COM_SSD_I2C u8g_com_linux_ssd_i2c_fn
+#endif
+#endif
+#if defined(U8G_CYPRESS_PSOC5)
+#define U8G_COM_HW_SPI u8g_com_psoc5_ssd_hw_spi_fn
+#define U8G_COM_FAST_PARALLEL u8g_com_psoc5_ssd_hw_parallel_fn
+#endif
 
 #ifndef U8G_COM_SSD_I2C
 #define U8G_COM_SSD_I2C u8g_com_null_fn
@@ -1467,7 +1511,7 @@ void u8g_i2c_clear_error(void) U8G_NOINLINE;
 uint8_t  u8g_i2c_get_error(void) U8G_NOINLINE;
 uint8_t u8g_i2c_get_err_pos(void) U8G_NOINLINE;
 void u8g_i2c_init(uint8_t options) U8G_NOINLINE;		/* use U8G_I2C_OPT_NONE as options */
-uint8_t u8g_i2c_wait(uint8_t mask, uint8_t pos) U8G_NOINLINE;
+uint8_t u8g_i2c_wait(uint8_t mask, uint8_t value, uint8_t pos) U8G_NOINLINE;
 uint8_t u8g_i2c_start(uint8_t sla) U8G_NOINLINE;
 uint8_t u8g_i2c_send_byte(uint8_t data) U8G_NOINLINE;
 uint8_t u8g_i2c_send_mode(uint8_t mode) U8G_NOINLINE;

diff --git a/csrc/u8g_clip.c b/csrc/u8g_clip.c
@@ -62,7 +62,7 @@
 #define U8G_ALWAYS_INLINE __inline__ __attribute__((always_inline))
 #else
 #define U8G_ALWAYS_INLINE
- #endif 
+#endif 
 
 /*
   intersection assumptions:

diff --git a/csrc/u8g_com_atmega_hw_spi.c b/csrc/u8g_com_atmega_hw_spi.c
@@ -30,12 +30,7 @@
   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
-
-
-  Assumes, that 
-    MOSI is at PORTB, Pin 3
-  and
-    SCK is at PORTB, Pin 5
+
 
   Update for ATOMIC operation done (01 Jun 2013)
     U8G_ATOMIC_OR(ptr, val)
@@ -49,8 +44,8 @@
 
 #include "u8g.h"
 
-
-#if defined(__AVR__)
+#if defined(__AVR_XMEGA__)
+#elif defined(__AVR__)
 #define U8G_ATMEGA_HW_SPI
 
 /* remove the definition for attiny */
@@ -69,6 +64,18 @@
 #include <avr/io.h>
 
 
+/* Some AVR models assign the hardware SPI to different pins. */
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega329P__) || defined(__AVR_ATmega3290P__)
+#define U8G_ATMEGA_HW_SPI_MOSI_PIN         (_BV(2))
+#define U8G_ATMEGA_HW_SPI_SCK_PIN          (_BV(1))
+#define U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN (_BV(0))
+#else
+#define U8G_ATMEGA_HW_SPI_MOSI_PIN         (_BV(3))
+#define U8G_ATMEGA_HW_SPI_SCK_PIN          (_BV(5))
+#define U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN (_BV(2))
+#endif
+
+
 static uint8_t u8g_atmega_spi_out(uint8_t data)
 {
   /* unsigned char x = 100; */
@@ -96,14 +103,14 @@ uint8_t u8g_com_atmega_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
       u8g_SetPIOutput(u8g, U8G_PI_RESET);
 
       U8G_ATOMIC_START();
-      
-      DDRB |= _BV(3);          /* D0, MOSI */
-      DDRB |= _BV(5);          /* SCK */
-      DDRB |= _BV(2);		/* slave select */
-    
-      PORTB &= ~_BV(3);        /* D0, MOSI = 0 */
-      PORTB &= ~_BV(5);        /* SCK = 0 */
-      
+
+      DDRB |= U8G_ATMEGA_HW_SPI_MOSI_PIN;
+      DDRB |= U8G_ATMEGA_HW_SPI_SCK_PIN;
+      DDRB |= U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN;
+
+      PORTB &= ~U8G_ATMEGA_HW_SPI_MOSI_PIN;
+      PORTB &= ~U8G_ATMEGA_HW_SPI_SCK_PIN;
+
       U8G_ATOMIC_END();
 
       u8g_SetPILevel(u8g, U8G_PI_CS, 1);
@@ -136,7 +143,7 @@ uint8_t u8g_com_atmega_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
       }
       else
       {
-        PORTB &= ~_BV(5);        /* SCK = 0 */
+	PORTB &= ~U8G_ATMEGA_HW_SPI_SCK_PIN;
         /* enable */
         u8g_SetPILevel(u8g, U8G_PI_CS, 0); /* CS = 0 (low active) */
       }

diff --git a/csrc/u8g_com_atmega_st7920_hw_spi.c b/csrc/u8g_com_atmega_st7920_hw_spi.c
@@ -33,11 +33,6 @@
 
   A special SPI interface for ST7920 controller with HW SPI Support
 
-  Assumes, that 
-    MOSI is at PORTB, Pin 3
-  and
-    SCK is at PORTB, Pin 5
-
   Update for ATOMIC operation done (01 Jun 2013)
     U8G_ATOMIC_OR(ptr, val)
     U8G_ATOMIC_AND(ptr, val)
@@ -49,7 +44,8 @@
 
 #include "u8g.h"
 
-#if defined(__AVR__)
+#if defined(__AVR_XMEGA__)
+#elif defined(__AVR__)
 #define U8G_ATMEGA_HW_SPI
 
 /* remove the definition for attiny */
@@ -67,6 +63,19 @@
 #include <avr/interrupt.h>
 #include <avr/io.h>
 
+
+/* Some AVR models assign the hardware SPI to different pins. */
+#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega329P__) || defined(__AVR_ATmega3290P__)
+#define U8G_ATMEGA_HW_SPI_MOSI_PIN         (_BV(2))
+#define U8G_ATMEGA_HW_SPI_SCK_PIN          (_BV(1))
+#define U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN (_BV(0))
+#else
+#define U8G_ATMEGA_HW_SPI_MOSI_PIN         (_BV(3))
+#define U8G_ATMEGA_HW_SPI_SCK_PIN          (_BV(5))
+#define U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN (_BV(2))
+#endif
+
+
 static uint8_t u8g_atmega_st7920_hw_spi_shift_out(u8g_t *u8g, uint8_t val) U8G_NOINLINE;
 static uint8_t u8g_atmega_st7920_hw_spi_shift_out(u8g_t *u8g, uint8_t val)
 {
@@ -113,13 +122,13 @@ uint8_t u8g_com_atmega_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val
       //u8g_SetPIOutput(u8g, U8G_PI_A0);
 
       U8G_ATOMIC_START();
-      
-      DDRB |= _BV(3);          /* D0, MOSI */
-      DDRB |= _BV(5);          /* SCK */
-      DDRB |= _BV(2);		/* slave select */
-    
-      PORTB &= ~_BV(3);        /* D0, MOSI = 0 */
-      PORTB &= ~_BV(5);        /* SCK = 0 */
+
+      DDRB |= U8G_ATMEGA_HW_SPI_MOSI_PIN;
+      DDRB |= U8G_ATMEGA_HW_SPI_SCK_PIN;
+      DDRB |= U8G_ATMEGA_HW_SPI_SLAVE_SELECT_PIN;
+
+      PORTB &= ~U8G_ATMEGA_HW_SPI_MOSI_PIN;
+      PORTB &= ~U8G_ATMEGA_HW_SPI_SCK_PIN;
       U8G_ATOMIC_END();
 
       u8g_SetPILevel(u8g, U8G_PI_CS, 1);
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ @@
     #define U8G_ALWAYS_INLINE __inline__ __attribute__((always_inline))
     #else
     #define U8G_ALWAYS_INLINE
-     #endif
+    #endif
     /*
       intersection assumptions:
@@ Expand Down @@