Compare commits

...

4 Commits

Author SHA1 Message Date
QMK Bot
e09c243a6e Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 22:34:53 +00:00
Joel Challis
5b0bd553b3
Delete config_common.h (#20312) 2023-04-01 23:34:13 +01:00
QMK Bot
65c09d6821 Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 18:02:22 +00:00
Drashna Jaelre
bf986579dd
Fixup Pointing device functions (#20311) 2023-04-01 19:01:46 +01:00
8 changed files with 15 additions and 34 deletions

View File

@ -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:
```c
void pointing_device_task(void) {
bool pointing_device_task(void) {
//...Custom pointing device task code
// 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
pointing_device_send();
return pointing_device_send();
}
```

View File

@ -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); }
void pointing_device_task(void) {
bool pointing_device_task(void) {
static bool debounce;
static uint16_t debounce_timer;
uint8_t state[5] = {};
@ -173,5 +173,5 @@ void pointing_device_task(void) {
update_member(&mouse.v, &h_offset);
#endif
pointing_device_set_report(mouse);
pointing_device_send();
return pointing_device_send();
}

View File

@ -43,7 +43,7 @@ uint8_t readRegister(uint8_t address) {
return data;
}
void pointing_device_task(void){
bool pointing_device_task(void){
uint8_t motion = readRegister(0x02);
// Motion has occurred on the trackpad
@ -73,6 +73,6 @@ void pointing_device_task(void){
}
pointing_device_set_report(currentReport);
pointing_device_send();
}
return pointing_device_send();
}

View File

@ -2,7 +2,7 @@
//#include "uart.h"
void pointing_device_task(void){
bool pointing_device_task(void){
/*report_mouse_t currentReport = {};
uint32_t timeout = 0;
@ -56,7 +56,7 @@ void pointing_device_task(void){
} else {
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
}*/
pointing_device_send();
return pointing_device_send();
}
void led_init(void) {

View File

@ -2,7 +2,7 @@
#include "pointing_device.h"
#include "report.h"
void pointing_device_task(void){
bool pointing_device_task(void){
/*report_mouse_t currentReport = {};
uint32_t timeout = 0;
@ -56,7 +56,7 @@ void pointing_device_task(void){
} else {
xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
}*/
pointing_device_send();
return pointing_device_send();
}
void led_init(void) {

View File

@ -237,7 +237,7 @@ motion_delta_t readSensor(void) {
return delta;
}
void pointing_device_task(void) {
bool pointing_device_task(void) {
motion_delta_t delta = readSensor();
report_mouse_t report = pointing_device_get_report();
@ -250,5 +250,5 @@ void pointing_device_task(void) {
}
pointing_device_set_report(report);
pointing_device_send();
return pointing_device_send();
}

View File

@ -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_task(void) {
bool pointing_device_task(void) {
report_mouse_t report = pointing_device_get_report();
if (!isLeftHand) {
@ -191,5 +191,5 @@ void pointing_device_task(void) {
}
pointing_device_set_report(report);
pointing_device_send();
return pointing_device_send();
}

View File

@ -1,19 +0,0 @@
/* Copyright 2015-2018 Jack Humbert
*
* 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/>.
*/
#pragma once
#pragma message("'config_common.h' should no longer be included!")