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.

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

SPI Plugin - added APA102 #722

Merged
merged 49 commits into from Jun 3, 2015
Commits
Jump to file or symbol
Failed to load files and symbols.
+4 −8
Diff settings

Always

Just for now

Viewing a subset of changes. View all

fixed whitespaces

  • Loading branch information...
s-light committed Jun 2, 2015
commit e34375df9ea8d0c54c0f3f710c8a927332968951
View
@@ -525,7 +525,8 @@ void SPIOutput::IndividualAPA102Control(const DmxBuffer &buffer) {
const uint16_t output_length = APA102_START_FRAME_BYTES +
(m_pixel_count * APA102_SPI_BYTES_PER_PIXEL);
uint8_t *output = m_backend->Checkout(
m_output_number, output_length,
m_output_number,
output_length,
CalculateAPA102LatchBytes(m_pixel_count));
// only update SPI data if possible
@@ -567,11 +568,6 @@ void SPIOutput::IndividualAPA102Control(const DmxBuffer &buffer) {
void SPIOutput::CombinedAPA102Control(const DmxBuffer &buffer) {
// for Protocol details see IndividualAPA102Control
// calculate DMX-start-address
const uint16_t first_slot = m_start_address - 1; // 0 offset
@@ -582,12 +578,12 @@ void SPIOutput::CombinedAPA102Control(const DmxBuffer &buffer) {
return;
}
// get data for entire string length
const uint16_t output_length = APA102_START_FRAME_BYTES +
(m_pixel_count * APA102_SPI_BYTES_PER_PIXEL);
uint8_t *output = m_backend->Checkout(
m_output_number, output_length,
m_output_number,
output_length,
CalculateAPA102LatchBytes(m_pixel_count));

This comment has been minimized.

@nomis52

nomis52 Jun 1, 2015

Member

Please fix the indentation here.

@nomis52

nomis52 Jun 1, 2015

Member

Please fix the indentation here.

This comment has been minimized.

@s-light

s-light Jun 1, 2015

Contributor

sorry - i changed this after the comment from peternewman #722 (diff)
how should i line it up correctly? (its to long for one line)

@s-light

s-light Jun 1, 2015

Contributor

sorry - i changed this after the comment from peternewman #722 (diff)
how should i line it up correctly? (its to long for one line)

This comment has been minimized.

@nomis52

nomis52 Jun 2, 2015

Member

I'd do:

uint8_t *output = m_backend->Checkout(
m_output_number, output_length,
CalculateAPA102LatchBytes(m_pixel_count));

That's a 4 space indent for the 2nd and 3rd lines.

@nomis52

nomis52 Jun 2, 2015

Member

I'd do:

uint8_t *output = m_backend->Checkout(
m_output_number, output_length,
CalculateAPA102LatchBytes(m_pixel_count));

That's a 4 space indent for the 2nd and 3rd lines.

// only update SPI data if possible
ProTip! Use n and p to navigate between commits in a pull request.