updated keyboard

This commit is contained in:
locker98 2024-11-27 22:18:52 -05:00
parent 6b8fd32d61
commit 59889b7e78
3 changed files with 72 additions and 13 deletions

View File

@ -26,7 +26,7 @@
#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
// #define SPLIT_USB_DETECT
#define SPLIT_USB_DETECT
// Setup OLED Screen Fonts and Options
#define CUSTOM_FONT
@ -70,10 +70,10 @@
#define RGBLED_SPLIT { 36, 36 } // haven't figured out how to use this yet
//#define RGBLIGHT_LED_COUNT 30
#define RGBLIGHT_LIMIT_VAL 170
#define RGBLIGHT_LIMIT_VAL 140
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
#endif
@ -87,7 +87,7 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT

View File

@ -19,7 +19,7 @@
#include QMK_KEYBOARD_H
#define INDICATOR_BRIGHTNESS 80
#define INDICATOR_BRIGHTNESS 60
#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
@ -44,7 +44,7 @@
#define KC_CTL_A MT(MOD_LCTL, KC_A) // Tap for A, hold for Control
#define KC_CTL_A MT(L, KC_A) // Tap for A, hold for Control
#define KC_CTL_CL MT(MOD_LCTL, KC_SCLN) // Tap for colon, hold for Control
#define KC_SFT_Z MT(MOD_RSFT, KC_Z) // Tap for Z, hold for Shift
#define KC_SFT_SL MT(MOD_RSFT, KC_SLSH) // Tap for slash, hold for Shift
@ -58,6 +58,9 @@
#define KC_SFT_TAB MT(MOD_RSFT, KC_TAB) // Tap for Tab, hold for Right Shift
// Tmux
#define KC_TMUX MT(C(KC_A), KC_SPC) // Tap for <space>, hold for ctrl+a
@ -149,11 +152,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
KC_LCTL,KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_CTL_CL, KC_QUOT,
KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_LSFT,KC_SFT_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SFT_SL, KC_LSFT,
KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_SPC, KC_RAISE, KC_LOWER, KC_BSPC, KC_ENT, KC_LSFT, KC_SPC , KC_RAISE, KC_RCTL, KC_RALT
KC_SPC, KC_RAISE, KC_LOWER, KC_BSPC, KC_ENT, KC_LSFT, KC_TMUX, KC_RAISE, KC_RCTL, KC_RALT
// \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
),
@ -171,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | trans| trans| trans| trans| /trans / \trans \ | trans| trans| trans| trans|
* | | | | |/ / \ \ | | | | |
* `----------------------------------' '------''---------------------------'
*/
*/
[_LOWER] = LAYOUT(
//,------------------------------------------------. ,---------------------------------------------------.
KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
@ -205,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, KC_LGUI, C(KC_F1), C(KC_F2),KC_CAPS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, C(KC_A), KC_LGUI, C(KC_F1), C(KC_F2),KC_CAPS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______, _______, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
@ -308,7 +311,7 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS
SET_UNDERGLOW(HSV_ORANGE),
SET_ALL(HSV_RED),
SET_NUMPAD(HSV_GREEN)
// {7, 4, HSV_ORANGE},
// {25, 2, HSV_ORANGE},
// {36+6, 4, HSV_ORANGE},

56
qmk_firmware.sln Normal file
View File

@ -0,0 +1,56 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{BD5C01D2-BE0D-4EED-88FE-9C3A93B98BBF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lufa", "lufa", "{75D1B393-B9ED-4CA0-B97B-0213A46846EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{70ABAB0B-32CE-4C18-910C-C53CB36FB3FD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TempDataLogger", "TempDataLogger", "{B281BC5E-D5FC-4631-BECB-0AD7BE944E69}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TempLoggerHostApp", "lib\lufa\Projects\TempDataLogger\TempLogHostApp\TempLoggerHostApp.csproj", "{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LEDNotifier", "LEDNotifier", "{E2505534-120A-4B45-ADF3-E73C3D6D7C3D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CPUMonitor", "lib\lufa\Projects\LEDNotifier\CPUUsageApp\CPUMonitor.csproj", "{CEF165B4-ECD7-4AF9-ABA1-127377F10805}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LEDMixer", "lib\lufa\Projects\LEDNotifier\LEDMixerApp\LEDMixer.csproj", "{79155C39-3E69-4869-B4CA-4BEB149428C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9}.Release|Any CPU.Build.0 = Release|Any CPU
{CEF165B4-ECD7-4AF9-ABA1-127377F10805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CEF165B4-ECD7-4AF9-ABA1-127377F10805}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CEF165B4-ECD7-4AF9-ABA1-127377F10805}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CEF165B4-ECD7-4AF9-ABA1-127377F10805}.Release|Any CPU.Build.0 = Release|Any CPU
{79155C39-3E69-4869-B4CA-4BEB149428C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79155C39-3E69-4869-B4CA-4BEB149428C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79155C39-3E69-4869-B4CA-4BEB149428C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79155C39-3E69-4869-B4CA-4BEB149428C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{75D1B393-B9ED-4CA0-B97B-0213A46846EF} = {BD5C01D2-BE0D-4EED-88FE-9C3A93B98BBF}
{70ABAB0B-32CE-4C18-910C-C53CB36FB3FD} = {75D1B393-B9ED-4CA0-B97B-0213A46846EF}
{B281BC5E-D5FC-4631-BECB-0AD7BE944E69} = {70ABAB0B-32CE-4C18-910C-C53CB36FB3FD}
{5D97CD1C-68E2-478F-8BED-1BF4F7785CB9} = {B281BC5E-D5FC-4631-BECB-0AD7BE944E69}
{E2505534-120A-4B45-ADF3-E73C3D6D7C3D} = {70ABAB0B-32CE-4C18-910C-C53CB36FB3FD}
{CEF165B4-ECD7-4AF9-ABA1-127377F10805} = {E2505534-120A-4B45-ADF3-E73C3D6D7C3D}
{79155C39-3E69-4869-B4CA-4BEB149428C0} = {E2505534-120A-4B45-ADF3-E73C3D6D7C3D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2EB533AF-991E-4DE6-A4B1-3B89AD5A0C4E}
EndGlobalSection
EndGlobal