Merge pull request #1429 from fredizzimo/fixes_for_emulator
Minor fixes to support the emulator
This commit is contained in:
commit
de833659ae
10 changed files with 10 additions and 28 deletions
|
@ -1,2 +0,0 @@
|
|||
GFXINC += drivers/gdisp/emulator_lcd
|
||||
GFXSRC += drivers/gdisp/emulator_lcd/emulator_lcd.c
|
|
@ -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"
|
|
@ -1,2 +0,0 @@
|
|||
GFXINC += drivers/gdisp/emulator_led
|
||||
GFXSRC += drivers/gdisp/emulator_led/emulator_led.c
|
|
@ -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"
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -28,6 +28,7 @@ SOFTWARE.
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "gfx.h"
|
||||
|
||||
#ifdef LCD_BACKLIGHT_ENABLE
|
||||
|
|
Loading…
Reference in a new issue