summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/drashna/.gitlab-ci.yml5
-rw-r--r--users/drashna/config.h7
-rw-r--r--users/drashna/drashna.c6
-rw-r--r--users/drashna/drashna.h3
-rw-r--r--users/drashna/oled_stuff.c17
-rw-r--r--users/drashna/pimoroni_trackball.c114
-rw-r--r--users/drashna/pimoroni_trackball.h18
-rw-r--r--users/drashna/process_records.c2
-rw-r--r--users/drashna/rgb_matrix_stuff.c6
-rw-r--r--users/drashna/rgb_stuff.c177
-rw-r--r--users/drashna/rules.mk10
11 files changed, 197 insertions, 168 deletions
diff --git a/users/drashna/.gitlab-ci.yml b/users/drashna/.gitlab-ci.yml
index 7218a21bec..71d216267f 100644
--- a/users/drashna/.gitlab-ci.yml
+++ b/users/drashna/.gitlab-ci.yml
@@ -7,16 +7,15 @@ QMK Firmware:
GIT_SUBMODULE_STRATEGY: recursive
tags:
- linux
- image: ubuntu:18.10
+ image: qmkfm/base_container
before_script:
- apt-get update -qy
- apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi git libnewlib-arm-none-eabi gcc-avr python3 unzip wget zip
- avr-gcc --version
- uname -a
script:
- - make test:all
- make planck/rev6:default planck/rev5:default
- - make keebio/iris/rev2:drashna keebio/iris/rev2:drashna_old ergodox_ez:drashna ergodox_ez:drashna_glow keebio/viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna planck/rev6:drashna fractal:drashna primekb/prime_m:drashna -j2 --output-sync
+ - make all:drashna -j2
artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 64b4b64ab7..7d83c78844 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -1,7 +1,7 @@
#pragma once
// Use custom magic number so that when switching branches, EEPROM always gets reset
-#define EECONFIG_MAGIC_NUMBER (uint16_t)0x1338
+#define EECONFIG_MAGIC_NUMBER (uint16_t)0x1339
/* Set Polling rate to 1000Hz */
#define USB_POLLING_INTERVAL_MS 1
@@ -98,8 +98,9 @@
# define ONESHOT_TIMEOUT 3000
#endif // !ONESHOT_TIMEOUT
-#ifndef QMK_KEYS_PER_SCAN
-# define QMK_KEYS_PER_SCAN 4
+#ifdef QMK_KEYS_PER_SCAN
+# undef QMK_KEYS_PER_SCAN
+# define QMK_KEYS_PER_SCAN 1
#endif // !QMK_KEYS_PER_SCAN
// this makes it possible to do rolling combos (zx) with keys that
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index ba19d4803f..5c0f180278 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -113,13 +113,9 @@ void shutdown_user(void) {
rgblight_setrgb_red();
#endif // RGBLIGHT_ENABLE
#ifdef RGB_MATRIX_ENABLE
-# ifdef __AVR__
rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
rgb_matrix_update_pwm_buffers();
-# else
- rgb_matrix_sethsv_noeeprom(0, 255, 255);
- rgb_matrix_mode_noeeprom(1);
-# endif
+
#endif // RGB_MATRIX_ENABLE
shutdown_keymap();
}
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index c10ea5114a..dd2b022584 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -34,6 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if defined(OLED_DRIVER_ENABLE)
# include "oled_stuff.h"
#endif
+#if defined(PIMORONI_TRACKBALL_ENABLE)
+# include "pimoroni_trackball.h"
+#endif
/* Define layer names */
enum userspace_layers {
diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c
index 7580de1d33..6503b970e2 100644
--- a/users/drashna/oled_stuff.c
+++ b/users/drashna/oled_stuff.c
@@ -170,6 +170,13 @@ void render_bootmagic_status(void) {
{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
};
+ bool is_bootmagic_on;
+ #ifdef OLED_DISPLAY_128X64
+ is_bootmagic_on = !keymap_config.swap_lctl_lgui;
+ #else
+ is_bootmagic_on = keymap_config.swap_lctl_lgui;
+ #endif
+
oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NAME), false);
#ifdef OLED_DISPLAY_128X64
if (keymap_config.swap_lctl_lgui)
@@ -177,11 +184,11 @@ void render_bootmagic_status(void) {
oled_write_P(PSTR(" "), false);
#endif
{
- oled_write_P(logo[1][0], false);
+ oled_write_P(logo[1][0], is_bootmagic_on);
#ifdef OLED_DISPLAY_128X64
} else {
#endif
- oled_write_P(logo[0][0], false);
+ oled_write_P(logo[0][0], !is_bootmagic_on);
}
oled_write_P(PSTR(" "), false);
#ifdef OLED_DISPLAY_128X64
@@ -192,11 +199,11 @@ void render_bootmagic_status(void) {
if (keymap_config.swap_lctl_lgui)
#endif
{
- oled_write_P(logo[1][1], false);
+ oled_write_P(logo[1][1], is_bootmagic_on);
#ifdef OLED_DISPLAY_128X64
} else {
#endif
- oled_write_P(logo[0][1], false);
+ oled_write_P(logo[0][1], !is_bootmagic_on);
}
oled_write_P(PSTR(" "), false);
#ifdef OLED_DISPLAY_128X64
@@ -233,7 +240,7 @@ __attribute__((weak)) void oled_driver_render_logo(void) {
}
void render_status_secondary(void) {
-#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DRIVER_128x64)
+#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DISPLAY_128X64)
oled_driver_render_logo();
#endif
#ifdef SPLIT_TRANSPORT_MIRROR
diff --git a/users/drashna/pimoroni_trackball.c b/users/drashna/pimoroni_trackball.c
new file mode 100644
index 0000000000..c5bb560b35
--- /dev/null
+++ b/users/drashna/pimoroni_trackball.c
@@ -0,0 +1,114 @@
+#include "pimoroni_trackball.h"
+#include "i2c_master.h"
+
+static uint8_t scrolling = 0;
+static int16_t x_offset = 0;
+static int16_t y_offset = 0;
+static int16_t h_offset = 0;
+static int16_t v_offset = 0;
+static float precisionSpeed = 1;
+
+#ifndef I2C_TIMEOUT
+# define I2C_TIMEOUT 100
+#endif
+#ifndef MOUSE_DEBOUNCE
+# define MOUSE_DEBOUNCE 5
+#endif
+
+void trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) {
+ uint8_t data[] = {0x00, red, green, blue, white};
+ i2c_transmit(TRACKBALL_WRITE, data, sizeof(data), I2C_TIMEOUT);
+}
+
+int16_t mouse_offset(uint8_t positive, uint8_t negative, int16_t scale) {
+ int16_t offset = (int16_t)positive - (int16_t)negative;
+ int16_t magnitude = (int16_t)(scale * offset * offset * precisionSpeed);
+ return offset < 0 ? -magnitude : magnitude;
+}
+
+void update_member(int8_t* member, int16_t* offset) {
+ if (*offset > 127) {
+ *member = 127;
+ *offset -= 127;
+ } else if (*offset < -127) {
+ *member = -127;
+ *offset += 127;
+ } else {
+ *member = *offset;
+ *offset = 0;
+ }
+}
+
+__attribute__((weak)) void trackball_check_click(bool pressed, report_mouse_t* mouse) {
+ if (pressed) {
+ mouse->buttons |= MOUSE_BTN1;
+ } else {
+ mouse->buttons &= ~MOUSE_BTN1;
+ }
+}
+
+float trackball_get_precision(void) { return precisionSpeed; }
+void trackball_set_precision(float precision) { precisionSpeed = precision; }
+bool trackball_is_scrolling(void) { return scrolling; }
+void trackball_set_scrolling(bool scroll) { scrolling = scroll; }
+
+__attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x00,0x00,0x00,0x4F); }
+
+void pointing_device_task(void) {
+ static bool debounce;
+ static uint16_t debounce_timer;
+ uint8_t state[5] = {};
+ if (i2c_readReg(TRACKBALL_WRITE, 0x04, state, 5, I2C_TIMEOUT) == I2C_STATUS_SUCCESS) {
+ if (!state[4] && !debounce) {
+ if (scrolling) {
+#ifdef PIMORONI_TRACKBALL_INVERT_X
+ h_offset += mouse_offset(state[2], state[3], 1);
+#else
+ h_offset -= mouse_offset(state[2], state[3], 1);
+#endif
+#ifdef PIMORONI_TRACKBALL_INVERT_Y
+ v_offset += mouse_offset(state[1], state[0], 1);
+#else
+ v_offset -= mouse_offset(state[1], state[0], 1);
+#endif
+ } else {
+#ifdef PIMORONI_TRACKBALL_INVERT_X
+ x_offset -= mouse_offset(state[2], state[3], 5);
+#else
+ x_offset += mouse_offset(state[2], state[3], 5);
+#endif
+#ifdef PIMORONI_TRACKBALL_INVERT_Y
+ y_offset -= mouse_offset(state[1], state[0], 5);
+#else
+ y_offset += mouse_offset(state[1], state[0], 5);
+#endif
+ }
+ } else {
+ if (state[4]) {
+ debounce = true;
+ debounce_timer = timer_read();
+ }
+ }
+ }
+
+ if (timer_elapsed(debounce_timer) > MOUSE_DEBOUNCE) debounce = false;
+
+ report_mouse_t mouse = pointing_device_get_report();
+
+ trackball_check_click(state[4] & (1 << 7), &mouse);
+
+
+#ifndef PIMORONI_TRACKBALL_ROTATE
+ update_member(&mouse.x, &x_offset);
+ update_member(&mouse.y, &y_offset);
+ update_member(&mouse.h, &h_offset);
+ update_member(&mouse.v, &v_offset);
+#else
+ update_member(&mouse.x, &y_offset);
+ update_member(&mouse.y, &x_offset);
+ update_member(&mouse.h, &v_offset);
+ update_member(&mouse.v, &h_offset);
+#endif
+ pointing_device_set_report(mouse);
+ pointing_device_send();
+}
diff --git a/users/drashna/pimoroni_trackball.h b/users/drashna/pimoroni_trackball.h
new file mode 100644
index 0000000000..7e8a7cc816
--- /dev/null
+++ b/users/drashna/pimoroni_trackball.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "quantum.h"
+#include "pointing_device.h"
+
+#ifndef TRACKBALL_ADDRESS
+# define TRACKBALL_ADDRESS 0x0A
+#endif
+#define TRACKBALL_WRITE ((TRACKBALL_ADDRESS << 1) | I2C_WRITE)
+#define TRACKBALL_READ ((TRACKBALL_ADDRESS << 1) | I2C_READ)
+
+void trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
+void trackball_check_click(bool pressed, report_mouse_t *mouse);
+
+float trackball_get_precision(void);
+void trackball_set_precision(float precision);
+bool trackball_is_scrolling(void);
+void trackball_set_scrolling(bool scroll);
diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c
index 101b3d95ce..8e3d3356ee 100644
--- a/users/drashna/process_records.c
+++ b/users/drashna/process_records.c
@@ -51,7 +51,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
clear_mods();
clear_oneshot_mods();
#endif
- send_string_with_delay_P(PSTR("bin/qmk"), TAP_CODE_DELAY);
+ send_string_with_delay_P(PSTR("qmk"), TAP_CODE_DELAY);
#ifndef MAKE_BOOTLOADER
if ((temp_mod | temp_osm) & MOD_MASK_SHIFT)
#endif
diff --git a/users/drashna/rgb_matrix_stuff.c b/users/drashna/rgb_matrix_stuff.c
index 0914aab144..c9c3224fa5 100644
--- a/users/drashna/rgb_matrix_stuff.c
+++ b/users/drashna/rgb_matrix_stuff.c
@@ -12,14 +12,14 @@ static uint32_t hypno_timer;
void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type) {
HSV hsv = {hue, sat, val};
- if (hsv.v > rgb_matrix_config.hsv.v) {
- hsv.v = rgb_matrix_config.hsv.v;
+ if (hsv.v > rgb_matrix_get_val()) {
+ hsv.v = rgb_matrix_get_val();
}
switch (mode) {
case 1: // breathing
{
- uint16_t time = scale16by8(g_rgb_counters.tick, speed / 8);
+ uint16_t time = scale16by8(g_rgb_timer, speed / 8);
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
RGB rgb = hsv_to_rgb(hsv);
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
diff --git a/users/drashna/rgb_stuff.c b/users/drashna/rgb_stuff.c
index 06b1e3c0c4..defee9ac18 100644
--- a/users/drashna/rgb_stuff.c
+++ b/users/drashna/rgb_stuff.c
@@ -2,136 +2,13 @@
#include "rgb_stuff.h"
#include "eeprom.h"
-extern rgblight_config_t rgblight_config;
-bool has_initialized;
+bool has_initialized;
-void rgblight_sethsv_default_helper(uint8_t index) { rgblight_sethsv_at(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, index); }
-
-/* Custom indicators for modifiers.
- * This allows for certain lights to be lit up, based on what mods are active, giving some visual feedback.
- * This is especially useful for One Shot Mods, since it's not always obvious if they're still lit up.
- */
-#ifdef INDICATOR_LIGHTS
-void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
- if (userspace_config.rgb_layer_change && get_highest_layer(layer_state) == 0) {
- if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
-# ifdef SHFT_LED1
- rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
-# endif // SHFT_LED1
-# ifdef SHFT_LED2
- rgblight_sethsv_at(120, 255, 255, SHFT_LED2);
-# endif // SHFT_LED2
- } else {
-# ifdef SHFT_LED1
- rgblight_sethsv_default_helper(SHFT_LED1);
-# endif // SHFT_LED1
-# ifdef SHFT_LED2
- rgblight_sethsv_default_helper(SHFT_LED2);
-# endif // SHFT_LED2
- }
- if ((this_mod | this_osm) & MOD_MASK_CTRL) {
-# ifdef CTRL_LED1
- rgblight_sethsv_at(0, 255, 255, CTRL_LED1);
-# endif // CTRL_LED1
-# ifdef CTRL_LED2
- rgblight_sethsv_at(0, 255, 255, CTRL_LED2);
-# endif // CTRL_LED2
- } else {
-# ifdef CTRL_LED1
- rgblight_sethsv_default_helper(CTRL_LED1);
-# endif // CTRL_LED1
-# ifdef CTRL_LED2
- rgblight_sethsv_default_helper(CTRL_LED2);
-# endif // CTRL_LED2
- }
- if ((this_mod | this_osm) & MOD_MASK_GUI) {
-# ifdef GUI_LED1
- rgblight_sethsv_at(51, 255, 255, GUI_LED1);
-# endif // GUI_LED1
-# ifdef GUI_LED2
- rgblight_sethsv_at(51, 255, 255, GUI_LED2);
-# endif // GUI_LED2
- } else {
-# ifdef GUI_LED1
- rgblight_sethsv_default_helper(GUI_LED1);
-# endif // GUI_LED1
-# ifdef GUI_LED2
- rgblight_sethsv_default_helper(GUI_LED2);
-# endif // GUI_LED2
- }
- if ((this_mod | this_osm) & MOD_MASK_ALT) {
-# ifdef ALT_LED1
- rgblight_sethsv_at(240, 255, 255, ALT_LED1);
-# endif // ALT_LED1
-# ifdef GUI_LED2
- rgblight_sethsv_at(240, 255, 255, ALT_LED2);
-# endif // GUI_LED2
- } else {
-# ifdef GUI_LED1
- rgblight_sethsv_default_helper(ALT_LED1);
-# endif // GUI_LED1
-# ifdef GUI_LED2
- rgblight_sethsv_default_helper(ALT_LED2);
-# endif // GUI_LED2
- }
- }
-}
-
-/* Function for the indicators */
-void matrix_scan_indicator(void) {
- if (has_initialized) {
- set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
- }
-}
-#endif // INDICATOR_LIGHTS
+void rgblight_sethsv_default_helper(uint8_t index) { rgblight_sethsv_at(rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val(), index); }
#ifdef RGBLIGHT_TWINKLE
static rgblight_fadeout lights[RGBLED_NUM];
-__attribute__((weak)) bool rgblight_twinkle_is_led_used_keymap(uint8_t index) { return false; }
-
-/* This function checks for used LEDs. This way, collisions don't occur and cause weird rendering */
-bool rgblight_twinkle_is_led_used(uint8_t index) {
- switch (index) {
-# ifdef INDICATOR_LIGHTS
-# ifdef SHFT_LED1
- case SHFT_LED1:
- return true;
-# endif // SHFT_LED1
-# ifdef SHFT_LED2
- case SHFT_LED2:
- return true;
-# endif // SHFT_LED2
-# ifdef CTRL_LED1
- case CTRL_LED1:
- return true;
-# endif // CTRL_LED1
-# ifdef CTRL_LED2
- case CTRL_LED2:
- return true;
-# endif // CTRL_LED2
-# ifdef GUI_LED1
- case GUI_LED1:
- return true;
-# endif // GUI_LED1
-# ifdef GUI_LED2
- case GUI_LED2:
- return true;
-# endif // GUI_LED2
-# ifdef ALT_LED1
- case ALT_LED1:
- return true;
-# endif // ALT_LED1
-# ifdef ALT_LED2
- case ALT_LED2:
- return true;
-# endif // ALT_LED2
-# endif // INDICATOR_LIGHTS
- default:
- return rgblight_twinkle_is_led_used_keymap(index);
- }
-}
-
/* Handler for fading/twinkling effect */
void scan_rgblight_fadeout(void) { // Don't effing change this function .... rgblight_sethsv is supppppper intensive
bool litup = false;
@@ -170,9 +47,6 @@ void start_rgb_light(void) {
uint8_t min_life_index = -1;
for (uint8_t index = 0; index < RGBLED_NUM; ++index) {
- if (rgblight_twinkle_is_led_used(index)) {
- continue;
- }
if (lights[index].enabled) {
if (min_life_index == -1 || lights[index].life < min_life) {
min_life = lights[index].life;
@@ -197,7 +71,7 @@ void start_rgb_light(void) {
light->timer = timer_read();
light->life = 0xC0 + rand() % 0x40;
- light->hue = rgblight_config.hue + (rand() % 0xB4) - 0x54;
+ light->hue = rgblight_get_hue() + (rand() % 0xB4) - 0x54;
rgblight_sethsv_at(light->hue, 255, light->life, light_index);
}
@@ -227,39 +101,52 @@ bool process_record_user_rgb_light(uint16_t keycode, keyrecord_t *record) {
return true;
}
+#if defined(RGBLIGHT_STARTUP_ANIMATION)
+static bool is_enabled;
+static bool is_rgblight_startup;
+static uint8_t old_hue;
+static uint16_t rgblight_startup_loop_timer;
+#endif
+
void keyboard_post_init_rgb_light(void) {
#if defined(RGBLIGHT_STARTUP_ANIMATION)
- bool is_enabled = rgblight_config.enable;
+ is_enabled = rgblight_is_enabled();
if (userspace_config.rgb_layer_change) {
rgblight_enable_noeeprom();
}
- if (rgblight_config.enable) {
+ if (rgblight_is_enabled()) {
layer_state_set_rgb_light(layer_state);
- uint16_t old_hue = rgblight_config.hue;
+ old_hue = rgblight_get_hue();
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
- for (uint16_t i = 255; i > 0; i--) {
- rgblight_sethsv_noeeprom((i + old_hue) % 255, 255, 255);
- matrix_scan();
- wait_ms(10);
- }
+ is_rgblight_startup = true;
}
- if (!is_enabled) {
- rgblight_disable_noeeprom();
- }
-
#endif
layer_state_set_rgb_light(layer_state);
}
void matrix_scan_rgb_light(void) {
-#ifdef RGBLIGHT_ENABLE
# ifdef RGBLIGHT_TWINKLE
scan_rgblight_fadeout();
# endif // RGBLIGHT_ENABLE
-# ifdef INDICATOR_LIGHTS
- matrix_scan_indicator();
-# endif
+#if defined(RGBLIGHT_STARTUP_ANIMATION)
+ if (is_rgblight_startup && is_keyboard_master()) {
+ if (timer_elapsed(rgblight_startup_loop_timer) > 10) {
+ static uint8_t counter;
+ counter++;
+ rgblight_sethsv_noeeprom((counter + old_hue) % 255, 255, 255);
+ rgblight_startup_loop_timer = timer_read();
+ if (counter == 255) {
+ is_rgblight_startup = false;
+ if (!is_enabled) {
+ rgblight_disable_noeeprom();
+ }
+ if (userspace_config.rgb_layer_change) {
+ layer_state_set_rgb_light(layer_state);
+ }
+ }
+ }
+ }
#endif
}
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 051368ff5e..b7523a436c 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -22,9 +22,6 @@ endif
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
SRC += rgb_stuff.c
- ifeq ($(strip $(INDICATOR_LIGHTS)), yes)
- OPT_DEFS += -DINDICATOR_LIGHTS
- endif
ifeq ($(strip $(RGBLIGHT_TWINKLE)), yes)
OPT_DEFS += -DRGBLIGHT_TWINKLE
endif
@@ -62,3 +59,10 @@ endif
ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes)
SRC += oled_stuff.c
endif
+
+ifeq ($(strip $(PIMORONI_TRACKBALL_ENABLE)), yes)
+ POINTING_DEVICE_ENABLE := yes
+ OPT_DEFS += -DPIMORONI_TRACKBALL_ENABLE
+ SRC += pimoroni_trackball.c
+ QUANTUM_LIB_SRC += i2c_master.c
+endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:12:44 +0000