summaryrefslogtreecommitdiffstats
path: root/keyboards/lfkeyboards
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-09-04 02:09:30 +1000
committerGitHub <noreply@github.com>2021-09-03 17:09:30 +0100
commit8574bf20d35b21c7b44ba8550fa11b4d100fdbbd (patch)
treed2492bc01a53343a1f86e7f49d85726686e3f6f1 /keyboards/lfkeyboards
parenta01057d19dfa208fcf5c7cd16689257cb41ac79b (diff)
Remove more cruft in keyboard files (#14288)
Diffstat (limited to 'keyboards/lfkeyboards')
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h15
-rw-r--r--keyboards/lfkeyboards/lfk87/lfk87.c4
-rw-r--r--keyboards/lfkeyboards/lfk87/lfk87.h14
-rw-r--r--keyboards/lfkeyboards/mini1800/mini1800.c4
-rw-r--r--keyboards/lfkeyboards/mini1800/mini1800.h14
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.c8
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.h16
7 files changed, 8 insertions, 67 deletions
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
index 53860ea2bf..3256451658 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h
@@ -1,26 +1,11 @@
#ifndef LFK65_HS_H
#define LFK65_HS_H
-/* if the kb.h file exists (because we're running from qmkbuilder) include it */
-#ifdef __has_include
-#if __has_include("kb.h")
-#include "kb.h"
-#endif
-#endif
-
#include "quantum.h"
#include "matrix.h"
#include <avr/sfr_defs.h>
#include <stdint.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
-
void reset_keyboard_kb(void);
// readability
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 4b34fcef7e..10fc14a8aa 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/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();
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.h b/keyboards/lfkeyboards/lfk87/lfk87.h
index 1a2f9fbaf6..5c1fba6bab 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.h
+++ b/keyboards/lfkeyboards/lfk87/lfk87.h
@@ -1,24 +1,10 @@
#ifndef LFK87_H
#define LFK87_H
-/* 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;
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index d5f4193c1d..4c897ac693 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -37,8 +37,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
_delay_ms(500);
#ifdef ISSI_ENABLE
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h
index 17f7da3483..c007d7f76a 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.h
+++ b/keyboards/lfkeyboards/mini1800/mini1800.h
@@ -1,24 +1,10 @@
#ifndef LFK87_H
#define LFK87_H
-/* 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;
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 7498febeb3..01c339f06b 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -34,12 +34,12 @@ void matrix_init_kb(void)
#ifdef AUDIO_ENABLE
// audio_init() sets PB5 to output and drives it low, which breaks our matrix
// so reset PB5 to input
- cbi(DDRB, 5);
- sbi(PORTB, 5);
+ setPinInput(B5);
+ writePinHigh(B5);
#else
// 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
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.h b/keyboards/lfkeyboards/smk65/revb/revb.h
index 3d3e5181fd..dbb25b869a 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.h
+++ b/keyboards/lfkeyboards/smk65/revb/revb.h
@@ -14,26 +14,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* if the kb.h file exists (because we're running from qmkbuilder) include it */
-#ifdef __has_include
-#if __has_include("kb.h")
-#include "kb.h"
-#endif
-#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;