Skip to content

Commit d15b597

Browse files
clang-format, bump version
1 parent 67cd55d commit d15b597

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit Protomatter
2-
version=1.5.10
2+
version=1.6.0
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=A library for Adafruit RGB LED matrices.

src/core.c

+11-13
Original file line numberDiff line numberDiff line change
@@ -924,9 +924,7 @@ static void _PM_resetFM6126A(Protomatter_core *core) {
924924

925925
uint8_t _PM_duty = _PM_defaultDuty;
926926

927-
void _PM_setDuty(uint8_t d) {
928-
_PM_duty = (d > _PM_maxDuty) ? _PM_maxDuty : d;
929-
}
927+
void _PM_setDuty(uint8_t d) { _PM_duty = (d > _PM_maxDuty) ? _PM_maxDuty : d; }
930928

931929
#if defined(ARDUINO) || defined(CIRCUITPY)
932930

@@ -962,7 +960,7 @@ __attribute__((noinline)) void _PM_convert_565_byte(Protomatter_core *core,
962960
dest += core->bufferSize * (1 - core->activeBuffer);
963961
}
964962

965-
//#if defined(_PM_portToggleRegister)
963+
// #if defined(_PM_portToggleRegister)
966964
#if defined(_PM_USE_TOGGLE_FORMAT)
967965
#if !defined(_PM_STRICT_32BIT_IO)
968966
// core->clockMask mask is already an 8-bit value
@@ -1022,7 +1020,7 @@ __attribute__((noinline)) void _PM_convert_565_byte(Protomatter_core *core,
10221020
uint32_t greenBit = initialGreenBit;
10231021
uint32_t blueBit = initialBlueBit;
10241022
for (uint8_t plane = 0; plane < core->numPlanes; plane++) {
1025-
//#if defined(_PM_portToggleRegister)
1023+
// #if defined(_PM_portToggleRegister)
10261024
#if defined(_PM_USE_TOGGLE_FORMAT)
10271025
uint8_t prior = clockMask; // Set clock bit on 1st out
10281026
#endif
@@ -1068,7 +1066,7 @@ __attribute__((noinline)) void _PM_convert_565_byte(Protomatter_core *core,
10681066
if (lowerRGB & blueBit)
10691067
result |= pinMask[5];
10701068
// THIS is where toggle format (without toggle reg.) messes up
1071-
//#if defined(_PM_portToggleRegister)
1069+
// #if defined(_PM_portToggleRegister)
10721070
#if defined(_PM_USE_TOGGLE_FORMAT)
10731071
*d2++ = result ^ prior;
10741072
prior = result | clockMask; // Set clock bit on next out
@@ -1090,7 +1088,7 @@ __attribute__((noinline)) void _PM_convert_565_byte(Protomatter_core *core,
10901088
redBit = 0b0000100000000000;
10911089
blueBit = 0b0000000000000001;
10921090
}
1093-
//#if defined(_PM_portToggleRegister)
1091+
// #if defined(_PM_portToggleRegister)
10941092
#if defined(_PM_USE_TOGGLE_FORMAT)
10951093
// If using bit-toggle register, erase the toggle bit on the
10961094
// first element of each bitplane & row pair. The matrix-driving
@@ -1141,7 +1139,7 @@ void _PM_convert_565_word(Protomatter_core *core, uint16_t *source,
11411139
// register exists, "clear" really means the clock mask is set in all
11421140
// but the first element on a scanline (per bitplane). If no toggle
11431141
// register, can just zero everything out.
1144-
//#if defined(_PM_portToggleRegister)
1142+
// #if defined(_PM_portToggleRegister)
11451143
#if defined(_PM_USE_TOGGLE_FORMAT)
11461144
// No per-chain loop is required; one clock bit handles all chains
11471145
uint32_t offset = 0; // Current position in the 'dest' buffer
@@ -1166,7 +1164,7 @@ void _PM_convert_565_word(Protomatter_core *core, uint16_t *source,
11661164
uint32_t greenBit = initialGreenBit;
11671165
uint32_t blueBit = initialBlueBit;
11681166
for (uint8_t plane = 0; plane < core->numPlanes; plane++) {
1169-
//#if defined(_PM_portToggleRegister)
1167+
// #if defined(_PM_portToggleRegister)
11701168
#if defined(_PM_USE_TOGGLE_FORMAT)
11711169
// Since we're ORing in bits over an existing clock bit,
11721170
// prior is 0 rather than clockMask as in the byte case.
@@ -1215,7 +1213,7 @@ void _PM_convert_565_word(Protomatter_core *core, uint16_t *source,
12151213
result |= pinMask[5];
12161214
// Main difference here vs byte converter is each chain
12171215
// ORs new bits into place (vs single-pass overwrite).
1218-
//#if defined(_PM_portToggleRegister)
1216+
// #if defined(_PM_portToggleRegister)
12191217
#if defined(_PM_USE_TOGGLE_FORMAT)
12201218
*d2++ |= result ^ prior; // Bitwise OR
12211219
prior = result;
@@ -1268,7 +1266,7 @@ void _PM_convert_565_long(Protomatter_core *core, uint16_t *source,
12681266
initialBlueBit = 0b0000000000000001 << shiftLeft;
12691267
}
12701268

1271-
//#if defined(_PM_portToggleRegister)
1269+
// #if defined(_PM_portToggleRegister)
12721270
#if defined(_PM_USE_TOGGLE_FORMAT)
12731271
// No per-chain loop is required; one clock bit handles all chains
12741272
uint32_t offset = 0; // Current position in the 'dest' buffer
@@ -1292,7 +1290,7 @@ void _PM_convert_565_long(Protomatter_core *core, uint16_t *source,
12921290
uint32_t greenBit = initialGreenBit;
12931291
uint32_t blueBit = initialBlueBit;
12941292
for (uint8_t plane = 0; plane < core->numPlanes; plane++) {
1295-
//#if defined(_PM_portToggleRegister)
1293+
// #if defined(_PM_portToggleRegister)
12961294
#if defined(_PM_USE_TOGGLE_FORMAT)
12971295
uint32_t prior = 0;
12981296
#endif
@@ -1339,7 +1337,7 @@ void _PM_convert_565_long(Protomatter_core *core, uint16_t *source,
13391337
result |= pinMask[5];
13401338
// Main difference here vs byte converter is each chain
13411339
// ORs new bits into place (vs single-pass overwrite).
1342-
//#if defined(_PM_portToggleRegister)
1340+
// #if defined(_PM_portToggleRegister)
13431341
#if defined(_PM_USE_TOGGLE_FORMAT)
13441342
*d2++ |= result ^ prior; // Bitwise OR
13451343
prior = result;

0 commit comments

Comments
 (0)