diff options
author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
---|---|---|
committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
commit | d18df8ef7a7e0528a29fdc96d4843ace54605121 (patch) | |
tree | 44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/eco | |
parent | 308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff) | |
parent | 933701c2129c0c585ecd8ba37c41b091a7dc687f (diff) |
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
# keyboards/bananasplit/Makefile
# keyboards/bananasplit/bananasplit.c
# keyboards/bananasplit/bananasplit.h
# keyboards/bananasplit/config.h
# keyboards/bananasplit/keymaps/default/keymap.c
# keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/eco')
-rw-r--r-- | keyboards/eco/Makefile | 2 | ||||
-rw-r--r-- | keyboards/eco/config.h | 3 | ||||
-rw-r--r-- | keyboards/eco/eco.h | 4 | ||||
-rw-r--r-- | keyboards/eco/readme.md | 2 | ||||
-rw-r--r-- | keyboards/eco/rev2/Makefile | 3 | ||||
-rw-r--r-- | keyboards/eco/rev2/config.h | 30 | ||||
-rw-r--r-- | keyboards/eco/rev2/rev2.c | 1 | ||||
-rw-r--r-- | keyboards/eco/rev2/rev2.h | 24 | ||||
-rw-r--r-- | keyboards/eco/rev2/rules.mk | 5 |
9 files changed, 72 insertions, 2 deletions
diff --git a/keyboards/eco/Makefile b/keyboards/eco/Makefile index 30b43c4eaa..b9bada8f8d 100644 --- a/keyboards/eco/Makefile +++ b/keyboards/eco/Makefile @@ -1,4 +1,4 @@ -SUBPROJECT_DEFAULT = rev1 +SUBPROJECT_DEFAULT = rev2 ifndef MAKEFILE_INCLUDED include ../../Makefile diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index af7e1822c8..99b057496f 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -73,5 +73,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef SUBPROJECT_rev1 #include "rev1/config.h" #endif +#ifdef SUBPROJECT_rev2 + #include "rev2/config.h" +#endif #endif diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 9da33b9b8d..2cfb8df26b 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h @@ -4,6 +4,10 @@ #ifdef SUBPROJECT_rev1 #include "rev1.h" #endif +#ifdef SUBPROJECT_rev2 + #include "rev2.h" +#endif + #include "quantum.h" diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md index 8fef3a1ce5..d29aa8ece7 100644 --- a/keyboards/eco/readme.md +++ b/keyboards/eco/readme.md @@ -10,6 +10,6 @@ Hardware Supported: ECO PCB rev1 Pro Micro Make example for this keyboard (after setting up your build environment): - make eco-rev1-that_canadian + make eco-rev2-that_canadian 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 diff --git a/keyboards/eco/rev2/Makefile b/keyboards/eco/rev2/Makefile new file mode 100644 index 0000000000..4e2a6f00fd --- /dev/null +++ b/keyboards/eco/rev2/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif
\ No newline at end of file diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h new file mode 100644 index 0000000000..83f2defc9e --- /dev/null +++ b/keyboards/eco/rev2/config.h @@ -0,0 +1,30 @@ +/* +Copyright 2012 Jun Wako <wakojun@gmail.com> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 REV2_CONFIG_H +#define REV2_CONFIG_H + +#include "../config.h" + +#define DEVICE_VER 0x0002 + +/* ECO V2.1 pin-out */ +#define MATRIX_ROW_PINS { D7, B5, B4, E6 } +#define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 } +#define UNUSED_PINS + +#endif diff --git a/keyboards/eco/rev2/rev2.c b/keyboards/eco/rev2/rev2.c new file mode 100644 index 0000000000..84097652d8 --- /dev/null +++ b/keyboards/eco/rev2/rev2.c @@ -0,0 +1 @@ +#include "eco.h" diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h new file mode 100644 index 0000000000..5b377f2908 --- /dev/null +++ b/keyboards/eco/rev2/rev2.h @@ -0,0 +1,24 @@ +#ifndef REV2_H +#define REV2_H + +#include "../eco.h" + +//void promicro_bootloader_jmp(bool program); +#include "quantum.h" + +//void promicro_bootloader_jmp(bool program); + +#define KEYMAP( \ + k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ + k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ + k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \ + ) \ + { \ + { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ + { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ + { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ + { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \ + } + +#endif
\ No newline at end of file diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk new file mode 100644 index 0000000000..a0825b4ef6 --- /dev/null +++ b/keyboards/eco/rev2/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif
\ No newline at end of file |