Integrate symmetric70_proto/promicro/normal/ and symmetric70_proto/pr…

…omicro/boost/.

keyboards/handwired/symmetric70_proto/promicro/boost/config.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifdef CANCEL_BOOST
-#    define PRODUCT      BASE_PRODUCT cancel boost
+#    define PRODUCT      BASE_PRODUCT normal(non boost)
 #    define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
 #    define MATRIX_COL_PINS { F4,F4,F5,F5, F6,F6,F7,F7,  B6,B6,B2,B2, B3,B3,B1,B1 }
 #    define MATRIX_MUL_SEL  {  0, 1, 0, 1,  0, 1, 0, 1,   1, 0, 1, 0,  1, 0, 1, 0 }

keyboards/handwired/symmetric70_proto/promicro/normal/config.h

@@ -1,42 +1,4 @@
-/*
-Copyright 2021 mtei
-
-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/>.
-*/
+// Copyright 2022 Takeshi Ishii (@mtei)
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-
-#define PRODUCT      BASE_PRODUCT normal
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4,F4,F5,F5, F6,F6,F7,F7,  B6,B6,B2,B2, B3,B3,B1,B1 }
-
-#define MATRIX_MUL_SEL  {  0, 1, 0, 1,  0, 1, 0, 1,   1, 0, 1, 0,  1, 0, 1, 0 }
-/* use 74HC157: quadruple 2-line to 1-line data selectors / multiplexers */
-#define MATRIX_MUL_SELECT  B5 /* 74HC157 pin1:~A/B */
-
-#ifdef MATRIX_IO_DELAY_ADAPTIVE_FAST
-#    define MATRIX_IO_DELAY_PORTS  B0, B0, F0, F0
-#    define MATRIX_IO_DELAY_MULSEL  0,  1,  0,  1
-//                                  76543210    76543210    76543210    76543210
-#    define MATRIX_IO_DELAY_MASKS 0b01001110, 0b01001110, 0b11110000, 0b11110000
-#endif
+#include "../boost/config.h"

keyboards/handwired/symmetric70_proto/promicro/normal/post_rules.mk

@@ -0,0 +1,2 @@
+KEYBOARD_BOOST_post_rules_MK := $(dir $(lastword $(MAKEFILE_LIST)))../boost/post_rules.mk
+include $(strip $(KEYBOARD_BOOST_post_rules_MK))

keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk

@@ -1,6 +1,4 @@
 VPATH += users/mtei/$(PLATFORM_PATH)
 VPATH += users/mtei/$(PLATFORM_PATH)/$(PLATFORM_KEY)
 
-CUSTOM_MATRIX = yes
-SRC += matrix_common.c
-SRC += matrix_debug/matrix.c
+CANCEL_BOOST ?= yes

keyboards/handwired/symmetric70_proto/promicro/readme.md

@@ -12,19 +12,19 @@ A compact 70keys keyboard (prototype) designed by mtei
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/symmetric70_proto/promicro/normal:default
-    make handwired/symmetric70_proto/promicro/fast:default
     make handwired/symmetric70_proto/promicro/boost:default
+    make handwired/symmetric70_proto/promicro/fast:default
 
 Flashing example for this keyboard:
 
     make handwired/symmetric70_proto/promicro/normal:default:flash
-    make handwired/symmetric70_proto/promicro/fast:default:flash
     make handwired/symmetric70_proto/promicro/boost:default:flash
+    make handwired/symmetric70_proto/promicro/fast:default:flash
 
 Testing options: (see more options: [local_features.mk](../local_features.mk), [matrix_debug](../matrix_debug/readme.md) and [matrix_fast](../matrix_fast/readme.md) )
 
     make MTEST=mdelay0 handwired/symmetric70_proto/promicro/normal:default:flash
-    make MTEST=mdelay0 handwired/symmetric70_proto/promicro/fast:default:flash
     make MTEST=mdelay0 handwired/symmetric70_proto/promicro/boost:default:flash
+    make MTEST=mdelay0 handwired/symmetric70_proto/promicro/fast:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).