diff options
Diffstat (limited to 'keyboards/handwired')
30 files changed, 199 insertions, 113 deletions
diff --git a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c index c70ecd5562..945613f987 100644 --- a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c +++ b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c @@ -49,48 +49,48 @@ void send_french_unicode_char(uint8_t count, uint32_t once, uint32_t twice) register_unicode(twice); } -void dance_a_q(qk_tap_dance_state_t *state, void *user_data) +void dance_a_q(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_A_GRAVE, FR_L_QUOTE); } -void dance_e_q(qk_tap_dance_state_t *state, void *user_data) +void dance_e_q(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_E_AIGU, FR_R_QUOTE); } -void dance_e_u(qk_tap_dance_state_t *state, void *user_data) +void dance_e_u(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_E_GRAVE, FR_U_GRAVE); } -void dance_e_e(qk_tap_dance_state_t *state, void *user_data) +void dance_e_e(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_E_HAT, FR_E_UMLAUT); } -void dance_a_y(qk_tap_dance_state_t *state, void *user_data) +void dance_a_y(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_A_HAT, FR_Y_UMLAUT); } -void dance_i_i(qk_tap_dance_state_t *state, void *user_data) +void dance_i_i(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_I_HAT, FR_I_UMLAUT); } -void dance_o_c(qk_tap_dance_state_t *state, void *user_data) +void dance_o_c(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_O_HAT, FR_C_CIRCUM); } -void dance_u_u(qk_tap_dance_state_t *state, void *user_data) +void dance_u_u(tap_dance_state_t *state, void *user_data) { send_french_unicode_char(state->count, FR_U_HAT, FR_U_UMLAUT); } /* Define the tap dance actions for the french characters */ -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [A_Q] = ACTION_TAP_DANCE_FN(dance_a_q), [E_Q] = ACTION_TAP_DANCE_FN(dance_e_q), [E_U] = ACTION_TAP_DANCE_FN(dance_e_u), diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h index 0810a3b23f..69c1beb03c 100644 --- a/keyboards/handwired/aranck/keymaps/turkishish/config.h +++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h @@ -21,4 +21,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD
\ No newline at end of file +#define QUICK_TAP_TERM 0
\ No newline at end of file diff --git a/keyboards/handwired/axon/readme.md b/keyboards/handwired/axon/readme.md index d48297b4f7..ca422130ef 100644 --- a/keyboards/handwired/axon/readme.md +++ b/keyboards/handwired/axon/readme.md @@ -15,8 +15,8 @@ Make example for this keyboard (after setting up your build environment): ## To reset into bootloader mode: 1. While plugged in, press and hold `BOOT` switch -2. While holding `BOOT`, press `QK_BOOT` and hold it for a second or two -3. Release `QK_BOOT` +2. While holding `BOOT`, press `RESET` and hold it for a second or two +3. Release `RESET` 4. Release `BOOT` 5. The keyboard should now be recognized as a USBasp programmer device. diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 317d25f5f5..9aba789cc2 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -93,7 +93,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define TAPPING_TERM 150 //#define IGNORE_MOD_TAP_INTERRUPT -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 6 diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c index edc0f7d3cf..aced9d13c6 100644 --- a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c +++ b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c @@ -29,7 +29,7 @@ enum taps { PNX, // Play/pause; next track. }; -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [PNX] = ACTION_TAP_DANCE_DOUBLE(KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK), }; diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h index 1e6e6e58c6..b8df581b72 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key #define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term #define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key -#define TAPPING_FORCE_HOLD_PER_KEY // disable double tap hold key repeat per key +#define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key #undef MOUSEKEY_INTERVAL #undef MOUSEKEY_DELAY #undef MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c index b5a8c82c4a..7df7897ae9 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c @@ -55,15 +55,15 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { } // Tapping force hold per key -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LT(3, KC_SPC): - return true; // Enable force hold - case LT(2, KC_TAB): - return true; - default: - return false; // Disable force hold - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LT(3, KC_SPC): + return 0; // Enable force hold + case LT(2, KC_TAB): + return 0; + default: + return QUICK_TAP_TERM; // Disable force hold + } } // Tapping term per key diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h index 5a94cd1760..6a28251c6b 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h @@ -45,12 +45,9 @@ // Configure the global tapping term (default: 200ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define FORCE_NKRO diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c index 413fa70492..9687e77d88 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c @@ -195,18 +195,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SPC_L: - return false; - case SPC_R: return true; - case ENT_L: + case SPC_R: return false; + case ENT_L: + return true; case ENT_R: - return false; - default: return true; + default: + return false; } } diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h index 0810a3b23f..69c1beb03c 100644 --- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h +++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h @@ -21,4 +21,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD
\ No newline at end of file +#define QUICK_TAP_TERM 0
\ No newline at end of file diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c index cd9b1599a5..3c6e61aea0 100644 --- a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c +++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum { TD_ESC_WINDOWS_EMOJI }; -void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) { +void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code(KC_ESC); } else if (state->count == 2) { @@ -36,7 +36,7 @@ void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) { } } -void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) { +void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code(KC_ESC); } else if (state->count == 2) { @@ -47,7 +47,7 @@ void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) { }; // Tap Dance definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji), [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji) }; diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json index 09ae9eea77..d29ccc3fd1 100644 --- a/keyboards/handwired/jscotto/scotto9/info.json +++ b/keyboards/handwired/jscotto/scotto9/info.json @@ -31,12 +31,12 @@ "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 } + { "matrix": [0, 2], "x": 2, "y": 0 }, // Row 2 { "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 } + { "matrix": [1, 2], "x": 2, "y": 1 }, // Row 3 { "matrix": [2, 0], "x": 0, "y": 2 }, diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c index 398178bf5b..97d2c206a8 100644 --- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c +++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum { TD_ESC_WINDOWS_EMOJI }; -void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) { +void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code(KC_ESC); } else if (state->count == 2) { @@ -36,7 +36,7 @@ void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) { } } -void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) { +void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code(KC_ESC); } else if (state->count == 2) { @@ -47,7 +47,7 @@ void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) { }; // Tap Dance definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji), [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji) }; diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json index 5bc3c14cc7..08bccff0d3 100644 --- a/keyboards/handwired/jscotto/scottostarter/info.json +++ b/keyboards/handwired/jscotto/scottostarter/info.json @@ -87,8 +87,8 @@ { "matrix": [4, 2], "x": 2, "y": 4}, { "matrix": [4, 4], "x": 4, "y": 4}, { "matrix": [4, 7], "x": 7, "y": 4}, - { "matrix": [4, 8], "x": 8, "y": 4 } - { "matrix": [4, 9], "x": 9, "y": 4 } + { "matrix": [4, 8], "x": 8, "y": 4 }, + { "matrix": [4, 9], "x": 9, "y": 4 }, { "matrix": [4, 10], "x": 10, "y": 4 } ] } diff --git a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c b/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c index c2f314116b..fdbc3c8a39 100644 --- a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c +++ b/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c @@ -6,7 +6,7 @@ enum { }; //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { //Tap once for Esc, twice for Caps Lock [TD_DOT_COMMAS] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA) // Other declarations would go here, separated by commas, if you have them diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c index 5f221904e9..8d2ecd9c79 100644 --- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c +++ b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #define CHOREOGRAPH(DANCE, PRESS, RELEASE, TAP, DOUBLETAP) \ static bool dance_ ## DANCE ## _pressed; \ \ - void dance_ ## DANCE ## _finished(qk_tap_dance_state_t *state, void *user_data) { \ + void dance_ ## DANCE ## _finished(tap_dance_state_t *state, void *user_data) { \ if (state->count == 1) { \ if (state->pressed) { \ dance_ ## DANCE ## _pressed = true; \ @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { } \ } \ \ - void dance_ ## DANCE ## _reset(qk_tap_dance_state_t *state, void *user_data) { \ + void dance_ ## DANCE ## _reset(tap_dance_state_t *state, void *user_data) { \ if (state->count == 1) { \ if (dance_ ## DANCE ## _pressed) { \ RELEASE; \ @@ -138,7 +138,7 @@ CHOREOGRAPH(TD_C_X, SEND_STRING(SS_UP(X_LCTL)), SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X) SS_UP(X_LCTL)),); -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { STEPS(TD_LEFT), STEPS(TD_RGHT), STEPS(TD_C_X) }; diff --git a/keyboards/handwired/myskeeb/keymaps/default/keymap.c b/keyboards/handwired/myskeeb/keymaps/default/keymap.c index ee0ead3664..d3a8ba20e8 100644 --- a/keyboards/handwired/myskeeb/keymaps/default/keymap.c +++ b/keyboards/handwired/myskeeb/keymaps/default/keymap.c @@ -12,7 +12,7 @@ enum { }; // Tap Dance Functions -void tri_open(qk_tap_dance_state_t *state, void *user_data) { +void tri_open(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(KC_LPRN); } else if (state->count == 2) { @@ -22,7 +22,7 @@ void tri_open(qk_tap_dance_state_t *state, void *user_data) { } } -void tri_close(qk_tap_dance_state_t *state, void *user_data) { +void tri_close(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(KC_RPRN); } else if (state->count == 2) { @@ -32,7 +32,7 @@ void tri_close(qk_tap_dance_state_t *state, void *user_data) { } } -void dquote(qk_tap_dance_state_t *state, void *user_data) { +void dquote(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { if (state->interrupted) tap_code(KC_QUOT); @@ -44,7 +44,7 @@ void dquote(qk_tap_dance_state_t *state, void *user_data) { } } -void tilded(qk_tap_dance_state_t *state, void *user_data) { +void tilded(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { if (state->interrupted) tap_code16(KC_TILD); @@ -55,7 +55,7 @@ void tilded(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [OP_QT] = ACTION_TAP_DANCE_FN(tri_open), [CL_QT] = ACTION_TAP_DANCE_FN(tri_close), [TD_DQ] = ACTION_TAP_DANCE_FN(dquote), diff --git a/keyboards/handwired/onekey/kb2040/config.h b/keyboards/handwired/onekey/kb2040/config.h index c6c6dbe2cf..20a41b1624 100644 --- a/keyboards/handwired/onekey/kb2040/config.h +++ b/keyboards/handwired/onekey/kb2040/config.h @@ -16,7 +16,7 @@ // settings for the oled keyboard demo with Adafruit 0.91" OLED display on the Stemma QT port #define OLED_DISPLAY_128X32 -#define I2C_DRIVER I2CD1 +#define I2C_DRIVER I2CD0 #define I2C1_SDA_PIN GP12 #define I2C1_SCL_PIN GP13 diff --git a/keyboards/handwired/onekey/keymaps/backlight/keymap.c b/keyboards/handwired/onekey/keymaps/backlight/keymap.c index 1fbbc632da..746e4619de 100644 --- a/keyboards/handwired/onekey/keymaps/backlight/keymap.c +++ b/keyboards/handwired/onekey/keymaps/backlight/keymap.c @@ -5,11 +5,11 @@ enum { TD_BL = 0 }; -void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_cln_finished(tap_dance_state_t *state, void *user_data) { // noop } -void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_cln_reset(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: // single tap - step through backlight @@ -30,7 +30,7 @@ void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_BL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset) }; diff --git a/keyboards/handwired/onekey/keymaps/lvgl/config.h b/keyboards/handwired/onekey/keymaps/lvgl/config.h new file mode 100644 index 0000000000..38bb5d0cf3 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/config.h @@ -0,0 +1,15 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI pins */ +#define SPI_DRIVER SPID0 +#define SPI_SCK_PIN GP18 +#define SPI_MOSI_PIN GP19 +#define SPI_MISO_PIN GP20 + +/* LCD Configuration */ +#define LCD_RST_PIN GP0 +#define LCD_DC_PIN GP1 +#define LCD_CS_PIN GP2 diff --git a/keyboards/handwired/onekey/keymaps/lvgl/halconf.h b/keyboards/handwired/onekey/keymaps/lvgl/halconf.h new file mode 100644 index 0000000000..27646bb3f5 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/halconf.h @@ -0,0 +1,12 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next <halconf.h> + +#undef HAL_USE_SPI +#define HAL_USE_SPI TRUE + +#undef SPI_USE_WAIT +#define SPI_USE_WAIT TRUE diff --git a/keyboards/handwired/onekey/keymaps/lvgl/keymap.c b/keyboards/handwired/onekey/keymaps/lvgl/keymap.c new file mode 100644 index 0000000000..be1ba48cf9 --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/keymap.c @@ -0,0 +1,50 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +#include "qp.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(JS_BUTTON0) +}; + +painter_device_t lcd; + +void lv_example_arc_2(void); + +void keyboard_post_init_user(void) { + lcd = qp_gc9a01_make_spi_device(240, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0); + qp_init(lcd, QP_ROTATION_0); + qp_rect(lcd, 0, 0, 239, 319, 0, 255, 255, true); + + if (qp_lvgl_attach(lcd)) { + lv_example_arc_2(); + } +} + +static void set_angle(void* obj, int32_t v) { + lv_arc_set_value(obj, v); +} + +/** + * Create an arc which acts as a loader. + */ +void lv_example_arc_2(void) { + /*Create an Arc*/ + lv_obj_t* arc = lv_arc_create(lv_scr_act()); + lv_arc_set_rotation(arc, 270); + lv_arc_set_bg_angles(arc, 0, 360); + lv_obj_remove_style(arc, NULL, LV_PART_KNOB); /*Be sure the knob is not displayed*/ + lv_obj_clear_flag(arc, LV_OBJ_FLAG_CLICKABLE); /*To not allow adjusting by click*/ + lv_obj_center(arc); + + static lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, arc); + lv_anim_set_exec_cb(&a, set_angle); + lv_anim_set_time(&a, 1000); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); /*Just for the demo*/ + lv_anim_set_repeat_delay(&a, 500); + lv_anim_set_values(&a, 0, 100); + lv_anim_start(&a); +} diff --git a/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h b/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h new file mode 100644 index 0000000000..bff74867ff --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2022 Jose Pablo Ramirez (@jpe230) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next <mcuconf.h> + +#undef RP_SPI_USE_SPI0 +#define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/handwired/onekey/keymaps/lvgl/rules.mk b/keyboards/handwired/onekey/keymaps/lvgl/rules.mk new file mode 100644 index 0000000000..872d12ad6f --- /dev/null +++ b/keyboards/handwired/onekey/keymaps/lvgl/rules.mk @@ -0,0 +1,3 @@ +QUANTUM_PAINTER_ENABLE = yes +QUANTUM_PAINTER_LVGL_INTEGRATION = yes +QUANTUM_PAINTER_DRIVERS = gc9a01_spi diff --git a/keyboards/handwired/onekey/keymaps/oled/keymap.c b/keyboards/handwired/onekey/keymaps/oled/keymap.c index 244dc4facb..120ab80fa5 100644 --- a/keyboards/handwired/onekey/keymaps/oled/keymap.c +++ b/keyboards/handwired/onekey/keymaps/oled/keymap.c @@ -63,7 +63,7 @@ static void stop_scrolling(void) { } } -static void dance_oled_finished(qk_tap_dance_state_t *state, void *user_data) { +static void dance_oled_finished(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: if (state->pressed) { @@ -155,7 +155,7 @@ static void dance_oled_finished(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = {[TD_OLED] = ACTION_TAP_DANCE_FN(dance_oled_finished)}; +tap_dance_action_t tap_dance_actions[] = {[TD_OLED] = ACTION_TAP_DANCE_FN(dance_oled_finished)}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {LAYOUT_ortho_1x1(TD(TD_OLED))}; diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c index cfd176a9d5..568427e52c 100644 --- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c +++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c @@ -108,11 +108,11 @@ enum { // // Alt held down, then use as normal. // // Alt tapped, then hold Alt, -int cur_dance (qk_tap_dance_state_t *state); -void alt_finished (qk_tap_dance_state_t *state, void *user_data); -void alt_reset (qk_tap_dance_state_t *state, void *user_data); +int cur_dance (tap_dance_state_t *state); +void alt_finished (tap_dance_state_t *state, void *user_data); +void alt_reset (tap_dance_state_t *state, void *user_data); -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->pressed) return SINGLE_HOLD; else return SINGLE_TAP; @@ -133,7 +133,7 @@ static tap alttap_state = { .state = 0 }; -void alt_finished (qk_tap_dance_state_t *state, void *user_data) { +void alt_finished (tap_dance_state_t *state, void *user_data) { alttap_state.state = cur_dance(state); switch (alttap_state.state) { case SINGLE_TAP: set_oneshot_layer(_ALT, ONESHOT_START); clear_oneshot_layer_state(ONESHOT_PRESSED); break; @@ -146,7 +146,7 @@ void alt_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void alt_reset (qk_tap_dance_state_t *state, void *user_data) { +void alt_reset (tap_dance_state_t *state, void *user_data) { switch (alttap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LALT); break; @@ -157,15 +157,15 @@ void alt_reset (qk_tap_dance_state_t *state, void *user_data) { } // Ctrl tapped, then hold Ctrl, -void ctl_finished (qk_tap_dance_state_t *state, void *user_data); -void ctl_reset (qk_tap_dance_state_t *state, void *user_data); +void ctl_finished (tap_dance_state_t *state, void *user_data); +void ctl_reset (tap_dance_state_t *state, void *user_data); static tap ctltap_state = { .is_press_action = true, .state = 0 }; -void ctl_finished (qk_tap_dance_state_t *state, void *user_data) { +void ctl_finished (tap_dance_state_t *state, void *user_data) { ctltap_state.state = cur_dance(state); switch (ctltap_state.state) { case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LCTL)); break; @@ -176,7 +176,7 @@ void ctl_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void ctl_reset (qk_tap_dance_state_t *state, void *user_data) { +void ctl_reset (tap_dance_state_t *state, void *user_data) { switch (ctltap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LCTL); break; @@ -189,15 +189,15 @@ void ctl_reset (qk_tap_dance_state_t *state, void *user_data) { // Layer Down tap dance -void layerDown_finished (qk_tap_dance_state_t *state, void *user_data); -void layerDown_reset (qk_tap_dance_state_t *state, void *user_data); +void layerDown_finished (tap_dance_state_t *state, void *user_data); +void layerDown_reset (tap_dance_state_t *state, void *user_data); static tap layerdn_tap_state = { .is_press_action = true, .state = 0 }; -void layerDown_finished (qk_tap_dance_state_t *state, void *user_data) { +void layerDown_finished (tap_dance_state_t *state, void *user_data) { layerdn_tap_state.state = cur_dance(state); switch (layerdn_tap_state.state) { case SINGLE_TAP: break; @@ -208,7 +208,7 @@ void layerDown_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void layerDown_reset (qk_tap_dance_state_t *state, void *user_data) { +void layerDown_reset (tap_dance_state_t *state, void *user_data) { switch (layerdn_tap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: layer_off(_LOWER); break; @@ -219,15 +219,15 @@ void layerDown_reset (qk_tap_dance_state_t *state, void *user_data) { } // Layer Up tap dance -void layerUp_finished (qk_tap_dance_state_t *state, void *user_data); -void layerUp_reset (qk_tap_dance_state_t *state, void *user_data); +void layerUp_finished (tap_dance_state_t *state, void *user_data); +void layerUp_reset (tap_dance_state_t *state, void *user_data); static tap layerup_tap_state = { .is_press_action = true, .state = 0 }; -void layerUp_finished (qk_tap_dance_state_t *state, void *user_data) { +void layerUp_finished (tap_dance_state_t *state, void *user_data) { layerup_tap_state.state = cur_dance(state); switch (layerup_tap_state.state) { case SINGLE_TAP: break; @@ -238,7 +238,7 @@ void layerUp_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void layerUp_reset (qk_tap_dance_state_t *state, void *user_data) { +void layerUp_reset (tap_dance_state_t *state, void *user_data) { switch (layerup_tap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: layer_off(_RAISE); break; @@ -255,16 +255,16 @@ void layerUp_reset (qk_tap_dance_state_t *state, void *user_data) { // Shift tapped, then Capitlize next keystroke only. // Shift double-tapped, then CAPSLOCK // Shift double-tapped again, CAPS UNLOCKED -// void dance_onshot_lsft(qk_tap_dance_state_t *state, void *user_data) { -void lshift_finished (qk_tap_dance_state_t *state, void *user_data); -void lshift_reset (qk_tap_dance_state_t *state, void *user_data); +// void dance_onshot_lsft(tap_dance_state_t *state, void *user_data) { +void lshift_finished (tap_dance_state_t *state, void *user_data); +void lshift_reset (tap_dance_state_t *state, void *user_data); static tap lshifttap_state = { .is_press_action = true, .state = 0 }; -void lshift_finished (qk_tap_dance_state_t *state, void *user_data) { +void lshift_finished (tap_dance_state_t *state, void *user_data) { lshifttap_state.state = cur_dance(state); switch (lshifttap_state.state) { case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LSFT)); break; @@ -274,7 +274,7 @@ void lshift_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void lshift_reset (qk_tap_dance_state_t *state, void *user_data) { +void lshift_reset (tap_dance_state_t *state, void *user_data) { switch (lshifttap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LSFT); break; @@ -285,15 +285,15 @@ void lshift_reset (qk_tap_dance_state_t *state, void *user_data) { } //TD_LSPACE -void lspace_finished (qk_tap_dance_state_t *state, void *user_data); -void lspace_reset (qk_tap_dance_state_t *state, void *user_data); +void lspace_finished (tap_dance_state_t *state, void *user_data); +void lspace_reset (tap_dance_state_t *state, void *user_data); static tap lspacetap_state = { .is_press_action = true, .state = 0 }; -void lspace_finished (qk_tap_dance_state_t *state, void *user_data) { +void lspace_finished (tap_dance_state_t *state, void *user_data) { lspacetap_state.state = cur_dance(state); switch (lspacetap_state.state) { case SINGLE_TAP: tap_code (KC_SPACE); break; @@ -303,7 +303,7 @@ void lspace_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void lspace_reset (qk_tap_dance_state_t *state, void *user_data) { +void lspace_reset (tap_dance_state_t *state, void *user_data) { switch (lspacetap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: layer_off(_LOWER); break; @@ -318,7 +318,7 @@ void lspace_reset (qk_tap_dance_state_t *state, void *user_data) { //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_DEL_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_BSPC), [TD_ESC_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRAVE), [TD_TAB_TILDE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_TILDE), diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c index 25ae840b79..d3fd18ec4e 100644 --- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c @@ -63,7 +63,7 @@ enum { // Shift tapped, then Capitlize next keystroke only. // Shift double-tapped, then CAPSLOCK // Shift double-tapped again, CAPS UNLOCKED -void dance_onshot_lsft(qk_tap_dance_state_t *state, void *user_data) { +void dance_onshot_lsft(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: // => set_oneshot_mods (MOD_LSFT); @@ -76,7 +76,7 @@ void dance_onshot_lsft(qk_tap_dance_state_t *state, void *user_data) { } //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_DEL_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_BSPC), [TD_ESC_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRAVE), [TD_TAB_TILDE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_TILDE), diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c index a5bb69ef24..733e3f3d4b 100644 --- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c +++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c @@ -104,11 +104,11 @@ enum { // // Alt held down, then use as normal. // // Alt tapped, then hold Alt, -int cur_dance (qk_tap_dance_state_t *state); -void alt_finished (qk_tap_dance_state_t *state, void *user_data); -void alt_reset (qk_tap_dance_state_t *state, void *user_data); +int cur_dance (tap_dance_state_t *state); +void alt_finished (tap_dance_state_t *state, void *user_data); +void alt_reset (tap_dance_state_t *state, void *user_data); -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->pressed) return SINGLE_HOLD; else return SINGLE_TAP; @@ -129,7 +129,7 @@ static tap alttap_state = { .state = 0 }; -void alt_finished (qk_tap_dance_state_t *state, void *user_data) { +void alt_finished (tap_dance_state_t *state, void *user_data) { alttap_state.state = cur_dance(state); switch (alttap_state.state) { case SINGLE_TAP: set_oneshot_layer(_ALT, ONESHOT_START); clear_oneshot_layer_state(ONESHOT_PRESSED); break; @@ -142,7 +142,7 @@ void alt_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void alt_reset (qk_tap_dance_state_t *state, void *user_data) { +void alt_reset (tap_dance_state_t *state, void *user_data) { switch (alttap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LALT); break; @@ -153,15 +153,15 @@ void alt_reset (qk_tap_dance_state_t *state, void *user_data) { } // Ctrl tapped, then hold Ctrl, -void ctl_finished (qk_tap_dance_state_t *state, void *user_data); -void ctl_reset (qk_tap_dance_state_t *state, void *user_data); +void ctl_finished (tap_dance_state_t *state, void *user_data); +void ctl_reset (tap_dance_state_t *state, void *user_data); static tap ctltap_state = { .is_press_action = true, .state = 0 }; -void ctl_finished (qk_tap_dance_state_t *state, void *user_data) { +void ctl_finished (tap_dance_state_t *state, void *user_data) { ctltap_state.state = cur_dance(state); switch (ctltap_state.state) { case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LCTL)); break; @@ -174,7 +174,7 @@ void ctl_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void ctl_reset (qk_tap_dance_state_t *state, void *user_data) { +void ctl_reset (tap_dance_state_t *state, void *user_data) { switch (ctltap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LCTL); break; @@ -186,15 +186,15 @@ void ctl_reset (qk_tap_dance_state_t *state, void *user_data) { // Layer Down tap dance -void layerDown_finished (qk_tap_dance_state_t *state, void *user_data); -void layerDown_reset (qk_tap_dance_state_t *state, void *user_data); +void layerDown_finished (tap_dance_state_t *state, void *user_data); +void layerDown_reset (tap_dance_state_t *state, void *user_data); static tap layerdn_tap_state = { .is_press_action = true, .state = 0 }; -void layerDown_finished (qk_tap_dance_state_t *state, void *user_data) { +void layerDown_finished (tap_dance_state_t *state, void *user_data) { layerdn_tap_state.state = cur_dance(state); switch (layerdn_tap_state.state) { case SINGLE_TAP: break; @@ -204,7 +204,7 @@ void layerDown_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void layerDown_reset (qk_tap_dance_state_t *state, void *user_data) { +void layerDown_reset (tap_dance_state_t *state, void *user_data) { switch (layerdn_tap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: layer_off(_LOWER); break; @@ -222,16 +222,16 @@ void layerDown_reset (qk_tap_dance_state_t *state, void *user_data) { // Shift tapped, then Capitlize next keystroke only. // Shift double-tapped, then CAPSLOCK // Shift double-tapped again, CAPS UNLOCKED -// void dance_onshot_lsft(qk_tap_dance_state_t *state, void *user_data) { -void lshift_finished (qk_tap_dance_state_t *state, void *user_data); -void lshift_reset (qk_tap_dance_state_t *state, void *user_data); +// void dance_onshot_lsft(tap_dance_state_t *state, void *user_data) { +void lshift_finished (tap_dance_state_t *state, void *user_data); +void lshift_reset (tap_dance_state_t *state, void *user_data); static tap lshifttap_state = { .is_press_action = true, .state = 0 }; -void lshift_finished (qk_tap_dance_state_t *state, void *user_data) { +void lshift_finished (tap_dance_state_t *state, void *user_data) { lshifttap_state.state = cur_dance(state); switch (lshifttap_state.state) { case SINGLE_TAP: set_oneshot_mods(MOD_BIT(KC_LSFT)); break; @@ -241,7 +241,7 @@ void lshift_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void lshift_reset (qk_tap_dance_state_t *state, void *user_data) { +void lshift_reset (tap_dance_state_t *state, void *user_data) { switch (lshifttap_state.state) { case SINGLE_TAP: break; case SINGLE_HOLD: unregister_code(KC_LSFT); break; @@ -254,7 +254,7 @@ void lshift_reset (qk_tap_dance_state_t *state, void *user_data) { //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_DEL_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, KC_BSPC), [TD_ESC_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRAVE), [TD_TAB_TILDE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_TILDE), diff --git a/keyboards/handwired/space_oddity/keymaps/default/keymap.c b/keyboards/handwired/space_oddity/keymaps/default/keymap.c index 4e8ee5ddca..5b61482344 100644 --- a/keyboards/handwired/space_oddity/keymaps/default/keymap.c +++ b/keyboards/handwired/space_oddity/keymaps/default/keymap.c @@ -35,7 +35,7 @@ enum { }; // Tap dance actions - double tap for Caps Lock. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [SFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), diff --git a/keyboards/handwired/swiftrax/digicarp65/readme.md b/keyboards/handwired/swiftrax/digicarp65/readme.md index 34e0c0b755..a10c1b567a 100644 --- a/keyboards/handwired/swiftrax/digicarp65/readme.md +++ b/keyboards/handwired/swiftrax/digicarp65/readme.md @@ -17,5 +17,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key)and plug in the keyboard -* **Physical reset button**: Briefly short the pad on the back of the PCB labeled QK_BOOT +* **Physical reset button**: Briefly short the pad on the back of the PCB labeled `RESET` * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available |