cast types in console for uart channel

Author: idolpx

lib/console/Commands/XFERCommands.cpp

@@ -27,10 +27,10 @@ std::string read_until(char delimiter)
     while (byte != delimiter)
     {
         size_t size = 0;
-        uart_get_buffered_data_len(CONSOLE_UART, &size);
+        uart_get_buffered_data_len((uart_port_t)CONSOLE_UART, &size);
         if (size > 0)
         {
-            int result = uart_read_bytes(CONSOLE_UART, &byte, 1, MAX_READ_WAIT_TICKS);
+            int result = uart_read_bytes((uart_port_t)CONSOLE_UART, &byte, 1, MAX_READ_WAIT_TICKS);
             if (result < 1)
             {
                 fprintf(stdout, "3 Error: Response Timeout\r\n");
@@ -75,10 +75,10 @@ int rx(int argc, char **argv)
     while (count < size)
     {
         size_t size = 0;
-        uart_get_buffered_data_len(CONSOLE_UART, &size);
+        uart_get_buffered_data_len((uart_port_t)CONSOLE_UART, &size);
         if (size > 0)
         {
-            int result = uart_read_bytes(CONSOLE_UART, &byte, 1, MAX_READ_WAIT_TICKS);
+            int result = uart_read_bytes((uart_port_t)CONSOLE_UART, &byte, 1, MAX_READ_WAIT_TICKS);
             if (result < 1)
                 break;
 

lib/console/Console.cpp

@@ -124,8 +124,8 @@ namespace ESP32Console
         this->uart_channel_ = channel;
 
         //Reinit the UART driver if the channel was already in use
-        if (uart_is_driver_installed(channel)) {
-            uart_driver_delete(channel);
+        if (uart_is_driver_installed((uart_port_t)channel)) {
+            uart_driver_delete((uart_port_t)channel);
         }
 
         /* Drain stdout before reconfiguring it */
@@ -157,21 +157,21 @@ namespace ESP32Console
         };
 
 
-        ESP_ERROR_CHECK(uart_param_config(channel, &uart_config));
+        ESP_ERROR_CHECK(uart_param_config((uart_port_t)channel, &uart_config));
 
         // Set the correct pins for the UART of needed
         if (rxPin > 0 || txPin > 0) {
             if (rxPin < 0 || txPin < 0) {
                 Debug_printv("Both rxPin and txPin has to be passed!");
             }
-            uart_set_pin(channel, txPin, rxPin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
+            uart_set_pin((uart_port_t)channel, txPin, rxPin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
         }
 
         /* Install UART driver for interrupt-driven reads and writes */
-        ESP_ERROR_CHECK(uart_driver_install(channel, 256, 0, 0, NULL, 0));
+        ESP_ERROR_CHECK(uart_driver_install((uart_port_t)channel, 256, 0, 0, NULL, 0));
 
         /* Tell VFS to use UART driver */
-        esp_vfs_dev_uart_use_driver(channel);
+        esp_vfs_dev_uart_use_driver((uart_port_t)channel);
 
         esp_console_config_t console_config = {
             .max_cmdline_length = max_cmdline_len_,
@@ -272,7 +272,7 @@ namespace ESP32Console
             //Debug_printv("Interpolated line: [%s]\n", interpolated_line.c_str());
 
             // Flush trailing CR
-            uart_flush(CONSOLE_UART);
+            uart_flush((uart_port_t)CONSOLE_UART);
 
             /* Try to run the command */
             int ret;

lib/console/ute/ute.cpp

@@ -8,7 +8,7 @@
 
 #define _DEFAULT_SOURCE
 #define _BSD_SOURCE
-#define _GNU_SOURCE
+//#define _GNU_SOURCE
 
 #include "ute.h"