line ending stuff

[qmk_firmware.git] / keyboards / ergodox / infinity / 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
index 1d21f0c498e97ad16f77b6537510d284fcb5f552..b4a5c84b0a97af612fe862650a7f084174a77d53 100644 (file)
--- a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
@@ -25,6 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "board_IS31FL3731C.h"
 
+
+// Can't include led_tables from here
+extern const uint8_t CIE1931_CURVE[];
+
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
@@ -39,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        #define GDISP_INITIAL_CONTRAST  0
 #endif
 #ifndef GDISP_INITIAL_BACKLIGHT
-       #define GDISP_INITIAL_BACKLIGHT 100
+       #define GDISP_INITIAL_BACKLIGHT 0
 #endif
 
 #define GDISP_FLG_NEEDFLUSH                    (GDISP_FLG_DRIVER<<0)
@@ -100,37 +104,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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.                                                   */
 /*===========================================================================*/
@@ -200,7 +173,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     }
 
     // software shutdown disable (i.e. turn stuff on)
-    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
+    write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
     gfxSleepMilliseconds(10);
 
     // Finish Init
@@ -210,7 +183,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
        g->g.Width = GDISP_SCREEN_WIDTH;
        g->g.Height = GDISP_SCREEN_HEIGHT;
        g->g.Orientation = GDISP_ROTATE_0;
-       g->g.Powermode = powerOn;
+       g->g.Powermode = powerOff;
        g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
        g->g.Contrast = GDISP_INITIAL_CONTRAST;
        return TRUE;
@@ -231,7 +204,8 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
                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];
+                       uint8_t val = (uint16_t)*src * g->g.Backlight / 100;
+                       PRIV(g)->write_buffer[get_led_address(g, x, y)]=CIE1931_CURVE[val];
                        ++src;
                    }
                }
@@ -324,8 +298,13 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
                        g->g.Orientation = (orientation_t)g->p.ptr;
                        return;
 
-               case GDISP_CONTROL_CONTRAST:
-                       return;
+               case GDISP_CONTROL_BACKLIGHT:
+                   if (g->g.Backlight == (unsigned)g->p.ptr)
+                return;
+                   unsigned val = (unsigned)g->p.ptr;
+                   g->g.Backlight = val > 100 ? 100 : val;
+            g->flags |= GDISP_FLG_NEEDFLUSH;
+                   return;
                }
        }
 #endif // GDISP_NEED_CONTROL