mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-09-21 19:29:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
VeyPatch 2024-12-10 14:13:02 +01:00
commit 54b94fd016
19 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/display/display.c
View file

@ -10,6 +10,9 @@
// Initialize the font // Initialize the font
static painter_font_handle_t thintel; static painter_font_handle_t thintel;
painter_device_t lcd;
painter_device_t lcd_surface;
// This function is ran on bootup of the keyboard // This function is ran on bootup of the keyboard
bool module_post_init_user(void) { bool module_post_init_user(void) {
// Load the font in to memory. // Load the font in to memory.
@ -55,12 +58,12 @@ bool display_module_housekeeping_task_user(bool second_display) {
// Make sure that the second display loads correctly, sometimes it takes a little while for the keyboard to know it has a second display. // Make sure that the second display loads correctly, sometimes it takes a little while for the keyboard to know it has a second display.
// So we reset the state and make it run again until the secondary display is drawn correctly // So we reset the state and make it run again until the secondary display is drawn correctly
if(second_display && !second_display_set) { if(second_display && !second_display_set) {
display_set = false; display_set = false;
} }
// Move surface to lcd, this actually writes the content to the physical display // Move surface to lcd, this actually writes the content to the physical display
qp_surface_draw(lcd_surface, lcd, 0, 0, 0); qp_surface_draw(lcd_surface, lcd, 0, 0, 0);
return false; return false;
} }

2
examples/display/rules.mk
View file

@ -2,4 +2,4 @@
SRC += display.c SRC += display.c
# Include the font file # Include the font file
SRC += graphics/thintel15.qff.c SRC += graphics/thintel15.qff.c

2
keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/keymap.c
View file

@ -271,4 +271,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} }
return false; return false;
} }
#endif #endif

2
keyboards/splitkb/halcyon/kyria/keymaps/default_hlc/rules.mk
View file

@ -1,2 +1,2 @@
# This adds module functionality to your keyboard (files found in users/halcyon_modules) # This adds module functionality to your keyboard (files found in users/halcyon_modules)
USER_NAME := halcyon_modules USER_NAME := halcyon_modules

2
keyboards/splitkb/halcyon/kyria/keymaps/vial_hlc/config.h
View file

@ -14,4 +14,4 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define DYNAMIC_KEYMAP_LAYER_COUNT 8 #define DYNAMIC_KEYMAP_LAYER_COUNT 8

2
keyboards/splitkb/halcyon/kyria/keymaps/vial_hlc/rules.mk
View file

@ -5,4 +5,4 @@ VIALRGB_ENABLE = yes
ENCODER_MAP_ENABLE = yes ENCODER_MAP_ENABLE = yes
# This adds module functionality to your keyboard (files found in users/halcyon_modules) # This adds module functionality to your keyboard (files found in users/halcyon_modules)
USER_NAME := halcyon_modules USER_NAME := halcyon_modules

2
users/halcyon_modules/config.h
View file

@ -64,4 +64,4 @@
{k8A, k8B, k8C, k8D, k8E, k8F, KC_NO}, \ {k8A, k8B, k8C, k8D, k8E, k8F, KC_NO}, \
{k9A, k9B, k9C, k9D, k9E, KC_NO, KC_NO} \ {k9A, k9B, k9C, k9D, k9E, KC_NO, KC_NO} \
} }
#endif #endif

5
users/halcyon_modules/halcyon.c
View file

@ -25,6 +25,7 @@ __attribute__((weak)) bool display_module_housekeeping_task_user(bool second_dis
return true; return true;
} }
module_t module_master;
module_t module; module_t module;
#ifdef HLC_NONE #ifdef HLC_NONE
module_t module = hlc_none; module_t module = hlc_none;
@ -91,7 +92,7 @@ void housekeeping_task_kb(void) {
display_module_housekeeping_task_kb(false); // Otherwise be the main display display_module_housekeeping_task_kb(false); // Otherwise be the main display
} }
} }
// Backlight feature // Backlight feature
if (backlight_off && last_input_activity_elapsed() <= HLC_BACKLIGHT_TIMEOUT) { if (backlight_off && last_input_activity_elapsed() <= HLC_BACKLIGHT_TIMEOUT) {
backlight_wakeup(); backlight_wakeup();
@ -153,4 +154,4 @@ const matrix_row_t matrix_mask[] = {
0b0011111, 0b0011111,
}; };
#endif #endif
#endif #endif

4
users/halcyon_modules/halcyon.h
View file

@ -11,11 +11,11 @@ typedef enum module {
hlc_tft_display hlc_tft_display
} module_t; } module_t;
module_t module_master; extern module_t module_master;
bool module_post_init_kb(void); bool module_post_init_kb(void);
bool module_housekeeping_task_kb(void); bool module_housekeeping_task_kb(void);
bool display_module_housekeeping_task_kb(bool second_display); bool display_module_housekeeping_task_kb(bool second_display);
bool module_post_init_user(void); bool module_post_init_user(void);
bool module_housekeeping_task_user(void); bool module_housekeeping_task_user(void);
bool display_module_housekeeping_task_user(bool second_display); bool display_module_housekeeping_task_user(bool second_display);

2
users/halcyon_modules/hlc_cirque_trackpad/config.h
View file

@ -15,4 +15,4 @@
#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE #define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE
#define CIRQUE_PINNACLE_TAP_ENABLE #define CIRQUE_PINNACLE_TAP_ENABLE
#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE

2
users/halcyon_modules/hlc_cirque_trackpad/rules.mk
View file

@ -1,3 +1,3 @@
CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
CONFIG_H += $(CURRENT_DIR)/config.h CONFIG_H += $(CURRENT_DIR)/config.h

2
users/halcyon_modules/hlc_encoder/config.h
View file

@ -9,4 +9,4 @@
#define HLC_ENCODER_BUTTON GP16 #define HLC_ENCODER_BUTTON GP16
#define HLC_ENCODER_A GP27 #define HLC_ENCODER_A GP27
#define HLC_ENCODER_B GP26 #define HLC_ENCODER_B GP26

4
users/halcyon_modules/hlc_encoder/hlc_encoder.c
View file

@ -124,7 +124,7 @@ void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Populate the matrix row with the state of the col pin // Populate the matrix row with the state of the col pin
current_row_value |= pin_state ? 0 : row_shifter; current_row_value |= pin_state ? 0 : row_shifter;
} }
} }
// ↑↑↑ THIS HAS BEEN ADDED/CHANGED // ↑↑↑ THIS HAS BEEN ADDED/CHANGED
// Unselect row // Unselect row
@ -133,4 +133,4 @@ void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Update the matrix // Update the matrix
current_matrix[current_row] = current_row_value; current_matrix[current_row] = current_row_value;
} }

2
users/halcyon_modules/hlc_encoder/rules.mk
View file

@ -1,4 +1,4 @@
CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
SRC += $(CURRENT_DIR)/hlc_encoder.c SRC += $(CURRENT_DIR)/hlc_encoder.c
CONFIG_H += $(CURRENT_DIR)/config.h CONFIG_H += $(CURRENT_DIR)/config.h

2
users/halcyon_modules/hlc_tft_display/config.h
View file

@ -31,4 +31,4 @@
#define BACKLIGHT_PIN GP27 #define BACKLIGHT_PIN GP27
// Timeout configuration // Timeout configuration
#define QUANTUM_PAINTER_DISPLAY_TIMEOUT HLC_BACKLIGHT_TIMEOUT #define QUANTUM_PAINTER_DISPLAY_TIMEOUT HLC_BACKLIGHT_TIMEOUT

21
users/halcyon_modules/hlc_tft_display/hlc_tft_display.c
View file

@ -37,6 +37,9 @@ static uint16_t lcd_surface_fb[135*240];
int color_value = 0; int color_value = 0;
painter_device_t lcd;
painter_device_t lcd_surface;
led_t last_led_usb_state = {0}; led_t last_led_usb_state = {0};
layer_state_t last_layer_state = {0}; layer_state_t last_layer_state = {0};
@ -81,7 +84,7 @@ void draw_grid() {
// Draw the filled cell inside the outline if it's alive // Draw the filled cell inside the outline if it's alive
if (grid[y][x]) { if (grid[y][x]) {
switch (color_value) { switch (color_value) {
case 0: case 0:
qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_0, true); qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_0, true);
break; break;
case 1: case 1:
@ -93,7 +96,7 @@ void draw_grid() {
case 3: case 3:
qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_3, true); qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_3, true);
break; break;
case 4: case 4:
qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_4, true); qp_rect(lcd_surface, left + OUTLINE_SIZE, top + OUTLINE_SIZE, right - OUTLINE_SIZE, bottom - OUTLINE_SIZE, HSV_LAYER_4, true);
break; break;
case 5: case 5:
@ -188,10 +191,10 @@ void update_display(void) {
last_led_usb_state = led_usb_state; last_led_usb_state = led_usb_state;
first_run_led = true; first_run_led = true;
} }
if(last_layer_state != layer_state || first_run_layer == false) { if(last_layer_state != layer_state || first_run_layer == false) {
switch (get_highest_layer(layer_state|default_layer_state)) { switch (get_highest_layer(layer_state|default_layer_state)) {
case 0: case 0:
layer_number = qp_load_image_mem(gfx_0); layer_number = qp_load_image_mem(gfx_0);
qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_0, HSV_BLACK); qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_0, HSV_BLACK);
break; break;
@ -207,7 +210,7 @@ void update_display(void) {
layer_number = qp_load_image_mem(gfx_3); layer_number = qp_load_image_mem(gfx_3);
qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_3, HSV_BLACK); qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_3, HSV_BLACK);
break; break;
case 4: case 4:
layer_number = qp_load_image_mem(gfx_4); layer_number = qp_load_image_mem(gfx_4);
qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_4, HSV_BLACK); qp_drawimage_recolor(lcd_surface, 5, 5, layer_number, HSV_LAYER_4, HSV_BLACK);
break; break;
@ -234,7 +237,7 @@ void update_display(void) {
} }
// Quantum function // Quantum function
void suspend_power_down_kb(void) { void suspend_power_down_kb(void) {
qp_power(lcd, false); qp_power(lcd, false);
suspend_power_down_user(); suspend_power_down_user();
} }
@ -273,7 +276,7 @@ bool module_post_init_kb(void) {
} }
// Called from halcyon.c // Called from halcyon.c
bool display_module_housekeeping_task_kb(bool second_display) { bool display_module_housekeeping_task_kb(bool second_display) {
if(!display_module_housekeeping_task_user(second_display)) { return false; } if(!display_module_housekeeping_task_user(second_display)) { return false; }
if(second_display) { if(second_display) {
@ -288,7 +291,7 @@ bool display_module_housekeeping_task_kb(bool second_display) {
second_display_set = true; second_display_set = true;
} }
if (timer_elapsed32(last_draw) >= 100) { // Throttle to 10 fps if (timer_elapsed32(last_draw) >= 100) { // Throttle to 10 fps
draw_grid(); draw_grid();
update_grid(); update_grid();
@ -311,4 +314,4 @@ bool display_module_housekeeping_task_kb(bool second_display) {
qp_surface_draw(lcd_surface, lcd, 0, 0, 0); qp_surface_draw(lcd_surface, lcd, 0, 0, 0);
return true; return true;
} }

6
users/halcyon_modules/hlc_tft_display/hlc_tft_display.h
View file

@ -25,8 +25,8 @@
// #define HSV_LAYER_8 213, 56, 255 // #define HSV_LAYER_8 213, 56, 255
#define HSV_LAYER_UNDEF 0, 255, 255 #define HSV_LAYER_UNDEF 0, 255, 255
painter_device_t lcd; extern painter_device_t lcd;
painter_device_t lcd_surface; extern painter_device_t lcd_surface;
void draw_grid(void); void draw_grid(void);
void update_grid(void); void update_grid(void);
@ -35,4 +35,4 @@ void add_cell_cluster(void);
uint8_t get_random_color_index(void); uint8_t get_random_color_index(void);
void update_display(void); void update_display(void);
void backlight_wakeup(void); void backlight_wakeup(void);
void backlight_suspend(void); void backlight_suspend(void);

4
users/halcyon_modules/hlc_tft_display/rules.mk
View file

@ -1,9 +1,9 @@
CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) CURRENT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
SRC += $(CURRENT_DIR)/hlc_tft_display.c SRC += $(CURRENT_DIR)/hlc_tft_display.c
CONFIG_H += $(CURRENT_DIR)/config.h CONFIG_H += $(CURRENT_DIR)/config.h
# Fonts # Fonts
SRC += $(CURRENT_DIR)/graphics/fonts/Retron2000-27.qff.c $(CURRENT_DIR)/graphics/fonts/Retron2000-underline-27.qff.c SRC += $(CURRENT_DIR)/graphics/fonts/Retron2000-27.qff.c $(CURRENT_DIR)/graphics/fonts/Retron2000-underline-27.qff.c
# Numbers in image format # Numbers in image format
SRC += $(CURRENT_DIR)/graphics/numbers/0.qgf.c $(CURRENT_DIR)/graphics/numbers/1.qgf.c $(CURRENT_DIR)/graphics/numbers/2.qgf.c $(CURRENT_DIR)/graphics/numbers/3.qgf.c $(CURRENT_DIR)/graphics/numbers/4.qgf.c $(CURRENT_DIR)/graphics/numbers/5.qgf.c $(CURRENT_DIR)/graphics/numbers/6.qgf.c $(CURRENT_DIR)/graphics/numbers/7.qgf.c $(CURRENT_DIR)/graphics/numbers/8.qgf.c $(CURRENT_DIR)/graphics/numbers/9.qgf.c $(CURRENT_DIR)/graphics/numbers/undef.qgf.c SRC += $(CURRENT_DIR)/graphics/numbers/0.qgf.c $(CURRENT_DIR)/graphics/numbers/1.qgf.c $(CURRENT_DIR)/graphics/numbers/2.qgf.c $(CURRENT_DIR)/graphics/numbers/3.qgf.c $(CURRENT_DIR)/graphics/numbers/4.qgf.c $(CURRENT_DIR)/graphics/numbers/5.qgf.c $(CURRENT_DIR)/graphics/numbers/6.qgf.c $(CURRENT_DIR)/graphics/numbers/7.qgf.c $(CURRENT_DIR)/graphics/numbers/8.qgf.c $(CURRENT_DIR)/graphics/numbers/9.qgf.c $(CURRENT_DIR)/graphics/numbers/undef.qgf.c

4
users/halcyon_modules/rules.mk
View file

@ -6,7 +6,7 @@ LTO_ENABLE ?= yes
# May need to be changed when adding more pointing devices # May need to be changed when adding more pointing devices
POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
# May need to be changed when adding more displays # May need to be changed when adding more displays
QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_ENABLE = yes
@ -31,4 +31,4 @@ HLC_OPTIONS := $(HLC_NONE) $(HLC_CIRQUE_TRACKPAD) $(HLC_ENCODER) $(HLC_TFT_DISPL
ifeq ($(filter 1, $(HLC_OPTIONS)), ) ifeq ($(filter 1, $(HLC_OPTIONS)), )
$(error Wrong or no module specified. Please specify one of the following: HLC_NONE, HLC_CIRQUE_TRACKPAD, HLC_ENCODER or HLC_TFT_DISPLAY.) $(error Wrong or no module specified. Please specify one of the following: HLC_NONE, HLC_CIRQUE_TRACKPAD, HLC_ENCODER or HLC_TFT_DISPLAY.)
endif endif