shagi
/
qmk_firmare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

le chiffre fp build vik support, and updated my personal keymap

This commit is contained in:
Sadek Baroudi 2024-04-30 17:25:55 -07:00
parent ca35e3a3b3
commit c6ac077baf
5 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/fingerpunch/personal/le_chiffre_democratique/config.h
View File

@ -74,6 +74,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VIK_GPIO_2 F4
#define VIK_WS2812_DI_PIN D4
// Used only if you have a weact st7735 display, set to unused pin
#define VIK_ST7735_UNUSED_PIN F6
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

14
keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json
View File

@ -1,4 +1,18 @@
[
{
"type" : "one-of",
"names" : [
"VIK_HAPTIC",
"VIK_PER56_CIRQUE_LEDS",
"VIK_PER56_CIRQUE_LEDS",
"VIK_PER56_PMW3360_LEDS",
"VIK_PMW3360",
"VIK_WEACT_ST7735",
"VIK_VIK_GC9A01",
"VIK_WAVESHARE_22224"
],
"user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224"
},
{
"type" : "single",
"name" : "CIRQUE_ENABLE",

73
keyboards/fingerpunch/personal/le_chiffre_democratique/keymaps/sadekbaroudi/keymap.c
View File

@ -36,18 +36,16 @@
K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, TO(_KICAD), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
KC_TAB, K01, K02, K03, LT(_FUNCTION, K04), K05, _______, TO(_NAVIGATION), K06, LT(_FUNCTION, K07), K08, K09, K0A, KC_BSLS, \
KC_CAPS, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, _______, TO(_ALPHA), LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), KC_QUOT, \
KC_LSFT, K21, K22, K23, K24, K25, _______, _______, K26, K27, K28, K29, K2A, KC_ENT, \
KC_LCTL, KC_LGUI, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), KC_MUTE, KC_MUTE, LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, KC_RGUI, KC_RCTL \
)
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), K08, K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, KC_MUTE, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_le_chiffre_democratique_base_wrapper(...) LAYOUT_le_chiffre_democratique_base(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_le_chiffre_democratique_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
@ -63,58 +61,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_NAVIGATION] = LAYOUT_wrapper(
_______, _______, _______, _______, _______, _______, _______, TO(_ALPHA), _______, _______, _______, _______, _______, _______,
_______, ________________NAVIGATION_1_______________, _______, TO(_SYMBOLS), _________________NUMPAD_1__________________, _______,
_______, ________________NAVIGATION_2_______________, _______, _______, _________________NUMPAD_2__________________, _______,
_______, ________________NAVIGATION_3_______________, _______, _______, _________________NUMPAD_3__________________, _______,
_______, _______, _______, _______, KC_TAB, _______, _______, KC_BSPC, KC_SPACE, KC_DOT, _______, _______
________________NAVIGATION_1_______________, _________________NUMPAD_1__________________,
________________NAVIGATION_2_______________, _______, _________________NUMPAD_2__________________,
________________NAVIGATION_3_______________, _________________NUMPAD_3__________________,
_______, _______, KC_TAB, KC_BSPC, KC_SPACE, KC_DOT
),
[_SYMBOLS] = LAYOUT_wrapper(
_______, _______, _______, _______, _______, _______, _______, TO(_NAVIGATION), _______, _______, _______, _______, _______, _______,
_______, ________________SYMBOLS_L1_________________, _______, TO(_FUNCTION), ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L2_________________, _______, _______, ________________SYMBOLS_R2_________________, _______,
_______, ________________SYMBOLS_L3_________________, _______, _______, ________________SYMBOLS_R3_________________, _______,
_______, _______, _______, KC_ENT, KC_DEL, _______, _______, KC_BSPC, _______, _______, _______, _______
________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________,
________________SYMBOLS_L2_________________, _______, ________________SYMBOLS_R2_________________,
________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________,
_______, KC_ENT, KC_DEL, KC_BSPC, _______, _______
),
[_FUNCTION] = LAYOUT_wrapper(
_______, _______, _______, _______, _______, _______, _______, TO(_SYMBOLS), _______, _______, _______, _______, _______, _______,
_______, ________________SHIFTNAV_1_________________, _______, TO(_MEDIA), ________________FUNCTION_1_________________, _______,
_______, ________________SHIFTNAV_2_________________, _______, _______, ________________FUNCTION_2_________________, _______,
_______, ________________SHIFTNAV_3_________________, _______, _______, ________________FUNCTION_3_________________, _______,
_______, _______, _______, _______, _______, _______, _______, N_DEL_LINE, KC_SPACE, _______, _______, _______
________________SHIFTNAV_1_________________, ________________FUNCTION_1_________________,
________________SHIFTNAV_2_________________, _______, ________________FUNCTION_2_________________,
________________SHIFTNAV_3_________________, ________________FUNCTION_3_________________,
_______, _______, _______, N_DEL_LINE, KC_SPACE, _______
),
[_MEDIA] = LAYOUT_wrapper(
_______, _______, _______, _______, _______, _______, _______, TO(_FUNCTION), _______, _______, _______, _______, _______, _______,
_______, ___________________RGB_1___________________, _______, TO(_MOUSE), _________________MACROS_1__________________, _______,
_______, ___________________RGB_2___________________, _______, _______, _________________MACROS_2__________________, _______,
_______, ___________________RGB_3___________________, _______, _______, _________________MACROS_3__________________, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
___________________RGB_1___________________, _________________MACROS_1__________________,
___________________RGB_2___________________, _______, _________________MACROS_2__________________,
___________________RGB_3___________________, _________________MACROS_3__________________,
_______, _______, _______, _______, _______, _______
),
[_MOUSE] = LAYOUT_wrapper(
_______, _______, _______, _______, _______, _______, _______, TO(_MEDIA), _______, _______, _______, _______, _______, _______,
_______, __________________MOUSE_1__________________, _______, TO(_GAME), ___________________BLANK___________________, _______,
_______, __________________MOUSE_2__________________, _______, _______, ___________________BLANK___________________, _______,
_______, __________________MOUSE_3__________________, _______, _______, ___________________BLANK___________________, _______,
_______, _______, _______, KC_MS_BTN1, KC_MS_BTN3, _______, _______, KC_MS_BTN3, KC_MS_BTN2, _______, _______, _______
),
[_GAME] = LAYOUT_wrapper(
__GAMES_R0_L__, ___________________GAMES_0_________________, __GAMES_R0_R__, TO(_MOUSE), _______, _______, _______, _______, _______, _______, \
__GAMES_R1_L__, ___________________GAMES_1_________________, __GAMES_R1_R__, TO(_KICAD), ___________________BLANK___________________, _______, \
__GAMES_R2_L__, ___________________GAMES_2_________________, __GAMES_R2_R__, _______, ___________________BLANK___________________, _______, \
__GAMES_R3_L__, ___________________GAMES_3_________________, __GAMES_R3_R__, _______, ___________________BLANK___________________, _______, \
__GAMES_R4_1__, __GAMES_R4_3__, __GAMES_TH_L__, __GAMES_TH_C__, __GAMES_TH_R__, _______, _______, _______, _______, _______, _______, _______ \
),
[_KICAD] = LAYOUT_wrapper(
__KICAD_R0_L__, ___________________KICAD_0_________________, __KICAD_R0_R__, TO(_GAME), _______, _______, _______, _______, _______, _______, \
__KICAD_R1_L__, ___________________KICAD_1_________________, __KICAD_R1_R__, TO(_ALPHA), _________________NUMPAD_1__________________, _______, \
__KICAD_R2_L__, ___________________KICAD_2_________________, __KICAD_R2_R__, _______, _________________NUMPAD_2__________________, _______, \
__KICAD_R3_L__, ___________________KICAD_3_________________, __GAMES_R3_R__, _______, _________________NUMPAD_3__________________, _______, \
__KICAD_R4_1__, __KICAD_R4_3__, __KICAD_TH_L__, __KICAD_TH_C__, __KICAD_TH_R__, _______, _______, KC_BSPC, KC_SPACE, KC_DOT, _______, _______ \
_______________AUTO_MOUSE_1________________, ___________________BLANK___________________,
_______________AUTO_MOUSE_2________________, _______, ___________________BLANK___________________,
_______________AUTO_MOUSE_3________________, ___________________BLANK___________________,
_______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______
)
};

4
keyboards/fingerpunch/personal/le_chiffre_democratique/rules.mk
View File

@ -36,9 +36,11 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
ENCODER_ENABLE = no
# EXTRAFLAGS += -flto # macros disabled, if you need the extra space
EXTRAFLAGS += -flto # macros disabled, if you need the extra space
MOUSEKEY_ENABLE = no
LTO_ENABLE = no
SRC += keyboards/fingerpunch/src/fp_matrix_74hc595_spi.c
QUANTUM_LIB_SRC += spi_master.c
CUSTOM_MATRIX = lite

5
users/sadekbaroudi/wrappers.h
View File

@ -201,6 +201,11 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
# define LAYOUT LAYOUT_kucheza
#endif
// Since LAYOUT_le_chiffre_democratique uses the name LAYOUT_le_chiffre_democratique instead of LAYOUT
#if (!defined(LAYOUT) && defined(LAYOUT_le_chiffre_democratique))
# define LAYOUT LAYOUT_le_chiffre_democratique
#endif
// clang-format off
#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__)
#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__)