Skip to content

Commit

Permalink
Replaced tabs with spaces to match TMK convention.
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilba6582 authored and Wilba6582 committed Mar 16, 2015
1 parent b80b6b3 commit 6568081
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
64 changes: 32 additions & 32 deletions keyboard/planck/backlight.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,42 @@

void backlight_init_ports()
{
// Setup PB7 as output and output low.
DDRB |= (1<<7);
PORTB &= ~(1<<7);
// Use full 16-bit resolution.
ICR1 = 0xFFFF;
// Setup PB7 as output and output low.
DDRB |= (1<<7);
PORTB &= ~(1<<7);
// Use full 16-bit resolution.
ICR1 = 0xFFFF;

// I could write a wall of text here to explain... but TL;DW
// Go read the ATmega32u4 datasheet.
// And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
// Pin PB7 = OCR1C (Timer 1, Channel C)
// Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
// (i.e. start high, go low when counter matches.)
// 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
TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010;
TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
// Default to zero duty cycle.
OCR1C = 0x0000;
// I could write a wall of text here to explain... but TL;DW
// Go read the ATmega32u4 datasheet.
// And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
// Pin PB7 = OCR1C (Timer 1, Channel C)
// Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
// (i.e. start high, go low when counter matches.)
// 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
TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010;
TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
// Default to zero duty cycle.
OCR1C = 0x0000;
}

void backlight_set(uint8_t level)
{
if ( level == 0 )
{
// Turn off PWM control on PB7, revert to output low.
TCCR1A &= ~(_BV(COM1C1));
}
else
{
// Turn on PWM control of PB7
TCCR1A |= _BV(COM1C1);
OCR1C = level << 12 | 0x0FFF;
}
if ( level == 0 )
{
// Turn off PWM control on PB7, revert to output low.
TCCR1A &= ~(_BV(COM1C1));
}
else
{
// Turn on PWM control of PB7
TCCR1A |= _BV(COM1C1);
OCR1C = level << 12 | 0x0FFF;
}
}

12 changes: 6 additions & 6 deletions keyboard/planck/keymap_wilba.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const uint16_t PROGMEM fn_actions[] = {
[17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // *
[18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // (
[19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // )
[20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _
[21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // +
[22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~
Expand All @@ -48,9 +48,9 @@ const uint16_t PROGMEM fn_actions[] = {
[25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // |

[26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
[27] = ACTION_BACKLIGHT_TOGGLE(),
[28] = ACTION_BACKLIGHT_INCREASE(),
[29] = ACTION_BACKLIGHT_DECREASE()
[27] = ACTION_BACKLIGHT_TOGGLE(),
[28] = ACTION_BACKLIGHT_INCREASE(),
[29] = ACTION_BACKLIGHT_DECREASE()
};
4 changes: 2 additions & 2 deletions keyboard/planck/led.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

void led_set(uint8_t usb_led)
{
// Using PE6 Caps Lock LED
if (usb_led & (1<<USB_LED_CAPS_LOCK))
// Using PE6 Caps Lock LED
if (usb_led & (1<<USB_LED_CAPS_LOCK))
{
// Output high.
DDRE |= (1<<6);
Expand Down
6 changes: 3 additions & 3 deletions keyboard/planck/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ void matrix_init(void)
MCUCR |= (1<<JTD);
MCUCR |= (1<<JTD);

// TODO fix this dependency
backlight_init_ports();
// TODO fix this dependency
backlight_init_ports();
// initialize row and col
unselect_rows();
init_cols();
Expand Down

0 comments on commit 6568081

Please sign in to comment.