Refactor of lets_split_eh to enable RGB split animations (#6411)

master
Joel Challis 2019-08-15 22:01:34 +01:00 committed by GitHub
parent ee8d9bd40a
commit fadb69e203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 52 deletions

View File

@ -15,8 +15,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -35,8 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if debouncing isn't needed */ /* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5 #define DEBOUNCE 5
/* serial.c configuration for split keyboard */
//#define SOFT_SERIAL_PIN D0
#endif

View File

@ -16,13 +16,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef EH_CONFIG_H #pragma once
#define EH_CONFIG_H
// To let configuration know this is of type EH, which will force I2C irregardless of user config
#define EH
// The 'EH' only uses I2C
#define USE_I2C
#include "config_common.h" #include "config_common.h"
@ -40,10 +34,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGB_DI_PIN B2 #define RGB_DI_PIN B2
#define RGBLED_NUM 6 // Number of LEDs (each hand) #define RGBLED_NUM 12 // Number of LEDs (each hand)
#define RGBLED_SPLIT { 6, 6 }
#define RGBLIGHT_ANIMATIONS
/* Split Defines */ /* Split Defines */
#define SPLIT_HAND_PIN D3 #define SPLIT_HAND_PIN D3
#define SOFT_SERIAL_PIN D0
#endif // The 'EH' has previously forced use of I2C so this default has been kept
// however users can undef to use serial
#define USE_I2C

View File

@ -1,14 +1 @@
#include "lets_split_eh.h" #include "lets_split_eh.h"
void matrix_init_kb(void) {
// JTAG disable for PORT F. write JTD bit twice within four cycles.
MCUCR |= (1<<JTD);
MCUCR |= (1<<JTD);
// Undo init of RX LED, we use that port currently
// DDRB &= ~(1<<0);
matrix_init_user();
};

View File

@ -1,5 +1,4 @@
#ifndef EH_H #pragma once
#define EH_H
#include "lets_split_eh.h" #include "lets_split_eh.h"
@ -23,5 +22,3 @@
} }
#define LAYOUT_ortho_4x12 LAYOUT #define LAYOUT_ortho_4x12 LAYOUT
#endif

View File

@ -1,4 +1,4 @@
BOOTLOADER = atmel-dfu BOOTLOADER = atmel-dfu
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes

View File

@ -4,11 +4,13 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layers {
#define _LOWER 3 _QWERTY,
#define _RAISE 4 _LOWER,
#define _FUNCTION 15 _RAISE,
#define _ADJUST 16 _FUNCTION,
_ADJUST,
};
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
#define RAISE MO(_RAISE) #define RAISE MO(_RAISE)
@ -77,9 +79,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Adjust (Lower + Raise) /* Adjust (Lower + Raise)
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* |Taskmg| | | | | | | |RGBVAI|RGBSAI|RGBHUI|caltde| * |Taskmg| | | | | | |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | | | | | | |RGBVAD|RGBSAD|RGBHUD|RGBTOG| * | | | | | | | |RGBRMO|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
* |------+------+------+------+------+------|------+------+------+------+------+------| * |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | | | | | | | | | |BLSTEP| * | | | | | | | | | | | |BLSTEP|
* |------+------+------+------+------+------+------+------+------+------+------+------| * |------+------+------+------+------+------+------+------+------+------+------+------|
@ -87,8 +89,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------' * `-----------------------------------------------------------------------------------'
*/ */
[_ADJUST] = LAYOUT( \ [_ADJUST] = LAYOUT( \
TSKMGR, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \ TSKMGR, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
_______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \ _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \
), ),
@ -116,7 +118,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
uint32_t layer_state_set_user(uint32_t state) { uint32_t layer_state_set_user(uint32_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}

View File

@ -1,5 +1,4 @@
#ifndef LETS_SPLIT_EH_H #pragma once
#define LETS_SPLIT_EH_H
#include "quantum.h" #include "quantum.h"
@ -23,5 +22,3 @@
) )
#define LAYOUT_kc_ortho_4x12 LAYOUT_kc #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
#endif