From 3dc51a49a6f1d67c7bf942f9050b304b75141799 Mon Sep 17 00:00:00 2001 From: "DESKTOP-PU0QGTF\\Fer" Date: Fri, 12 Oct 2018 20:47:49 +0200 Subject: [PATCH] Deleted innecesary stuff and trailing spaces Just as commit title said. --- .../handwired/bluepill/Unavailable pins.txt | 9 -- keyboards/handwired/bluepill/bluepill.c | 2 +- keyboards/handwired/bluepill/bluepill.h | 4 +- .../bluepill/bluepill70/bluepill70.c | 2 +- .../handwired/bluepill/bluepill70/flash.sh | 2 +- .../handwired/bluepill/bluepill70/mcuconf.h | 2 +- .../handwired/bluepill/bluepill70/rules.mk | 2 +- keyboards/handwired/bluepill/config.h | 2 +- .../handwired/bluepill/ejemplo de layer light | 149 ------------------ keyboards/handwired/bluepill/readme.md | 5 +- keyboards/handwired/bluepill/rules.mk | 2 +- 11 files changed, 10 insertions(+), 171 deletions(-) delete mode 100644 keyboards/handwired/bluepill/Unavailable pins.txt delete mode 100644 keyboards/handwired/bluepill/ejemplo de layer light diff --git a/keyboards/handwired/bluepill/Unavailable pins.txt b/keyboards/handwired/bluepill/Unavailable pins.txt deleted file mode 100644 index 5c7fcb0aad..0000000000 --- a/keyboards/handwired/bluepill/Unavailable pins.txt +++ /dev/null @@ -1,9 +0,0 @@ -PA2 - Alternate output (USART2 TX) -PA3 - Normal input (USART2 RX) -PA9 - Alternate output (USART1 TX) -PA10 - Normal input (USART1 RX) -PA11 - (USB D-) -PA12 - (USB D+) - -PB10 - Push Pull output (USB switch). -PC13 - Push Pull output (LED) \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill.c b/keyboards/handwired/bluepill/bluepill.c index 30effbc31d..85c92dfe96 100644 --- a/keyboards/handwired/bluepill/bluepill.c +++ b/keyboards/handwired/bluepill/bluepill.c @@ -1 +1 @@ -#include "bluepill.h" +#include "bluepill.h" \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill.h b/keyboards/handwired/bluepill/bluepill.h index e2e392bdb0..9d2f1a08f3 100644 --- a/keyboards/handwired/bluepill/bluepill.h +++ b/keyboards/handwired/bluepill/bluepill.h @@ -54,6 +54,4 @@ { K50, K51, K52, KC_NO, KC_NO, KC_NO, K53, KC_NO, KC_NO,K54, K55, K56, K57, K58, K59 } \ } - -#endif /* KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ */ - +#endif /* KEYBOARDS_CHIBIOS_TEST_CHIBIOS_TEST_H_ */ \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill70/bluepill70.c b/keyboards/handwired/bluepill/bluepill70/bluepill70.c index c8b0bebdb1..511c602d45 100644 --- a/keyboards/handwired/bluepill/bluepill70/bluepill70.c +++ b/keyboards/handwired/bluepill/bluepill70/bluepill70.c @@ -1 +1 @@ -#include "bluepill70.h" +#include "bluepill70.h" \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill70/flash.sh b/keyboards/handwired/bluepill/bluepill70/flash.sh index 15501dfa57..d001ff007e 100644 --- a/keyboards/handwired/bluepill/bluepill70/flash.sh +++ b/keyboards/handwired/bluepill/bluepill70/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -Arduino_STM32_usb_hid/tools/linux/maple_upload ttyACM0 2 1EAF:0003 build/ch.bin +Arduino_STM32_usb_hid/tools/linux/maple_upload ttyACM0 2 1EAF:0003 build/ch.bin \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill70/mcuconf.h b/keyboards/handwired/bluepill/bluepill70/mcuconf.h index 6e16bd61b8..60d9931c35 100644 --- a/keyboards/handwired/bluepill/bluepill70/mcuconf.h +++ b/keyboards/handwired/bluepill/bluepill70/mcuconf.h @@ -206,4 +206,4 @@ #define STM32_USB_USB1_HP_IRQ_PRIORITY 13 #define STM32_USB_USB1_LP_IRQ_PRIORITY 14 -#endif /* _MCUCONF_H_ */ +#endif /* _MCUCONF_H_ */ \ No newline at end of file diff --git a/keyboards/handwired/bluepill/bluepill70/rules.mk b/keyboards/handwired/bluepill/bluepill70/rules.mk index e7b4ce0a53..e89abca8ca 100644 --- a/keyboards/handwired/bluepill/bluepill70/rules.mk +++ b/keyboards/handwired/bluepill/bluepill70/rules.mk @@ -44,4 +44,4 @@ ARMV = 7 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf # This also requires a patch to chibios: # /tmk_core/tool/chibios/ch-bootloader-jump.patch -#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 +#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 \ No newline at end of file diff --git a/keyboards/handwired/bluepill/config.h b/keyboards/handwired/bluepill/config.h index 53efb01a23..eb98dcdd26 100644 --- a/keyboards/handwired/bluepill/config.h +++ b/keyboards/handwired/bluepill/config.h @@ -58,4 +58,4 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#endif +#endif \ No newline at end of file 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/readme.md b/keyboards/handwired/bluepill/readme.md index 08d6c25579..8b53f12f46 100644 --- a/keyboards/handwired/bluepill/readme.md +++ b/keyboards/handwired/bluepill/readme.md @@ -13,8 +13,7 @@ make handwired/bluepill/bluepill70:default See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. - -{% hint style='info' %} Read everything before using it for something {% endhint %} +Read everything before using it. ## Introduction @@ -58,4 +57,4 @@ PC13: Caps Lock led. Backlight dual color leds, my version is for common anode that's more common, for leds with common anode just replace the palSetPad with palClearPad and viceversa. PA1: Backlight color A. -PA0: Backlight color B. +PA0: Backlight color B. \ No newline at end of file diff --git a/keyboards/handwired/bluepill/rules.mk b/keyboards/handwired/bluepill/rules.mk index d9091c3af8..38bacae34d 100644 --- a/keyboards/handwired/bluepill/rules.mk +++ b/keyboards/handwired/bluepill/rules.mk @@ -7,4 +7,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = yes # Custom matrix file MOUSEKEY_ENABLE = no -DEFAULT_FOLDER = handwired/stm32/stm70 \ No newline at end of file +DEFAULT_FOLDER = handwired/bluepill/bluepill70 \ No newline at end of file