From 7af56b536cd67b840916e0ebed18d90ce048bbdb Mon Sep 17 00:00:00 2001 From: "DESKTOP-PU0QGTF\\Fer" Date: Sun, 22 Jul 2018 14:04:38 +0200 Subject: [PATCH 1/2] Changed again Iso fix for Space Cadet --- keyboards/handwired/stm32/stm70/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/stm32/stm70/config.h b/keyboards/handwired/stm32/stm70/config.h index 3a14e9a714..0f1d7c5108 100644 --- a/keyboards/handwired/stm32/stm70/config.h +++ b/keyboards/handwired/stm32/stm70/config.h @@ -23,7 +23,7 @@ #define MATRIX_COLS 15 #define DIODE_DIRECTION COL2ROW -// Iso fix for Space Cadet +// Iso fix for Space Cadet, comment for ANSI layouts #define LSPO_KEY KC_8 #define RSPC_KEY KC_9 From a6d2ed31a14369e4157cce6ea3437dae27ec6bd4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-PU0QGTF\\Fer" Date: Mon, 1 Oct 2018 20:11:56 +0200 Subject: [PATCH 2/2] Revert "Try to add layer activated light" This reverts commit 205af820d845dab08988f329b9f062f558060220. --- keyboards/handwired/bluepill/bluepill.h | 29 +++- .../handwired/bluepill/ejemplo de layer light | 149 ------------------ .../bluepill/keymaps/default/keymap.c | 14 +- .../handwired/bluepill/keymaps/iso/keymap.c | 43 +++-- keyboards/handwired/bluepill/readme.md | 7 +- 5 files changed, 62 insertions(+), 180 deletions(-) delete mode 100644 keyboards/handwired/bluepill/ejemplo de layer light diff --git a/keyboards/handwired/bluepill/bluepill.h b/keyboards/handwired/bluepill/bluepill.h index 3d156533c3..ae22dae75c 100644 --- a/keyboards/handwired/bluepill/bluepill.h +++ b/keyboards/handwired/bluepill/bluepill.h @@ -4,7 +4,7 @@ #include "quantum.h" #include "led.h" -/* 70% LAYOUT +/* ANSI LAYOUT ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD GRA| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ' | ¡ | BCKS | DEL TAB| Q | W | E | R | T | Y | U | I | O | P | ` | + | | HOM @@ -13,7 +13,32 @@ LCT| WIN| ALT| ESPACE | ALG| FN | RCT| LEF| DOW| RIG */ -#define KEYMAP_SEVENTY( \ +#define KEYMAP_SEVENTY_ANSI( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ + K50, K51, K52, K53, K54, K55, K56, K57, K58, K59 \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K0E, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ + { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \ +} + +/* ISO LAYOUT + ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12| PSC| PGU| PGD + GRA| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ' | ¡ | BCKS | DEL + TAB| Q | W | E | R | T | Y | U | I | O | P | ` | + | | HOM + CAP| A | S | D | F | G | H | J | K | L | Ñ | ´ | Ç | ENTER | END + LSI| < | Z | X | C | V | B | N | M | , | . | - | RSHIF | UP | FNL + LCT| WIN| ALT| ESPACE | ALG| FN | RCT| LEF| DOW| RIG +*/ + +#define KEYMAP_SEVENTY_ISO( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ diff --git a/keyboards/handwired/bluepill/ejemplo de layer light b/keyboards/handwired/bluepill/ejemplo de layer light deleted file mode 100644 index 2f1498490b..0000000000 --- a/keyboards/handwired/bluepill/ejemplo de layer light +++ /dev/null @@ -1,149 +0,0 @@ -// keymap.c -// https://github.com/AGausmann/qmk_firmware/tree/agausmann-v3.x/keyboards/nyquist/keymaps/agausmann - -#include "action_layer.h" -#include "eeconfig.h" -#include "util.h" -#ifdef RGBLIGHT_ENABLE -#include "rgblight.h" -#endif - -extern keymap_config_t keymap_config; - -#define DEFAULT_LAYER 0 -#define LOWER_LAYER 1 -#define RAISE_LAYER 2 -#define MIDI_LAYER 4 -#define GAMING_LAYER 8 -#define GAMING_NUMPAD_LAYER 9 -#define SETUP_LAYER 12 -#define NUMPAD_LAYER 13 - -enum custom_keycodes { - CK_BACK = TO(DEFAULT_LAYER), - CK_LOW = MO(LOWER_LAYER), - CK_RAS = MO(RAISE_LAYER), - CK_MIDI = TG(MIDI_LAYER), - CK_GAME = TG(GAMING_LAYER), - CK_GNUM = OSL(GAMING_NUMPAD_LAYER), - CK_SET = OSL(SETUP_LAYER), - CK_NUM = TG(NUMPAD_LAYER), -}; - -#define _______ KC_TRNS -#define XXXXXXX KC_NO - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[DEFAULT_LAYER] = KEYMAP( \ - CK_BACK, _______, CK_MIDI, CK_GAME, CK_SET, _______, _______, CK_NUM, _______, _______, _______, _______, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - KC_CLCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, _______, CK_LOW, KC_ENT, KC_SPC, CK_RAS, _______, KC_RALT, KC_RGUI, KC_RCTL \ -), - -[LOWER_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, \ - _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, \ - _______, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PAUS, KC_PSCR, KC_SLCK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -[RAISE_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ - _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -[MIDI_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - MI_ALLOFF,MI_Gs, MI_A, MI_As, MI_B, MI_OCTU, _______, _______, _______, _______, _______, _______, \ - _______, MI_E, MI_F, MI_Fs, MI_G, MI_TRNSU,_______, _______, _______, _______, _______, _______, \ - _______, MI_C, MI_Cs, MI_D, MI_Ds, MI_TRNSD,_______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, MI_SUS, MI_OCTD, _______, _______, _______, _______, _______, _______ \ -), - -[GAMING_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, \ - KC_LCTL, XXXXXXX, KC_LALT, CK_GNUM, KC_BSLS, KC_SPC, KC_SPC, XXXXXXX, XXXXXXX, KC_LEFT, KC_RGHT, KC_DOWN \ -), - -[GAMING_NUMPAD_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_0, KC_1, KC_2, KC_3, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -[SETUP_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -[NUMPAD_LAYER] = KEYMAP( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PAST, _______, \ - _______, _______, _______, _______, _______, _______, KC_NLCK, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PEQL, \ - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_PENT, \ - _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PSLS, _______ \ -), - -}; - - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -void matrix_init_user(void) { - - - rgblight_enable(); -} - -void matrix_scan_user(void) { - #ifdef RGBLIGHT_ENABLE - - static uint8_t old_layer = 255; - uint8_t new_layer = biton32(layer_state); - - if (old_layer != new_layer) { - switch (new_layer) { - case DEFAULT_LAYER: - rgblight_setrgb(0x00, 0x00, 0xFF); - break; - case NUMPAD_LAYER: - rgblight_setrgb(0x00, 0xA0, 0xFF); - break; - case MIDI_LAYER: - rgblight_setrgb(0xFF, 0x00, 0x00); - break; - case GAMING_LAYER: - rgblight_setrgb(0xFF, 0x20, 0x00); - break; - case SETUP_LAYER: - rgblight_setrgb(0xFF, 0x00, 0xFF); - break; - } - - old_layer = new_layer; - } - - #endif //RGBLIGHT_ENABLE -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} \ No newline at end of file diff --git a/keyboards/handwired/bluepill/keymaps/default/keymap.c b/keyboards/handwired/bluepill/keymaps/default/keymap.c index 42a294df8a..af61cf32bd 100644 --- a/keyboards/handwired/bluepill/keymaps/default/keymap.c +++ b/keyboards/handwired/bluepill/keymaps/default/keymap.c @@ -17,8 +17,6 @@ along with this program. If not, see . #include "bluepill.h" -#define XXXXXXX KC_NO - // Define layer names #define _NORMAL 0 #define _FNONE 1 @@ -27,28 +25,28 @@ along with this program. If not, see . // Highly Modified by Xydane const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_NORMAL] = KEYMAP_SEVENTY( + [_NORMAL] = KEYMAP_SEVENTY_ISO( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCREEN,KC_HOME, KC_END, \ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DELETE, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,KC_PGDOWN, \ - KC_LSPO, XXXXXXX,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSPC,KC_UP, F(1), \ + KC_LSPO, KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSPC,KC_UP, F(1), \ KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,F(0), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FNONE] = KEYMAP_SEVENTY( + [_FNONE] = KEYMAP_SEVENTY_ISO( KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P1, KC_P2, KC_P3, KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ - KC_TRNS, XXXXXXX, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0, KC_PDOT,KC_PENT, KC_PSLS, KC_TRNS,KC_TRNS,KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0, KC_PDOT,KC_PENT, KC_PSLS, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, F(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ), - [_FNTWO] = KEYMAP_SEVENTY( + [_FNTWO] = KEYMAP_SEVENTY_ISO( KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P1, KC_P2, KC_P3, KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ - KC_TRNS, XXXXXXX, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0, KC_PDOT,KC_PENT, KC_PSLS, KC_TRNS,KC_TRNS,KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0, KC_PDOT,KC_PENT, KC_PSLS, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, F(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ), }; diff --git a/keyboards/handwired/bluepill/keymaps/iso/keymap.c b/keyboards/handwired/bluepill/keymaps/iso/keymap.c index 28a5247d6d..6af611365d 100644 --- a/keyboards/handwired/bluepill/keymaps/iso/keymap.c +++ b/keyboards/handwired/bluepill/keymaps/iso/keymap.c @@ -25,7 +25,7 @@ along with this program. If not, see . // Highly Modified by Xydane const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_NORMAL] = KEYMAP_SEVENTY( + [_NORMAL] = KEYMAP_SEVENTY_ISO( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCREEN,KC_HOME, KC_END, \ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DELETE, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, \ @@ -33,7 +33,7 @@ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, K KC_LSPO, KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSPC,KC_UP, F(1), \ KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,F(0), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FNONE] = KEYMAP_SEVENTY( + [_FNONE] = KEYMAP_SEVENTY_ISO( KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU, KC_TRNS,KC_TRNS,KC_NLCK, KC_CALC, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, \ @@ -41,7 +41,7 @@ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, K KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_P0, KC_PDOT,KC_PENT, KC_PSLS, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, F(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ), - [_FNTWO] = KEYMAP_SEVENTY( + [_FNTWO] = KEYMAP_SEVENTY_ISO( KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU, KC_TRNS,KC_TRNS,KC_NLCK, KC_CALC, KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, \ @@ -54,6 +54,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay [1] = ACTION_LAYER_TOGGLE(2), // to Fn overlay [2] = ACTION_FUNCTION(2), + [3] = ACTION_FUNCTION(3), }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { @@ -61,26 +62,34 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { case 2: if (record->event.pressed) { palTogglePad(GPIOA, 1); - //palTogglePad(GPIOA, 0); } break; -}; -/* Layer based ilumination, comment to off */ -uint32_t layer_state_set_user(uint32_t state) { + // Continuar para incluir funciones propias + /*case 3: + if (record->event.pressed) { + function_led(algo); + } + break;*/ + + } +} + +/* Layer based ilumination, set min value to 0xFFF */ +/*uint32_t layer_state_set_user(uint32_t state) { switch (biton32(state)) { case _FNONE: - palClearPad(GPIOA, 0); //ON - palSetPad(GPIOA, 1); //OFF - break; + custom_function1(min1, min2;) + rgblight_setrgb (0xFF, 0x00, 0x00); + break; case _FNTWO: - palClearPad(GPIOA, 1); //ON - palSetPad(GPIOA, 1); //OFF - break; + custom_function2(min1, min2;) + rgblight_setrgb (0x00, 0xFF, 0x00); + break; default: // for any other layers, or the default layer - palClearPad(GPIOA, 1); //ON - palSetPad(GPIOA, 0); //OFF - break; + custom_function3(min1, min2;) + rgblight_setrgb (0x00, 0xFF, 0xFF); + break; } return state; -}; \ No newline at end of file +}*/ \ No newline at end of file diff --git a/keyboards/handwired/bluepill/readme.md b/keyboards/handwired/bluepill/readme.md index f81d336852..b44353e04e 100644 --- a/keyboards/handwired/bluepill/readme.md +++ b/keyboards/handwired/bluepill/readme.md @@ -25,15 +25,15 @@ As I'm mainly a web developer I didn't even get to debug the controller, not to ## Resistor fix -If you want to use the Bluepill USB port, it's very likely that you need to solder a 1.8 kΩ between PA12 and 3.3V. That depends on the PC's motherboard but I needed it, more info [here](https://wiki.stm32duino.com/index.php?title=Blue_Pill). +If you want to use the Bluepill USB port, it's very likely that you need to solder a 1.8 kΩ between PA12 and 3.3V. That depends on the PC's motherboard but I needed, more info [here](https://wiki.stm32duino.com/index.php?title=Blue_Pill). ## No bootloader -Neither Xydane or I used the bootloader. Just use a serial programmer (FTDI, ST-LINK). +Neither Xydane or I used the bootloader, the code for it is commented and you can use it if you want. I didn't achieve to run it and just used a serial programmer (FTDI, ST-LINK). ## Adding layouts and revisions -If you want to create new layouts just add it to the keymaps folder. If you prefer to develop a more complex revision just copy the bluepill70 folder, rename it and create a new keymap in /keymap.c (I tried to divide the project even more but it didn't worked). +If you want to create new layouts just add it to the keymaps folder. If you prefer to develop a more complex revision just copy the bluepill70 folder, rename it and create a new keymap in /keymap.c ## Pinout @@ -49,5 +49,4 @@ That's the pinout; It also uses: PC13: Caps Lock led. -PA0: Backlight. PA1: Backlight. \ No newline at end of file