Skip to content

Commit

Permalink
astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@sterisa
sterisa committed Oct 25, 2024
1 parent 1a69d86 commit ea7d615
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
48 changes: 24 additions & 24 deletions led_strip/src/led_strip_rmt_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ static esp_err_t led_strip_rmt_set_pixel(led_strip_t *strip, uint32_t index, uin
ESP_RETURN_ON_FALSE(index < rmt_strip->strip_len, ESP_ERR_INVALID_ARG, TAG, "index out of maximum number of LEDs");
uint32_t start = index * rmt_strip->bytes_per_pixel;
switch(rmt_strip->led_pixel_format) {
case LED_PIXEL_FORMAT_GRBW:
rmt_strip->pixel_buf[start + 3] = 0;
// fall through
case LED_PIXEL_FORMAT_GRB:
rmt_strip->pixel_buf[start + 0] = green & 0xFF;
rmt_strip->pixel_buf[start + 1] = red & 0xFF;
rmt_strip->pixel_buf[start + 2] = blue & 0xFF;
break;
case LED_PIXEL_FORMAT_RGB:
rmt_strip->pixel_buf[start + 0] = red & 0xFF;
rmt_strip->pixel_buf[start + 1] = green & 0xFF;
rmt_strip->pixel_buf[start + 2] = blue & 0xFF;
break;
default:
assert(false);
case LED_PIXEL_FORMAT_GRBW:
rmt_strip->pixel_buf[start + 3] = 0;
// fall through
case LED_PIXEL_FORMAT_GRB:
rmt_strip->pixel_buf[start + 0] = green & 0xFF;
rmt_strip->pixel_buf[start + 1] = red & 0xFF;
rmt_strip->pixel_buf[start + 2] = blue & 0xFF;
break;
case LED_PIXEL_FORMAT_RGB:
rmt_strip->pixel_buf[start + 0] = red & 0xFF;
rmt_strip->pixel_buf[start + 1] = green & 0xFF;
rmt_strip->pixel_buf[start + 2] = blue & 0xFF;
break;
default:
assert(false);
}
return ESP_OK;
}
Expand Down Expand Up @@ -113,15 +113,15 @@ esp_err_t led_strip_new_rmt_device(const led_strip_config_t *led_config, const l
ESP_GOTO_ON_FALSE(led_config->led_pixel_format < LED_PIXEL_FORMAT_INVALID, ESP_ERR_INVALID_ARG, err, TAG, "invalid led_pixel_format");
uint8_t bytes_per_pixel = 3;
switch(led_config->led_pixel_format) {
case LED_PIXEL_FORMAT_GRBW:
bytes_per_pixel = 4;
break;
case LED_PIXEL_FORMAT_GRB:
case LED_PIXEL_FORMAT_RGB:
bytes_per_pixel = 3;
break;
default:
assert(false);
case LED_PIXEL_FORMAT_GRBW:
bytes_per_pixel = 4;
break;
case LED_PIXEL_FORMAT_GRB:
case LED_PIXEL_FORMAT_RGB:
bytes_per_pixel = 3;
break;
default:
assert(false);
}
rmt_strip = calloc(1, sizeof(led_strip_rmt_obj) + led_config->max_leds * bytes_per_pixel);
ESP_GOTO_ON_FALSE(rmt_strip, ESP_ERR_NO_MEM, err, TAG, "no mem for rmt strip");
Expand Down
44 changes: 22 additions & 22 deletions led_strip/src/led_strip_spi_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ static esp_err_t led_strip_spi_set_pixel(led_strip_t *strip, uint32_t index, uin
uint32_t start = index * spi_strip->bytes_per_pixel * SPI_BYTES_PER_COLOR_BYTE;
memset(spi_strip->pixel_buf + start, 0, spi_strip->bytes_per_pixel * SPI_BYTES_PER_COLOR_BYTE);
switch(spi_strip->led_pixel_format) {
case LED_PIXEL_FORMAT_GRBW:
__led_strip_spi_bit(0, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 3]);
// fall through
case LED_PIXEL_FORMAT_GRB:
__led_strip_spi_bit(green, &spi_strip->pixel_buf[start]);
__led_strip_spi_bit(red, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE]);
__led_strip_spi_bit(blue, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 2]);
break;
case LED_PIXEL_FORMAT_RGB:
__led_strip_spi_bit(red, &spi_strip->pixel_buf[start]);
__led_strip_spi_bit(green, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE]);
__led_strip_spi_bit(blue, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 2]);
break;
default:
assert(false);
case LED_PIXEL_FORMAT_GRBW:
__led_strip_spi_bit(0, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 3]);
// fall through
case LED_PIXEL_FORMAT_GRB:
__led_strip_spi_bit(green, &spi_strip->pixel_buf[start]);
__led_strip_spi_bit(red, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE]);
__led_strip_spi_bit(blue, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 2]);
break;
case LED_PIXEL_FORMAT_RGB:
__led_strip_spi_bit(red, &spi_strip->pixel_buf[start]);
__led_strip_spi_bit(green, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE]);
__led_strip_spi_bit(blue, &spi_strip->pixel_buf[start + SPI_BYTES_PER_COLOR_BYTE * 2]);
break;
default:
assert(false);
}

return ESP_OK;
Expand Down Expand Up @@ -140,15 +140,15 @@ esp_err_t led_strip_new_spi_device(const led_strip_config_t *led_config, const l
ESP_GOTO_ON_FALSE(led_config->led_pixel_format < LED_PIXEL_FORMAT_INVALID, ESP_ERR_INVALID_ARG, err, TAG, "invalid led_pixel_format");
uint8_t bytes_per_pixel = 3;
switch(led_config->led_pixel_format) {
case LED_PIXEL_FORMAT_GRBW:
bytes_per_pixel = 4;
case LED_PIXEL_FORMAT_GRBW:
bytes_per_pixel = 4;
break;
case LED_PIXEL_FORMAT_GRB:
case LED_PIXEL_FORMAT_RGB:
bytes_per_pixel = 3;
case LED_PIXEL_FORMAT_GRB:
case LED_PIXEL_FORMAT_RGB:
bytes_per_pixel = 3;
break;
default:
assert(false);
default:
assert(false);
}
uint32_t mem_caps = MALLOC_CAP_DEFAULT;
if (spi_config->flags.with_dma) {
Expand Down

0 comments on commit ea7d615

Please sign in to comment.