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/atomic | |
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/atomic')
-rw-r--r-- | keyboards/atomic/keymaps/pvc/config.h | 24 | ||||
-rw-r--r-- | keyboards/atomic/readme.md | 6 |
2 files changed, 6 insertions, 24 deletions
diff --git a/keyboards/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h index ea5821ee7..e63a7340c 100644 --- a/keyboards/atomic/keymaps/pvc/config.h +++ b/keyboards/atomic/keymaps/pvc/config.h | |||
@@ -15,37 +15,19 @@ 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 PRODUCT_ID |
25 | #define PRODUCT_ID 0x0419 | 25 | #define PRODUCT_ID 0x0419 |
26 | #define DEVICE_VER 0x0001 | ||
27 | #define MANUFACTURER Ortholinear Keyboards | ||
28 | #define PRODUCT The Atomic Keyboard | ||
29 | #define DESCRIPTION A compact ortholinear keyboard | ||
30 | 26 | ||
31 | /* key matrix size */ | 27 | /* key matrix size */ |
32 | #define MATRIX_ROWS 5 | 28 | #define MATRIX_ROWS 5 |
33 | #define MATRIX_COLS 15 | 29 | #define MATRIX_COLS 15 |
34 | 30 | ||
35 | /* | ||
36 | * Keyboard Matrix Assignments | ||
37 | * | ||
38 | * Change this to how you wired your keyboard | ||
39 | * COLS: AVR pins used for columns, left to right | ||
40 | * ROWS: AVR pins used for rows, top to bottom | ||
41 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
42 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
43 | * | ||
44 | */ | ||
45 | #define MATRIX_ROW_PINS { D0, D5, B5, B6, B3 } | ||
46 | #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } | ||
47 | #define UNUSED_PINS | ||
48 | |||
49 | #define BACKLIGHT_PIN B7 | 31 | #define BACKLIGHT_PIN B7 |
50 | #define BACKLIGHT_BREATHING | 32 | #define BACKLIGHT_BREATHING |
51 | 33 | ||
diff --git a/keyboards/atomic/readme.md b/keyboards/atomic/readme.md index 1224c415f..54a6ee9b5 100644 --- a/keyboards/atomic/readme.md +++ b/keyboards/atomic/readme.md | |||
@@ -5,12 +5,12 @@ Atomic | |||
5 | 5 | ||
6 | A compact 60% (15x5) ortholinear keyboard kit made and sold by OLKB. [More info on qmk.fm](http://qmk.fm/atomic/) | 6 | A compact 60% (15x5) ortholinear keyboard kit made and sold by OLKB. [More info on qmk.fm](http://qmk.fm/atomic/) |
7 | 7 | ||
8 | Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert) | 8 | Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert) |
9 | Hardware Supported: Atomic PCB rev1, Teensy 2.0 | 9 | Hardware Supported: Atomic PCB rev1, Teensy 2.0 |
10 | Hardware Availability: no longer available | 10 | Hardware Availability: no longer available |
11 | 11 | ||
12 | Make example for this keyboard (after setting up your build environment): | 12 | Make example for this keyboard (after setting up your build environment): |
13 | 13 | ||
14 | make atomic-default | 14 | make atomic:default |
15 | 15 | ||
16 | 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. \ No newline at end of file | 16 | 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. \ No newline at end of file |