Skip to content

Commit e69f538

Browse files
committed
Fix - Clang picking up protos/ folder!
1 parent 0e5f1db commit e69f538

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/build-clang-doxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ jobs:
927927
run: bash ci/actions_install.sh
928928

929929
- name: clang
930-
run: python3 ci/run-clang-format.py -r -e "ci/*" -e "bin/*" -e src/nanopb -e src/wippersnapper -e src/pb.h -e src/provisioning/tinyusb src/
930+
run: python3 ci/run-clang-format.py -r -e "ci/*" -e "bin/*" -e src/nanopb -e src/protos -e src/wippersnapper -e src/pb.h -e src/provisioning/tinyusb src/
931931

932932
- name: doxygen
933933
env:

src/Wippersnapper_V2.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,9 +804,9 @@ void Wippersnapper_V2::runNetFSMV2() {
804804
WS_DEBUG_PRINT("Performing a WiFi scan for SSID...");
805805
if (!check_valid_ssid()) {
806806
#ifdef USE_DISPLAY
807-
WsV2._ui_helperV2->show_scr_error("ERROR",
808-
"Unable to find WiFi network listed in "
809-
"the secrets file. Rebooting soon...");
807+
WsV2._ui_helperV2->show_scr_error(
808+
"ERROR", "Unable to find WiFi network listed in "
809+
"the secrets file. Rebooting soon...");
810810
#endif
811811
haltErrorV2("ERROR: Unable to find WiFi network, rebooting soon...",
812812
WS_LED_STATUS_WIFI_CONNECTING);

src/Wippersnapper_V2.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@
6262
while (millis() - start < timeout) { \
6363
delay(10); \
6464
yield(); \
65-
WsV2.feedWDTV2(); \
65+
WsV2.feedWDTV2(); \
6666
if (millis() < start) { \
6767
start = millis(); \
6868
} \
6969
} \
7070
}
7171

7272
// Cpp STD
73+
#include <algorithm>
7374
#include <functional>
7475
#include <map>
7576
#include <string>
7677
#include <vector>
77-
#include <algorithm>
7878

7979
// Nanopb dependencies
8080
#include <nanopb/pb_common.h>
@@ -254,7 +254,8 @@ class Wippersnapper_V2 {
254254
DS18X20Controller *_ds18x20_controller =
255255
nullptr; ///< Instance of DS18X20 controller
256256
I2cController *_i2c_controller = nullptr; ///< Instance of I2C controller
257-
PixelsController *_pixels_controller = nullptr; ///< Instance of Pixels controller
257+
PixelsController *_pixels_controller =
258+
nullptr; ///< Instance of Pixels controller
258259

259260
// TODO: does this really need to be global?
260261
uint8_t _macAddrV2[6]; /*!< Unique network iface identifier */

src/ws_adapters.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ typedef ws_wifi_esp8266 ws_adapter_wifi;
3333
#include "adapters/wifi/ws_wifi_esp32.h"
3434
typedef ws_wifi_esp32 ws_adapter_wifi;
3535
// Networking adapters for Raspberry Pi Pico W-series
36-
#elif defined(ARDUINO_RASPBERRY_PI_PICO_W) || defined (ARDUINO_RASPBERRY_PI_PICO_2W)
36+
#elif defined(ARDUINO_RASPBERRY_PI_PICO_W) || \
37+
defined(ARDUINO_RASPBERRY_PI_PICO_2W)
3738
#include "adapters/wifi/ws_wifi_pico.h"
3839
typedef ws_wifi_pico ws_adapter_wifi;
3940
// Networking adapter for Arduino Nano 33 IoT and MKR WiFi 1010

0 commit comments

Comments
 (0)