di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Update features for RedScarfII

Browse Source 
- USB 6KRO
- SoftPWM LED
- Breathing LED
- Fading LED
- Typing LED
- Ledmap
- Ledmap in EEPROM
This commit is contained in:
Kai Ryu 2014-09-29 17:41:45 +09:00
parent 8e055c5d73
commit 24b533adca
9 changed files with 215 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
keyboard/RedScarfII/Makefile
View File

@ -51,7 +51,8 @@ TARGET_DIR = .
SRC = keymap_common.c \
matrix.c \
led.c \
backlight.c
backlight.c \
ledmap.c
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
@ -127,12 +128,18 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
USB_6KRO_ENABLE = yes # USB 6key Rollover
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
#PS2_USE_BUSYWAIT = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_EX_ENABLE = yes # External keymap in eeprom
KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom
#KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
FADING_LED_ENABLE = yes # Enable fading backlight
BREATHING_LED_ENABLE = yes # Enable breathing backlight
LEDMAP_ENABLE = yes # Enable LED mapping
LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax

13
keyboard/RedScarfII/Makefile.pjrc
View File

@ -39,7 +39,7 @@
#----------------------------------------------------------------------------
# Target file name (without extension).
TARGET = RedScarfII__pjrc
TARGET = RedScarfII_pjrc
# Directory common source filess exist
TOP_DIR = ../..
@ -51,7 +51,8 @@ TARGET_DIR = .
SRC = keymap_common.c \
matrix.c \
led.c \
backlight.c
backlight.c \
ledmap.c
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
@ -99,9 +100,13 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_EX_ENABLE = yes # External keymap in eeprom
KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom
#KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
FADING_LED_ENABLE = yes # Enable fading backlight
BREATHING_LED_ENABLE = yes # Enable breathing backlight
LEDMAP_ENABLE = yes # Enable LED mapping
LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path

96
keyboard/RedScarfII/backlight.c
View File

@ -19,33 +19,49 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "backlight.h"
#ifdef SOFTPWM_LED_ENABLE
#include "softpwm_led.h"
#else
#include "breathing_led.h"
#endif
#include "action.h"
#ifdef BACKLIGHT_ENABLE
void backlight_enable(void);
void backlight_disable(void);
inline void backlight_set_raw(uint8_t raw);
static uint8_t backlight_mode;
static const uint8_t backlight_table[] PROGMEM = {
0, 16, 128, 255
};
void backlight_enable(void);
void backlight_disable(void);
inline void backlight_set_raw(uint8_t raw);
/* Backlight pin configuration
* PWM: PB7(OC1C)
*/
void backlight_enable(void)
{
#ifdef SOFTPWM_LED_ENABLE
DDRB |= (1<<PB7);
softpwm_led_enable();
#else
// Turn on PWM
DDRB |= (1<<PB7);
cli();
TCCR1A |= ((1<<WGM10) | (1<<COM1C1));
TCCR1B |= ((1<<CS11) | (1<<CS10));
sei();
#endif
}
void backlight_disable(void)
{
#ifdef SOFTPWM_LED_ENABLE
DDRB &= ~(1<<PB7);
softpwm_led_disable();
#else
// Turn off PWM
cli();
DDRB &= ~(1<<PB7);
@ -53,6 +69,7 @@ void backlight_disable(void)
TCCR1B &= ~( (1<<CS11) | (1<<CS10) );
sei();
OCR1C = 0;
#endif
}
void backlight_set(uint8_t level)
@ -63,19 +80,54 @@ void backlight_set(uint8_t level)
case 2:
case 3:
backlight_enable();
#ifdef SOFTPWM_LED_ENABLE
#ifdef FADING_LED_ENABLE
fading_led_disable_all();
#endif
breathing_led_disable_all();
#else
breathing_led_disable();
#endif
backlight_set_raw(pgm_read_byte(&backlight_table[level]));
break;
case 4:
case 5:
case 6:
backlight_enable();
#ifdef SOFTPWM_LED_ENABLE
#ifdef FADING_LED_ENABLE
fading_led_disable_all();
#endif
breathing_led_enable_all();
#else
breathing_led_enable();
#endif
breathing_led_set_duration(6 - level);
break;
#ifdef FADING_LED_ENABLE
case 7:
backlight_enable();
fading_led_enable_all();
breathing_led_disable_all();
fading_led_set_direction(FADING_LED_FADE_IN);
fading_led_set_duration(3);
case 8:
backlight_enable();
fading_led_enable_all();
breathing_led_disable_all();
fading_led_set_direction(FADING_LED_FADE_OUT);
fading_led_set_duration(3);
#endif
case 0:
default:
#ifdef SOFTPWM_LED_ENABLE
#ifdef FADING_LED_ENABLE
fading_led_disable_all();
#endif
breathing_led_disable_all();
#else
breathing_led_disable();
#endif
backlight_disable();
break;
}
@ -90,16 +142,54 @@ void backlight_set(uint8_t level)
#endif
}
#ifndef SOFTPWM_LED_ENABLE
#ifdef BREATHING_LED_ENABLE
void breathing_led_set_raw(uint8_t raw)
{
backlight_set_raw(raw);
}
#endif
#endif
inline void backlight_set_raw(uint8_t raw)
{
#ifdef SOFTPWM_LED_ENABLE
softpwm_led_set_all(raw);
#else
OCR1C = raw;
#endif
}
#ifndef LEDMAP_ENABLE
#ifdef SOFTPWM_LED_ENABLE
void softpwm_led_on(uint8_t index)
{
PORTB |= (1<<PB7);
}
void softpwm_led_off(uint8_t index)
{
PORTB &= ~(1<<PB7);
}
#endif
#endif
#ifdef SOFTPWM_LED_ENABLE
#ifdef FADING_LED_ENABLE
void action_keyevent(keyevent_t event)
{
if (backlight_mode == 7) {
if (event.pressed) {
softpwm_led_decrease_all(32);
}
}
if (backlight_mode == 8) {
if (event.pressed) {
softpwm_led_increase_all(32);
}
}
}
#endif
#endif
#endif

6
keyboard/RedScarfII/config.h
View File

@ -43,11 +43,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* number of backlight levels */
#ifdef BREATHING_LED_ENABLE
#ifdef FADING_LED_ENABLE
#define BACKLIGHT_LEVELS 8
#else
#define BACKLIGHT_LEVELS 6
#endif
#else
#define BACKLIGHT_LEVELS 3
#endif
#define LED_COUNT 4
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

6
keyboard/RedScarfII/keymap_common.c
View File

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
{
#ifndef KEYMAP_EX_ENABLE
#ifndef KEYMAP_IN_EEPROM_ENABLE
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
#else
return eeconfig_read_keymap_key(layer, key.row, key.col);
@ -30,7 +30,7 @@ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
action_t keymap_fn_to_action(uint8_t keycode)
{
return (action_t) {
#ifndef KEYMAP_EX_ENABLE
#ifndef KEYMAP_IN_EEPROM_ENABLE
.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)])
#else
.code = eeconfig_read_keymap_fn_action(FN_INDEX(keycode))
@ -38,7 +38,7 @@ action_t keymap_fn_to_action(uint8_t keycode)
};
}
#ifdef KEYMAP_EX_ENABLE
#ifdef KEYMAP_IN_EEPROM_ENABLE
const uint8_t* keymaps_pointer(void) {
return (const uint8_t*)keymaps;
}

2
keyboard/RedScarfII/keymap_common.h
View File

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "print.h"
#include "debug.h"
#include "keymap.h"
#include "keymap_ex.h"
#include "keymap_in_eeprom.h"
extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];

2
keyboard/RedScarfII/keymap_default.c
View File

@ -81,7 +81,7 @@ const uint16_t fn_actions[] PROGMEM = {
[4] = ACTION_LAYER_TOGGLE(2)
};
#ifdef KEYMAP_EX_ENABLE
#ifdef KEYMAP_IN_EEPROM_ENABLE
uint16_t keys_count(void) {
return sizeof(keymaps) / sizeof(keymaps[0]) * MATRIX_ROWS * MATRIX_COLS;
}

4
keyboard/RedScarfII/led.c
View File

@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdint.h"
#include "led.h"
#ifndef LEDMAP_ENABLE
/* LED pin configuration
* CapsLock: PC7
* NumLock: PE6
@ -56,3 +58,5 @@ void led_set(uint8_t usb_led)
PORTC &= ~(1<<PC6);
}
}
#endif

88
keyboard/RedScarfII/ledmap.c Normal file
View File

@ -0,0 +1,88 @@
/*
Copyright 2014 Kai Ryu <kai1103@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/pgmspace.h>
#include "ledmap.h"
#ifdef LEDMAP_ENABLE
static const uint8_t ledmaps[LED_COUNT] PROGMEM = {
[0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT, // CapsLock
[1] = LEDMAP_NUM_LOCK | LEDMAP_BACKLIGHT, // NumLock
[2] = LEDMAP_SCROLL_LOCK | LEDMAP_BACKLIGHT, // Logo
[3] = LEDMAP_BACKLIGHT, // Backlight
};
uint8_t ledmap_get_code(uint8_t index)
{
return pgm_read_byte(&ledmaps[index]);
}
/* LED pin configration
* CapsLock: PC7
* NumLock: PE6
* Logo: PC6
* Backlight: PB7
*/
void ledmap_led_init(void)
{
DDRC |= (1<<PC7);
PORTC |= (1<<PC7);
DDRE |= (1<<PE6);
PORTE |= (1<<PE6);
DDRC |= (1<<PC6);
PORTC &= ~(1<<PC6);
DDRB |= (1<<PB7);
PORTB &= ~(1<<PB7);
}
void ledmap_led_on(uint8_t index)
{
switch (index) {
case 0:
PORTC &= ~(1<<PC7);
break;
case 1:
PORTE &= ~(1<<PE6);
break;
case 2:
PORTC |= (1<<PC6);
break;
case 3:
PORTB |= (1<<PB7);
}
}
void ledmap_led_off(uint8_t index)
{
switch (index) {
case 0:
PORTC |= (1<<PC7);
break;
case 1:
PORTE |= (1<<PE6);
break;
case 2:
PORTC &= ~(1<<PB6);
break;
case 3:
PORTB &= ~(1<<PB7);
break;
}
}
#endif