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

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

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/

View file

@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
@ -65,6 +65,3 @@
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
// partially generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
@ -31,6 +31,3 @@
{ K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
}
// partially generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -33,6 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
// partially generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -46,6 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
// partially generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -23,6 +23,3 @@ AUDIO_ENABLE = no # Audio output
KEY_LOCK_ENABLE = yes # Enable KC_LOCK support
LAYOUTS = 65_ansi_blocker
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -30,7 +30,3 @@
{ KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
{ K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -57,6 +57,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

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

View file

@ -25,6 +25,3 @@ RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
LAYOUTS = 60_ansi_arrow
# partially generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -33,6 +33,3 @@
{ K40, KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4C }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -33,7 +33,7 @@
{"label":"K19 (B7,C6)", "x":9, "y":1.5},
{"label":"K1A (B7,B5)", "x":10, "y":1.5},
{"label":"K1B (B7,F4)", "x":11, "y":1.5},
{"label":"K1C (B7,F1)", "x":12, "y":1.5},
{"label":"K1C (B7,F1)", "x":12, "y":1.5},
{"label":"K1E (B7,B0)", "x":13, "y":1.5, "w":2},
{"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
{"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
@ -68,7 +68,7 @@
{"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
{"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
{"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
{"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
{"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
{"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
{"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
{"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
@ -79,7 +79,7 @@
{"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
{"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
{"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
{"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
{"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
{"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
@ -95,5 +95,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

View file

@ -24,6 +24,3 @@ LTO_ENABLE = yes
KEY_LOCK_ENABLE = no # Enable KC_LOCK support
LAYOUTS = tkl_ansi
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -44,7 +44,7 @@
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
@ -65,6 +65,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

@ -49,6 +49,3 @@
}
#define LAYOUT LAYOUT_7u_space
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

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

View file

@ -24,6 +24,3 @@
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

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

View file

@ -21,6 +21,3 @@ RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
UNICODE_ENABLE = no # Unicode
AUDIO_ENABLE = no # Audio output
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/