From 952e805edb5b5c42a8bbe35b6689c28943a53858 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Fri, 17 Jan 2020 18:50:58 +0000
Subject: Initial refactor of ergo42 to split common

---
 keyboards/ergo42/rev1/config.h |  9 ++-------
 keyboards/ergo42/rev1/rev1.c   | 21 ---------------------
 keyboards/ergo42/rev1/rev1.h   | 13 +------------
 3 files changed, 3 insertions(+), 40 deletions(-)

(limited to 'keyboards/ergo42/rev1')

diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h
index f8fae93cf4..8d146bb8b9 100644
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@@ -17,8 +17,7 @@ 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 REV1_CONFIG_H
-#define REV1_CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -40,8 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
 // #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
 
-/* define tapping term */
-#define TAPPING_TERM 100
+#define SOFT_SERIAL_PIN D0
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
@@ -59,7 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
@@ -79,5 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/ergo42/rev1/rev1.c b/keyboards/ergo42/rev1/rev1.c
index f2e8abb1a0..626a0893bb 100644
--- a/keyboards/ergo42/rev1/rev1.c
+++ b/keyboards/ergo42/rev1/rev1.c
@@ -1,22 +1 @@
 #include "ergo42.h"
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/ergo42/rev1/rev1.h b/keyboards/ergo42/rev1/rev1.h
index 724ec38970..9a5aec4d26 100644
--- a/keyboards/ergo42/rev1/rev1.h
+++ b/keyboards/ergo42/rev1/rev1.h
@@ -1,18 +1,9 @@
-#ifndef REV1_H
-#define REV1_H
+#pragma once
 
 #include "ergo42.h"
 
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
@@ -54,5 +45,3 @@
 #endif
 
 #define LAYOUT LAYOUT_ortho_4x14
-
-#endif
-- 
cgit v1.2.3


From 75d4ff7d51160690558cf4bee1bae057f847b706 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Fri, 17 Jan 2020 18:55:24 +0000
Subject: Prevent fallthrough for DIODE_DIRECTION

---
 keyboards/ergo42/rev1/config.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'keyboards/ergo42/rev1')

diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h
index 8d146bb8b9..3850be968d 100644
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@@ -39,6 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
 // #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
 
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
 #define SOFT_SERIAL_PIN D0
 
 /* define if matrix has ghost */
-- 
cgit v1.2.3