Fix compilation issues

Author: me-no-dev

CMakeLists.txt

@@ -152,3 +152,9 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl b
 
 idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
 
+if(IDF_TARGET STREQUAL "esp32")
+target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32_DEV" -DARDUINO_VARIANT="esp32" -DESP32)
+endif()
+if(IDF_TARGET STREQUAL "esp32s2")
+target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32S2_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32S2_DEV" -DARDUINO_VARIANT="esp32s2" -DESP32)
+endif()

cores/esp32/esp32-hal-tinyusb.c

@@ -265,7 +265,7 @@ bool tud_vendor_control_request_cb(uint8_t rhport, tusb_control_request_t const
             // match vendor request in BOS descriptor
             // Get landing page url
             tinyusb_url_descriptor.bLength = 3 + strlen(WEBUSB_URL);
-            snprintf(tinyusb_url_descriptor.url, 126, "%s", WEBUSB_URL);
+            snprintf(tinyusb_url_descriptor.url, 127, "%s", WEBUSB_URL);
             return tud_control_xfer(rhport, request, (void*) &tinyusb_url_descriptor, tinyusb_url_descriptor.bLength);
         }
         // Get Microsoft OS 2.0 compatible descriptor
@@ -419,7 +419,7 @@ static void set_usb_serial_num(void)
     memcpy(mac_bytes + 4, &mac1, 2);
 
     /* Convert to UTF16 string */
-    uint8_t* srl = USB_DEVICE_SERIAL;
+    uint8_t* srl = (uint8_t*)USB_DEVICE_SERIAL;
     for (int i = 0; i < 6; ++i) {
         uint8_t b = mac_bytes[5 - i]; /* printing from the MSB */
         if (i) {

libraries/BLE/src/BLEAdvertising.h

@@ -12,7 +12,7 @@
 #include <esp_gap_ble_api.h>
 #include "BLEUUID.h"
 #include <vector>
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 /**
  * @brief Advertisement data set by the programmer to be published by the %BLE server.

libraries/BLE/src/BLECharacteristic.h

@@ -16,7 +16,7 @@
 #include <esp_gap_ble_api.h>
 #include "BLEDescriptor.h"
 #include "BLEValue.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLEService;
 class BLEDescriptor;

libraries/BLE/src/BLEDescriptor.h

@@ -13,7 +13,7 @@
 #include "BLEUUID.h"
 #include "BLECharacteristic.h"
 #include <esp_gatts_api.h>
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLEService;
 class BLECharacteristic;

libraries/BLE/src/BLERemoteCharacteristic.h

@@ -17,7 +17,7 @@
 #include "BLERemoteService.h"
 #include "BLERemoteDescriptor.h"
 #include "BLEUUID.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLERemoteService;
 class BLERemoteDescriptor;

libraries/BLE/src/BLERemoteDescriptor.h

@@ -15,7 +15,7 @@
 
 #include "BLERemoteCharacteristic.h"
 #include "BLEUUID.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLERemoteCharacteristic;
 /**

libraries/BLE/src/BLERemoteService.h

@@ -15,7 +15,7 @@
 #include "BLEClient.h"
 #include "BLERemoteCharacteristic.h"
 #include "BLEUUID.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLEClient;
 class BLERemoteCharacteristic;

libraries/BLE/src/BLEScan.h

@@ -15,7 +15,7 @@
 #include <string>
 #include "BLEAdvertisedDevice.h"
 #include "BLEClient.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLEAdvertisedDevice;
 class BLEAdvertisedDeviceCallbacks;

libraries/BLE/src/BLEServer.h

@@ -20,7 +20,7 @@
 #include "BLECharacteristic.h"
 #include "BLEService.h"
 #include "BLESecurity.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 #include "BLEAddress.h"
 
 class BLEServerCallbacks;

libraries/BLE/src/BLEService.h

@@ -15,7 +15,7 @@
 #include "BLECharacteristic.h"
 #include "BLEServer.h"
 #include "BLEUUID.h"
-#include "FreeRTOS.h"
+#include "RTOS.h"
 
 class BLEServer;
 

libraries/BLE/src/FreeRTOS.cpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include "FreeRTOS.h"
+#include "RTOS.h"
 #include "sdkconfig.h"
 #include "esp32-hal-log.h"
 

libraries/BLE/src/GeneralUtils.cpp

@@ -12,7 +12,7 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include "FreeRTOS.h"
+#include "RTOS.h"
 #include <esp_err.h>
 #include <nvs.h>
 #include <esp_wifi.h>