diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-07-09 20:35:33 +0300 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-07-10 09:01:59 -0400 |
| commit | 9d8279960d8784d5602025f6845b0af92db12848 (patch) | |
| tree | a69982fe08b9c2b01cd958aeba645cd649e10c86 /drivers/ugfx | |
| parent | 4da3b19603255115f71812964383ee7b518637be (diff) | |
| download | qmk_firmware-9d8279960d8784d5602025f6845b0af92db12848.tar.gz qmk_firmware-9d8279960d8784d5602025f6845b0af92db12848.zip | |
Make it easier to use drivers
Diffstat (limited to 'drivers/ugfx')
| -rw-r--r-- | drivers/ugfx/gdisp/is31fl3731c/driver.mk | 1 | ||||
| -rw-r--r-- | drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c | 12 | ||||
| -rw-r--r-- | drivers/ugfx/gdisp/st7565/driver.mk | 1 | ||||
| -rw-r--r-- | drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/drivers/ugfx/gdisp/is31fl3731c/driver.mk b/drivers/ugfx/gdisp/is31fl3731c/driver.mk index c9de62d1e..4364787c9 100644 --- a/drivers/ugfx/gdisp/is31fl3731c/driver.mk +++ b/drivers/ugfx/gdisp/is31fl3731c/driver.mk | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | GFXINC += drivers/ugfx/gdisp/is31fl3731c | 1 | GFXINC += drivers/ugfx/gdisp/is31fl3731c |
| 2 | GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c | 2 | GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c |
| 3 | GDISP_DRIVER_LIST += GDISPVMT_IS31FL3731C_QMK \ No newline at end of file | ||
diff --git a/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c index 0691dbfbf..3faddcda8 100644 --- a/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c +++ b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c | |||
| @@ -19,7 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | 19 | ||
| 20 | #if GFX_USE_GDISP | 20 | #if GFX_USE_GDISP |
| 21 | 21 | ||
| 22 | #define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_QMK | 22 | #define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_QMK |
| 23 | #define GDISP_SCREEN_HEIGHT LED_HEIGHT | ||
| 24 | #define GDISP_SCREEN_WIDTH LED_WIDTH | ||
| 25 | |||
| 23 | #include "gdisp_lld_config.h" | 26 | #include "gdisp_lld_config.h" |
| 24 | #include "src/gdisp/gdisp_driver.h" | 27 | #include "src/gdisp/gdisp_driver.h" |
| 25 | 28 | ||
| @@ -33,12 +36,6 @@ extern const uint8_t CIE1931_CURVE[]; | |||
| 33 | /* Driver local definitions. */ | 36 | /* Driver local definitions. */ |
| 34 | /*===========================================================================*/ | 37 | /*===========================================================================*/ |
| 35 | 38 | ||
| 36 | #ifndef GDISP_SCREEN_HEIGHT | ||
| 37 | #define GDISP_SCREEN_HEIGHT 9 | ||
| 38 | #endif | ||
| 39 | #ifndef GDISP_SCREEN_WIDTH | ||
| 40 | #define GDISP_SCREEN_WIDTH 16 | ||
| 41 | #endif | ||
| 42 | #ifndef GDISP_INITIAL_CONTRAST | 39 | #ifndef GDISP_INITIAL_CONTRAST |
| 43 | #define GDISP_INITIAL_CONTRAST 0 | 40 | #define GDISP_INITIAL_CONTRAST 0 |
| 44 | #endif | 41 | #endif |
| @@ -100,7 +97,6 @@ extern const uint8_t CIE1931_CURVE[]; | |||
| 100 | #define IS31_PWM_SIZE 0x90 | 97 | #define IS31_PWM_SIZE 0x90 |
| 101 | 98 | ||
| 102 | #define IS31_LED_MASK_SIZE 0x12 | 99 | #define IS31_LED_MASK_SIZE 0x12 |
| 103 | #define IS31_SCREEN_WIDTH 16 | ||
| 104 | 100 | ||
| 105 | #define IS31 | 101 | #define IS31 |
| 106 | 102 | ||
diff --git a/drivers/ugfx/gdisp/st7565/driver.mk b/drivers/ugfx/gdisp/st7565/driver.mk index 0190b6019..31fc8f1c7 100644 --- a/drivers/ugfx/gdisp/st7565/driver.mk +++ b/drivers/ugfx/gdisp/st7565/driver.mk | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | GFXINC += drivers/ugfx/gdisp/st7565 | 1 | GFXINC += drivers/ugfx/gdisp/st7565 |
| 2 | GFXSRC += drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c | 2 | GFXSRC += drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c |
| 3 | GDISP_DRIVER_LIST += GDISPVMT_ST7565_QMK \ No newline at end of file | ||
diff --git a/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c index 55552cb79..4a4c83e89 100644 --- a/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c +++ b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c | |||
| @@ -20,10 +20,10 @@ | |||
| 20 | /*===========================================================================*/ | 20 | /*===========================================================================*/ |
| 21 | 21 | ||
| 22 | #ifndef GDISP_SCREEN_HEIGHT | 22 | #ifndef GDISP_SCREEN_HEIGHT |
| 23 | #define GDISP_SCREEN_HEIGHT 32 | 23 | #define GDISP_SCREEN_HEIGHT LCD_HEIGHT |
| 24 | #endif | 24 | #endif |
| 25 | #ifndef GDISP_SCREEN_WIDTH | 25 | #ifndef GDISP_SCREEN_WIDTH |
| 26 | #define GDISP_SCREEN_WIDTH 128 | 26 | #define GDISP_SCREEN_WIDTH LCD_WIDTH |
| 27 | #endif | 27 | #endif |
| 28 | #ifndef GDISP_INITIAL_CONTRAST | 28 | #ifndef GDISP_INITIAL_CONTRAST |
| 29 | #define GDISP_INITIAL_CONTRAST 35 | 29 | #define GDISP_INITIAL_CONTRAST 35 |
