diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-06-05 08:08:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 08:08:35 -0700 |
| commit | 770a3349bed397967dae159501ebc7a4ab1fadde (patch) | |
| tree | d03db6c80671c51f13e73364f454ddaab419e823 | |
| parent | c7c9f3e3cfc5e662a36edf67cd5dfe6b20d433a2 (diff) | |
Fix includes for pmw3360 driver (#13108)
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c | 13 | ||||
| -rw-r--r-- | keyboards/ploopyco/pmw3360.c | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c index 9b6d93207a..59e3495127 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c +++ b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c @@ -18,12 +18,12 @@ #ifdef POINTING_DEVICE_ENABLE +#include "wait.h" +#include "debug.h" +#include "print.h" #include "pmw3360.h" #include "pmw3360_firmware.h" -#ifdef CONSOLE_ENABLE -# include "print.h" -#endif bool _inBurst = false; #ifndef PMW_CPI @@ -36,10 +36,7 @@ bool _inBurst = false; # define ROTATIONAL_TRANSFORM_ANGLE 0x00 #endif -#ifdef CONSOLE_ENABLE void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); } -#endif - bool spi_start_adv(void) { bool status = spi_start(SPI_SS_PIN, false, 3, SPI_DIVISOR); @@ -173,9 +170,7 @@ bool pmw_check_signature(void) { report_pmw_t pmw_read_burst(void) { if (!_inBurst) { -#ifdef CONSOLE_ENABLE dprintf("burst on"); -#endif spi_write_adv(REG_Motion_Burst, 0x00); _inBurst = true; } @@ -200,14 +195,12 @@ report_pmw_t pmw_read_burst(void) { spi_stop(); -#ifdef CONSOLE_ENABLE print_byte(data.motion); print_byte(data.dx); print_byte(data.mdx); print_byte(data.dy); print_byte(data.mdy); dprintf("\n"); -#endif data.isMotion = (data.motion & 0x80) != 0; data.isOnSurface = (data.motion & 0x08) == 0; diff --git a/keyboards/ploopyco/pmw3360.c b/keyboards/ploopyco/pmw3360.c index 8007fecef6..5f9f72a9ec 100644 --- a/keyboards/ploopyco/pmw3360.c +++ b/keyboards/ploopyco/pmw3360.c @@ -16,13 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - +#include "wait.h" +#include "debug.h" +#include "print.h" #include "pmw3360.h" #include "pmw3360_firmware.h" -#ifdef CONSOLE_ENABLE -# include "print.h" -#endif bool _inBurst = false; #ifndef PMW_CPI @@ -35,9 +34,7 @@ bool _inBurst = false; # define ROTATIONAL_TRANSFORM_ANGLE 0x00 #endif -#ifdef CONSOLE_ENABLE void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); } -#endif bool spi_start_adv(void) { @@ -172,9 +169,7 @@ bool pmw_check_signature(void) { report_pmw_t pmw_read_burst(void) { if (!_inBurst) { -#ifdef CONSOLE_ENABLE dprintf("burst on"); -#endif spi_write_adv(REG_Motion_Burst, 0x00); _inBurst = true; } @@ -199,14 +194,12 @@ report_pmw_t pmw_read_burst(void) { spi_stop(); -#ifdef CONSOLE_ENABLE print_byte(data.motion); print_byte(data.dx); print_byte(data.mdx); print_byte(data.dy); print_byte(data.mdy); dprintf("\n"); -#endif data.isMotion = (data.motion & 0x80) != 0; data.isOnSurface = (data.motion & 0x08) == 0; |