di0ib
/
tmk_keyboard_custom
Наблюдаван 1
Харесван 0
Разклонения 0
Код Версии 0 Activity
Преглед на файлове

Implement ledmap and fix bugs

yuk86
Kai Ryu преди 9 години
родител
b9c65be036
ревизия
34886dfffb
променени са 8 файла, в които са добавени 46 реда и са изтрити 17 реда
Разделен изглед Покажи статистика за разликите
  1. 4
    0
      common/bootmagic.c
  2. 9
    0
      common/keyboard.c
  3. 15
    7
      common/ledmap.c
  4. 2
    4
      common/ledmap.h
  5. 11
    3
      common/ledmap_in_eeprom.c
  6. 2
    0
      common/ledmap_in_eeprom.h
  7. 1
    2
      keyboard/gh60/Makefile
  8. 2
    1
      keyboard/gh60/ledmap.c

+ 4
- 0
common/bootmagic.c Целия файл

@@ -8,6 +8,7 @@
#include "action_layer.h"
#include "eeconfig.h"
#include "keymap_in_eeprom.h"
#include "ledmap_in_eeprom.h"
#include "bootmagic.h"


@@ -35,6 +36,9 @@ void bootmagic(void)
eeconfig_init();
#ifdef KEYMAP_IN_EEPROM_ENABLE
write_keymap_to_eeprom();
#endif
#ifdef LEDMAP_IN_EEPROM_ENABLE
write_ledmap_to_eeprom();
#endif
}


+ 9
- 0
common/keyboard.c Целия файл

@@ -36,6 +36,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#else
#include "breathing_led.h"
#endif
#include "ledmap.h"
#include "ledmap_in_eeprom.h"
#include "keymap_in_eeprom.h"
#ifdef MOUSEKEY_ENABLE
# include "mousekey.h"
@@ -82,6 +84,13 @@ void keyboard_init(void)
bootmagic();
#endif

#ifdef LEDMAP_ENABLE
ledmap_led_init();
#ifdef LEDMAP_IN_EEPROM_ENABLE
ledmap_in_eeprom_init();
#endif
#endif

#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif

+ 15
- 7
common/ledmap.c Целия файл

@@ -3,6 +3,7 @@
#include "led.h"
#include "softpwm_led.h"
#include "action_layer.h"
#include "debug.h"

static led_state_t led_state = 0;
static led_state_t led_state_last = 0;
@@ -13,25 +14,32 @@ void led_set(uint8_t usb_led)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
uint8_t code = ledmap_get_code(i);
/*
switch (code) {
case LEDMAP_NUM_LOCK:
usb_led & (1 << USB_LED_NUM_LOCK) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(usb_led & (1 << USB_LED_NUM_LOCK)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
break;
case LEDMAP_CAPS_LOCK:
usb_led & (1 << USB_LED_CAPS_LOCK) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(usb_led & (1 << USB_LED_CAPS_LOCK)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
break;
case LEDMAP_SCROLL_LOCK:
usb_led & (1 << USB_LED_SCROLL_LOCK) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(usb_led & (1 << USB_LED_SCROLL_LOCK)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
break;
case LEDMAP_COMPOSE:
usb_led & (1 << USB_LED_COMPOSE) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(usb_led & (1 << USB_LED_COMPOSE)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
break;
case LEDMAP_KANA:
usb_led & (1 << USB_LED_KANA) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(usb_led & (1 << USB_LED_KANA)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
break;
default:
break;
}
*/
for (uint8_t j = USB_LED_NUM_LOCK; j <= USB_LED_KANA; j++) {
if (code - LEDMAP_NUM_LOCK == j) {
(usb_led & (1 << j)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
}
}
}
update_led_state();
}
@@ -42,7 +50,7 @@ void default_layer_state_change(uint32_t state)
for (uint8_t i = 0; i < LED_COUNT; i++) {
uint8_t code = ledmap_get_code(i);
if (code >= LEDMAP_DEFAULT_LAYER_0 && code < LEDMAP_DEFAULT_LAYER_31) {
state & (1UL << (code - LEDMAP_DEFAULT_LAYER_0)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(state & (1UL << (code - LEDMAP_DEFAULT_LAYER_0))) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
}
}
update_led_state();
@@ -53,7 +61,7 @@ void layer_state_change(uint32_t state)
for (uint8_t i = 0; i < LED_COUNT; i++) {
uint8_t code = ledmap_get_code(i);
if (code >= LEDMAP_LAYER_0 && code < LEDMAP_LAYER_31) {
state & (1UL << (code - LEDMAP_LAYER_0)) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
(state & (1UL << (code - LEDMAP_LAYER_0))) ? LED_BIT_ON(led_state, i) : LED_BIT_OFF(led_state, i);
}
}
update_led_state();

+ 2
- 4
common/ledmap.h Целия файл

@@ -40,10 +40,8 @@ typedef enum {
LEDMAP_UNCONFIGURED = 0xFF
} ledmap_code_t;

#define LEDMAP_LAYER(x) (x)
#define LEDMAP_DEFAULT_LAYER(x) (32 + x)

void ledmap_init(void);
#define LEDMAP_DEFAULT_LAYER(x) (LEDMAP_DEFAULT_LAYER_0 + x)
#define LEDMAP_LAYER(x) (LEDMAP_LAYER_0 + x)

#ifdef LEDMAP_ENABLE
uint8_t ledmap_get_code(uint8_t index);

+ 11
- 3
common/ledmap_in_eeprom.c Целия файл

@@ -9,17 +9,25 @@

static uint8_t ledmap[LED_COUNT];

void ledmap_in_eeprom_init(void) {
// read and check ledmap in eeprom
void ledmap_in_eeprom_init(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
ledmap[i] = eeprom_read_byte(EECONFIG_LEDMAP + i);
ledmap[i] = LEDMAP_UNCONFIGURED;
if (ledmap[i] == LEDMAP_UNCONFIGURED) {
ledmap[i] = lemap_get_code(i);
ledmap[i] = ledmap_get_code(i);
eeprom_write_byte(EECONFIG_LEDMAP + i, ledmap[i]);
}
}
}

void write_ledmap_to_eeprom(void)
{
for (uint8_t i = 0; i < LED_COUNT; i++) {
eeprom_write_byte(EECONFIG_LEDMAP + i, ledmap_get_code(i));
}
}

uint8_t ledmap_in_eeprom_get_code(uint8_t i)
{
return ledmap[i];

+ 2
- 0
common/ledmap_in_eeprom.h Целия файл

@@ -11,9 +11,11 @@
#ifdef LEDMAP_IN_EEPROM_ENABLE
#define ledmap_get_code ledmap_in_eeprom_get_code
void ledmap_in_eeprom_init(void);
void write_ledmap_to_eeprom(void);
uint8_t ledmap_in_eeprom_get_code(uint8_t index);
#else
#define ledmap_in_eeprom_init()
#define write_ledmap_to_eeprom()
#define ledmap_in_eeprom_get_code()
#endif


+ 1
- 2
keyboard/gh60/Makefile Целия файл

@@ -50,7 +50,6 @@ TARGET_DIR = .
# project specific files
SRC = keymap_common.c \
matrix.c \
led.c \
backlight.c \
ledmap.c \
led_matrix.c
@@ -139,7 +138,7 @@ USB_6KRO_ENABLE = yes # USB 6key Rollover
#PS2_USE_BUSYWAIT = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom
KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
#KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
BREATHING_LED_ENABLE = yes # Enable breathing backlight
LEDMAP_ENABLE = yes # Enable LED mapping

+ 2
- 1
keyboard/gh60/ledmap.c Целия файл

@@ -1,5 +1,6 @@
#include "ledmap.h"
#include <avr/pgmspace.h>
#include "ledmap.h"
#include "debug.h"


#ifdef LEDMAP_ENABLE