Skip to content

Commit 666e951

Browse files
committed
fix: format code and fix bugs
1 parent 66065fc commit 666e951

File tree

7 files changed

+37
-36
lines changed

7 files changed

+37
-36
lines changed

frontend/compress.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const uint8_t GUI_HTML[] PROGMEM = {${addLineBreaks(output)}};
5151
5252
void startGui(AsyncWebServerRequest *request)
5353
{
54-
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", GUI_HTML, GUI_HTML_SIZE);
54+
AsyncWebServerResponse *response = request->beginResponse(200, "text/html", GUI_HTML, GUI_HTML_SIZE);
5555
response->addHeader("Content-Encoding", "gzip");
5656
request->send(response);
5757
}

platformio.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ default_envs = esp32dev
1313

1414
[env]
1515
framework = arduino
16-
lib_deps =
16+
lib_deps =
1717
esp32async/ESPAsyncWebServer @ ^3.7.10
1818
bblanchon/ArduinoJson @ ^6.21.5
1919
tzapu/WiFiManager @ ^2.0.17
@@ -63,7 +63,7 @@ monitor_filters = esp32_exception_decoder
6363
[env:nodemcuv2]
6464
board = nodemcuv2
6565
platform = espressif8266
66-
lib_deps =
66+
lib_deps =
6767
${env.lib_deps}
6868
vshymanskyy/Preferences @ ^2.1.0
6969
monitor_filters = esp8266_exception_decoder
@@ -73,7 +73,7 @@ board_build.f_cpu = 80000000L
7373
[env:d1_mini_pro-ota]
7474
board = d1_mini_pro
7575
platform = espressif8266
76-
lib_deps =
76+
lib_deps =
7777
${env.lib_deps}
7878
vshymanskyy/Preferences @ ^2.1.0
7979
monitor_filters = esp8266_exception_decoder

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#define WEBSERVER_H
88
#endif
99

10-
1110
#include <WiFiManager.h>
1211

1312
#ifdef ESP32
@@ -64,7 +63,8 @@ void connectToWiFi()
6463
{
6564
// if a WiFi setup AP was started, reboot is required to clear routes
6665
bool wifiWebServerStarted = false;
67-
wifiManager.setWebServerCallback([&wifiWebServerStarted]() { wifiWebServerStarted = true; });
66+
wifiManager.setWebServerCallback([&wifiWebServerStarted]()
67+
{ wifiWebServerStarted = true; });
6868

6969
wifiManager.setHostname(WIFI_HOSTNAME);
7070

src/plugins/ArtNet.cpp

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "plugins/ArtNet.h"
22

3-
void ArtNetPlugin::setup() {
3+
void ArtNetPlugin::setup()
4+
{
45
artnet.begin();
56
artnet.setArtDmxCallback(onDmxFrame);
67
Serial.print("ArtNet server listening at IP: ");
@@ -10,14 +11,14 @@ void ArtNetPlugin::setup() {
1011
artnet.setUniverse(1);
1112
Serial.print("Universe: ");
1213
Serial.println(artnet.getOutgoing());
13-
14-
1514
}
1615

17-
void ArtNetPlugin::teardown() {
16+
void ArtNetPlugin::teardown()
17+
{
1818
}
1919

20-
void ArtNetPlugin::loop() {
20+
void ArtNetPlugin::loop()
21+
{
2122
artnet.read();
2223
}
2324

@@ -26,30 +27,33 @@ const char *ArtNetPlugin::getName() const
2627
return "ArtNet";
2728
}
2829

29-
void ArtNetPlugin::onDmxFrame(uint16_t universe, uint16_t length, uint16_t outgoing, uint8_t* data) {
30+
void ArtNetPlugin::onDmxFrame(uint16_t universe, uint16_t length, uint16_t outgoing, uint8_t *data)
31+
{
3032
Serial.print("Universe: ");
3133
Serial.println(universe);
32-
if (universe == 0 || universe == outgoing) {
33-
for (int i=0; i < ROWS * COLS; i++) {
34-
Screen.setPixelAtIndex(i, data[i] > 4, data[i]);
34+
if (universe == 0 || universe == outgoing)
35+
{
36+
for (int i = 0; i < ROWS * COLS; i++)
37+
{
38+
Screen.setPixelAtIndex(i, data[i] > 4, data[i]);
3539
}
3640
}
3741
}
3842

3943
void ArtNetPlugin::websocketHook(DynamicJsonDocument &request)
4044
{
41-
const char *event = request["event"];
45+
const char *event = request["event"];
4246

43-
if (currentStatus == NONE)
44-
{
45-
if (!strcmp(event, "artnet"))
47+
if (currentStatus == NONE)
4648
{
47-
uint16_t universe = request["universe"].as<uint16_t>();
48-
Serial.print("Changing ArtNet Universe to ");
49-
Serial.println(universe);
50-
artnet.setUniverse(universe);
51-
Serial.print("Current Universe: ");
52-
Serial.println(artnet.getOutgoing());
49+
if (!strcmp(event, "artnet"))
50+
{
51+
uint16_t universe = request["universe"].as<uint16_t>();
52+
Serial.print("Changing ArtNet Universe to ");
53+
Serial.println(universe);
54+
artnet.setUniverse(universe);
55+
Serial.print("Current Universe: ");
56+
Serial.println(artnet.getOutgoing());
57+
}
5358
}
54-
}
5559
}

src/plugins/DDPPlugin.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
void DDPPlugin::setup()
44
{
5-
#ifdef ASYNC_UDP_ENABLED
5+
#ifdef ASYNC_UDP_ENABLED
66
udp = new AsyncUDP();
77
if (udp->listen(4048))
88
{
99
Serial.print("DDP server listening at port: 4048");
1010

1111
udp->onPacket([](AsyncUDPPacket packet)
12-
{
12+
{
1313
if (packet.length() >= 10) { // Basic DDP header check
1414
const uint8_t* data = packet.data() + 10; // Skip header
1515
const size_t dataLength = packet.length() - 10;
@@ -26,21 +26,20 @@ void DDPPlugin::setup()
2626
Screen.setPixelAtIndex(i, brightness > 4, brightness);
2727
}
2828
}
29-
}
30-
});
29+
} });
3130
}
32-
#endif
31+
#endif
3332
}
3433

3534
void DDPPlugin::teardown()
3635
{
37-
#ifdef ASYNC_UDP_ENABLED
36+
#ifdef ASYNC_UDP_ENABLED
3837
if (udp)
3938
{
4039
delete udp;
4140
udp = nullptr;
4241
}
43-
#endif
42+
#endif
4443
}
4544

4645
void DDPPlugin::loop()

src/plugins/PongClockPlugin.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,6 @@ void PongClockPlugin::loop()
344344
pongPaddleRightY = map(ballX, 256 - Y_MAX, Y_MAX, pongPaddleRightStart, pongPaddleRightTarget + offset);
345345
}
346346

347-
348-
349347
Screen.clearRect(0, 5, 16, 11);
350348

351349
// draw paddles

src/webgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ const uint8_t GUI_HTML[] PROGMEM = {31,139,8,0,0,0,0,0,2,3,108,84,87,114,227,56,
689689

690690
void startGui(AsyncWebServerRequest *request)
691691
{
692-
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", GUI_HTML, GUI_HTML_SIZE);
692+
AsyncWebServerResponse *response = request->beginResponse(200, "text/html", GUI_HTML, GUI_HTML_SIZE);
693693
response->addHeader("Content-Encoding", "gzip");
694694
request->send(response);
695695
}

0 commit comments

Comments
 (0)