Merge Idf to main (#1948)

* idf compile errors

* IDF support: Arduino Compile Errors

* IDF Arduino Compile Errors

* IDF round 2 - Client

* Comment

* Compile Errors div platforms

Author: pschatzmann

src/AudioTools/AudioCodecs/MP3HeaderParser.h

@@ -153,7 +153,7 @@ class MP3HeaderParser {
               {0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, -1},
           },
       };
-      char rate_byte = rateTable[AudioVersion][Layer][BitrateIndex];
+      signed char rate_byte = rateTable[AudioVersion][Layer][BitrateIndex];
       if (rate_byte == -1) {
         LOGE("Unsupported bitrate");
         return 0;

src/AudioTools/AudioLibs/Desktop/NoArduino.h

@@ -2,170 +2,179 @@
 /**
  * @file NoArduino.h
  * @author Phil Schatzmann
- * @brief If you want to use the framework w/o Arduino you need to provide the implementation
- * of a couple of classes and methods!
+ * @brief If you want to use the framework w/o Arduino you need to provide the
+ * implementation of a couple of classes and methods!
  * @version 0.1
  * @date 2022-09-19
- * 
+ *
  * @copyright Copyright (c) 2022
- * 
+ *
  */
+#include <ctype.h>
 #include <stdint.h>
-#include <algorithm>    // std::max
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
+
+#include <algorithm>  // std::max
 #include <chrono>
+
 #include "AudioConfig.h"
 
 #define IS_NOARDUINO
 
 #ifndef PSTR
-#  define PSTR(fmt) fmt
+#define PSTR(fmt) fmt
 #endif
 
 #ifndef PI
-#  define PI 3.14159265359f
+#define PI 3.14159265359f
 #endif
 
 #ifndef INPUT
-#  define INPUT 0x0
+#define INPUT 0x0
 #endif
 
 #ifndef OUTPUT
-#  define OUTPUT 0x1
+#define OUTPUT 0x1
 #endif
 
 #ifndef INPUT_PULLUP
-#  define INPUT_PULLUP 0x2
+#define INPUT_PULLUP 0x2
 #endif
 
 #ifndef HIGH
 #define HIGH 0x1
-#  endif
+#endif
 #ifndef LOW
-#  define LOW  0x0
+#define LOW 0x0
 #endif
 
-
 using namespace std;
 
-enum PrintCharFmt {DEC, HEX};
+enum PrintCharFmt { DEC, HEX };
 
 namespace audio_tools {
 
 class Print {
-public:
+ public:
 #ifndef DOXYGEN
-    virtual size_t write(uint8_t ch){
-		// not implememnted: to be overritten
-		return 0;
-	}
-
-    virtual size_t write(const char *str) {
-      return write((const uint8_t *)str, strlen(str));
-    }
-
-    virtual size_t write(const char *buffer, size_t size) {
-      return write((const uint8_t *)buffer, size);
-    }
-
-    virtual int print(const char* msg){
-		int result = strlen(msg);
-		return write(msg, result);
+  virtual size_t write(uint8_t ch) {
+    // not implememnted: to be overritten
+    return 0;
+  }
+
+  virtual size_t write(const char *str) {
+    return write((const uint8_t *)str, strlen(str));
+  }
+
+  virtual size_t write(const char *buffer, size_t size) {
+    return write((const uint8_t *)buffer, size);
+  }
+
+  virtual int print(const char *msg) {
+    int result = strlen(msg);
+    return write(msg, result);
+  }
+
+  virtual int println(const char *msg = "") {
+    int result = print(msg);
+    write('\n');
+    return result + 1;
+  }
+
+  virtual int println(float number) {
+    char buffer[120];
+    snprintf(buffer, 120, "%f", number);
+    return println(buffer);
+  }
+
+  virtual int print(float number) {
+    char buffer[120];
+    snprintf(buffer, 120, "%f", number);
+    return print(buffer);
+  }
+
+  virtual int print(int number) {
+    char buffer[80];
+    snprintf(buffer, 80, "%d", number);
+    return print(buffer);
+  }
+
+  virtual int print(char c, PrintCharFmt spec) {
+    char result[5];
+    switch (spec) {
+      case DEC:
+        snprintf(result, 3, "%c", c);
+        return print(result);
+      case HEX:
+        snprintf(result, 3, "%x", c);
+        return print(result);
     }
+    return -1;
+  }
 
-	virtual int println(const char* msg="") {
-		int result = print(msg);
-		write('\n');
-		return result+1;
-	}
-
-	virtual int println(float number){
-		char buffer[120];
-		snprintf(buffer, 120, "%f", number);
-		return println(buffer);
-	}
-
-	virtual int print(float number){
-		char buffer[120];
-		snprintf(buffer, 120, "%f", number);
-		return print(buffer);
-	}
-
-	virtual int print(int number){
-		char buffer[80];
-		snprintf(buffer,80,"%d", number);
-		return print(buffer);
-	}
-
-	virtual int print(char c, PrintCharFmt spec){
-		char result[5];
-		switch(spec){
-		case DEC:
-			 snprintf(result, 3,"%c", c);
-			 return print(result);
-		case HEX:
-			 snprintf(result, 3,"%x", c);
-			 return print(result);
-		}
-		return -1;
-	}
+  int println(int value, PrintCharFmt fmt) {
+    return print(value, fmt) + println();
+  }
 
 #endif
 
-    virtual size_t write(const uint8_t *data, size_t len){
-        if (data == nullptr) return 0;
-    	for (size_t j=0;j<len;j++){
-    		write(data[j]);
-    	}
-    	return len;
+  virtual size_t write(const uint8_t *data, size_t len) {
+    if (data == nullptr) return 0;
+    for (size_t j = 0; j < len; j++) {
+      write(data[j]);
     }
+    return len;
+  }
 
+  virtual int availableForWrite() { return 1024; }
 
-    virtual int availableForWrite() { return 1024; }
-
-
-	virtual void flush() { /* Empty implementation for backward compatibility */ }
-
-  protected:
-	int _timeout = 10;
+  virtual void flush() { /* Empty implementation for backward compatibility */ }
 
+ protected:
+  int _timeout = 10;
 };
 
 class Stream : public Print {
-public:
-	virtual int available(){return 0;}
-	virtual size_t readBytes(uint8_t* data, size_t len) {return 0;}
+ public:
+  virtual int available() { return 0; }
+  virtual size_t readBytes(uint8_t *data, size_t len) { return 0; }
 #ifndef DOXYGEN
-	virtual int read(){return -1;}
-	virtual int peek(){return -1;}
-	virtual void setTimeout(size_t t){}
-#endif
-	operator bool(){
-		return true;
+  virtual int read() { return -1; }
+  virtual int peek() { return -1; }
+  virtual void setTimeout(size_t t) {}
+  size_t readBytesUntil(char terminator, char *buffer, size_t length) {
+	for (int j=0;j<length;j++){
+		int val = read();
+		if (val == -1) return j-1;
+		if (val == terminator) return j;
+		buffer[j] = val;
 	}
+	return length;
+  };
+  size_t readBytesUntil(char terminator, uint8_t *buffer, size_t length) {
+    return readBytesUntil(terminator, (char *)buffer, length);
+  }
+
+#endif
+  operator bool() { return true; }
 };
 
 class Client : public Stream {
-public:
-	void stop() {};
-	virtual int read(uint8_t* buffer, size_t len) { return 0;};
-	virtual int read() { return 0; };
-	bool connected() { return false;};
-	bool connect(const char* ip, int port) {return false;}
-	virtual operator bool() { return false;}
+ public:
+  void stop() {};
+  virtual int read(uint8_t *buffer, size_t len) { return 0; };
+  virtual int read() { return 0; };
+  bool connected() { return false; };
+  bool connect(const char *ip, int port) { return false; }
+  virtual operator bool() { return false; }
 };
 
 class HardwareSerial : public Stream {
-public:
-    size_t write(uint8_t ch) override {
-		return putchar(ch);
-	}
-	virtual operator bool() {
-        return true;
-    }
+ public:
+  size_t write(uint8_t ch) override { return putchar(ch); }
+  virtual operator bool() { return true; }
 };
 
 static HardwareSerial Serial;
@@ -189,10 +198,10 @@ inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
 // /// Returns the milliseconds since the start
 // extern uint32_t micros();
 
-// #else 
+// #else
 
 // extern "C" {
-	
+
 // /// Waits for the indicated milliseconds
 // extern void delay(uint32_t ms);
 
@@ -207,45 +216,40 @@ inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
 
 // }
 
-//#endif
+// #endif
 
+}  // namespace audio_tools
 
-} // namespace
-
-#if defined(ESP32) 
+#if defined(ESP32)
 #include "driver/gpio.h"
 /// e.g. for AudioActions
 static int digitalRead(int pin) {
-	printf("digitalRead:%d\n", pin);
-	return gpio_get_level((gpio_num_t)pin);
+  printf("digitalRead:%d\n", pin);
+  return gpio_get_level((gpio_num_t)pin);
 }
 
 static void pinMode(int pin, int mode) {
-	gpio_num_t gpio_pin=(gpio_num_t)pin;
-	printf("pinMode(%d,%d)\n", pin, mode);
-
-	gpio_reset_pin(gpio_pin);
-	switch (mode){
-		case INPUT:
-			gpio_set_direction(gpio_pin, GPIO_MODE_INPUT);
-			break;
-		case OUTPUT:
-			gpio_set_direction(gpio_pin, GPIO_MODE_OUTPUT);
-			break;
-		case INPUT_PULLUP:
-			gpio_set_direction(gpio_pin, GPIO_MODE_INPUT);
-			gpio_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
-			break;
-		default:
-			gpio_set_direction(gpio_pin, GPIO_MODE_INPUT_OUTPUT);
-			break;
-	}
+  gpio_num_t gpio_pin = (gpio_num_t)pin;
+  printf("pinMode(%d,%d)\n", pin, mode);
+
+  gpio_reset_pin(gpio_pin);
+  switch (mode) {
+    case INPUT:
+      gpio_set_direction(gpio_pin, GPIO_MODE_INPUT);
+      break;
+    case OUTPUT:
+      gpio_set_direction(gpio_pin, GPIO_MODE_OUTPUT);
+      break;
+    case INPUT_PULLUP:
+      gpio_set_direction(gpio_pin, GPIO_MODE_INPUT);
+      gpio_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
+      break;
+    default:
+      gpio_set_direction(gpio_pin, GPIO_MODE_INPUT_OUTPUT);
+      break;
+  }
 }
 
 #endif
 
-//using namespace audio_tools;
-
-
-
-
+// using namespace audio_tools;