Merge remote-tracking branch 'origin/master' into develop

2 files changed, 3 insertions, 18 deletions

diff --git a/keyboards/pandora/config.h b/keyboards/pandora/config.h
index 873f6dd150..3a44129c49 100644
--- a/keyboards/pandora/config.h
+++ b/keyboards/pandora/config.h
@@ -47,6 +47,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 /* Encoder Function */
 #define ENCODERS_PAD_A { F6 }
 #define ENCODERS_PAD_B { F5 }
diff --git a/keyboards/pandora/pandora.c b/keyboards/pandora/pandora.c
index 6c5d8a166f..3d166646b8 100644
--- a/keyboards/pandora/pandora.c
+++ b/keyboards/pandora/pandora.c
@@ -15,21 +15,3 @@
  */
 
 #include "pandora.h"
-
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-};
-
-void led_init_ports(void) {
-    setPinOutput(E6);
-    writePinHigh(E6);
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(E6, !led_state.caps_lock);
-    }
-    return res;
-}