Integrate symmetric70_proto/proton_c/normal/ and symmetric70_proto/pr…

…oton_c/boost/.

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

@@ -18,7 +18,7 @@
 #endif
 
 #ifdef CANCEL_BOOST
-#    define PRODUCT      BASE_PRODUCT cancel boost
+#    define PRODUCT      BASE_PRODUCT normal(non boost)
 #    define MATRIX_COL_PINS { A2, A1, A0, B8, B13, B14, B15, B9, B0, B1, B2, B3, B4, B5, B6, B7 }
 #    define MATRIX_ROW_PINS { A4, A5, A6, A7, A8 }
 #else

keyboards/handwired/symmetric70_proto/proton_c/boost/post_rules.mk

@@ -1,3 +1,8 @@
+VPATH += users/mtei/$(PLATFORM_PATH)
+VPATH += users/mtei/$(PLATFORM_PATH)/$(PLATFORM_KEY)
+
+SRC += users/mtei/matrix_output_delay.c
+
 KEYBOARD_LOCAL_OPTIONS_MK := $(dir $(lastword $(MAKEFILE_LIST)))../../local_options.mk
 include $(strip $(KEYBOARD_LOCAL_OPTIONS_MK))
 

keyboards/handwired/symmetric70_proto/proton_c/boost/rules.mk

@@ -1,6 +1 @@
-VPATH += users/mtei/$(PLATFORM_PATH)
-VPATH += users/mtei/$(PLATFORM_PATH)/$(PLATFORM_KEY)
-
 CANCEL_BOOST ?= no
-
-SRC += users/mtei/matrix_output_delay.c

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

@@ -1,38 +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
-
-/*
- * 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 PRODUCT      BASE_PRODUCT normal
-
-#define MATRIX_ROW_PINS { A4, A5, A6, A7, A8 }
-#define MATRIX_COL_PINS { A2, A1, A0, B8,  B13, B14, B15, B9,  B0, B1, B2, B3,  B4, B5, B6, B7 }
-
-#ifdef MATRIX_IO_DELAY_ADAPTIVE_FAST
-#    define MATRIX_IO_DELAY_PORTS A0, B0
-//                                  fedcba9876543210    fedcba9876543210
-#    define MATRIX_IO_DELAY_MASKS 0b0000000000000111, 0b1110001111111111
-#endif
+#include "../boost/config.h"

keyboards/handwired/symmetric70_proto/proton_c/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/proton_c/normal/rules.mk

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

keyboards/handwired/symmetric70_proto/proton_c/readme.md

@@ -11,19 +11,19 @@ A compact 70keys keyboard (prototype) designed by mtei
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/symmetric70_proto/proton_c/normal:default
-    make handwired/symmetric70_proto/proton_c/fast:default
     make handwired/symmetric70_proto/proton_c/boost:default
+    make handwired/symmetric70_proto/proton_c/fast:default
 
 Flashing example for this keyboard:
 
     make handwired/symmetric70_proto/proton_c/normal:default:flash
-    make handwired/symmetric70_proto/proton_c/fast:default:flash
     make handwired/symmetric70_proto/proton_c/boost:default:flash
+    make handwired/symmetric70_proto/proton_c/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/proton_c/normal:default:flash
-    make MTEST=mdelay0 handwired/symmetric70_proto/proton_c/fast:default:flash
     make MTEST=mdelay0 handwired/symmetric70_proto/proton_c/boost:default:flash
+    make MTEST=mdelay0 handwired/symmetric70_proto/proton_c/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).