diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-15 13:57:46 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-15 13:57:46 +0000 |
| commit | 5f817a1d7fb525003413167b4471eaebd2099b78 (patch) | |
| tree | 8f823c83de85418b50502d15d0d6b3906c5a886d /keyboards/1upkeyboards | |
| parent | 872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (diff) | |
| parent | 764dc18a81f762fdff5f74eb6d3b517ba79d5c11 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/1upkeyboards')
| -rw-r--r-- | keyboards/1upkeyboards/1up60hse/config.h | 2 | ||||
| -rw-r--r-- | keyboards/1upkeyboards/super16/config.h | 2 | ||||
| -rw-r--r-- | keyboards/1upkeyboards/super16v2/config.h | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index 3f4f742b48..2396e9083b 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -108,5 +108,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h index 354f0680e8..fd11e13fe1 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -181,8 +181,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION /* Bootmagic Lite key configuration */ // #define BOOTMAGIC_LITE_ROW 0 diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index 77bb89d954..4685e66b2d 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -135,10 +135,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - /* Bootmagic Lite key configuration */ //#define BOOTMAGIC_LITE_ROW 0 //#define BOOTMAGIC_LITE_COLUMN 0 |