Replaced tabs with spaces to match TMK convention.

This commit is contained in:
Wilba6582 2015-03-17 00:56:41 +11:00
parent b80b6b369c
commit 65680819df
4 changed files with 43 additions and 43 deletions

View file

@ -5,42 +5,42 @@
void backlight_init_ports() void backlight_init_ports()
{ {
// Setup PB7 as output and output low. // Setup PB7 as output and output low.
DDRB |= (1<<7); DDRB |= (1<<7);
PORTB &= ~(1<<7); PORTB &= ~(1<<7);
// Use full 16-bit resolution. // Use full 16-bit resolution.
ICR1 = 0xFFFF; ICR1 = 0xFFFF;
// I could write a wall of text here to explain... but TL;DW // I could write a wall of text here to explain... but TL;DW
// Go read the ATmega32u4 datasheet. // Go read the ATmega32u4 datasheet.
// And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
// Pin PB7 = OCR1C (Timer 1, Channel C) // Pin PB7 = OCR1C (Timer 1, Channel C)
// Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0 // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
// (i.e. start high, go low when counter matches.) // (i.e. start high, go low when counter matches.)
// WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0 // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0
// Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1 // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1
TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010; TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010;
TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
// Default to zero duty cycle. // Default to zero duty cycle.
OCR1C = 0x0000; OCR1C = 0x0000;
} }
void backlight_set(uint8_t level) void backlight_set(uint8_t level)
{ {
if ( level == 0 ) if ( level == 0 )
{ {
// Turn off PWM control on PB7, revert to output low. // Turn off PWM control on PB7, revert to output low.
TCCR1A &= ~(_BV(COM1C1)); TCCR1A &= ~(_BV(COM1C1));
} }
else else
{ {
// Turn on PWM control of PB7 // Turn on PWM control of PB7
TCCR1A |= _BV(COM1C1); TCCR1A |= _BV(COM1C1);
OCR1C = level << 12 | 0x0FFF; OCR1C = level << 12 | 0x0FFF;
} }
} }

View file

@ -39,7 +39,7 @@ const uint16_t PROGMEM fn_actions[] = {
[17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // *
[18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // (
[19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // )
[20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _ [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _
[21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // +
[22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~ [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~
@ -48,9 +48,9 @@ const uint16_t PROGMEM fn_actions[] = {
[25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // | [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // |
[26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), [26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
[27] = ACTION_BACKLIGHT_TOGGLE(), [27] = ACTION_BACKLIGHT_TOGGLE(),
[28] = ACTION_BACKLIGHT_INCREASE(), [28] = ACTION_BACKLIGHT_INCREASE(),
[29] = ACTION_BACKLIGHT_DECREASE() [29] = ACTION_BACKLIGHT_DECREASE()
}; };

View file

@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
void led_set(uint8_t usb_led) void led_set(uint8_t usb_led)
{ {
// Using PE6 Caps Lock LED // Using PE6 Caps Lock LED
if (usb_led & (1<<USB_LED_CAPS_LOCK)) if (usb_led & (1<<USB_LED_CAPS_LOCK))
{ {
// Output high. // Output high.
DDRE |= (1<<6); DDRE |= (1<<6);

View file

@ -62,9 +62,9 @@ void matrix_init(void)
MCUCR |= (1<<JTD); MCUCR |= (1<<JTD);
MCUCR |= (1<<JTD); MCUCR |= (1<<JTD);
// TODO fix this dependency // TODO fix this dependency
backlight_init_ports(); backlight_init_ports();
// initialize row and col // initialize row and col
unselect_rows(); unselect_rows();
init_cols(); init_cols();