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

This commit is contained in:
QMK Bot 2021-09-26 07:01:41 +00:00
commit 327b1c0298
32 changed files with 7 additions and 90 deletions

View file

@ -15,6 +15,3 @@
*/
#include "bigmac.h"
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -31,6 +31,3 @@
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G }, \
{ K40, K41, KC_NO, K43, KC_NO, K45, K46, K47, K48, K49, KC_NO, K4B, KC_NO, K4D, K4E, K4F, K4G }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -43,7 +43,3 @@
#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3, D2, D1, D0, D4, C6, D7, E6, B4 }
#define DIODE_DIRECTION COL2ROW
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -89,5 +89,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

View file

@ -19,6 +19,3 @@ NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER PH
#define PRODUCT Redragon Vara
#define PRODUCT Redragon Vara
/* key matrix size */
#define MATRIX_ROWS 12
@ -44,7 +44,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { D1, D2, D3, C6, D5, C7, D4, D7, B4, B5, B6 }
#define DIODE_DIRECTION COL2ROW
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -112,5 +112,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

View file

@ -38,6 +38,3 @@
{ KC_NO, KA1, KA2, KA3, KC_NO, KA5, KC_NO, KC_NO, KA8, KC_NO, KAA }, \
{ KB0, KB1, KC_NO, KB3, KB4, KB5, KB6, KB7, KC_NO, KB9, KBA }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -66,6 +66,3 @@
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -102,5 +102,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

View file

@ -15,6 +15,3 @@
*/
#include "marauder.h"
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -39,6 +39,3 @@
{ KA0, KA1, KA2, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \
{ KC_NO, KB1, KC_NO, KB3, KB4, KC_NO, KB6, KB7, KC_NO }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -20,6 +20,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes # Link Time Optimization, shrinks the output slightly
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/