]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Move Infinity Ergodox drivers to subproject, and fix makefile
authorFred Sundvik <fsundvik@gmail.com>
Sun, 10 Jul 2016 11:29:00 +0000 (14:29 +0300)
committerFred Sundvik <fsundvik@gmail.com>
Fri, 29 Jul 2016 18:09:36 +0000 (21:09 +0300)
27 files changed:
keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h [deleted file]
keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk [deleted file]
keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c [deleted file]
keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h [deleted file]
keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk [deleted file]
keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c [deleted file]
keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk [deleted file]
keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c [deleted file]
keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h [deleted file]
keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk [deleted file]
keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c [deleted file]
keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h [deleted file]
keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h [deleted file]
keyboards/ergodox/infinity/Makefile
keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h [new file with mode: 0644]
keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h [new file with mode: 0644]

diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
deleted file mode 100644 (file)
index 2ea73f1..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _GDISP_LLD_BOARD_H
-#define _GDISP_LLD_BOARD_H
-
-static const I2CConfig i2ccfg = {
-  400000 // clock speed (Hz); 400kHz max for IS31
-};
-
-#define GDISP_SCREEN_WIDTH  7
-#define GDISP_SCREEN_HEIGHT 7
-
-static const uint8_t led_mask[] = {
-       0xFF, 0x00, /* C1-1 -> C1-16 */
-       0xFF, 0x00, /* C2-1 -> C2-16 */
-       0xFF, 0x00, /* C3-1 -> C3-16 */
-       0xFF, 0x00, /* C4-1 -> C4-16 */
-       0x3F, 0x00, /* C5-1 -> C5-16 */
-       0x00, 0x00, /* C6-1 -> C6-16 */
-       0x00, 0x00, /* C7-1 -> C7-16 */
-       0x00, 0x00, /* C8-1 -> C8-16 */
-       0x00, 0x00, /* C9-1 -> C9-16 */
-};
-
-// The address of the LED
-#define LA(c, r) (c + r * 16 )
-// Need to be an address that is not mapped, but inside the range of the controller matrix
-#define NA LA(8, 8)
-
-// The numbers in the comments are the led numbers DXX on the PCB
-// The mapping is taken from the schematic of left hand side
-static const uint8_t led_mapping[GDISP_SCREEN_HEIGHT][GDISP_SCREEN_WIDTH] = {
-//   45        44        43        42        41        40        39
-   { LA(1, 1), LA(1, 0), LA(0, 4), LA(0, 3), LA(0, 2), LA(0, 1), LA(0, 0)},
-//   52        51        50        49        48        47        46
-   { LA(2, 3), LA(2, 2), LA(2, 1), LA(2, 0), LA(1, 4), LA(1, 3), LA(1, 2) },
-//   58        57        56        55        54        53        N/A
-   { LA(3, 4), LA(3, 3), LA(3, 2), LA(3, 1), LA(3, 0), LA(2, 4), NA },
-//   67        66        65        64        63        62        61
-   { LA(5, 3), LA(5, 2), LA(5, 1), LA(5, 0), LA(4, 4), LA(4, 3), LA(4, 2) },
-//   76        75        74        73        72        60        59
-   { LA(7, 3), LA(7, 2), LA(7, 1), LA(7, 0), LA(6, 3), LA(4, 1), LA(4, 0) },
-//   N/A       N/A       N/A       N/A       N/A       N/A       68
-   { NA,       NA,       NA,       NA,       NA,       NA,       LA(5, 4) },
-//   N/A       N/A       N/A       N/A       71        70        69
-   { NA,       NA,       NA,       NA,       LA(6, 2), LA(6, 1), LA(6, 0) },
-};
-
-
-#define IS31_ADDR_DEFAULT 0x74 // AD connected to GND
-#define IS31_TIMEOUT 5000
-
-static GFXINLINE void init_board(GDisplay *g) {
-    (void) g;
-    /* I2C pins */
-    palSetPadMode(GPIOB, 0, PAL_MODE_ALTERNATIVE_2); // PTB0/I2C0/SCL
-    palSetPadMode(GPIOB, 1, PAL_MODE_ALTERNATIVE_2); // PTB1/I2C0/SDA
-    palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL);
-    palClearPad(GPIOB, 16);
-    /* start I2C */
-    i2cStart(&I2CD1, &i2ccfg);
-    // try high drive (from kiibohd)
-    I2CD1.i2c->C2 |= I2Cx_C2_HDRS;
-    // try glitch fixing (from kiibohd)
-    I2CD1.i2c->FLT = 4;
-}
-
-static GFXINLINE void post_init_board(GDisplay *g) {
-       (void) g;
-}
-
-static GFXINLINE const uint8_t* get_led_mask(GDisplay* g) {
-    (void) g;
-    return led_mask;
-}
-
-static GFXINLINE uint8_t get_led_address(GDisplay* g, uint16_t x, uint16_t y)
-{
-    (void) g;
-    return led_mapping[y][x];
-}
-
-static GFXINLINE void set_hardware_shutdown(GDisplay* g, bool shutdown) {
-    (void) g;
-    if(!shutdown) {
-        palSetPad(GPIOB, 16);
-    }
-    else {
-        palClearPad(GPIOB, 16);
-    }
-}
-
-static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
-       (void) g;
-       i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, data, length, 0, 0, US2ST(IS31_TIMEOUT));
-}
-
-#endif /* _GDISP_LLD_BOARD_H */
diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk
deleted file mode 100644 (file)
index f32d0d8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-GFXINC += drivers/gdisp/IS31FL3731C
-GFXSRC += drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
deleted file mode 100644 (file)
index 1d21f0c..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "gfx.h"
-
-#if GFX_USE_GDISP
-
-#define GDISP_DRIVER_VMT                       GDISPVMT_IS31FL3731C_ERGODOX
-#include "drivers/gdisp/IS31FL3731C/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
-
-#include "board_IS31FL3731C.h"
-
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
-#ifndef GDISP_SCREEN_HEIGHT
-       #define GDISP_SCREEN_HEIGHT             9
-#endif
-#ifndef GDISP_SCREEN_WIDTH
-       #define GDISP_SCREEN_WIDTH              16
-#endif
-#ifndef GDISP_INITIAL_CONTRAST
-       #define GDISP_INITIAL_CONTRAST  0
-#endif
-#ifndef GDISP_INITIAL_BACKLIGHT
-       #define GDISP_INITIAL_BACKLIGHT 100
-#endif
-
-#define GDISP_FLG_NEEDFLUSH                    (GDISP_FLG_DRIVER<<0)
-
-#define IS31_ADDR_DEFAULT 0x74
-
-#define IS31_REG_CONFIG  0x00
-// bits in reg
-#define IS31_REG_CONFIG_PICTUREMODE 0x00
-#define IS31_REG_CONFIG_AUTOPLAYMODE 0x08
-#define IS31_REG_CONFIG_AUDIOPLAYMODE 0x18
-// D2:D0 bits are starting frame for autoplay mode
-
-#define IS31_REG_PICTDISP 0x01 // D2:D0 frame select for picture mode
-
-#define IS31_REG_AUTOPLAYCTRL1 0x02
-// D6:D4 number of loops (000=infty)
-// D2:D0 number of frames to be used
-
-#define IS31_REG_AUTOPLAYCTRL2 0x03 // D5:D0 delay time (*11ms)
-
-#define IS31_REG_DISPLAYOPT 0x05
-#define IS31_REG_DISPLAYOPT_INTENSITY_SAME 0x20 // same intensity for all frames
-#define IS31_REG_DISPLAYOPT_BLINK_ENABLE 0x8
-// D2:D0 bits blink period time (*0.27s)
-
-#define IS31_REG_AUDIOSYNC 0x06
-#define IS31_REG_AUDIOSYNC_ENABLE 0x1
-
-#define IS31_REG_FRAMESTATE 0x07
-
-#define IS31_REG_BREATHCTRL1 0x08
-// D6:D4 fade out time (26ms*2^i)
-// D2:D0 fade in time (26ms*2^i)
-
-#define IS31_REG_BREATHCTRL2 0x09
-#define IS31_REG_BREATHCTRL2_ENABLE 0x10
-// D2:D0 extinguish time (3.5ms*2^i)
-
-#define IS31_REG_SHUTDOWN 0x0A
-#define IS31_REG_SHUTDOWN_OFF 0x0
-#define IS31_REG_SHUTDOWN_ON 0x1
-
-#define IS31_REG_AGCCTRL 0x0B
-#define IS31_REG_ADCRATE 0x0C
-
-#define IS31_COMMANDREGISTER 0xFD
-#define IS31_FUNCTIONREG 0x0B    // helpfully called 'page nine'
-#define IS31_FUNCTIONREG_SIZE 0xD
-
-#define IS31_FRAME_SIZE 0xB4
-
-#define IS31_PWM_REG 0x24
-#define IS31_PWM_SIZE 0x90
-
-#define IS31_LED_MASK_SIZE 0x12
-#define IS31_SCREEN_WIDTH 16
-
-#define IS31
-
-//Generated by http://jared.geek.nz/2013/feb/linear-led-pwm
-const unsigned char cie[256] = {
-    0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
-    3, 4, 4, 4, 4, 4, 4, 5, 5, 5,
-    5, 5, 6, 6, 6, 6, 6, 7, 7, 7,
-    7, 8, 8, 8, 8, 9, 9, 9, 10, 10,
-    10, 10, 11, 11, 11, 12, 12, 12, 13, 13,
-    13, 14, 14, 15, 15, 15, 16, 16, 17, 17,
-    17, 18, 18, 19, 19, 20, 20, 21, 21, 22,
-    22, 23, 23, 24, 24, 25, 25, 26, 26, 27,
-    28, 28, 29, 29, 30, 31, 31, 32, 32, 33,
-    34, 34, 35, 36, 37, 37, 38, 39, 39, 40,
-    41, 42, 43, 43, 44, 45, 46, 47, 47, 48,
-    49, 50, 51, 52, 53, 54, 54, 55, 56, 57,
-    58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-    68, 70, 71, 72, 73, 74, 75, 76, 77, 79,
-    80, 81, 82, 83, 85, 86, 87, 88, 90, 91,
-    92, 94, 95, 96, 98, 99, 100, 102, 103, 105,
-    106, 108, 109, 110, 112, 113, 115, 116, 118, 120,
-    121, 123, 124, 126, 128, 129, 131, 132, 134, 136,
-    138, 139, 141, 143, 145, 146, 148, 150, 152, 154,
-    155, 157, 159, 161, 163, 165, 167, 169, 171, 173,
-    175, 177, 179, 181, 183, 185, 187, 189, 191, 193,
-    196, 198, 200, 202, 204, 207, 209, 211, 214, 216,
-    218, 220, 223, 225, 228, 230, 232, 235, 237, 240,
-    242, 245, 247, 250, 252, 255,
-};
-
-
-/*===========================================================================*/
-/* Driver local functions.                                                   */
-/*===========================================================================*/
-
-typedef struct{
-    uint8_t write_buffer_offset;
-    uint8_t write_buffer[IS31_FRAME_SIZE];
-    uint8_t frame_buffer[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH];
-    uint8_t page;
-}__attribute__((__packed__)) PrivData;
-
-// Some common routines and macros
-#define PRIV(g)                         ((PrivData*)g->priv)
-
-/*===========================================================================*/
-/* Driver exported functions.                                                */
-/*===========================================================================*/
-
-static GFXINLINE void write_page(GDisplay* g, uint8_t page) {
-    uint8_t tx[2] __attribute__((aligned(2)));
-    tx[0] = IS31_COMMANDREGISTER;
-    tx[1] = page;
-    write_data(g, tx, 2);
-}
-
-static GFXINLINE void write_register(GDisplay* g, uint8_t page, uint8_t reg, uint8_t data) {
-    uint8_t tx[2] __attribute__((aligned(2)));
-    tx[0] = reg;
-    tx[1] = data;
-    write_page(g, page);
-    write_data(g, tx, 2);
-}
-
-static GFXINLINE void write_ram(GDisplay *g, uint8_t page, uint16_t offset, uint16_t length) {
-    PRIV(g)->write_buffer_offset = offset;
-    write_page(g, page);
-    write_data(g, (uint8_t*)PRIV(g), length + 1);
-}
-
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
-       // The private area is the display surface.
-       g->priv = gfxAlloc(sizeof(PrivData));
-    __builtin_memset(PRIV(g), 0, sizeof(PrivData));
-       PRIV(g)->page = 0;
-
-       // Initialise the board interface
-       init_board(g);
-       gfxSleepMilliseconds(10);
-
-    // zero function page, all registers (assuming full_page is all zeroes)
-    write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE);
-    set_hardware_shutdown(g, false);
-    gfxSleepMilliseconds(10);
-    // software shutdown
-    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
-    gfxSleepMilliseconds(10);
-    // zero function page, all registers
-    write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE);
-    gfxSleepMilliseconds(10);
-
-
-    // zero all LED registers on all 8 pages, and enable the mask
-    __builtin_memcpy(PRIV(g)->write_buffer, get_led_mask(g), IS31_LED_MASK_SIZE);
-    for(uint8_t i=0; i<8; i++) {
-        write_ram(g, i, 0, IS31_FRAME_SIZE);
-        gfxSleepMilliseconds(1);
-    }
-
-    // software shutdown disable (i.e. turn stuff on)
-    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
-    gfxSleepMilliseconds(10);
-
-    // Finish Init
-    post_init_board(g);
-
-       /* Initialise the GDISP structure */
-       g->g.Width = GDISP_SCREEN_WIDTH;
-       g->g.Height = GDISP_SCREEN_HEIGHT;
-       g->g.Orientation = GDISP_ROTATE_0;
-       g->g.Powermode = powerOn;
-       g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
-       g->g.Contrast = GDISP_INITIAL_CONTRAST;
-       return TRUE;
-}
-
-#if GDISP_HARDWARE_FLUSH
-       LLDSPEC void gdisp_lld_flush(GDisplay *g) {
-               // Don't flush if we don't need it.
-               if (!(g->flags & GDISP_FLG_NEEDFLUSH))
-                       return;
-
-               PRIV(g)->page++;
-               PRIV(g)->page %= 2;
-               // TODO: some smarter algorithm for this
-               // We should run only one physical page at a time
-               // This way we don't need to send so much data, and
-               // we could use slightly less memory
-               uint8_t* src = PRIV(g)->frame_buffer;
-               for (int y=0;y<GDISP_SCREEN_HEIGHT;y++) {
-                   for (int x=0;x<GDISP_SCREEN_WIDTH;x++) {
-                       PRIV(g)->write_buffer[get_led_address(g, x, y)]=cie[*src];
-                       ++src;
-                   }
-               }
-        write_ram(g, PRIV(g)->page, IS31_PWM_REG, IS31_PWM_SIZE);
-        gfxSleepMilliseconds(1);
-        write_register(g, IS31_FUNCTIONREG, IS31_REG_PICTDISP, PRIV(g)->page);
-
-               g->flags &= ~GDISP_FLG_NEEDFLUSH;
-       }
-#endif
-
-#if GDISP_HARDWARE_DRAWPIXEL
-       LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
-               coord_t         x, y;
-
-               switch(g->g.Orientation) {
-               default:
-               case GDISP_ROTATE_0:
-                       x = g->p.x;
-                       y = g->p.y;
-                       break;
-               case GDISP_ROTATE_180:
-                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
-                       y = g->p.y;
-                       break;
-               }
-               PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x] = gdispColor2Native(g->p.color);
-               g->flags |= GDISP_FLG_NEEDFLUSH;
-       }
-#endif
-
-#if GDISP_HARDWARE_PIXELREAD
-       LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
-               coord_t         x, y;
-
-               switch(g->g.Orientation) {
-               default:
-               case GDISP_ROTATE_0:
-                       x = g->p.x;
-                       y = g->p.y;
-                       break;
-               case GDISP_ROTATE_180:
-                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
-                       y = g->p.y;
-                       break;
-               }
-               return gdispNative2Color(PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x]);
-       }
-#endif
-
-#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
-       LLDSPEC void gdisp_lld_control(GDisplay *g) {
-               switch(g->p.x) {
-               case GDISP_CONTROL_POWER:
-                       if (g->g.Powermode == (powermode_t)g->p.ptr)
-                               return;
-                       switch((powermode_t)g->p.ptr) {
-                       case powerOff:
-                       case powerSleep:
-                       case powerDeepSleep:
-                write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
-                               break;
-                       case powerOn:
-                write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
-                               break;
-                       default:
-                               return;
-                       }
-                       g->g.Powermode = (powermode_t)g->p.ptr;
-                       return;
-
-               case GDISP_CONTROL_ORIENTATION:
-                       if (g->g.Orientation == (orientation_t)g->p.ptr)
-                               return;
-                       switch((orientation_t)g->p.ptr) {
-                       /* Rotation is handled by the drawing routines */
-                       case GDISP_ROTATE_0:
-                       case GDISP_ROTATE_180:
-                               g->g.Height = GDISP_SCREEN_HEIGHT;
-                               g->g.Width = GDISP_SCREEN_WIDTH;
-                               break;
-                       case GDISP_ROTATE_90:
-                       case GDISP_ROTATE_270:
-                               g->g.Height = GDISP_SCREEN_WIDTH;
-                               g->g.Width = GDISP_SCREEN_HEIGHT;
-                               break;
-                       default:
-                               return;
-                       }
-                       g->g.Orientation = (orientation_t)g->p.ptr;
-                       return;
-
-               case GDISP_CONTROL_CONTRAST:
-                       return;
-               }
-       }
-#endif // GDISP_NEED_CONTROL
-
-#endif // GFX_USE_GDISP
diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
deleted file mode 100644 (file)
index bb28ad7..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _GDISP_LLD_CONFIG_H
-#define _GDISP_LLD_CONFIG_H
-
-#if GFX_USE_GDISP
-
-/*===========================================================================*/
-/* Driver hardware support.                                                  */
-/*===========================================================================*/
-
-#define GDISP_HARDWARE_FLUSH                   TRUE            // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL               TRUE
-#define GDISP_HARDWARE_PIXELREAD               TRUE
-#define GDISP_HARDWARE_CONTROL                 TRUE
-
-#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_GRAY256
-
-#endif /* GFX_USE_GDISP */
-
-#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk
deleted file mode 100644 (file)
index 16c3f80..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-GFXINC += drivers/gdisp/emulator_lcd
-GFXSRC += drivers/gdisp/emulator_lcd/emulator_lcd.c
diff --git a/keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c
deleted file mode 100644 (file)
index babfe2b..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#define GDISP_DRIVER_VMT                       GDISPVMT_EMULATOR_LCD_ERGODOX
-#define GDISP_HARDWARE_DRAWPIXEL               TRUE
-#define GDISP_HARDWARE_PIXELREAD               TRUE
-#define GDISP_HARDWARE_CONTROL                 TRUE
-#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
-#define GDISP_SCREEN_WIDTH                     128
-#define GDISP_SCREEN_HEIGHT                    32
-#define ROTATE_180_IS_FLIP
-
-#include "emulator/emulator_driver_impl.h"
diff --git a/keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk
deleted file mode 100644 (file)
index 2554344..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-GFXINC += drivers/gdisp/emulator_led
-GFXSRC += drivers/gdisp/emulator_led/emulator_led.c
diff --git a/keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c
deleted file mode 100644 (file)
index b0ebcdc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#define GDISP_DRIVER_VMT                           GDISPVMT_EMULATOR_LED_ERGODOX
-#define GDISP_HARDWARE_DRAWPIXEL               TRUE
-#define GDISP_HARDWARE_PIXELREAD               TRUE
-#define GDISP_HARDWARE_CONTROL                 TRUE
-#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
-#define GDISP_SCREEN_WIDTH                     7
-#define GDISP_SCREEN_HEIGHT                    7
-#define ROTATE_180_IS_FLIP
-
-#include "emulator/emulator_driver_impl.h"
diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h
deleted file mode 100644 (file)
index 290571c..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#ifndef _GDISP_LLD_BOARD_H
-#define _GDISP_LLD_BOARD_H
-
-#include "print.h"
-
-#define ST7565_LCD_BIAS         ST7565_LCD_BIAS_9 // actually 6
-#define ST7565_ADC              ST7565_ADC_NORMAL
-#define ST7565_COM_SCAN         ST7565_COM_SCAN_DEC
-#define ST7565_PAGE_ORDER       0,1,2,3
-/*
- * Custom page order for several LCD boards, e.g. HEM12864-99
- * #define ST7565_PAGE_ORDER       4,5,6,7,0,1,2,3
- */
-
-#define ST7565_GPIOPORT GPIOC
-#define ST7565_PORT PORTC
-#define ST7565_A0_PIN 7
-#define ST7565_RST_PIN 8
-#define ST7565_MOSI_PIN 6
-#define ST7565_SLCK_PIN 5
-#define ST7565_SS_PIN 4
-
-#define palSetPadModeRaw(portname, bits) \
-    ST7565_PORT->PCR[ST7565_##portname##_PIN] = bits
-
-#define palSetPadModeNamed(portname, portmode) \
-    palSetPadMode(ST7565_GPIOPORT, ST7565_##portname##_PIN, portmode)
-
-#define ST7565_SPI_MODE PORTx_PCRn_DSE | PORTx_PCRn_MUX(2)
-// DSPI Clock and Transfer Attributes
-// Frame Size: 8 bits
-// MSB First
-// CLK Low by default
-static const SPIConfig spi1config = {
-       NULL,
-       /* HW dependent part.*/
-       ST7565_GPIOPORT,
-    ST7565_SS_PIN,
-    SPIx_CTARn_FMSZ(7)
-    | SPIx_CTARn_ASC(7)
-    | SPIx_CTARn_DT(7)
-    | SPIx_CTARn_CSSCK(7)
-    | SPIx_CTARn_PBR(0)
-    | SPIx_CTARn_BR(7)
-       //SPI_CR1_BR_0
-};
-
-static bool_t st7565_is_data_mode = 1;
-
-static GFXINLINE void init_board(GDisplay *g) {
-    (void) g;
-    palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-    st7565_is_data_mode = 1;
-    palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    palSetPadModeRaw(MOSI, ST7565_SPI_MODE);
-    palSetPadModeRaw(SLCK, ST7565_SPI_MODE);
-    palSetPadModeRaw(SS, ST7565_SPI_MODE);
-
-    spiInit();
-    spiStart(&SPID1, &spi1config);
-    spiSelect(&SPID1);
-}
-
-static GFXINLINE void post_init_board(GDisplay *g) {
-       (void) g;
-}
-
-static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
-    (void) g;
-    if (state) {
-        palClearPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    }
-    else {
-        palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    }
-}
-
-static GFXINLINE void acquire_bus(GDisplay *g) {
-    (void) g;
-    // Only the LCD is using the SPI bus, so no need to acquire
-    // spiAcquireBus(&SPID1);
-}
-
-static GFXINLINE void release_bus(GDisplay *g) {
-    (void) g;
-    // Only the LCD is using the SPI bus, so no need to release
-    //spiReleaseBus(&SPID1);
-}
-
-static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
-       (void) g;
-       if (st7565_is_data_mode) {
-           // The sleeps need to be at lest 10 vs 25 ns respectively
-           // So let's sleep two ticks, one tick might not be enough
-           // if we are at the end of the tick
-           chThdSleep(2);
-        palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-        chThdSleep(2);
-        st7565_is_data_mode = 0;
-       }
-       spiSend(&SPID1, 1, &cmd);
-}
-
-static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
-       (void) g;
-       if (!st7565_is_data_mode) {
-           // The sleeps need to be at lest 10 vs 25 ns respectively
-           // So let's sleep two ticks, one tick might not be enough
-           // if we are at the end of the tick
-           chThdSleep(2);
-        palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-           chThdSleep(2);
-        st7565_is_data_mode = 1;
-       }
-       spiSend(&SPID1, length, data);
-}
-
-#endif /* _GDISP_LLD_BOARD_H */
diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk
deleted file mode 100644 (file)
index 889a1a0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-GFXINC += drivers/gdisp/st7565ergodox
-GFXSRC += drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
deleted file mode 100644 (file)
index c33aea8..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#include "gfx.h"
-
-#if GFX_USE_GDISP
-
-#define GDISP_DRIVER_VMT                       GDISPVMT_ST7565_ERGODOX
-#include "drivers/gdisp/st7565ergodox/gdisp_lld_config.h"
-#include "src/gdisp/gdisp_driver.h"
-
-#include "board_ST7565.h"
-
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
-#ifndef GDISP_SCREEN_HEIGHT
-       #define GDISP_SCREEN_HEIGHT             32
-#endif
-#ifndef GDISP_SCREEN_WIDTH
-       #define GDISP_SCREEN_WIDTH              128
-#endif
-#ifndef GDISP_INITIAL_CONTRAST
-       #define GDISP_INITIAL_CONTRAST  0
-#endif
-#ifndef GDISP_INITIAL_BACKLIGHT
-       #define GDISP_INITIAL_BACKLIGHT 100
-#endif
-
-#define GDISP_FLG_NEEDFLUSH                    (GDISP_FLG_DRIVER<<0)
-
-#include "drivers/gdisp/st7565ergodox/st7565.h"
-
-/*===========================================================================*/
-/* Driver config defaults for backward compatibility.                       */
-/*===========================================================================*/
-#ifndef ST7565_LCD_BIAS
-  #define ST7565_LCD_BIAS         ST7565_LCD_BIAS_7
-#endif
-#ifndef ST7565_ADC
-  #define ST7565_ADC              ST7565_ADC_NORMAL
-#endif
-#ifndef ST7565_COM_SCAN
-  #define ST7565_COM_SCAN         ST7565_COM_SCAN_INC
-#endif
-#ifndef ST7565_PAGE_ORDER
-  #define ST7565_PAGE_ORDER       0,1,2,3
-#endif
-
-/*===========================================================================*/
-/* Driver local functions.                                                   */
-/*===========================================================================*/
-
-typedef struct{
-    bool_t buffer2;
-    uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8];
-}PrivData;
-
-// Some common routines and macros
-#define PRIV(g)                         ((PrivData*)g->priv)
-#define RAM(g)                                                 (PRIV(g)->ram)
-#define write_cmd2(g, cmd1, cmd2)              { write_cmd(g, cmd1); write_cmd(g, cmd2); }
-#define write_cmd3(g, cmd1, cmd2, cmd3)        { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); }
-
-// Some common routines and macros
-#define delay(us)                      gfxSleepMicroseconds(us)
-#define delay_ms(ms)           gfxSleepMilliseconds(ms)
-
-#define xyaddr(x, y)           ((x) + ((y)>>3)*GDISP_SCREEN_WIDTH)
-#define xybit(y)                       (1<<((y)&7))
-
-/*===========================================================================*/
-/* Driver exported functions.                                                */
-/*===========================================================================*/
-
-/*
- * As this controller can't update on a pixel boundary we need to maintain the
- * the entire display surface in memory so that we can do the necessary bit
- * operations. Fortunately it is a small display in monochrome.
- * 64 * 128 / 8 = 1024 bytes.
- */
-
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
-       // The private area is the display surface.
-       g->priv = gfxAlloc(sizeof(PrivData));
-       PRIV(g)->buffer2 = false;
-
-       // Initialise the board interface
-       init_board(g);
-
-       // Hardware reset
-       setpin_reset(g, TRUE);
-       gfxSleepMilliseconds(20);
-       setpin_reset(g, FALSE);
-       gfxSleepMilliseconds(20);
-
-       acquire_bus(g);
-    write_cmd(g, ST7565_DISPLAY_OFF);
-       write_cmd(g, ST7565_LCD_BIAS);
-    write_cmd(g, ST7565_ADC);
-    write_cmd(g, ST7565_COM_SCAN);
-    
-    write_cmd(g, ST7565_START_LINE | 0);
-
-       write_cmd(g, ST7565_RESISTOR_RATIO | 0x6);
-
-       // turn on voltage converter (VC=1, VR=0, VF=0)
-       write_cmd(g, ST7565_POWER_CONTROL | 0x04);
-       delay_ms(50);
-
-       // turn on voltage regulator (VC=1, VR=1, VF=0)
-       write_cmd(g, ST7565_POWER_CONTROL | 0x06);
-       delay_ms(50);
-
-       // turn on voltage follower (VC=1, VR=1, VF=1)
-       write_cmd(g, ST7565_POWER_CONTROL | 0x07);
-       delay_ms(50);
-
-       write_cmd(g, 0xE2);
-    write_cmd(g, ST7565_COM_SCAN);
-       write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101);
-       //write_cmd2(g, ST7565_CONTRAST, 0);
-       write_cmd(g, ST7565_DISPLAY_ON);
-       write_cmd(g, ST7565_ALLON_NORMAL);
-       write_cmd(g, ST7565_INVERT_DISPLAY);
-
-       write_cmd(g, ST7565_RMW);
-
-    // Finish Init
-    post_init_board(g);
-
-       // Release the bus
-       release_bus(g);
-
-       /* Initialise the GDISP structure */
-       g->g.Width = GDISP_SCREEN_WIDTH;
-       g->g.Height = GDISP_SCREEN_HEIGHT;
-       g->g.Orientation = GDISP_ROTATE_0;
-       g->g.Powermode = powerOn;
-       g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
-       g->g.Contrast = GDISP_INITIAL_CONTRAST;
-       return TRUE;
-}
-
-#if GDISP_HARDWARE_FLUSH
-       LLDSPEC void gdisp_lld_flush(GDisplay *g) {
-               unsigned        p;
-
-               // Don't flush if we don't need it.
-               if (!(g->flags & GDISP_FLG_NEEDFLUSH))
-                       return;
-
-               acquire_bus(g);
-               unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0);
-               for (p = 0; p < 4; p++) {
-                       write_cmd(g, ST7565_PAGE | (p + dstOffset));
-                       write_cmd(g, ST7565_COLUMN_MSB | 0);
-                       write_cmd(g, ST7565_COLUMN_LSB | 0);
-                       write_cmd(g, ST7565_RMW);
-                       write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH);
-               }
-               unsigned line = (PRIV(g)->buffer2 ? 32 : 0);
-        write_cmd(g, ST7565_START_LINE | line);
-        PRIV(g)->buffer2 = !PRIV(g)->buffer2;
-               release_bus(g);
-
-               g->flags &= ~GDISP_FLG_NEEDFLUSH;
-       }
-#endif
-
-#if GDISP_HARDWARE_DRAWPIXEL
-       LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
-               coord_t         x, y;
-
-               switch(g->g.Orientation) {
-               default:
-               case GDISP_ROTATE_0:
-                       x = g->p.x;
-                       y = g->p.y;
-                       break;
-               case GDISP_ROTATE_90:
-                       x = g->p.y;
-                       y = GDISP_SCREEN_HEIGHT-1 - g->p.x;
-                       break;
-               case GDISP_ROTATE_180:
-                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
-                       y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
-                       break;
-               case GDISP_ROTATE_270:
-                       x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
-                       y = g->p.x;
-                       break;
-               }
-               if (gdispColor2Native(g->p.color) != Black)
-                       RAM(g)[xyaddr(x, y)] |= xybit(y);
-               else
-                       RAM(g)[xyaddr(x, y)] &= ~xybit(y);
-               g->flags |= GDISP_FLG_NEEDFLUSH;
-       }
-#endif
-
-#if GDISP_HARDWARE_PIXELREAD
-       LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
-               coord_t         x, y;
-
-               switch(g->g.Orientation) {
-               default:
-               case GDISP_ROTATE_0:
-                       x = g->p.x;
-                       y = g->p.y;
-                       break;
-               case GDISP_ROTATE_90:
-                       x = g->p.y;
-                       y = GDISP_SCREEN_HEIGHT-1 - g->p.x;
-                       break;
-               case GDISP_ROTATE_180:
-                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
-                       y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
-                       break;
-               case GDISP_ROTATE_270:
-                       x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
-                       y = g->p.x;
-                       break;
-               }
-               return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black;
-       }
-#endif
-
-#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
-       LLDSPEC void gdisp_lld_control(GDisplay *g) {
-               switch(g->p.x) {
-               case GDISP_CONTROL_POWER:
-                       if (g->g.Powermode == (powermode_t)g->p.ptr)
-                               return;
-                       switch((powermode_t)g->p.ptr) {
-                       case powerOff:
-                       case powerSleep:
-                       case powerDeepSleep:
-                               acquire_bus(g);
-                               write_cmd(g, ST7565_DISPLAY_OFF);
-                               release_bus(g);
-                               break;
-                       case powerOn:
-                               acquire_bus(g);
-                               write_cmd(g, ST7565_DISPLAY_ON);
-                               release_bus(g);
-                               break;
-                       default:
-                               return;
-                       }
-                       g->g.Powermode = (powermode_t)g->p.ptr;
-                       return;
-
-               case GDISP_CONTROL_ORIENTATION:
-                       if (g->g.Orientation == (orientation_t)g->p.ptr)
-                               return;
-                       switch((orientation_t)g->p.ptr) {
-                       /* Rotation is handled by the drawing routines */
-                       case GDISP_ROTATE_0:
-                       case GDISP_ROTATE_180:
-                               g->g.Height = GDISP_SCREEN_HEIGHT;
-                               g->g.Width = GDISP_SCREEN_WIDTH;
-                               break;
-                       case GDISP_ROTATE_90:
-                       case GDISP_ROTATE_270:
-                               g->g.Height = GDISP_SCREEN_WIDTH;
-                               g->g.Width = GDISP_SCREEN_HEIGHT;
-                               break;
-                       default:
-                               return;
-                       }
-                       g->g.Orientation = (orientation_t)g->p.ptr;
-                       return;
-
-               case GDISP_CONTROL_CONTRAST:
-            if ((unsigned)g->p.ptr > 100)
-               g->p.ptr = (void *)100;
-                       acquire_bus(g);
-                       write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F);
-                       release_bus(g);
-            g->g.Contrast = (unsigned)g->p.ptr;
-                       return;
-               }
-       }
-#endif // GDISP_NEED_CONTROL
-
-#endif // GFX_USE_GDISP
diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
deleted file mode 100644 (file)
index 48587b9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#ifndef _GDISP_LLD_CONFIG_H
-#define _GDISP_LLD_CONFIG_H
-
-#if GFX_USE_GDISP
-
-/*===========================================================================*/
-/* Driver hardware support.                                                  */
-/*===========================================================================*/
-
-#define GDISP_HARDWARE_FLUSH                   TRUE            // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL               TRUE
-#define GDISP_HARDWARE_PIXELREAD               TRUE
-#define GDISP_HARDWARE_CONTROL                 TRUE
-
-#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
-
-#endif /* GFX_USE_GDISP */
-
-#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h
deleted file mode 100644 (file)
index 48636b3..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#ifndef _ST7565_H
-#define _ST7565_H
-
-#define ST7565_CONTRAST             0x81
-#define ST7565_ALLON_NORMAL         0xA4
-#define ST7565_ALLON                0xA5
-#define ST7565_POSITIVE_DISPLAY     0xA6
-#define ST7565_INVERT_DISPLAY       0xA7
-#define ST7565_DISPLAY_OFF          0xAE
-#define ST7565_DISPLAY_ON           0xAF
-
-#define ST7565_LCD_BIAS_7           0xA3
-#define ST7565_LCD_BIAS_9           0xA2
-
-#define ST7565_ADC_NORMAL           0xA0
-#define ST7565_ADC_REVERSE          0xA1
-
-#define ST7565_COM_SCAN_INC         0xC0
-#define ST7565_COM_SCAN_DEC         0xC8
-
-#define ST7565_START_LINE           0x40
-#define ST7565_PAGE                 0xB0
-#define ST7565_COLUMN_MSB           0x10
-#define ST7565_COLUMN_LSB           0x00
-#define ST7565_RMW                  0xE0
-
-#define ST7565_RESISTOR_RATIO       0x20
-#define ST7565_POWER_CONTROL        0x28
-
-#endif /* _ST7565_H */
index 22065e4d2db3607ed3397932913adaa16651493a..d1ec266d0471bd103bb45422422773c068ef3cb3 100644 (file)
@@ -65,11 +65,11 @@ LED_ENABLE ?= yes
 LCD_BACKLIGHT_ENABLE ?= yes
 
 ifdef LCD_ENABLE
-include drivers/gdisp/st7565ergodox/driver.mk
+include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk
 endif
 
 ifdef LED_ENABLE
-include drivers/gdisp/IS31FL3731C/driver.mk
+include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
 endif
 
 ifndef QUANTUM_DIR
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
new file mode 100644 (file)
index 0000000..2ea73f1
--- /dev/null
@@ -0,0 +1,113 @@
+/*
+Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _GDISP_LLD_BOARD_H
+#define _GDISP_LLD_BOARD_H
+
+static const I2CConfig i2ccfg = {
+  400000 // clock speed (Hz); 400kHz max for IS31
+};
+
+#define GDISP_SCREEN_WIDTH  7
+#define GDISP_SCREEN_HEIGHT 7
+
+static const uint8_t led_mask[] = {
+       0xFF, 0x00, /* C1-1 -> C1-16 */
+       0xFF, 0x00, /* C2-1 -> C2-16 */
+       0xFF, 0x00, /* C3-1 -> C3-16 */
+       0xFF, 0x00, /* C4-1 -> C4-16 */
+       0x3F, 0x00, /* C5-1 -> C5-16 */
+       0x00, 0x00, /* C6-1 -> C6-16 */
+       0x00, 0x00, /* C7-1 -> C7-16 */
+       0x00, 0x00, /* C8-1 -> C8-16 */
+       0x00, 0x00, /* C9-1 -> C9-16 */
+};
+
+// The address of the LED
+#define LA(c, r) (c + r * 16 )
+// Need to be an address that is not mapped, but inside the range of the controller matrix
+#define NA LA(8, 8)
+
+// The numbers in the comments are the led numbers DXX on the PCB
+// The mapping is taken from the schematic of left hand side
+static const uint8_t led_mapping[GDISP_SCREEN_HEIGHT][GDISP_SCREEN_WIDTH] = {
+//   45        44        43        42        41        40        39
+   { LA(1, 1), LA(1, 0), LA(0, 4), LA(0, 3), LA(0, 2), LA(0, 1), LA(0, 0)},
+//   52        51        50        49        48        47        46
+   { LA(2, 3), LA(2, 2), LA(2, 1), LA(2, 0), LA(1, 4), LA(1, 3), LA(1, 2) },
+//   58        57        56        55        54        53        N/A
+   { LA(3, 4), LA(3, 3), LA(3, 2), LA(3, 1), LA(3, 0), LA(2, 4), NA },
+//   67        66        65        64        63        62        61
+   { LA(5, 3), LA(5, 2), LA(5, 1), LA(5, 0), LA(4, 4), LA(4, 3), LA(4, 2) },
+//   76        75        74        73        72        60        59
+   { LA(7, 3), LA(7, 2), LA(7, 1), LA(7, 0), LA(6, 3), LA(4, 1), LA(4, 0) },
+//   N/A       N/A       N/A       N/A       N/A       N/A       68
+   { NA,       NA,       NA,       NA,       NA,       NA,       LA(5, 4) },
+//   N/A       N/A       N/A       N/A       71        70        69
+   { NA,       NA,       NA,       NA,       LA(6, 2), LA(6, 1), LA(6, 0) },
+};
+
+
+#define IS31_ADDR_DEFAULT 0x74 // AD connected to GND
+#define IS31_TIMEOUT 5000
+
+static GFXINLINE void init_board(GDisplay *g) {
+    (void) g;
+    /* I2C pins */
+    palSetPadMode(GPIOB, 0, PAL_MODE_ALTERNATIVE_2); // PTB0/I2C0/SCL
+    palSetPadMode(GPIOB, 1, PAL_MODE_ALTERNATIVE_2); // PTB1/I2C0/SDA
+    palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL);
+    palClearPad(GPIOB, 16);
+    /* start I2C */
+    i2cStart(&I2CD1, &i2ccfg);
+    // try high drive (from kiibohd)
+    I2CD1.i2c->C2 |= I2Cx_C2_HDRS;
+    // try glitch fixing (from kiibohd)
+    I2CD1.i2c->FLT = 4;
+}
+
+static GFXINLINE void post_init_board(GDisplay *g) {
+       (void) g;
+}
+
+static GFXINLINE const uint8_t* get_led_mask(GDisplay* g) {
+    (void) g;
+    return led_mask;
+}
+
+static GFXINLINE uint8_t get_led_address(GDisplay* g, uint16_t x, uint16_t y)
+{
+    (void) g;
+    return led_mapping[y][x];
+}
+
+static GFXINLINE void set_hardware_shutdown(GDisplay* g, bool shutdown) {
+    (void) g;
+    if(!shutdown) {
+        palSetPad(GPIOB, 16);
+    }
+    else {
+        palClearPad(GPIOB, 16);
+    }
+}
+
+static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
+       (void) g;
+       i2cMasterTransmitTimeout(&I2CD1, IS31_ADDR_DEFAULT, data, length, 0, 0, US2ST(IS31_TIMEOUT));
+}
+
+#endif /* _GDISP_LLD_BOARD_H */
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
new file mode 100644 (file)
index 0000000..f32d0d8
--- /dev/null
@@ -0,0 +1,2 @@
+GFXINC += drivers/gdisp/IS31FL3731C
+GFXSRC += drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
new file mode 100644 (file)
index 0000000..1d21f0c
--- /dev/null
@@ -0,0 +1,333 @@
+/*
+Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "gfx.h"
+
+#if GFX_USE_GDISP
+
+#define GDISP_DRIVER_VMT                       GDISPVMT_IS31FL3731C_ERGODOX
+#include "drivers/gdisp/IS31FL3731C/gdisp_lld_config.h"
+#include "src/gdisp/gdisp_driver.h"
+
+#include "board_IS31FL3731C.h"
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+#ifndef GDISP_SCREEN_HEIGHT
+       #define GDISP_SCREEN_HEIGHT             9
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+       #define GDISP_SCREEN_WIDTH              16
+#endif
+#ifndef GDISP_INITIAL_CONTRAST
+       #define GDISP_INITIAL_CONTRAST  0
+#endif
+#ifndef GDISP_INITIAL_BACKLIGHT
+       #define GDISP_INITIAL_BACKLIGHT 100
+#endif
+
+#define GDISP_FLG_NEEDFLUSH                    (GDISP_FLG_DRIVER<<0)
+
+#define IS31_ADDR_DEFAULT 0x74
+
+#define IS31_REG_CONFIG  0x00
+// bits in reg
+#define IS31_REG_CONFIG_PICTUREMODE 0x00
+#define IS31_REG_CONFIG_AUTOPLAYMODE 0x08
+#define IS31_REG_CONFIG_AUDIOPLAYMODE 0x18
+// D2:D0 bits are starting frame for autoplay mode
+
+#define IS31_REG_PICTDISP 0x01 // D2:D0 frame select for picture mode
+
+#define IS31_REG_AUTOPLAYCTRL1 0x02
+// D6:D4 number of loops (000=infty)
+// D2:D0 number of frames to be used
+
+#define IS31_REG_AUTOPLAYCTRL2 0x03 // D5:D0 delay time (*11ms)
+
+#define IS31_REG_DISPLAYOPT 0x05
+#define IS31_REG_DISPLAYOPT_INTENSITY_SAME 0x20 // same intensity for all frames
+#define IS31_REG_DISPLAYOPT_BLINK_ENABLE 0x8
+// D2:D0 bits blink period time (*0.27s)
+
+#define IS31_REG_AUDIOSYNC 0x06
+#define IS31_REG_AUDIOSYNC_ENABLE 0x1
+
+#define IS31_REG_FRAMESTATE 0x07
+
+#define IS31_REG_BREATHCTRL1 0x08
+// D6:D4 fade out time (26ms*2^i)
+// D2:D0 fade in time (26ms*2^i)
+
+#define IS31_REG_BREATHCTRL2 0x09
+#define IS31_REG_BREATHCTRL2_ENABLE 0x10
+// D2:D0 extinguish time (3.5ms*2^i)
+
+#define IS31_REG_SHUTDOWN 0x0A
+#define IS31_REG_SHUTDOWN_OFF 0x0
+#define IS31_REG_SHUTDOWN_ON 0x1
+
+#define IS31_REG_AGCCTRL 0x0B
+#define IS31_REG_ADCRATE 0x0C
+
+#define IS31_COMMANDREGISTER 0xFD
+#define IS31_FUNCTIONREG 0x0B    // helpfully called 'page nine'
+#define IS31_FUNCTIONREG_SIZE 0xD
+
+#define IS31_FRAME_SIZE 0xB4
+
+#define IS31_PWM_REG 0x24
+#define IS31_PWM_SIZE 0x90
+
+#define IS31_LED_MASK_SIZE 0x12
+#define IS31_SCREEN_WIDTH 16
+
+#define IS31
+
+//Generated by http://jared.geek.nz/2013/feb/linear-led-pwm
+const unsigned char cie[256] = {
+    0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
+    3, 4, 4, 4, 4, 4, 4, 5, 5, 5,
+    5, 5, 6, 6, 6, 6, 6, 7, 7, 7,
+    7, 8, 8, 8, 8, 9, 9, 9, 10, 10,
+    10, 10, 11, 11, 11, 12, 12, 12, 13, 13,
+    13, 14, 14, 15, 15, 15, 16, 16, 17, 17,
+    17, 18, 18, 19, 19, 20, 20, 21, 21, 22,
+    22, 23, 23, 24, 24, 25, 25, 26, 26, 27,
+    28, 28, 29, 29, 30, 31, 31, 32, 32, 33,
+    34, 34, 35, 36, 37, 37, 38, 39, 39, 40,
+    41, 42, 43, 43, 44, 45, 46, 47, 47, 48,
+    49, 50, 51, 52, 53, 54, 54, 55, 56, 57,
+    58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+    68, 70, 71, 72, 73, 74, 75, 76, 77, 79,
+    80, 81, 82, 83, 85, 86, 87, 88, 90, 91,
+    92, 94, 95, 96, 98, 99, 100, 102, 103, 105,
+    106, 108, 109, 110, 112, 113, 115, 116, 118, 120,
+    121, 123, 124, 126, 128, 129, 131, 132, 134, 136,
+    138, 139, 141, 143, 145, 146, 148, 150, 152, 154,
+    155, 157, 159, 161, 163, 165, 167, 169, 171, 173,
+    175, 177, 179, 181, 183, 185, 187, 189, 191, 193,
+    196, 198, 200, 202, 204, 207, 209, 211, 214, 216,
+    218, 220, 223, 225, 228, 230, 232, 235, 237, 240,
+    242, 245, 247, 250, 252, 255,
+};
+
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+typedef struct{
+    uint8_t write_buffer_offset;
+    uint8_t write_buffer[IS31_FRAME_SIZE];
+    uint8_t frame_buffer[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH];
+    uint8_t page;
+}__attribute__((__packed__)) PrivData;
+
+// Some common routines and macros
+#define PRIV(g)                         ((PrivData*)g->priv)
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+static GFXINLINE void write_page(GDisplay* g, uint8_t page) {
+    uint8_t tx[2] __attribute__((aligned(2)));
+    tx[0] = IS31_COMMANDREGISTER;
+    tx[1] = page;
+    write_data(g, tx, 2);
+}
+
+static GFXINLINE void write_register(GDisplay* g, uint8_t page, uint8_t reg, uint8_t data) {
+    uint8_t tx[2] __attribute__((aligned(2)));
+    tx[0] = reg;
+    tx[1] = data;
+    write_page(g, page);
+    write_data(g, tx, 2);
+}
+
+static GFXINLINE void write_ram(GDisplay *g, uint8_t page, uint16_t offset, uint16_t length) {
+    PRIV(g)->write_buffer_offset = offset;
+    write_page(g, page);
+    write_data(g, (uint8_t*)PRIV(g), length + 1);
+}
+
+LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+       // The private area is the display surface.
+       g->priv = gfxAlloc(sizeof(PrivData));
+    __builtin_memset(PRIV(g), 0, sizeof(PrivData));
+       PRIV(g)->page = 0;
+
+       // Initialise the board interface
+       init_board(g);
+       gfxSleepMilliseconds(10);
+
+    // zero function page, all registers (assuming full_page is all zeroes)
+    write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE);
+    set_hardware_shutdown(g, false);
+    gfxSleepMilliseconds(10);
+    // software shutdown
+    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
+    gfxSleepMilliseconds(10);
+    // zero function page, all registers
+    write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE);
+    gfxSleepMilliseconds(10);
+
+
+    // zero all LED registers on all 8 pages, and enable the mask
+    __builtin_memcpy(PRIV(g)->write_buffer, get_led_mask(g), IS31_LED_MASK_SIZE);
+    for(uint8_t i=0; i<8; i++) {
+        write_ram(g, i, 0, IS31_FRAME_SIZE);
+        gfxSleepMilliseconds(1);
+    }
+
+    // software shutdown disable (i.e. turn stuff on)
+    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
+    gfxSleepMilliseconds(10);
+
+    // Finish Init
+    post_init_board(g);
+
+       /* Initialise the GDISP structure */
+       g->g.Width = GDISP_SCREEN_WIDTH;
+       g->g.Height = GDISP_SCREEN_HEIGHT;
+       g->g.Orientation = GDISP_ROTATE_0;
+       g->g.Powermode = powerOn;
+       g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
+       g->g.Contrast = GDISP_INITIAL_CONTRAST;
+       return TRUE;
+}
+
+#if GDISP_HARDWARE_FLUSH
+       LLDSPEC void gdisp_lld_flush(GDisplay *g) {
+               // Don't flush if we don't need it.
+               if (!(g->flags & GDISP_FLG_NEEDFLUSH))
+                       return;
+
+               PRIV(g)->page++;
+               PRIV(g)->page %= 2;
+               // TODO: some smarter algorithm for this
+               // We should run only one physical page at a time
+               // This way we don't need to send so much data, and
+               // we could use slightly less memory
+               uint8_t* src = PRIV(g)->frame_buffer;
+               for (int y=0;y<GDISP_SCREEN_HEIGHT;y++) {
+                   for (int x=0;x<GDISP_SCREEN_WIDTH;x++) {
+                       PRIV(g)->write_buffer[get_led_address(g, x, y)]=cie[*src];
+                       ++src;
+                   }
+               }
+        write_ram(g, PRIV(g)->page, IS31_PWM_REG, IS31_PWM_SIZE);
+        gfxSleepMilliseconds(1);
+        write_register(g, IS31_FUNCTIONREG, IS31_REG_PICTDISP, PRIV(g)->page);
+
+               g->flags &= ~GDISP_FLG_NEEDFLUSH;
+       }
+#endif
+
+#if GDISP_HARDWARE_DRAWPIXEL
+       LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
+               coord_t         x, y;
+
+               switch(g->g.Orientation) {
+               default:
+               case GDISP_ROTATE_0:
+                       x = g->p.x;
+                       y = g->p.y;
+                       break;
+               case GDISP_ROTATE_180:
+                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
+                       y = g->p.y;
+                       break;
+               }
+               PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x] = gdispColor2Native(g->p.color);
+               g->flags |= GDISP_FLG_NEEDFLUSH;
+       }
+#endif
+
+#if GDISP_HARDWARE_PIXELREAD
+       LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
+               coord_t         x, y;
+
+               switch(g->g.Orientation) {
+               default:
+               case GDISP_ROTATE_0:
+                       x = g->p.x;
+                       y = g->p.y;
+                       break;
+               case GDISP_ROTATE_180:
+                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
+                       y = g->p.y;
+                       break;
+               }
+               return gdispNative2Color(PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x]);
+       }
+#endif
+
+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
+       LLDSPEC void gdisp_lld_control(GDisplay *g) {
+               switch(g->p.x) {
+               case GDISP_CONTROL_POWER:
+                       if (g->g.Powermode == (powermode_t)g->p.ptr)
+                               return;
+                       switch((powermode_t)g->p.ptr) {
+                       case powerOff:
+                       case powerSleep:
+                       case powerDeepSleep:
+                write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
+                               break;
+                       case powerOn:
+                write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
+                               break;
+                       default:
+                               return;
+                       }
+                       g->g.Powermode = (powermode_t)g->p.ptr;
+                       return;
+
+               case GDISP_CONTROL_ORIENTATION:
+                       if (g->g.Orientation == (orientation_t)g->p.ptr)
+                               return;
+                       switch((orientation_t)g->p.ptr) {
+                       /* Rotation is handled by the drawing routines */
+                       case GDISP_ROTATE_0:
+                       case GDISP_ROTATE_180:
+                               g->g.Height = GDISP_SCREEN_HEIGHT;
+                               g->g.Width = GDISP_SCREEN_WIDTH;
+                               break;
+                       case GDISP_ROTATE_90:
+                       case GDISP_ROTATE_270:
+                               g->g.Height = GDISP_SCREEN_WIDTH;
+                               g->g.Width = GDISP_SCREEN_HEIGHT;
+                               break;
+                       default:
+                               return;
+                       }
+                       g->g.Orientation = (orientation_t)g->p.ptr;
+                       return;
+
+               case GDISP_CONTROL_CONTRAST:
+                       return;
+               }
+       }
+#endif // GDISP_NEED_CONTROL
+
+#endif // GFX_USE_GDISP
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
new file mode 100644 (file)
index 0000000..bb28ad7
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _GDISP_LLD_CONFIG_H
+#define _GDISP_LLD_CONFIG_H
+
+#if GFX_USE_GDISP
+
+/*===========================================================================*/
+/* Driver hardware support.                                                  */
+/*===========================================================================*/
+
+#define GDISP_HARDWARE_FLUSH                   TRUE            // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL               TRUE
+#define GDISP_HARDWARE_PIXELREAD               TRUE
+#define GDISP_HARDWARE_CONTROL                 TRUE
+
+#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_GRAY256
+
+#endif /* GFX_USE_GDISP */
+
+#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
new file mode 100644 (file)
index 0000000..16c3f80
--- /dev/null
@@ -0,0 +1,2 @@
+GFXINC += drivers/gdisp/emulator_lcd
+GFXSRC += drivers/gdisp/emulator_lcd/emulator_lcd.c
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
new file mode 100644 (file)
index 0000000..babfe2b
--- /dev/null
@@ -0,0 +1,10 @@
+#define GDISP_DRIVER_VMT                       GDISPVMT_EMULATOR_LCD_ERGODOX
+#define GDISP_HARDWARE_DRAWPIXEL               TRUE
+#define GDISP_HARDWARE_PIXELREAD               TRUE
+#define GDISP_HARDWARE_CONTROL                 TRUE
+#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
+#define GDISP_SCREEN_WIDTH                     128
+#define GDISP_SCREEN_HEIGHT                    32
+#define ROTATE_180_IS_FLIP
+
+#include "emulator/emulator_driver_impl.h"
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
new file mode 100644 (file)
index 0000000..2554344
--- /dev/null
@@ -0,0 +1,2 @@
+GFXINC += drivers/gdisp/emulator_led
+GFXSRC += drivers/gdisp/emulator_led/emulator_led.c
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
new file mode 100644 (file)
index 0000000..b0ebcdc
--- /dev/null
@@ -0,0 +1,10 @@
+#define GDISP_DRIVER_VMT                           GDISPVMT_EMULATOR_LED_ERGODOX
+#define GDISP_HARDWARE_DRAWPIXEL               TRUE
+#define GDISP_HARDWARE_PIXELREAD               TRUE
+#define GDISP_HARDWARE_CONTROL                 TRUE
+#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
+#define GDISP_SCREEN_WIDTH                     7
+#define GDISP_SCREEN_HEIGHT                    7
+#define ROTATE_180_IS_FLIP
+
+#include "emulator/emulator_driver_impl.h"
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
new file mode 100644 (file)
index 0000000..290571c
--- /dev/null
@@ -0,0 +1,127 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#ifndef _GDISP_LLD_BOARD_H
+#define _GDISP_LLD_BOARD_H
+
+#include "print.h"
+
+#define ST7565_LCD_BIAS         ST7565_LCD_BIAS_9 // actually 6
+#define ST7565_ADC              ST7565_ADC_NORMAL
+#define ST7565_COM_SCAN         ST7565_COM_SCAN_DEC
+#define ST7565_PAGE_ORDER       0,1,2,3
+/*
+ * Custom page order for several LCD boards, e.g. HEM12864-99
+ * #define ST7565_PAGE_ORDER       4,5,6,7,0,1,2,3
+ */
+
+#define ST7565_GPIOPORT GPIOC
+#define ST7565_PORT PORTC
+#define ST7565_A0_PIN 7
+#define ST7565_RST_PIN 8
+#define ST7565_MOSI_PIN 6
+#define ST7565_SLCK_PIN 5
+#define ST7565_SS_PIN 4
+
+#define palSetPadModeRaw(portname, bits) \
+    ST7565_PORT->PCR[ST7565_##portname##_PIN] = bits
+
+#define palSetPadModeNamed(portname, portmode) \
+    palSetPadMode(ST7565_GPIOPORT, ST7565_##portname##_PIN, portmode)
+
+#define ST7565_SPI_MODE PORTx_PCRn_DSE | PORTx_PCRn_MUX(2)
+// DSPI Clock and Transfer Attributes
+// Frame Size: 8 bits
+// MSB First
+// CLK Low by default
+static const SPIConfig spi1config = {
+       NULL,
+       /* HW dependent part.*/
+       ST7565_GPIOPORT,
+    ST7565_SS_PIN,
+    SPIx_CTARn_FMSZ(7)
+    | SPIx_CTARn_ASC(7)
+    | SPIx_CTARn_DT(7)
+    | SPIx_CTARn_CSSCK(7)
+    | SPIx_CTARn_PBR(0)
+    | SPIx_CTARn_BR(7)
+       //SPI_CR1_BR_0
+};
+
+static bool_t st7565_is_data_mode = 1;
+
+static GFXINLINE void init_board(GDisplay *g) {
+    (void) g;
+    palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
+    st7565_is_data_mode = 1;
+    palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
+    palSetPadModeRaw(MOSI, ST7565_SPI_MODE);
+    palSetPadModeRaw(SLCK, ST7565_SPI_MODE);
+    palSetPadModeRaw(SS, ST7565_SPI_MODE);
+
+    spiInit();
+    spiStart(&SPID1, &spi1config);
+    spiSelect(&SPID1);
+}
+
+static GFXINLINE void post_init_board(GDisplay *g) {
+       (void) g;
+}
+
+static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
+    (void) g;
+    if (state) {
+        palClearPad(ST7565_GPIOPORT, ST7565_RST_PIN);
+    }
+    else {
+        palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
+    }
+}
+
+static GFXINLINE void acquire_bus(GDisplay *g) {
+    (void) g;
+    // Only the LCD is using the SPI bus, so no need to acquire
+    // spiAcquireBus(&SPID1);
+}
+
+static GFXINLINE void release_bus(GDisplay *g) {
+    (void) g;
+    // Only the LCD is using the SPI bus, so no need to release
+    //spiReleaseBus(&SPID1);
+}
+
+static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
+       (void) g;
+       if (st7565_is_data_mode) {
+           // The sleeps need to be at lest 10 vs 25 ns respectively
+           // So let's sleep two ticks, one tick might not be enough
+           // if we are at the end of the tick
+           chThdSleep(2);
+        palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN);
+        chThdSleep(2);
+        st7565_is_data_mode = 0;
+       }
+       spiSend(&SPID1, 1, &cmd);
+}
+
+static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
+       (void) g;
+       if (!st7565_is_data_mode) {
+           // The sleeps need to be at lest 10 vs 25 ns respectively
+           // So let's sleep two ticks, one tick might not be enough
+           // if we are at the end of the tick
+           chThdSleep(2);
+        palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
+           chThdSleep(2);
+        st7565_is_data_mode = 1;
+       }
+       spiSend(&SPID1, length, data);
+}
+
+#endif /* _GDISP_LLD_BOARD_H */
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
new file mode 100644 (file)
index 0000000..889a1a0
--- /dev/null
@@ -0,0 +1,2 @@
+GFXINC += drivers/gdisp/st7565ergodox
+GFXSRC += drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
new file mode 100644 (file)
index 0000000..c33aea8
--- /dev/null
@@ -0,0 +1,292 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#include "gfx.h"
+
+#if GFX_USE_GDISP
+
+#define GDISP_DRIVER_VMT                       GDISPVMT_ST7565_ERGODOX
+#include "drivers/gdisp/st7565ergodox/gdisp_lld_config.h"
+#include "src/gdisp/gdisp_driver.h"
+
+#include "board_ST7565.h"
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+#ifndef GDISP_SCREEN_HEIGHT
+       #define GDISP_SCREEN_HEIGHT             32
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+       #define GDISP_SCREEN_WIDTH              128
+#endif
+#ifndef GDISP_INITIAL_CONTRAST
+       #define GDISP_INITIAL_CONTRAST  0
+#endif
+#ifndef GDISP_INITIAL_BACKLIGHT
+       #define GDISP_INITIAL_BACKLIGHT 100
+#endif
+
+#define GDISP_FLG_NEEDFLUSH                    (GDISP_FLG_DRIVER<<0)
+
+#include "drivers/gdisp/st7565ergodox/st7565.h"
+
+/*===========================================================================*/
+/* Driver config defaults for backward compatibility.                       */
+/*===========================================================================*/
+#ifndef ST7565_LCD_BIAS
+  #define ST7565_LCD_BIAS         ST7565_LCD_BIAS_7
+#endif
+#ifndef ST7565_ADC
+  #define ST7565_ADC              ST7565_ADC_NORMAL
+#endif
+#ifndef ST7565_COM_SCAN
+  #define ST7565_COM_SCAN         ST7565_COM_SCAN_INC
+#endif
+#ifndef ST7565_PAGE_ORDER
+  #define ST7565_PAGE_ORDER       0,1,2,3
+#endif
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+typedef struct{
+    bool_t buffer2;
+    uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8];
+}PrivData;
+
+// Some common routines and macros
+#define PRIV(g)                         ((PrivData*)g->priv)
+#define RAM(g)                                                 (PRIV(g)->ram)
+#define write_cmd2(g, cmd1, cmd2)              { write_cmd(g, cmd1); write_cmd(g, cmd2); }
+#define write_cmd3(g, cmd1, cmd2, cmd3)        { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); }
+
+// Some common routines and macros
+#define delay(us)                      gfxSleepMicroseconds(us)
+#define delay_ms(ms)           gfxSleepMilliseconds(ms)
+
+#define xyaddr(x, y)           ((x) + ((y)>>3)*GDISP_SCREEN_WIDTH)
+#define xybit(y)                       (1<<((y)&7))
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/*
+ * As this controller can't update on a pixel boundary we need to maintain the
+ * the entire display surface in memory so that we can do the necessary bit
+ * operations. Fortunately it is a small display in monochrome.
+ * 64 * 128 / 8 = 1024 bytes.
+ */
+
+LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+       // The private area is the display surface.
+       g->priv = gfxAlloc(sizeof(PrivData));
+       PRIV(g)->buffer2 = false;
+
+       // Initialise the board interface
+       init_board(g);
+
+       // Hardware reset
+       setpin_reset(g, TRUE);
+       gfxSleepMilliseconds(20);
+       setpin_reset(g, FALSE);
+       gfxSleepMilliseconds(20);
+
+       acquire_bus(g);
+    write_cmd(g, ST7565_DISPLAY_OFF);
+       write_cmd(g, ST7565_LCD_BIAS);
+    write_cmd(g, ST7565_ADC);
+    write_cmd(g, ST7565_COM_SCAN);
+    
+    write_cmd(g, ST7565_START_LINE | 0);
+
+       write_cmd(g, ST7565_RESISTOR_RATIO | 0x6);
+
+       // turn on voltage converter (VC=1, VR=0, VF=0)
+       write_cmd(g, ST7565_POWER_CONTROL | 0x04);
+       delay_ms(50);
+
+       // turn on voltage regulator (VC=1, VR=1, VF=0)
+       write_cmd(g, ST7565_POWER_CONTROL | 0x06);
+       delay_ms(50);
+
+       // turn on voltage follower (VC=1, VR=1, VF=1)
+       write_cmd(g, ST7565_POWER_CONTROL | 0x07);
+       delay_ms(50);
+
+       write_cmd(g, 0xE2);
+    write_cmd(g, ST7565_COM_SCAN);
+       write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101);
+       //write_cmd2(g, ST7565_CONTRAST, 0);
+       write_cmd(g, ST7565_DISPLAY_ON);
+       write_cmd(g, ST7565_ALLON_NORMAL);
+       write_cmd(g, ST7565_INVERT_DISPLAY);
+
+       write_cmd(g, ST7565_RMW);
+
+    // Finish Init
+    post_init_board(g);
+
+       // Release the bus
+       release_bus(g);
+
+       /* Initialise the GDISP structure */
+       g->g.Width = GDISP_SCREEN_WIDTH;
+       g->g.Height = GDISP_SCREEN_HEIGHT;
+       g->g.Orientation = GDISP_ROTATE_0;
+       g->g.Powermode = powerOn;
+       g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
+       g->g.Contrast = GDISP_INITIAL_CONTRAST;
+       return TRUE;
+}
+
+#if GDISP_HARDWARE_FLUSH
+       LLDSPEC void gdisp_lld_flush(GDisplay *g) {
+               unsigned        p;
+
+               // Don't flush if we don't need it.
+               if (!(g->flags & GDISP_FLG_NEEDFLUSH))
+                       return;
+
+               acquire_bus(g);
+               unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0);
+               for (p = 0; p < 4; p++) {
+                       write_cmd(g, ST7565_PAGE | (p + dstOffset));
+                       write_cmd(g, ST7565_COLUMN_MSB | 0);
+                       write_cmd(g, ST7565_COLUMN_LSB | 0);
+                       write_cmd(g, ST7565_RMW);
+                       write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH);
+               }
+               unsigned line = (PRIV(g)->buffer2 ? 32 : 0);
+        write_cmd(g, ST7565_START_LINE | line);
+        PRIV(g)->buffer2 = !PRIV(g)->buffer2;
+               release_bus(g);
+
+               g->flags &= ~GDISP_FLG_NEEDFLUSH;
+       }
+#endif
+
+#if GDISP_HARDWARE_DRAWPIXEL
+       LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
+               coord_t         x, y;
+
+               switch(g->g.Orientation) {
+               default:
+               case GDISP_ROTATE_0:
+                       x = g->p.x;
+                       y = g->p.y;
+                       break;
+               case GDISP_ROTATE_90:
+                       x = g->p.y;
+                       y = GDISP_SCREEN_HEIGHT-1 - g->p.x;
+                       break;
+               case GDISP_ROTATE_180:
+                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
+                       y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
+                       break;
+               case GDISP_ROTATE_270:
+                       x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
+                       y = g->p.x;
+                       break;
+               }
+               if (gdispColor2Native(g->p.color) != Black)
+                       RAM(g)[xyaddr(x, y)] |= xybit(y);
+               else
+                       RAM(g)[xyaddr(x, y)] &= ~xybit(y);
+               g->flags |= GDISP_FLG_NEEDFLUSH;
+       }
+#endif
+
+#if GDISP_HARDWARE_PIXELREAD
+       LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
+               coord_t         x, y;
+
+               switch(g->g.Orientation) {
+               default:
+               case GDISP_ROTATE_0:
+                       x = g->p.x;
+                       y = g->p.y;
+                       break;
+               case GDISP_ROTATE_90:
+                       x = g->p.y;
+                       y = GDISP_SCREEN_HEIGHT-1 - g->p.x;
+                       break;
+               case GDISP_ROTATE_180:
+                       x = GDISP_SCREEN_WIDTH-1 - g->p.x;
+                       y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
+                       break;
+               case GDISP_ROTATE_270:
+                       x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
+                       y = g->p.x;
+                       break;
+               }
+               return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black;
+       }
+#endif
+
+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
+       LLDSPEC void gdisp_lld_control(GDisplay *g) {
+               switch(g->p.x) {
+               case GDISP_CONTROL_POWER:
+                       if (g->g.Powermode == (powermode_t)g->p.ptr)
+                               return;
+                       switch((powermode_t)g->p.ptr) {
+                       case powerOff:
+                       case powerSleep:
+                       case powerDeepSleep:
+                               acquire_bus(g);
+                               write_cmd(g, ST7565_DISPLAY_OFF);
+                               release_bus(g);
+                               break;
+                       case powerOn:
+                               acquire_bus(g);
+                               write_cmd(g, ST7565_DISPLAY_ON);
+                               release_bus(g);
+                               break;
+                       default:
+                               return;
+                       }
+                       g->g.Powermode = (powermode_t)g->p.ptr;
+                       return;
+
+               case GDISP_CONTROL_ORIENTATION:
+                       if (g->g.Orientation == (orientation_t)g->p.ptr)
+                               return;
+                       switch((orientation_t)g->p.ptr) {
+                       /* Rotation is handled by the drawing routines */
+                       case GDISP_ROTATE_0:
+                       case GDISP_ROTATE_180:
+                               g->g.Height = GDISP_SCREEN_HEIGHT;
+                               g->g.Width = GDISP_SCREEN_WIDTH;
+                               break;
+                       case GDISP_ROTATE_90:
+                       case GDISP_ROTATE_270:
+                               g->g.Height = GDISP_SCREEN_WIDTH;
+                               g->g.Width = GDISP_SCREEN_HEIGHT;
+                               break;
+                       default:
+                               return;
+                       }
+                       g->g.Orientation = (orientation_t)g->p.ptr;
+                       return;
+
+               case GDISP_CONTROL_CONTRAST:
+            if ((unsigned)g->p.ptr > 100)
+               g->p.ptr = (void *)100;
+                       acquire_bus(g);
+                       write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F);
+                       release_bus(g);
+            g->g.Contrast = (unsigned)g->p.ptr;
+                       return;
+               }
+       }
+#endif // GDISP_NEED_CONTROL
+
+#endif // GFX_USE_GDISP
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
new file mode 100644 (file)
index 0000000..48587b9
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#ifndef _GDISP_LLD_CONFIG_H
+#define _GDISP_LLD_CONFIG_H
+
+#if GFX_USE_GDISP
+
+/*===========================================================================*/
+/* Driver hardware support.                                                  */
+/*===========================================================================*/
+
+#define GDISP_HARDWARE_FLUSH                   TRUE            // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL               TRUE
+#define GDISP_HARDWARE_PIXELREAD               TRUE
+#define GDISP_HARDWARE_CONTROL                 TRUE
+
+#define GDISP_LLD_PIXELFORMAT                  GDISP_PIXELFORMAT_MONO
+
+#endif /* GFX_USE_GDISP */
+
+#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
new file mode 100644 (file)
index 0000000..48636b3
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#ifndef _ST7565_H
+#define _ST7565_H
+
+#define ST7565_CONTRAST             0x81
+#define ST7565_ALLON_NORMAL         0xA4
+#define ST7565_ALLON                0xA5
+#define ST7565_POSITIVE_DISPLAY     0xA6
+#define ST7565_INVERT_DISPLAY       0xA7
+#define ST7565_DISPLAY_OFF          0xAE
+#define ST7565_DISPLAY_ON           0xAF
+
+#define ST7565_LCD_BIAS_7           0xA3
+#define ST7565_LCD_BIAS_9           0xA2
+
+#define ST7565_ADC_NORMAL           0xA0
+#define ST7565_ADC_REVERSE          0xA1
+
+#define ST7565_COM_SCAN_INC         0xC0
+#define ST7565_COM_SCAN_DEC         0xC8
+
+#define ST7565_START_LINE           0x40
+#define ST7565_PAGE                 0xB0
+#define ST7565_COLUMN_MSB           0x10
+#define ST7565_COLUMN_LSB           0x00
+#define ST7565_RMW                  0xE0
+
+#define ST7565_RESISTOR_RATIO       0x20
+#define ST7565_POWER_CONTROL        0x28
+
+#endif /* _ST7565_H */