max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2020-08-05 00:53:13 -04:00
commit df8e7d58d9
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tmk_core/common/host.h
View file

@ -32,6 +32,9 @@ extern "C" {
extern bool keyboard_nkro;
#endif
/* These parameters should be included into host driver also?
* keyboard_protocol: 0:Boot, 1:Report(default)
* keyboard_idle: idle rate in unit of 4ms */
extern uint8_t keyboard_idle;
extern uint8_t keyboard_protocol;

13
tmk_core/protocol/vusb/vusb.c
View file

@ -26,8 +26,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "vusb.h"
/* host.h */
uint8_t keyboard_protocol=1;
uint8_t keyboard_idle = 0;
static uint8_t vusb_keyboard_leds = 0;
static uint8_t vusb_idle_rate = 0;
/* Keyboard report send buffer */
#define KBUF_SIZE 16
@ -179,13 +182,13 @@ usbRequest_t *rq = (void *)data;
return sizeof(keyboard_report);
}else if(rq->bRequest == USBRQ_HID_GET_IDLE){
debug("GET_IDLE: ");
//debug_hex(vusb_idle_rate);
usbMsgPtr = &vusb_idle_rate;
//debug_hex(keyboard_idle);
usbMsgPtr = &keyboard_idle;
return 1;
}else if(rq->bRequest == USBRQ_HID_SET_IDLE){
vusb_idle_rate = rq->wValue.bytes[1];
keyboard_idle = rq->wValue.bytes[1];
debug("SET_IDLE: ");
debug_hex(vusb_idle_rate);
debug_hex(keyboard_idle);
}else if(rq->bRequest == USBRQ_HID_SET_REPORT){
debug("SET_REPORT: ");
// Report Type: 0x02(Out)/ReportID: 0x00(none) && Interface: 0(keyboard)