mk: clang-format-11 => clang-format-15

.clang-format

@@ -3,10 +3,14 @@ BasedOnStyle: Mozilla
 AllowShortFunctionsOnASingleLine: Empty
 BinPackArguments: true
 BinPackParameters: true
+BreakBeforeBraces: Attach
 ColumnLimit: 100
 Cpp11BracedListStyle: true
 FixNamespaceComments: true
+IncludeIsMainRegex: '(\.t)?$'
+InsertBraces: true
+QualifierAlignment: Custom
+QualifierOrder: ['static', 'inline', 'const', 'constexpr', 'volatile', 'type', 'restrict']
 ReflowComments: false
-SortIncludes: true
-SortUsingDeclarations: true
+ShortNamespaceLines: 1000000
 SpacesInContainerLiterals: false

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
 permissions: {}
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: arduino/setup-arduino-cli@v1
       - id: cores
@@ -26,8 +26,8 @@ jobs:
           arduino-cli core install esp8266:esp8266 esp32:esp32 --additional-urls "$(<~/arduino-cores.txt)"
       - name: Install dependencies
         run: |
-          sudo apt-get install -y --no-install-recommends clang-format-11 doxygen
-      - uses: actions/checkout@v3
+          sudo apt-get install -y --no-install-recommends clang-format-15 doxygen
+      - uses: actions/checkout@v4
       - name: Check code style
         run: |
           mk/format-code.sh
@@ -48,7 +48,7 @@ jobs:
       - name: Build docs
         run: docs/build.sh
       - name: Deploy docs
-        uses: nwtgck/actions-netlify@30aa80fe8d5eec30813fc8b17b77e0a6663f09b5
+        uses: nwtgck/actions-netlify@v2.1.0
         with:
           publish-dir: ./docs/html/
           production-deploy: true

docs/build.sh

@@ -4,5 +4,5 @@ cd "$( dirname "${BASH_SOURCE[0]}" )"
 
 doxygen Doxyfile 2>&1 | ./filter-Doxygen-warning.awk 1>&2
 
-find html -name '*.html' | xargs sed -i '/<\/head>/ i\<script async src="https://www.googletagmanager.com/gtag/js?id=G-MLZ5G2C4X2"></script><script>window.dataLayer=[];function gtag(){dataLayer.push(arguments);}if(location.hostname.endsWith(".yoursunny.dev")){gtag("js",new Date());gtag("config","G-MLZ5G2C4X2");}</script></script>'
+find html -name '*.html' | xargs sed -i '/<\/head>/ i\<script async src="https://www.googletagmanager.com/gtag/js?id=G-MLZ5G2C4X2"></script><script>window.dataLayer=[];function gtag(){dataLayer.push(arguments);}if(location.hostname.endsWith(".yoursunny.dev")){gtag("js",new Date());gtag("config","G-MLZ5G2C4X2");}</script>'
 cp _redirects html/

examples/EspNowBroadcast/EspNowBroadcast.ino

@@ -36,8 +36,7 @@ static const int LED_PIN = 2;
 int ledState = HIGH;
 
 void
-processRx(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count, void* arg)
-{
+processRx(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count, void* arg) {
   Serial.printf("Message from %02X:%02X:%02X:%02X:%02X:%02X\n", mac[0], mac[1], mac[2], mac[3],
                 mac[4], mac[5]);
   for (size_t i = 0; i < count; ++i) {
@@ -50,8 +49,7 @@ processRx(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count,
 }
 
 void
-setup()
-{
+setup() {
   Serial.begin(115200);
   Serial.println();
 
@@ -78,8 +76,7 @@ setup()
 }
 
 void
-sendMessage()
-{
+sendMessage() {
   char msg[60];
   int len = snprintf(msg, sizeof(msg), "hello ESP-NOW from %s at %lu",
                      WiFi.softAPmacAddress().c_str(), millis());
@@ -99,13 +96,13 @@ sendMessage()
 }
 
 void
-loop()
-{
+loop() {
   if (digitalRead(BUTTON_PIN) == LOW) { // button is pressed
     sendMessage();
 
-    while (digitalRead(BUTTON_PIN) == LOW) // wait for button release
+    while (digitalRead(BUTTON_PIN) == LOW) { // wait for button release
       ;
+    }
   }
 
   WifiEspNowBroadcast.loop();

examples/EspNowUnicast/EspNowUnicast.ino

@@ -29,8 +29,7 @@ static uint8_t PEER[]{0x02, 0x00, 0x00, 0x45, 0x53, 0x50};
 
 void
 printReceivedMessage(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count,
-                     void* arg)
-{
+                     void* arg) {
   Serial.printf("Message from %02X:%02X:%02X:%02X:%02X:%02X\n", mac[0], mac[1], mac[2], mac[3],
                 mac[4], mac[5]);
   for (int i = 0; i < static_cast<int>(count); ++i) {
@@ -40,8 +39,7 @@ printReceivedMessage(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, siz
 }
 
 void
-setup()
-{
+setup() {
   Serial.begin(115200);
   Serial.println();
 
@@ -81,8 +79,7 @@ setup()
 }
 
 void
-loop()
-{
+loop() {
   char msg[60];
   int len = snprintf(msg, sizeof(msg), "hello ESP-NOW from %s at %lu",
                      WiFi.softAPmacAddress().c_str(), millis());

mk/format-code.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-set -eo pipefail
+set -euo pipefail
 cd "$( dirname "${BASH_SOURCE[0]}" )"/..
 
 find -name '*.[hc]pp' -or -name '*.ino' | \
-  xargs clang-format-11 -i -style=file
+  xargs clang-format-15 -i -style=file

src/WifiEspNow.cpp

@@ -14,8 +14,7 @@
 WifiEspNowClass WifiEspNow;
 
 bool
-WifiEspNowClass::begin()
-{
+WifiEspNowClass::begin() {
   end();
   m_ready =
     esp_now_init() == 0 &&
@@ -28,8 +27,7 @@ WifiEspNowClass::begin()
 }
 
 void
-WifiEspNowClass::end()
-{
+WifiEspNowClass::end() {
   if (!m_ready) {
     return;
   }
@@ -38,8 +36,7 @@ WifiEspNowClass::end()
 }
 
 bool
-WifiEspNowClass::setPrimaryKey(const uint8_t key[WIFIESPNOW_KEYLEN])
-{
+WifiEspNowClass::setPrimaryKey(const uint8_t key[WIFIESPNOW_KEYLEN]) {
   return m_ready && key != nullptr &&
 #if defined(ARDUINO_ARCH_ESP8266)
          esp_now_set_kok(const_cast<u8*>(key), WIFIESPNOW_KEYLEN) == 0;
@@ -49,8 +46,7 @@ WifiEspNowClass::setPrimaryKey(const uint8_t key[WIFIESPNOW_KEYLEN])
 }
 
 int
-WifiEspNowClass::listPeers(WifiEspNowPeerInfo* peers, int maxPeers) const
-{
+WifiEspNowClass::listPeers(WifiEspNowPeerInfo* peers, int maxPeers) const {
   if (!m_ready) {
     return 0;
   }
@@ -75,8 +71,7 @@ WifiEspNowClass::listPeers(WifiEspNowPeerInfo* peers, int maxPeers) const
 }
 
 bool
-WifiEspNowClass::hasPeer(const uint8_t mac[WIFIESPNOW_ALEN]) const
-{
+WifiEspNowClass::hasPeer(const uint8_t mac[WIFIESPNOW_ALEN]) const {
   return m_ready &&
 #if defined(ARDUINO_ARCH_ESP8266)
          esp_now_is_peer_exist(const_cast<u8*>(mac)) > 0;
@@ -88,8 +83,7 @@ WifiEspNowClass::hasPeer(const uint8_t mac[WIFIESPNOW_ALEN]) const
 #if defined(ARDUINO_ARCH_ESP8266)
 bool
 WifiEspNowClass::addPeer(const uint8_t mac[WIFIESPNOW_ALEN], int channel,
-                         const uint8_t key[WIFIESPNOW_KEYLEN])
-{
+                         const uint8_t key[WIFIESPNOW_KEYLEN]) {
   if (!m_ready) {
     return false;
   }
@@ -105,8 +99,7 @@ WifiEspNowClass::addPeer(const uint8_t mac[WIFIESPNOW_ALEN], int channel,
 #elif defined(ARDUINO_ARCH_ESP32)
 bool
 WifiEspNowClass::addPeer(const uint8_t mac[WIFIESPNOW_ALEN], int channel,
-                         const uint8_t key[WIFIESPNOW_KEYLEN], int netif)
-{
+                         const uint8_t key[WIFIESPNOW_KEYLEN], int netif) {
   if (!m_ready) {
     return false;
   }
@@ -130,21 +123,18 @@ WifiEspNowClass::addPeer(const uint8_t mac[WIFIESPNOW_ALEN], int channel,
 #endif
 
 bool
-WifiEspNowClass::removePeer(const uint8_t mac[WIFIESPNOW_ALEN])
-{
+WifiEspNowClass::removePeer(const uint8_t mac[WIFIESPNOW_ALEN]) {
   return m_ready && esp_now_del_peer(const_cast<uint8_t*>(mac)) == 0;
 }
 
 void
-WifiEspNowClass::onReceive(RxCallback cb, void* arg)
-{
+WifiEspNowClass::onReceive(RxCallback cb, void* arg) {
   m_rxCb = cb;
   m_rxArg = arg;
 }
 
 bool
-WifiEspNowClass::send(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count)
-{
+WifiEspNowClass::send(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, size_t count) {
   if (!m_ready || count > WIFIESPNOW_MAXMSGLEN || count == 0) {
     return false;
   }
@@ -154,15 +144,13 @@ WifiEspNowClass::send(const uint8_t mac[WIFIESPNOW_ALEN], const uint8_t* buf, si
 }
 
 void
-WifiEspNowClass::rx(const uint8_t* mac, const uint8_t* data, uint8_t len)
-{
+WifiEspNowClass::rx(const uint8_t* mac, const uint8_t* data, uint8_t len) {
   if (WifiEspNow.m_rxCb != nullptr) {
     (*WifiEspNow.m_rxCb)(mac, data, len, WifiEspNow.m_rxArg);
   }
 }
 
 void
-WifiEspNowClass::tx(const uint8_t* mac, uint8_t status)
-{
+WifiEspNowClass::tx(const uint8_t* mac, uint8_t status) {
   WifiEspNow.m_txRes = status == 0 ? WifiEspNowSendStatus::OK : WifiEspNowSendStatus::FAIL;
 }

src/WifiEspNowBroadcast.cpp

@@ -26,8 +26,7 @@
 WifiEspNowBroadcastClass WifiEspNowBroadcast;
 
 bool
-WifiEspNowBroadcastClass::begin(const char* ssid, int channel, int scanFreq)
-{
+WifiEspNowBroadcastClass::begin(const char* ssid, int channel, int scanFreq) {
   m_ssid = ssid;
   m_nextScan = 0;
   m_scanFreq = scanFreq;
@@ -43,16 +42,14 @@ WifiEspNowBroadcastClass::begin(const char* ssid, int channel, int scanFreq)
 }
 
 void
-WifiEspNowBroadcastClass::end()
-{
+WifiEspNowBroadcastClass::end() {
   WifiEspNow.end();
   WiFi.softAPdisconnect();
   m_ssid = "";
 }
 
 void
-WifiEspNowBroadcastClass::loop()
-{
+WifiEspNowBroadcastClass::loop() {
   if (millis() >= m_nextScan && !m_isScanning && WiFi.scanComplete() != WIFI_SCAN_RUNNING) {
     this->scan();
   }
@@ -65,8 +62,7 @@ WifiEspNowBroadcastClass::loop()
 
 bool
 WifiEspNowBroadcastClass::setKey(const uint8_t primary[WIFIESPNOW_KEYLEN],
-                                 const uint8_t peer[WIFIESPNOW_KEYLEN])
-{
+                                 const uint8_t peer[WIFIESPNOW_KEYLEN]) {
   if (peer == nullptr) {
     m_hasPeerKey = false;
     return true;
@@ -77,8 +73,7 @@ WifiEspNowBroadcastClass::setKey(const uint8_t primary[WIFIESPNOW_KEYLEN],
 }
 
 void
-WifiEspNowBroadcastClass::scan()
-{
+WifiEspNowBroadcastClass::scan() {
   LOG("scan()");
   m_isScanning = true;
 #if defined(ARDUINO_ARCH_ESP8266)
@@ -96,8 +91,7 @@ WifiEspNowBroadcastClass::scan()
 
 #if defined(ARDUINO_ARCH_ESP8266)
 void
-WifiEspNowBroadcastClass::processScan(void* result, int status)
-{
+WifiEspNowBroadcastClass::processScan(void* result, int status) {
   WifiEspNowBroadcast.processScan2(result, status);
 }