From af30f799d6ffe819a205c3786bb8328bad68fb66 Mon Sep 17 00:00:00 2001
From: bwisn <56162793+bwisn@users.noreply.github.com>
Date: Tue, 19 Oct 2021 22:00:04 +0200
Subject: [PATCH] annepro2: apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/annepro2/annepro2.h   | 7 ++++---
 keyboards/annepro2/c15/config.h | 6 ------
 keyboards/annepro2/c18/config.h | 6 ------
 keyboards/annepro2/matrix.c     | 3 ---
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index e952c2dcb5a..5f67f791b05 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -24,9 +24,6 @@ typedef struct __attribute__((__packed__)) {
     uint8_t _dummy[10];
     bool    caps_lock;
 } ble_capslock_t;
-
-extern uint16_t annepro2LedMatrix[MATRIX_ROWS * MATRIX_COLS];
-
 extern ble_capslock_t BLECapsLock;
 
 // Matrix keymap
@@ -62,3 +59,7 @@ enum AP2KeyCodes {
     KC_AP_LED_SPEED,
     AP2_SAFE_RANGE,
 };
+
+#undef SAFE_RANGE
+#define SAFE_RANGE AP2_SAFE_RANGE
+
diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
index 490ce9c3916..4b6363507e4 100644
--- a/keyboards/annepro2/c15/config.h
+++ b/keyboards/annepro2/c15/config.h
@@ -23,17 +23,11 @@
 #define DEVICE_VER 0x1337
 #define MANUFACTURER Obins
 #define PRODUCT Anne Pro 2 QMK
-
-#define ANNEPRO2_C15
-
 // key matrix size
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 // layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 144 bytes
 
-// Number of supported layouts
-#define NUM_LAYOUTS 4
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
index eb23bde144d..ad77ed9d26e 100644
--- a/keyboards/annepro2/c18/config.h
+++ b/keyboards/annepro2/c18/config.h
@@ -23,17 +23,11 @@
 #define DEVICE_VER 0x1337
 #define MANUFACTURER Obins
 #define PRODUCT Anne Pro 2(c18)QMK
-
-#define ANNEPRO2_C18
-
 // key matrix size
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 // layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 144 bytes
 
-// Number of supported layouts
-#define NUM_LAYOUTS 4
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/annepro2/matrix.c b/keyboards/annepro2/matrix.c
index ffab3be4965..cbd522a54a9 100644
--- a/keyboards/annepro2/matrix.c
+++ b/keyboards/annepro2/matrix.c
@@ -28,9 +28,6 @@
 extern ioline_t row_list[MATRIX_ROWS];
 extern ioline_t col_list[MATRIX_COLS];
 
-void matrix_init_custom(void) {
-}
-
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
 	bool matrix_has_changed = false;
     // cache of input ports for columns