drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Backlight abstraction and other changes (#439)

Browse source 
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
This commit is contained in:
Jack Humbert 2016-06-23 22:18:20 -04:00 • committed by GitHub
parent ba116ceb49
commit 13bb6b4b7f
239 changed files with 1146 additions and 139888 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/satan/Makefile
View file

@ -1,7 +1,4 @@
SRC = led.c
# MCU name
#MCU = at90usb1287
MCU = atmega32u4

24
keyboards/satan/backlight.c
View file

@ -1,24 +0,0 @@
#include <avr/io.h>
#include "backlight.h"
#include "print.h"
void init_backlight_pin(void) {
print("init_backlight_pin()\n");
// Set our LED pins as output
DDRB |= (1<<6);
// Set our LED pins low
PORTB &= ~(1<<6);
}
void backlight_set(uint8_t level) {
if ( level == 0 ) {
// Turn off light
PORTB |= (1<<6);
} else {
// Turn on light
PORTB &= ~(1<<6);
}
}

2
keyboards/satan/config.h
View file

@ -38,6 +38,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
#define UNUSED_PINS
#define BACKLIGHT_PIN B6
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

1543
keyboards/satan/keymaps/default/compiled.hex
View file

File diff suppressed because it is too large Load diff

36
keyboards/satan/led.c
View file

@ -1,36 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@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/io.h>
#include "stdint.h"
#include "led.h"
void led_init_ports(void) {
// * Set our LED pins as output
DDRB |= (1<<2);
}
void led_set_kb(uint8_t usb_led) {
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
// Turn capslock on
PORTB |= (1<<2);
} else {
// Turn capslock off
PORTB &= ~(1<<2);
}
}

102
keyboards/satan/satan.c
View file

@ -1,94 +1,30 @@
#include "satan.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
#endif
__attribute__ ((weak))
void matrix_init_user(void) {
// leave these blank
};
__attribute__ ((weak))
void matrix_scan_user(void) {
// leave these blank
};
#ifdef BACKLIGHT_ENABLE
void backlight_init_ports()
{
// Setup PB6 as output and output low.
DDRB |= (1<<6);
PORTB &= ~(1<<6);
// 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 PB6 = OCR1B (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(COM1B1) | _BV(WGM11); // = 0b00001010;
TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
backlight_init();
}
void backlight_set(uint8_t level)
{
// Prevent backlight blink on lowest level
PORTB &= ~(_BV(PORTB6));
if ( level == 0 )
{
// Turn off PWM control on PB6, revert to output low.
TCCR1A &= ~(_BV(COM1B1));
OCR1B = 0x0;
}
else if ( level == BACKLIGHT_LEVELS )
{
// Turn on PWM control of PB6
TCCR1A |= _BV(COM1B1);
// Set the brightness
OCR1B = 0xFFFF;
}
else
{
// Turn on PWM control of PB6
TCCR1A |= _BV(COM1B1);
// Set the brightness
OCR1B = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2));
}
}
#endif
#include "led.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
if (matrix_init_user) {
(*matrix_init_user)();
}
matrix_init_user();
led_init_ports();
#ifdef BACKLIGHT_ENABLE
backlight_init_ports();
#endif
};
void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
if (matrix_scan_user) {
(*matrix_scan_user)();
}
};
matrix_scan_user();
};
void led_init_ports(void) {
// * Set our LED pins as output
DDRB |= (1<<2);
}
void led_set_kb(uint8_t usb_led) {
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
// Turn capslock on
PORTB |= (1<<2);
} else {
// Turn capslock off
PORTB &= ~(1<<2);
}
}

5
keyboards/satan/satan.h
View file

@ -1,10 +1,7 @@
#ifndef SATAN_H
#define SATAN_H
#include "matrix.h"
#include "keymap.h"
#include <stddef.h>
#include "action_util.h"
#include "quantum.h"
/* Clueboard matrix layout
* ,-----------------------------------------------------------.