drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Make arguments redo, subproject elimination (#1784)

Browse source 
* 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
This commit is contained in:
Jack Humbert 2017-10-14 11:32:19 -10:00 • committed by GitHub
parent e5dc2253e2
commit 800ec55dfc
217 changed files with 722 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/s60_x/default/config.h
View file

@ -1,7 +1,7 @@
#ifndef DEFAULT_CONFIG_H
#define DEFAULT_CONFIG_H
#include "../config.h"
#include "config_common.h"
#define PRODUCT S60-X
#define DESCRIPTION q.m.k. keyboard firmware for S60-X

29
keyboards/s60_x/keymaps/bluebear/config.h
View file

@ -15,30 +15,14 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#undef DEVICE_VER
#define DEVICE_VER 0x0003
#define MANUFACTURER Sentraq
#define PRODUCT S60-RGB
#define DESCRIPTION QMK keyboard firmware for Sentraq S60-RGB
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
#define UNUSED_PINS
#define BACKLIGHT_PIN B7
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
@ -65,10 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Underlight configuration
*/
#define RGB_DI_PIN F6
#define RGBLIGHT_TIMER
#define RGBLED_NUM 10 // Number of LEDs
#undef RGBLIGHT_HUE_STEP
#undef RGBLIGHT_SAT_STEP
#undef RGBLIGHT_VAL_STEP
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

6
keyboards/s60_x/keymaps/bluebear/rules.mk
View file

@ -11,8 +11,4 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
TAP_DANCE_ENABLE = no # Enable tap dancing keys
ifndef QUANTUM_DIR
include ../../../../Makefile
endif
TAP_DANCE_ENABLE = no # Enable tap dancing keys

2
keyboards/s60_x/readme.md
View file

@ -8,6 +8,6 @@ Hardware Availability: https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?
Make example for this keyboard (after setting up your build environment):
make s60_x-default
make s60_x:default
See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.

2
keyboards/s60_x/rgb/config.h
View file

@ -1,7 +1,7 @@
#ifndef RBG_CONFIG_H
#define RBG_CONFIG_H
#include "../config.h"
#include "config_common.h"
#define PRODUCT S60-X-RGB
#define DESCRIPTION q.m.k. keyboard firmware for S60-X RGB

4
keyboards/s60_x/rules.mk
View file

@ -62,4 +62,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
MIDI_ENABLE = no # MIDI controls
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
AUDIO_ENABLE = no # Audio output on port C6
DEFAULT_FOLDER = s60_x/default

4
keyboards/s60_x/s60_x.h
View file

@ -1,10 +1,10 @@
#ifndef S60X_H
#define S60X_H
#ifdef SUBPROJECT_default
#ifdef KEYBOARD_s60_x_default
#include "default.h"
#endif
#ifdef SUBPROJECT_rgb
#ifdef KEYBOARD_s60_x_rgb
#include "rgb.h"
#endif

1
keyboards/s60_x/subproject.mk
View file

@ -1 +0,0 @@
SUBPROJECT_DEFAULT = default