Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pwm3360 driver cleanup and diff reduction to adns9800 #15559

Merged
merged 2 commits into from
Dec 27, 2021
Merged

pwm3360 driver cleanup and diff reduction to adns9800 #15559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07c26fb
Diff reduction between ADNS9800 and PMW3360 drivers.
uqs Dec 23, 2021
b8b022a
Cleanup pwm3360 driver some more.
uqs Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions drivers/sensors/adns9800.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@
#define MSB1 0x80
// clang-format on

void adns9800_spi_start(void) { spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR); }
void adns9800_spi_start(void) {
spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR);
}

void adns9800_write(uint8_t reg_addr, uint8_t data) {
adns9800_spi_start();
Expand Down Expand Up @@ -154,8 +156,8 @@ void adns9800_init() {
}

config_adns9800_t adns9800_get_config(void) {
uint8_t config_1 = adns9800_read(REG_Configuration_I);
return (config_adns9800_t){(config_1 & 0xFF) * CPI_STEP};
uint8_t cpival = adns9800_read(REG_Configuration_I);
return (config_adns9800_t){(cpival & 0xFF) * CPI_STEP};
}

void adns9800_set_config(config_adns9800_t config) {
Expand All @@ -164,8 +166,8 @@ void adns9800_set_config(config_adns9800_t config) {
}

uint16_t adns9800_get_cpi(void) {
uint8_t config_1 = adns9800_read(REG_Configuration_I);
return (uint16_t){(config_1 & 0xFF) * CPI_STEP};
uint8_t cpival = adns9800_read(REG_Configuration_I);
return (uint16_t)(cpival & 0xFF) * CPI_STEP;
}

void adns9800_set_cpi(uint16_t cpi) {
Expand All @@ -184,7 +186,7 @@ static int16_t convertDeltaToInt(uint8_t high, uint8_t low) {
}

report_adns9800_t adns9800_get_report(void) {
report_adns9800_t report = {0, 0};
report_adns9800_t report = {0};

adns9800_spi_start();

Expand Down
Loading