Fixup Pointing device functions (#20311)
This commit is contained in:
		
							parent
							
								
									9359504255
								
							
						
					
					
						commit
						bf986579dd
					
				
					 7 changed files with 15 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -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();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -237,11 +237,11 @@ 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();
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
    if(delta.motion_ind) {
 | 
			
		||||
        // clamp deltas from -127 to 127
 | 
			
		||||
        report.x = delta.delta_x < -127 ? -127 : delta.delta_x > 127 ? 127 : delta.delta_x;
 | 
			
		||||
| 
						 | 
				
			
			@ -250,5 +250,5 @@ void pointing_device_task(void) {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
    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_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();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue