qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit bd1ad405bfb50a42f162b66b00037a7630474307
parent 03df19d3f6968f0dc3041b39b7ae8b85198aaa56
Author: Cole Markham <github@themarkhams.us>
Date:   Wed,  7 Mar 2018 16:06:41 -0600

Update Meira for revision 1.1 to enable backlighting by default (#2468)

* Update Meira for revision 1.1 to enable backlighting by default

* Updates to fix other keymaps

Diffstat:
keyboards/meira/config.h | 1-
keyboards/meira/featherble/rules.mk | 1-
keyboards/meira/keymaps/default/keymap.c | 5++---
keyboards/meira/keymaps/grahampheath/rules.mk | 3+++
keyboards/meira/lighting.c | 2++
keyboards/meira/meira.h | 19++++++++++++++++++-
keyboards/meira/promicro/rules.mk | 1-
keyboards/meira/rules.mk | 7+++----
8 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/keyboards/meira/config.h b/keyboards/meira/config.h @@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} -#define BACKLIGHT_BREATHING #define RGB_DI_PIN D3 #define RGBLIGHT_TIMER diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/meira/featherble/rules.mk @@ -1,4 +1,3 @@ BLUETOOTH_ENABLE = yes -BACKLIGHT_ENABLE = no F_CPU = 8000000 diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "meira.h" -#include "issi.h" #include "lighting.h" #ifdef RGBLIGHT_ENABLE @@ -277,10 +276,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; break; case BL_TOGG: -#ifdef ISSI_ENABLE +#ifdef BACKLIGHT_ENABLE if (record->event.pressed) { print("Enabling backlight\n"); - issi_init(); + backlight_init_ports(); } #endif return false; diff --git a/keyboards/meira/keymaps/grahampheath/rules.mk b/keyboards/meira/keymaps/grahampheath/rules.mk @@ -1,3 +1,5 @@ AUDIO_ENABLE = yes # Audio output on port C6 EXTRAFLAGS+=-flto # -4-7k MOUSEKEY_ENABLE = no # Mouse keys(-47kb) +ISSI_ENABLE = no +BACKLIGHT_ENABLE = no+ \ No newline at end of file diff --git a/keyboards/meira/lighting.c b/keyboards/meira/lighting.c @@ -49,6 +49,8 @@ void backlight_set(uint8_t level){ #endif } + + void set_backlight_by_keymap(uint8_t col, uint8_t row){ // dprintf("LED: %02X, %d %d %d\n", lookup_value, matrix, led_col, led_row); // activateLED(matrix, led_col, led_row, 255); diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h @@ -17,6 +17,7 @@ #define MEIRA_H #include "quantum.h" +#include "issi.h" void reset_keyboard_kb(void); @@ -37,6 +38,22 @@ void reset_keyboard_kb(void); { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ } -#endif +// Used to create a keymap using only KC_ prefixed keys +#define KC_KEYMAP( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ + ) \ + KEYMAP( \ + KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \ + KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \ + KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \ + KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \ + ) #define LAYOUT_ortho_4x12 KEYMAP +#define KC_LAYOUT_ortho_4x12 KC_KEYMAP + +#endif + diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/meira/promicro/rules.mk @@ -1,2 +1 @@ BLUETOOTH_ENABLE = no -BACKLIGHT_ENABLE = no diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk @@ -62,16 +62,15 @@ COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -ISSI_ENABLE = no # If the I2C pullup resistors aren't install this must be disabled -#WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms +BACKLIGHT_CUSTOM_DRIVER = yes +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality, also set ISSI_ENABLE below for Miera +ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled CUSTOM_MATRIX = yes