From 465559e1666b4f2d346bd899d884a6266a4d9ca4 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Wed, 23 Jan 2019 21:04:04 -0800 Subject: [PATCH] Optimize/Update the new_project script (#4920) * use pragma once in our templates * template.h is present in both avr/ps2avrgb options so we moved it to base. In addition we now use pragma once --- quantum/template/avr/template.h | 38 ------------------- .../template/{ps2avrgb => base}/template.h | 5 +-- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 quantum/template/avr/template.h rename quantum/template/{ps2avrgb => base}/template.h (94%) diff --git a/quantum/template/avr/template.h b/quantum/template/avr/template.h deleted file mode 100644 index aaa971504c6..00000000000 --- a/quantum/template/avr/template.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 REPLACE_WITH_YOUR_NAME - * - * 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 . - */ -#ifndef %KEYBOARD_UPPERCASE%_H -#define %KEYBOARD_UPPERCASE%_H - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, KC_NO, K11 }, \ -} - -#endif diff --git a/quantum/template/ps2avrgb/template.h b/quantum/template/base/template.h similarity index 94% rename from quantum/template/ps2avrgb/template.h rename to quantum/template/base/template.h index 1958f48a02c..caf2abb4c6b 100644 --- a/quantum/template/ps2avrgb/template.h +++ b/quantum/template/base/template.h @@ -13,8 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef %KEYBOARD_UPPERCASE%_H -#define %KEYBOARD_UPPERCASE%_H +#pragma once #include "quantum.h" @@ -34,5 +33,3 @@ { k00, k01, k02 }, \ { k10, KC_NO, k11 }, \ } - -#endif