g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CTRL/ALT keyboard does not wake computer from sleep 

Fix for Massdrop CTRL and ALT keyboards not waking computer from sleep
master
patrickmt 2018-10-30 12:23:57 -04:00 committed by Drashna Jaelre
parent f1529e74c4
commit 563fe23e53
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tmk_core/protocol/arm_atsam/main_arm_atsam.c
View File

@ -62,6 +62,12 @@ void send_keyboard(report_keyboard_t *report)
{ {
uint32_t irqflags; uint32_t irqflags;
if (usb_state == USB_STATE_POWERDOWN)
{
udc_remotewakeup();
return;
}
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (!keymap_config.nkro) if (!keymap_config.nkro)
{ {
@ -156,25 +162,27 @@ void send_consumer(uint16_t data)
} }
uint8_t g_drvid; uint8_t g_drvid;
uint8_t g_usb_sleeping = 0;
void main_subtask_usb_state(void) void main_subtask_usb_state(void)
{ {
if (usb_state == USB_STATE_POWERDOWN) if (usb_state == USB_STATE_POWERDOWN)
{ {
uint32_t timer_led = timer_read32(); if (!g_usb_sleeping)
led_on;
if (led_enabled)
{ {
for (g_drvid = 0; g_drvid < ISSI3733_DRIVER_COUNT; g_drvid++) g_usb_sleeping = 1;
if (led_enabled)
{ {
I2C3733_Control_Set(0); for (g_drvid = 0; g_drvid < ISSI3733_DRIVER_COUNT; g_drvid++)
{
I2C3733_Control_Set(0);
}
} }
} }
while (usb_state == USB_STATE_POWERDOWN) }
{ else if (g_usb_sleeping)
if (timer_read32() - timer_led > 1000) led_off; //Good to indicate went to sleep, but only for a second {
} g_usb_sleeping = 0;
if (led_enabled) if (led_enabled)
{ {
for (g_drvid = 0; g_drvid < ISSI3733_DRIVER_COUNT; g_drvid++) for (g_drvid = 0; g_drvid < ISSI3733_DRIVER_COUNT; g_drvid++)
@ -182,12 +190,12 @@ void main_subtask_usb_state(void)
I2C3733_Control_Set(1); I2C3733_Control_Set(1);
} }
} }
led_off;
} }
} }
void main_subtask_led(void) void main_subtask_led(void)
{ {
if (g_usb_sleeping) return;
led_matrix_task(); led_matrix_task();
} }

2
tmk_core/protocol/arm_atsam/usb/udc.h
View File

@ -210,7 +210,7 @@ static inline void udc_detach(void)
/*! \brief The USB driver sends a resume signal called \e "Upstream Resume" /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
* This is authorized only when the remote wakeup feature is enabled by host. * This is authorized only when the remote wakeup feature is enabled by host.
*/ */
static inline void udc_remotewakeup(void) inline void udc_remotewakeup(void)
{ {
udd_send_remotewakeup(); udd_send_remotewakeup();
} }