Browse Source

pkg/u8g2: update version

patch-1
PeterKietzmann 6 years ago
parent
commit
f710d4f457
  1. 2
      pkg/u8g2/Makefile
  2. 35
      pkg/u8g2/patches/0002-u8g2-add-riot-os-interface.patch

2
pkg/u8g2/Makefile

@ -1,6 +1,6 @@
PKG_NAME=u8g2
PKG_URL=https://github.com/olikraus/u8g2
PKG_VERSION=2c9ca376e0e0eaa496494926ccfd77b035518c8d
PKG_VERSION=7346987f4e2eadc2e0791b77a1c1c8a27bd72a93
PKG_LICENSE=BSD-2-Clause
.PHONY: all

35
pkg/u8g2/patches/0002-u8g2-add-riot-os-interface.patch

@ -4,17 +4,17 @@ Date: Wed, 22 Jun 2016 18:04:31 +0200
Subject: [PATCH 2/3] u8g2: add riot-os interface.
---
csrc/u8g2.h | 4 +-
csrc/u8g2.h | 3 +
csrc/u8g2_riotos.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
csrc/u8x8.h | 17 +++++-
3 files changed, 180 insertions(+), 4 deletions(-)
csrc/u8x8.h | 18 +++++-
3 files changed, 181 insertions(+), 3 deletions(-)
create mode 100644 csrc/u8g2_riotos.c
diff --git a/csrc/u8g2.h b/csrc/u8g2.h
index b65c9f1..bd8c485 100644
index 8f89ebc..6cf4440 100644
--- a/csrc/u8g2.h
+++ b/csrc/u8g2.h
@@ -362,6 +362,9 @@ void u8g2_ClearDisplay(u8g2_t *u8g2);
@@ -375,6 +375,9 @@ void u8g2_ClearDisplay(u8g2_t *u8g2);
#define u8g2_SetMenuDownPin(u8g2, val) u8x8_SetMenuDownPin(u8g2_GetU8x8(u8g2), (val))
#endif
@ -24,11 +24,6 @@ index b65c9f1..bd8c485 100644
/*==========================================*/
/* u8g2_setup.c */
@@ -1663,4 +1666,3 @@ extern const uint8_t u8g2_font_px437wyse700b_mn[] U8G2_FONT_SECTION("u8g2_font_p
#endif
-
diff --git a/csrc/u8g2_riotos.c b/csrc/u8g2_riotos.c
new file mode 100644
index 0000000..e0c042c
@ -199,7 +194,7 @@ index 0000000..e0c042c
+}
+#endif /* I2C_NUMOF */
diff --git a/csrc/u8x8.h b/csrc/u8x8.h
index dd74869..7c45b6a 100644
index b396344..7dcd659 100644
--- a/csrc/u8x8.h
+++ b/csrc/u8x8.h
@@ -107,6 +107,8 @@
@ -211,20 +206,20 @@ index dd74869..7c45b6a 100644
#if defined(__GNUC__) && defined(__AVR__)
#include <avr/pgmspace.h>
#endif
@@ -154,9 +156,9 @@ extern "C" {
# define u8x8_pgm_read(adr) (*(const uint8_t *)(adr))
@@ -170,9 +172,9 @@ uint8_t u8x8_pgm_read_esp(const uint8_t * addr); /* u8x8_8x8.c */
# define U8X8_PROGMEM
#endif
-#ifdef ARDUINO
-#define U8X8_USE_PINS
-#endif
+//#ifdef ARDUINO
+//#define U8X8_USE_PINS
+//#endif
+// #ifdef ARDUINO
+// #define U8X8_USE_PINS
+// #endif
/*==========================================*/
/* U8X8 typedefs and data structures */
@@ -316,6 +318,10 @@ struct u8x8_struct
@@ -335,6 +337,10 @@ struct u8x8_struct
#ifdef U8X8_USE_PINS
uint8_t pins[U8X8_PIN_CNT]; /* defines a pinlist: Mainly a list of pins for the Arduino Envionment, use U8X8_PIN_xxx to access */
#endif
@ -235,7 +230,7 @@ index dd74869..7c45b6a 100644
};
#define u8x8_GetCols(u8x8) ((u8x8)->display_info->tile_width)
@@ -337,6 +343,8 @@ struct u8x8_struct
@@ -358,6 +364,8 @@ struct u8x8_struct
#define u8x8_SetMenuDownPin(u8x8, val) u8x8_SetPin((u8x8),U8X8_PIN_MENU_DOWN,(val))
#endif
@ -244,16 +239,18 @@ index dd74869..7c45b6a 100644
/*==========================================*/
@@ -818,6 +826,9 @@ extern const uint8_t u8x8_font_pxplustandynewtv_u[] U8X8_FONT_SECTION("u8x8_font
@@ -900,6 +908,10 @@ extern const uint8_t u8x8_font_pxplustandynewtv_u[] U8X8_FONT_SECTION("u8x8_font
/* end font list */
+extern uint8_t u8x8_byte_riotos_hw_spi(u8x8_t *u8g2, uint8_t msg, uint8_t arg_int, void *arg_ptr);
+extern uint8_t u8x8_gpio_and_delay_riotos(u8x8_t *u8g2, uint8_t msg, uint8_t arg_int, void *arg_ptr);
+extern uint8_t u8x8_byte_riotos_hw_i2c(u8x8_t *u8g2, uint8_t msg, uint8_t arg_int, void *arg_ptr);
+
#ifdef __cplusplus
}
--
1.9.1

Loading…
Cancel
Save