summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-25 10:29:00 -0400
committerGitHub <noreply@github.com>2017-06-25 10:29:00 -0400
commitde833659ae0408be6774ff10ebfcbf98fe0e10f1 (patch)
treebae192f0e883b4994d6d09766006029c58871eca
parent62c77e7dbf0ac6d52448886bc6e1fda7551f94f5 (diff)
parent1e6a3f9e170759dd88ba29f67d35d9c34b3f8f8c (diff)
Merge pull request #1429 from fredizzimo/fixes_for_emulator
Minor fixes to support the emulator
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk2
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c10
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk2
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c10
-rw-r--r--keyboards/ergodox/infinity/visualizer.c2
-rw-r--r--quantum/visualizer/lcd_backlight.c4
-rw-r--r--quantum/visualizer/lcd_backlight.h3
-rw-r--r--quantum/visualizer/led_keyframes.c2
-rw-r--r--quantum/visualizer/visualizer.c2
-rw-r--r--quantum/visualizer/visualizer.h1
10 files changed, 10 insertions, 28 deletions
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
index 16c3f80f53..0000000000
--- 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
index babfe2b367..0000000000
--- 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
index 2554344321..0000000000
--- 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
index b0ebcdc475..0000000000
--- 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 a4b09a34d0..5b6b320074 100644
--- 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 00de3fab52..6cd996f75e 100644
--- 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 14dde64a1a..95d7a07b46 100644
--- 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 c14491e5e1..2f4e200439 100644
--- 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 486ff25b3f..a4b3ea7e49 100644
--- 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 1c567440fb..90ecdcbaea 100644
--- 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