Skip to content

Commit 6ecc0d1

Browse files
pre-commit-ci-lite[bot]pre-commit-ci-lite[bot]
authored
ci(pre-commit): Apply automatic fixes
1 parent 39897fd commit 6ecc0d1

File tree

7 files changed

+200
-210
lines changed

7 files changed

+200
-210
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,4 +397,4 @@ if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS
397397
endif()
398398
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
399399
maybe_add_component(espressif__network_provisioning)
400-
endif()
400+
endif()

‎cores/esp32/ColorFormat.c

+54-66
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@
2323
// define a clamp macro to substitute the std::clamp macro which is available from C++17 onwards
2424
#define clamp(a, min, max) ((a) < (min) ? (min) : ((a) > (max) ? (max) : (a)))
2525

26-
const espHsvColor_t HSV_BLACK = {0, 0, 0};
27-
const espHsvColor_t HSV_WHITE = {0, 0, 254};
28-
const espHsvColor_t HSV_RED = {0, 254, 254};
29-
const espHsvColor_t HSV_YELLOW = {42, 254, 254};
30-
const espHsvColor_t HSV_GREEN = {84, 254, 254};
31-
const espHsvColor_t HSV_CYAN = {127, 254, 254};
32-
const espHsvColor_t HSV_BLUE = {169, 254, 254};
26+
const espHsvColor_t HSV_BLACK = {0, 0, 0};
27+
const espHsvColor_t HSV_WHITE = {0, 0, 254};
28+
const espHsvColor_t HSV_RED = {0, 254, 254};
29+
const espHsvColor_t HSV_YELLOW = {42, 254, 254};
30+
const espHsvColor_t HSV_GREEN = {84, 254, 254};
31+
const espHsvColor_t HSV_CYAN = {127, 254, 254};
32+
const espHsvColor_t HSV_BLUE = {169, 254, 254};
3333
const espHsvColor_t HSV_MAGENTA = {211, 254, 254};
3434

35-
const espRgbColor_t RGB_BLACK = {0, 0, 0};
36-
const espRgbColor_t RGB_WHITE = {255, 255, 255};
37-
const espRgbColor_t RGB_RED = {255, 0, 0};
38-
const espRgbColor_t RGB_YELLOW = {255, 255, 0};
39-
const espRgbColor_t RGB_GREEN = {0, 255, 0};
40-
const espRgbColor_t RGB_CYAN = {0, 255, 255};
41-
const espRgbColor_t RGB_BLUE = {0, 0, 255};
42-
const espRgbColor_t RGB_MAGENTA = {255, 0, 255};
35+
const espRgbColor_t RGB_BLACK = {0, 0, 0};
36+
const espRgbColor_t RGB_WHITE = {255, 255, 255};
37+
const espRgbColor_t RGB_RED = {255, 0, 0};
38+
const espRgbColor_t RGB_YELLOW = {255, 255, 0};
39+
const espRgbColor_t RGB_GREEN = {0, 255, 0};
40+
const espRgbColor_t RGB_CYAN = {0, 255, 255};
41+
const espRgbColor_t RGB_BLUE = {0, 0, 255};
42+
const espRgbColor_t RGB_MAGENTA = {255, 0, 255};
4343

4444
// main color temperature values
45-
const espCtColor_t COOL_WHITE_COLOR_TEMPERATURE = { 142 };
46-
const espCtColor_t DAYLIGHT_WHITE_COLOR_TEMPERATURE = { 181 };
47-
const espCtColor_t WHITE_COLOR_TEMPERATURE = { 250 };
48-
const espCtColor_t SOFT_WHITE_COLOR_TEMPERATURE = { 370 };
49-
const espCtColor_t WARM_WHITE_COLOR_TEMPERATURE = { 454 };
45+
const espCtColor_t COOL_WHITE_COLOR_TEMPERATURE = {142};
46+
const espCtColor_t DAYLIGHT_WHITE_COLOR_TEMPERATURE = {181};
47+
const espCtColor_t WHITE_COLOR_TEMPERATURE = {250};
48+
const espCtColor_t SOFT_WHITE_COLOR_TEMPERATURE = {370};
49+
const espCtColor_t WARM_WHITE_COLOR_TEMPERATURE = {454};
5050

5151
espRgbColor_t espHsvToRgbColor(uint16_t h, uint8_t s, uint8_t v) {
5252
espHsvColor_t hsv = {h, s, v};
@@ -56,44 +56,32 @@ espRgbColor_t espHsvToRgbColor(uint16_t h, uint8_t s, uint8_t v) {
5656
espRgbColor_t espHsvColorToRgbColor(espHsvColor_t hsv) {
5757
espRgbColor_t rgb;
5858

59-
uint8_t region, p, q, t;
60-
uint32_t h, s, v, remainder;
59+
uint8_t region, p, q, t;
60+
uint32_t h, s, v, remainder;
6161

62-
if (hsv.s == 0) {
63-
rgb.r = rgb.g = rgb.b = hsv.v;
64-
} else {
65-
h = hsv.h;
66-
s = hsv.s;
67-
v = hsv.v;
68-
69-
region = h / 43;
70-
remainder = (h - (region * 43)) * 6;
71-
p = (v * (255 - s)) >> 8;
72-
q = (v * (255 - ((s * remainder) >> 8))) >> 8;
73-
t = (v * (255 - ((s * (255 - remainder)) >> 8))) >> 8;
74-
switch (region) {
75-
case 0:
76-
rgb.r = v, rgb.g = t, rgb.b = p;
77-
break;
78-
case 1:
79-
rgb.r = q, rgb.g = v, rgb.b = p;
80-
break;
81-
case 2:
82-
rgb.r = p, rgb.g = v, rgb.b = t;
83-
break;
84-
case 3:
85-
rgb.r = p, rgb.g = q, rgb.b = v;
86-
break;
87-
case 4:
88-
rgb.r = t, rgb.g = p, rgb.b = v;
89-
break;
90-
case 5:
91-
default:
92-
rgb.r = v, rgb.g = p, rgb.b = q;
93-
break;
94-
}
62+
if (hsv.s == 0) {
63+
rgb.r = rgb.g = rgb.b = hsv.v;
64+
} else {
65+
h = hsv.h;
66+
s = hsv.s;
67+
v = hsv.v;
68+
69+
region = h / 43;
70+
remainder = (h - (region * 43)) * 6;
71+
p = (v * (255 - s)) >> 8;
72+
q = (v * (255 - ((s * remainder) >> 8))) >> 8;
73+
t = (v * (255 - ((s * (255 - remainder)) >> 8))) >> 8;
74+
switch (region) {
75+
case 0: rgb.r = v, rgb.g = t, rgb.b = p; break;
76+
case 1: rgb.r = q, rgb.g = v, rgb.b = p; break;
77+
case 2: rgb.r = p, rgb.g = v, rgb.b = t; break;
78+
case 3: rgb.r = p, rgb.g = q, rgb.b = v; break;
79+
case 4: rgb.r = t, rgb.g = p, rgb.b = v; break;
80+
case 5:
81+
default: rgb.r = v, rgb.g = p, rgb.b = q; break;
9582
}
96-
return rgb;
83+
}
84+
return rgb;
9785
}
9886

9987
espHsvColor_t espRgbToHsvColor(uint8_t r, uint8_t g, uint8_t b) {
@@ -110,22 +98,22 @@ espHsvColor_t espRgbColorToHsvColor(espRgbColor_t rgb) {
11098

11199
hsv.v = rgbMax;
112100
if (hsv.v == 0) {
113-
hsv.h = 0;
114-
hsv.s = 0;
115-
return hsv;
101+
hsv.h = 0;
102+
hsv.s = 0;
103+
return hsv;
116104
}
117105

118106
hsv.s = 255 * (rgbMax - rgbMin) / hsv.v;
119107
if (hsv.s == 0) {
120-
hsv.h = 0;
121-
return hsv;
108+
hsv.h = 0;
109+
return hsv;
122110
}
123111
if (rgbMax == rgb.r) {
124-
hsv.h = 0 + 43 * (rgb.g - rgb.b) / (rgbMax - rgbMin);
112+
hsv.h = 0 + 43 * (rgb.g - rgb.b) / (rgbMax - rgbMin);
125113
} else if (rgbMax == rgb.g) {
126-
hsv.h = 85 + 43 * (rgb.b - rgb.r) / (rgbMax - rgbMin);
114+
hsv.h = 85 + 43 * (rgb.b - rgb.r) / (rgbMax - rgbMin);
127115
} else {
128-
hsv.h = 171 + 43 * (rgb.r - rgb.g) / (rgbMax - rgbMin);
116+
hsv.h = 171 + 43 * (rgb.r - rgb.g) / (rgbMax - rgbMin);
129117
}
130118
return hsv;
131119
}
@@ -194,7 +182,7 @@ espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t curren
194182
return rgb;
195183
}
196184

197-
espXyColor_t espRgbToXYColor(uint8_t r, uint8_t g, uint8_t b){
185+
espXyColor_t espRgbToXYColor(uint8_t r, uint8_t g, uint8_t b) {
198186
espRgbColor_t rgb = {r, g, b};
199187
return espRgbColorToXYColor(rgb);
200188
}
@@ -242,7 +230,7 @@ espXyColor_t espRgbColorToXYColor(espRgbColor_t rgb) {
242230
return xy;
243231
}
244232

245-
espRgbColor_t espCTToRgbColor(uint16_t ct){
233+
espRgbColor_t espCTToRgbColor(uint16_t ct) {
246234
espCtColor_t ctColor = {ct};
247235
return espCTColorToRgbColor(ctColor);
248236
}

‎cores/esp32/ColorFormat.h

+12-11
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ extern "C" {
2424
#endif
2525

2626
struct RgbColor_t {
27-
uint8_t r;
28-
uint8_t g;
29-
uint8_t b;
27+
uint8_t r;
28+
uint8_t g;
29+
uint8_t b;
3030
};
3131

3232
struct HsvColor_t {
33-
uint16_t h;
34-
uint8_t s;
35-
uint8_t v;
33+
uint16_t h;
34+
uint8_t s;
35+
uint8_t v;
3636
};
3737

3838
struct XyColor_t {
39-
uint16_t x;
40-
uint16_t y;
39+
uint16_t x;
40+
uint16_t y;
4141
};
4242

4343
struct CtColor_t {
@@ -51,8 +51,8 @@ typedef struct CtColor_t espCtColor_t;
5151

5252
espRgbColor_t espXYToRgbColor(uint8_t Level, uint16_t current_X, uint16_t current_Y);
5353
espRgbColor_t espXYColorToRgb(uint8_t Level, espXyColor_t xy);
54-
espXyColor_t espRgbColorToXYColor(espRgbColor_t rgb);
55-
espXyColor_t espRgbToXYColor(uint8_t r, uint8_t g, uint8_t b);
54+
espXyColor_t espRgbColorToXYColor(espRgbColor_t rgb);
55+
espXyColor_t espRgbToXYColor(uint8_t r, uint8_t g, uint8_t b);
5656
espRgbColor_t espHsvColorToRgbColor(espHsvColor_t hsv);
5757
espRgbColor_t espHsvToRgbColor(uint16_t h, uint8_t s, uint8_t v);
5858
espRgbColor_t espCTColorToRgbColor(espCtColor_t ct);
@@ -61,7 +61,8 @@ espHsvColor_t espRgbColorToHsvColor(espRgbColor_t rgb);
6161
espHsvColor_t espRgbToHsvColor(uint8_t r, uint8_t g, uint8_t b);
6262

6363
extern const espHsvColor_t HSV_BLACK, HSV_WHITE, HSV_RED, HSV_YELLOW, HSV_GREEN, HSV_CYAN, HSV_BLUE, HSV_MAGENTA;
64-
extern const espCtColor_t COOL_WHITE_COLOR_TEMPERATURE, DAYLIGHT_WHITE_COLOR_TEMPERATURE, WHITE_COLOR_TEMPERATURE, SOFT_WHITE_COLOR_TEMPERATURE, WARM_WHITE_COLOR_TEMPERATURE;
64+
extern const espCtColor_t COOL_WHITE_COLOR_TEMPERATURE, DAYLIGHT_WHITE_COLOR_TEMPERATURE, WHITE_COLOR_TEMPERATURE, SOFT_WHITE_COLOR_TEMPERATURE,
65+
WARM_WHITE_COLOR_TEMPERATURE;
6566
extern const espRgbColor_t RGB_BLACK, RGB_WHITE, RGB_RED, RGB_YELLOW, RGB_GREEN, RGB_CYAN, RGB_BLUE, RGB_MAGENTA;
6667

6768
#ifdef __cplusplus

‎libraries/Matter/examples/Matter_ColorLight/Matter_ColorLight.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ void setup() {
118118
if (Matter.isDeviceCommissioned()) {
119119
Serial.println("Matter Node is commissioned and connected to Wi-Fi. Ready for use.");
120120
Serial.printf(
121-
"Initial state: %s | RGB Color: (%d,%d,%d) \r\n", ColorLight ? "ON" : "OFF",
122-
ColorLight.getColorRGB().r, ColorLight.getColorRGB().g, ColorLight.getColorRGB().b
121+
"Initial state: %s | RGB Color: (%d,%d,%d) \r\n", ColorLight ? "ON" : "OFF", ColorLight.getColorRGB().r, ColorLight.getColorRGB().g,
122+
ColorLight.getColorRGB().b
123123
);
124124
// configure the Light based on initial on-off state and its color
125125
ColorLight.updateAccessory();
@@ -149,8 +149,8 @@ void loop() {
149149
}
150150
}
151151
Serial.printf(
152-
"Initial state: %s | RGB Color: (%d,%d,%d) \r\n", ColorLight ? "ON" : "OFF",
153-
ColorLight.getColorRGB().r, ColorLight.getColorRGB().g, ColorLight.getColorRGB().b
152+
"Initial state: %s | RGB Color: (%d,%d,%d) \r\n", ColorLight ? "ON" : "OFF", ColorLight.getColorRGB().r, ColorLight.getColorRGB().g,
153+
ColorLight.getColorRGB().b
154154
);
155155
// configure the Light based on initial on-off state and its color
156156
ColorLight.updateAccessory();

‎libraries/Matter/examples/Matter_ColorLight/ci.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{
2-
"fqbn_append": "PartitionScheme=huge_app",
3-
"requires": [
4-
"CONFIG_SOC_WIFI_SUPPORTED=y",
5-
"CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
6-
]
7-
}
1+
{
2+
"fqbn_append": "PartitionScheme=huge_app",
3+
"requires": [
4+
"CONFIG_SOC_WIFI_SUPPORTED=y",
5+
"CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
6+
]
7+
}

0 commit comments

Comments
 (0)