mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-14 05:40:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
65c09d6821
@ -713,7 +713,7 @@ _Note: The Cirque pinnacle track pad already implements a custom activation func
|
|||||||
When using a custom pointing device (overwriting `pointing_device_task`) the following code should be somewhere in the `pointing_device_task_*` stack:
|
When using a custom pointing device (overwriting `pointing_device_task`) the following code should be somewhere in the `pointing_device_task_*` stack:
|
||||||
|
|
||||||
```c
|
```c
|
||||||
void pointing_device_task(void) {
|
bool pointing_device_task(void) {
|
||||||
//...Custom pointing device task code
|
//...Custom pointing device task code
|
||||||
|
|
||||||
// handle automatic mouse layer (needs report_mouse_t as input)
|
// handle automatic mouse layer (needs report_mouse_t as input)
|
||||||
@ -721,7 +721,7 @@ void pointing_device_task(void) {
|
|||||||
|
|
||||||
//...More custom pointing device task code
|
//...More custom pointing device task code
|
||||||
|
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ void trackball_set_scrolling(bool scroll) { scrolling = scroll; }
|
|||||||
|
|
||||||
__attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x80, 0x00, 0x00, 0x00); }
|
__attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x80, 0x00, 0x00, 0x00); }
|
||||||
|
|
||||||
void pointing_device_task(void) {
|
bool pointing_device_task(void) {
|
||||||
static bool debounce;
|
static bool debounce;
|
||||||
static uint16_t debounce_timer;
|
static uint16_t debounce_timer;
|
||||||
uint8_t state[5] = {};
|
uint8_t state[5] = {};
|
||||||
@ -173,5 +173,5 @@ void pointing_device_task(void) {
|
|||||||
update_member(&mouse.v, &h_offset);
|
update_member(&mouse.v, &h_offset);
|
||||||
#endif
|
#endif
|
||||||
pointing_device_set_report(mouse);
|
pointing_device_set_report(mouse);
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ uint8_t readRegister(uint8_t address) {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pointing_device_task(void){
|
bool pointing_device_task(void){
|
||||||
uint8_t motion = readRegister(0x02);
|
uint8_t motion = readRegister(0x02);
|
||||||
|
|
||||||
// Motion has occurred on the trackpad
|
// Motion has occurred on the trackpad
|
||||||
@ -73,6 +73,6 @@ void pointing_device_task(void){
|
|||||||
}
|
}
|
||||||
|
|
||||||
pointing_device_set_report(currentReport);
|
pointing_device_set_report(currentReport);
|
||||||
pointing_device_send();
|
|
||||||
}
|
}
|
||||||
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
//#include "uart.h"
|
//#include "uart.h"
|
||||||
|
|
||||||
void pointing_device_task(void){
|
bool pointing_device_task(void){
|
||||||
/*report_mouse_t currentReport = {};
|
/*report_mouse_t currentReport = {};
|
||||||
uint32_t timeout = 0;
|
uint32_t timeout = 0;
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ void pointing_device_task(void){
|
|||||||
} else {
|
} else {
|
||||||
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
|
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
|
||||||
}*/
|
}*/
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
|
||||||
void led_init(void) {
|
void led_init(void) {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#include "pointing_device.h"
|
#include "pointing_device.h"
|
||||||
#include "report.h"
|
#include "report.h"
|
||||||
|
|
||||||
void pointing_device_task(void){
|
bool pointing_device_task(void){
|
||||||
/*report_mouse_t currentReport = {};
|
/*report_mouse_t currentReport = {};
|
||||||
uint32_t timeout = 0;
|
uint32_t timeout = 0;
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ void pointing_device_task(void){
|
|||||||
} else {
|
} else {
|
||||||
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
|
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
|
||||||
}*/
|
}*/
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
|
||||||
void led_init(void) {
|
void led_init(void) {
|
||||||
|
@ -237,7 +237,7 @@ motion_delta_t readSensor(void) {
|
|||||||
return delta;
|
return delta;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pointing_device_task(void) {
|
bool pointing_device_task(void) {
|
||||||
motion_delta_t delta = readSensor();
|
motion_delta_t delta = readSensor();
|
||||||
|
|
||||||
report_mouse_t report = pointing_device_get_report();
|
report_mouse_t report = pointing_device_get_report();
|
||||||
@ -250,5 +250,5 @@ void pointing_device_task(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pointing_device_set_report(report);
|
pointing_device_set_report(report);
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
@ -146,7 +146,7 @@ void update_keycode_status(uint16_t keycode, bool last, bool current) {
|
|||||||
|
|
||||||
void pointing_device_init(void) { thumbstick_init(); }
|
void pointing_device_init(void) { thumbstick_init(); }
|
||||||
|
|
||||||
void pointing_device_task(void) {
|
bool pointing_device_task(void) {
|
||||||
report_mouse_t report = pointing_device_get_report();
|
report_mouse_t report = pointing_device_get_report();
|
||||||
|
|
||||||
if (!isLeftHand) {
|
if (!isLeftHand) {
|
||||||
@ -191,5 +191,5 @@ void pointing_device_task(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pointing_device_set_report(report);
|
pointing_device_set_report(report);
|
||||||
pointing_device_send();
|
return pointing_device_send();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user