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

keyboards/lfkeyboards/lfk87/lfk87.c

@@ -32,8 +32,8 @@ void matrix_init_kb(void)
     set_rgb(32, 0xFF, 0x00, 0x00);  // Layer indicator, start red
 #ifndef AUDIO_ENABLE
     // If we're not using the audio pin, drive it low
-    sbi(DDRC, 6);
-    cbi(PORTC, 6);
+    setPinOutput(C6);
+    writePinLow(C6);
 #endif
 #ifdef ISSI_ENABLE
     issi_init();

keyboards/lfkeyboards/lfk87/lfk87.h

@@ -1,23 +1,9 @@
 #pragma once
 
-/* if the kb.h file exists (because we're running from qmkbuilder) include it */
-#if __has_include("kb.h")
-#include "kb.h"
-#endif
-
 #include "quantum.h"
 #include "matrix.h"
 #include <avr/sfr_defs.h>
 
-#ifndef cbi
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#endif
-
-#ifndef sbi
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-#endif
-
-
 typedef struct RGB_Color {
     uint16_t red;
     uint16_t green;