fix: pin mapping and refactor headers

Author: kakopappa

examples/Relay/MultiRelays_advance/MultiRelays_advance.ino

@@ -46,7 +46,7 @@
   #define RELAYPIN_6 D6
   #define RELAYPIN_7 D7
   #define RELAYPIN_8 D8
-#elif defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#else
   #define RELAYPIN_1 16
   #define RELAYPIN_2 17
   #define RELAYPIN_3 18

examples/Relay/Relay/Relay.ino

@@ -44,7 +44,7 @@
 
 #if defined(ESP8266)
   #define RELAY_PIN         D5                  // Pin where the relay is connected (D5 = GPIO 14 on ESP8266)
-#elif defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#else
   #define RELAY_PIN         16                  // Pin where the relay is connected (GPIO 16 on ESP32)
 #endif
 

examples/Switch/MultiSwitch_advance/MultiSwitch_advance.ino

@@ -70,7 +70,7 @@
   #define SWITCHPIN_2 D7
   #define SWITCHPIN_3 D6
   #define SWITCHPIN_4 D5
-#elif defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#else
   #define LED_BUILTIN 2
 
   #define RELAYPIN_1 16

src/SinricProWebsocket.h

@@ -111,6 +111,10 @@ void WebsocketListener::setExtraHeaders() {
     const char* platform = "UNKNOWN";
 #endif
 
+    String headers = "appkey:" + appKey;
+    headers += "\r\ndeviceids:" + deviceIds;
+    headers += "\r\nrestoredevicestates:" + String(restoreDeviceStates ? "true" : "false");
+    headers += "\r\nip:" + WiFi.localIP().toString();
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_UNOWIFIR4) || defined(ARDUINO_MINIMA)
     // WiFiNINA and WiFiS3 return MAC address as byte array in network order (LSB first).
     // mac[0] = LSB, mac[5] = MSB. We format it in standard notation (MSB:...:LSB).
@@ -123,13 +127,6 @@ void WebsocketListener::setExtraHeaders() {
                  mac[5], mac[4], mac[3], mac[2], mac[1], mac[0]);
         return String(macStr);
     };
-#endif
-
-    String headers = "appkey:" + appKey;
-    headers += "\r\ndeviceids:" + deviceIds;
-    headers += "\r\nrestoredevicestates:" + String(restoreDeviceStates ? "true" : "false");
-    headers += "\r\nip:" + WiFi.localIP().toString();
-#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_UNOWIFIR4) || defined(ARDUINO_MINIMA)
     headers += "\r\nmac:" + formatMacAddress();
 #else
     headers += "\r\nmac:" + WiFi.macAddress();