Merge pull request #1427 from blakedietz/master

Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz

diff --git a/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
deleted file mode 100644 (file)
index 16c3f80..0000000
--- a/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644 (file)
index babfe2b..0000000
--- a/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
+++ /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/infinity/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
deleted file mode 100644 (file)
index 2554344..0000000
--- a/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644 (file)
index b0ebcdc..0000000
--- a/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
+++ /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/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c
index a4b09a34d0f7e50af01b0440ad769350511f3f28..5b6b320074250e68943e01e8a272bcf9659ff67a 100644 (file)
--- a/keyboards/ergodox/infinity/visualizer.c
+++ b/keyboards/ergodox/infinity/visualizer.c
@@ -123,7 +123,7 @@ void initialize_user_visualizer(visualizer_state_t* state) {
     start_keyframe_animation(&default_startup_animation);
 }
 
-inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) {
+static inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) {
     return user_data->led_on & (1u << num);
 }
 

diff --git a/quantum/visualizer/lcd_backlight.c b/quantum/visualizer/lcd_backlight.c
index 00de3fab52d4a6cf1dc0e5e83d4644f1a34f484e..6cd996f75e5f076d108a7631b20e7c62017eeba8 100644 (file)
--- a/quantum/visualizer/lcd_backlight.c
+++ b/quantum/visualizer/lcd_backlight.c
@@ -83,3 +83,7 @@ void lcd_backlight_brightness(uint8_t b) {
     current_brightness = b;
     lcd_backlight_color(current_hue, current_saturation, current_intensity);
 }
+
+uint8_t lcd_get_backlight_brightness(void) {
+       return current_brightness;
+}

diff --git a/quantum/visualizer/lcd_backlight.h b/quantum/visualizer/lcd_backlight.h
index 14dde64a1ab9697f5b7c4fb53a8bf8970f74a70b..95d7a07b46ee1b16d705332762d4d46239c857b3 100644 (file)
--- a/quantum/visualizer/lcd_backlight.h
+++ b/quantum/visualizer/lcd_backlight.h
@@ -32,13 +32,14 @@ SOFTWARE.
 #define LCD_SAT(color) ((color >> 8) & 0xFF)
 #define LCD_INT(color) (color & 0xFF)
 
-inline uint32_t change_lcd_color_intensity(uint32_t color, uint8_t new_intensity) {
+static inline uint32_t change_lcd_color_intensity(uint32_t color, uint8_t new_intensity) {
     return (color & 0xFFFFFF00) | new_intensity;
 }
 
 void lcd_backlight_init(void);
 void lcd_backlight_color(uint8_t hue, uint8_t saturation, uint8_t intensity);
 void lcd_backlight_brightness(uint8_t b);
+uint8_t lcd_get_backlight_brightness(void);
 
 void lcd_backlight_hal_init(void);
 void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b);

diff --git a/quantum/visualizer/led_keyframes.c b/quantum/visualizer/led_keyframes.c
index c14491e5e1ea5c3d2e16f177f77b06e85abf6b37..2f4e200439af988b4276d1af504a0368a8c88f30 100644 (file)
--- a/quantum/visualizer/led_keyframes.c
+++ b/quantum/visualizer/led_keyframes.c
@@ -48,7 +48,7 @@ static uint8_t crossfade_start_frame[NUM_ROWS][NUM_COLS];
 static uint8_t crossfade_end_frame[NUM_ROWS][NUM_COLS];
 
 static uint8_t compute_gradient_color(float t, float index, float num) {
-    const float two_pi = M_2_PI;
+    const float two_pi = M_PI * 2.0f;
     float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi;
     float x = t * two_pi + normalized_index;
     float v = 0.5 * (cosf(x) + 1.0f);

diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index 486ff25b3f8a3ca300002216c72bd1e5b8a482a1..a4b3ea7e491805434ac1218e35c8c82f73d6ce68 100644 (file)
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "visualizer.h"
 #include "config.h"
+#include "visualizer.h"
 #include <string.h>
 #ifdef PROTOCOL_CHIBIOS
 #include "ch.h"

diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h
index 1c567440fb030bc33557ae501d8af8d9da80b712..90ecdcbaea56c3e85d72d71d1c6813b0392bc460 100644 (file)
--- a/quantum/visualizer/visualizer.h
+++ b/quantum/visualizer/visualizer.h
@@ -28,6 +28,7 @@ SOFTWARE.
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "config.h"
 #include "gfx.h"
 
 #ifdef LCD_BACKLIGHT_ENABLE