diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-10-14 11:32:19 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 11:32:19 -1000 |
| commit | 800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch) | |
| tree | 718e43d976bc71627558b5f9e1b657e8a64e4131 /keyboards/s60_x/keymaps/bluebear/config.h | |
| parent | e5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff) | |
| download | qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.zip | |
Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci]
* don't put spaces after statements - hard lessons in makefile development
* fix-up some other rules.mk
* give travis a chance
* reset KEYMAPS variable
* start converting keyboards to new system
* try making all with travis
* redo make args to use colons, better folder structuring system [skip ci]
* don't put spaces after statements - hard lessons in makefile development
* fix-up some other rules.mk
* give travis a chance
* reset KEYMAPS variable
* start converting keyboards to new system
* try making all with travis
* start to update readmes and keyboards
* look in keyboard directories for board.mk
* update visualizer rules
* fix up some other keyboards/keymaps
* fix arm board ld includes
* fix board rules
* fix up remaining keyboards
* reset layout variable
* reset keyboard_layouts
* fix remainging keymaps/boards
* update readmes, docs
* add note to makefile error
* update readmes
* remove planck keymap warnings
* update references and docs
* test out tarvis build stages
* don't use stages for now
* don't use stages for now
Diffstat (limited to 'keyboards/s60_x/keymaps/bluebear/config.h')
| -rw-r--r-- | keyboards/s60_x/keymaps/bluebear/config.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h index 5c0d08833..35754b523 100644 --- a/keyboards/s60_x/keymaps/bluebear/config.h +++ b/keyboards/s60_x/keymaps/bluebear/config.h | |||
| @@ -15,30 +15,14 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef CONFIG_H | 18 | #ifndef CONFIG_USER_H |
| 19 | #define CONFIG_H | 19 | #define CONFIG_USER_H |
| 20 | 20 | ||
| 21 | #include "config_common.h" | 21 | #include "config_common.h" |
| 22 | 22 | ||
| 23 | /* USB Device descriptor parameter */ | 23 | /* USB Device descriptor parameter */ |
| 24 | #define VENDOR_ID 0xFEED | 24 | #undef DEVICE_VER |
| 25 | #define PRODUCT_ID 0x6060 | ||
| 26 | #define DEVICE_VER 0x0003 | 25 | #define DEVICE_VER 0x0003 |
| 27 | #define MANUFACTURER Sentraq | ||
| 28 | #define PRODUCT S60-RGB | ||
| 29 | #define DESCRIPTION QMK keyboard firmware for Sentraq S60-RGB | ||
| 30 | |||
| 31 | /* key matrix size */ | ||
| 32 | #define MATRIX_ROWS 5 | ||
| 33 | #define MATRIX_COLS 15 | ||
| 34 | |||
| 35 | // ROWS: Top to bottom, COLS: Left to right | ||
| 36 | |||
| 37 | #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } | ||
| 38 | #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } | ||
| 39 | #define UNUSED_PINS | ||
| 40 | |||
| 41 | #define BACKLIGHT_PIN B7 | ||
| 42 | 26 | ||
| 43 | /* COL2ROW or ROW2COL */ | 27 | /* COL2ROW or ROW2COL */ |
| 44 | #define DIODE_DIRECTION COL2ROW | 28 | #define DIODE_DIRECTION COL2ROW |
| @@ -65,10 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 65 | 49 | ||
| 66 | /* Underlight configuration | 50 | /* Underlight configuration |
| 67 | */ | 51 | */ |
| 68 | 52 | #undef RGBLIGHT_HUE_STEP | |
| 69 | #define RGB_DI_PIN F6 | 53 | #undef RGBLIGHT_SAT_STEP |
| 70 | #define RGBLIGHT_TIMER | 54 | #undef RGBLIGHT_VAL_STEP |
| 71 | #define RGBLED_NUM 10 // Number of LEDs | ||
| 72 | #define RGBLIGHT_HUE_STEP 10 | 55 | #define RGBLIGHT_HUE_STEP 10 |
| 73 | #define RGBLIGHT_SAT_STEP 17 | 56 | #define RGBLIGHT_SAT_STEP 17 |
| 74 | #define RGBLIGHT_VAL_STEP 17 | 57 | #define RGBLIGHT_VAL_STEP 17 |