drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

Browse source
This commit is contained in:
Jack Humbert 2016-11-28 23:51:07 -05:00
commit 6e0f994950
22 changed files with 1415 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tmk_core/common/avr/suspend.c
View file

@ -47,6 +47,7 @@ void suspend_idle(uint8_t time)
sleep_disable();
}
#ifndef NO_SUSPEND_POWER_DOWN
/* Power down MCU with watchdog timer
* wdto: watchdog timer timeout defined in <avr/wdt.h>
* WDTO_15MS
@ -61,6 +62,7 @@ void suspend_idle(uint8_t time)
* WDTO_8S
*/
static uint8_t wdt_timeout = 0;
static void power_down(uint8_t wdto)
{
#ifdef PROTOCOL_LUFA
@ -98,19 +100,19 @@ static void power_down(uint8_t wdto)
// Disable watchdog after sleep
wdt_disable();
}
#endif
void suspend_power_down(void)
{
#ifndef NO_SUSPEND_POWER_DOWN
power_down(WDTO_15MS);
#endif
}
__attribute__ ((weak)) void matrix_power_up(void) {}
__attribute__ ((weak)) void matrix_power_down(void) {}
bool suspend_wakeup_condition(void)
{
#ifdef BACKLIGHT_ENABLE
backlight_set(0);
#endif
matrix_power_up();
matrix_scan();
matrix_power_down();
@ -126,10 +128,9 @@ void suspend_wakeup_init(void)
// clear keyboard state
clear_keyboard();
#ifdef BACKLIGHT_ENABLE
backlight_set(0);
backlight_init();
#endif
led_set(host_keyboard_leds());
led_set(host_keyboard_leds());
}
#ifndef NO_SUSPEND_POWER_DOWN

4
tmk_core/common/backlight.c
View file

@ -36,9 +36,9 @@ void backlight_increase(void)
if(backlight_config.level < BACKLIGHT_LEVELS)
{
backlight_config.level++;
backlight_config.enable = 1;
eeconfig_update_backlight(backlight_config.raw);
}
backlight_config.enable = 1;
eeconfig_update_backlight(backlight_config.raw);
dprintf("backlight increase: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}

5
tmk_core/protocol/ps2_mouse.c
View file

@ -26,6 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "print.h"
#include "debug.h"
#ifndef PS2_INIT_DELAY
#define PS2_INIT_DELAY 1000
#endif
static report_mouse_t mouse_report = {};
@ -39,7 +42,7 @@ uint8_t ps2_mouse_init(void) {
ps2_host_init();
_delay_ms(1000); // wait for powering up
_delay_ms(PS2_INIT_DELAY); // wait for powering up
// send Reset
rcv = ps2_host_send(0xFF);