diff --git a/lib/lib_audio/es7210/library.json b/lib/libesp32_audio/es7210/library.json similarity index 100% rename from lib/lib_audio/es7210/library.json rename to lib/libesp32_audio/es7210/library.json diff --git a/lib/lib_audio/es7210/library.properties b/lib/libesp32_audio/es7210/library.properties similarity index 100% rename from lib/lib_audio/es7210/library.properties rename to lib/libesp32_audio/es7210/library.properties diff --git a/lib/lib_audio/es7210/src/es7210.cpp b/lib/libesp32_audio/es7210/src/es7210.cpp similarity index 99% rename from lib/lib_audio/es7210/src/es7210.cpp rename to lib/libesp32_audio/es7210/src/es7210.cpp index 3bf680308..65b2c0cb7 100644 --- a/lib/lib_audio/es7210/src/es7210.cpp +++ b/lib/libesp32_audio/es7210/src/es7210.cpp @@ -45,7 +45,7 @@ static es7210_gain_value_t gain; /* * Clock coefficient structer */ -struct _coeff_div { +struct _coeff_div_es7210 { uint32_t mclk; /* mclk frequency */ uint32_t lrck; /* lrck */ uint8_t ss_ds; @@ -75,7 +75,7 @@ static es7210_input_mics_t mic_select = (es7210_input_mics_t)(ES7210_INPUT_MIC1 * lrckh: 0x04 * lrckl: 0x05 */ -static const struct _coeff_div coeff_div[] = { +static const struct _coeff_div_es7210 coeff_div[] = { //mclk lrck ss_ds adc_div dll doubler osr mclk_src lrckh lrckl /* 8k */ {12288000, 8000 , 0x00, 0x03, 0x01, 0x00, 0x20, 0x00, 0x06, 0x00}, diff --git a/lib/lib_audio/es7210/src/es7210.h b/lib/libesp32_audio/es7210/src/es7210.h similarity index 100% rename from lib/lib_audio/es7210/src/es7210.h rename to lib/libesp32_audio/es7210/src/es7210.h diff --git a/lib/lib_audio/es7243e/library.json b/lib/libesp32_audio/es7243e/library.json similarity index 100% rename from lib/lib_audio/es7243e/library.json rename to lib/libesp32_audio/es7243e/library.json diff --git a/lib/lib_audio/es7243e/library.properties b/lib/libesp32_audio/es7243e/library.properties similarity index 100% rename from lib/lib_audio/es7243e/library.properties rename to lib/libesp32_audio/es7243e/library.properties diff --git a/lib/lib_audio/es7243e/src/es7243e.cpp b/lib/libesp32_audio/es7243e/src/es7243e.cpp similarity index 100% rename from lib/lib_audio/es7243e/src/es7243e.cpp rename to lib/libesp32_audio/es7243e/src/es7243e.cpp diff --git a/lib/lib_audio/es7243e/src/es7243e.h b/lib/libesp32_audio/es7243e/src/es7243e.h similarity index 100% rename from lib/lib_audio/es7243e/src/es7243e.h rename to lib/libesp32_audio/es7243e/src/es7243e.h diff --git a/lib/lib_audio/es8156/library.json b/lib/libesp32_audio/es8156/library.json similarity index 100% rename from lib/lib_audio/es8156/library.json rename to lib/libesp32_audio/es8156/library.json diff --git a/lib/lib_audio/es8156/library.properties b/lib/libesp32_audio/es8156/library.properties similarity index 100% rename from lib/lib_audio/es8156/library.properties rename to lib/libesp32_audio/es8156/library.properties diff --git a/lib/lib_audio/es8156/src/audio_hal.h b/lib/libesp32_audio/es8156/src/audio_hal.h similarity index 100% rename from lib/lib_audio/es8156/src/audio_hal.h rename to lib/libesp32_audio/es8156/src/audio_hal.h diff --git a/lib/lib_audio/es8156/src/es8156.cpp b/lib/libesp32_audio/es8156/src/es8156.cpp similarity index 100% rename from lib/lib_audio/es8156/src/es8156.cpp rename to lib/libesp32_audio/es8156/src/es8156.cpp diff --git a/lib/lib_audio/es8156/src/es8156.h b/lib/libesp32_audio/es8156/src/es8156.h similarity index 100% rename from lib/lib_audio/es8156/src/es8156.h rename to lib/libesp32_audio/es8156/src/es8156.h diff --git a/lib/lib_audio/es8156/src/esxxx_common.h b/lib/libesp32_audio/es8156/src/esxxx_common.h similarity index 100% rename from lib/lib_audio/es8156/src/esxxx_common.h rename to lib/libesp32_audio/es8156/src/esxxx_common.h diff --git a/lib/lib_audio/es8311/library.json b/lib/libesp32_audio/es8311/library.json similarity index 100% rename from lib/lib_audio/es8311/library.json rename to lib/libesp32_audio/es8311/library.json diff --git a/lib/lib_audio/es8311/library.properties b/lib/libesp32_audio/es8311/library.properties similarity index 100% rename from lib/lib_audio/es8311/library.properties rename to lib/libesp32_audio/es8311/library.properties diff --git a/lib/lib_audio/es8311/src/es8311.cpp b/lib/libesp32_audio/es8311/src/es8311.cpp similarity index 100% rename from lib/lib_audio/es8311/src/es8311.cpp rename to lib/libesp32_audio/es8311/src/es8311.cpp diff --git a/lib/lib_audio/es8311/src/es8311.h b/lib/libesp32_audio/es8311/src/es8311.h similarity index 100% rename from lib/lib_audio/es8311/src/es8311.h rename to lib/libesp32_audio/es8311/src/es8311.h diff --git a/lib/lib_audio/mp3_shine_esp32/COPYING b/lib/libesp32_audio/mp3_shine_esp32/COPYING similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/COPYING rename to lib/libesp32_audio/mp3_shine_esp32/COPYING diff --git a/lib/lib_audio/mp3_shine_esp32/LICENSE b/lib/libesp32_audio/mp3_shine_esp32/LICENSE similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/LICENSE rename to lib/libesp32_audio/mp3_shine_esp32/LICENSE diff --git a/lib/lib_audio/mp3_shine_esp32/README.md b/lib/libesp32_audio/mp3_shine_esp32/README.md similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/README.md rename to lib/libesp32_audio/mp3_shine_esp32/README.md diff --git a/lib/lib_audio/mp3_shine_esp32/changelog.txt b/lib/libesp32_audio/mp3_shine_esp32/changelog.txt similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/changelog.txt rename to lib/libesp32_audio/mp3_shine_esp32/changelog.txt diff --git a/lib/lib_audio/mp3_shine_esp32/component.mk b/lib/libesp32_audio/mp3_shine_esp32/component.mk similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/component.mk rename to lib/libesp32_audio/mp3_shine_esp32/component.mk diff --git a/lib/lib_audio/mp3_shine_esp32/library.json b/lib/libesp32_audio/mp3_shine_esp32/library.json similarity index 50% rename from lib/lib_audio/mp3_shine_esp32/library.json rename to lib/libesp32_audio/mp3_shine_esp32/library.json index d7de5755a..f73928c85 100644 --- a/lib/lib_audio/mp3_shine_esp32/library.json +++ b/lib/libesp32_audio/mp3_shine_esp32/library.json @@ -1,7 +1,8 @@ { - "name": "mp3_shine_esp32", + "name":"mp3_shine_esp32", + "version": "1.0.0", "description": "mp3 encoder", "keywords": "ESP32, MP3", - "version": "1.0.0", - "frameworks": "Arduino" + "frameworks": "Arduino", + "platforms": "espressif32" } diff --git a/lib/lib_audio/mp3_shine_esp32/library.properties b/lib/libesp32_audio/mp3_shine_esp32/library.properties similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/library.properties rename to lib/libesp32_audio/mp3_shine_esp32/library.properties diff --git a/lib/lib_audio/mp3_shine_esp32/src/bitstream.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/bitstream.cpp similarity index 99% rename from lib/lib_audio/mp3_shine_esp32/src/bitstream.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/bitstream.cpp index 866e94704..81b6d3b98 100755 --- a/lib/lib_audio/mp3_shine_esp32/src/bitstream.cpp +++ b/lib/libesp32_audio/mp3_shine_esp32/src/bitstream.cpp @@ -9,7 +9,6 @@ #include "types.h" #include "bitstream.h" - #if !defined(__APPLE__) && !defined(__FreeBSD__) #include <malloc.h> #endif diff --git a/lib/lib_audio/mp3_shine_esp32/src/bitstream.h b/lib/libesp32_audio/mp3_shine_esp32/src/bitstream.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/bitstream.h rename to lib/libesp32_audio/mp3_shine_esp32/src/bitstream.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/huffman.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/huffman.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/huffman.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/huffman.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/huffman.h b/lib/libesp32_audio/mp3_shine_esp32/src/huffman.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/huffman.h rename to lib/libesp32_audio/mp3_shine_esp32/src/huffman.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3bitstream.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/l3bitstream.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3bitstream.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/l3bitstream.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3bitstream.h b/lib/libesp32_audio/mp3_shine_esp32/src/l3bitstream.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3bitstream.h rename to lib/libesp32_audio/mp3_shine_esp32/src/l3bitstream.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3loop.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/l3loop.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3loop.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/l3loop.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3loop.h b/lib/libesp32_audio/mp3_shine_esp32/src/l3loop.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3loop.h rename to lib/libesp32_audio/mp3_shine_esp32/src/l3loop.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3mdct.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/l3mdct.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3mdct.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/l3mdct.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3mdct.h b/lib/libesp32_audio/mp3_shine_esp32/src/l3mdct.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3mdct.h rename to lib/libesp32_audio/mp3_shine_esp32/src/l3mdct.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3subband.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/l3subband.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3subband.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/l3subband.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/l3subband.h b/lib/libesp32_audio/mp3_shine_esp32/src/l3subband.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/l3subband.h rename to lib/libesp32_audio/mp3_shine_esp32/src/l3subband.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/layer3.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/layer3.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/layer3.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/layer3.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/layer3.h b/lib/libesp32_audio/mp3_shine_esp32/src/layer3.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/layer3.h rename to lib/libesp32_audio/mp3_shine_esp32/src/layer3.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/mult_mips_gcc.h b/lib/libesp32_audio/mp3_shine_esp32/src/mult_mips_gcc.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/mult_mips_gcc.h rename to lib/libesp32_audio/mp3_shine_esp32/src/mult_mips_gcc.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/mult_noarch_gcc.h b/lib/libesp32_audio/mp3_shine_esp32/src/mult_noarch_gcc.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/mult_noarch_gcc.h rename to lib/libesp32_audio/mp3_shine_esp32/src/mult_noarch_gcc.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/mult_sarm_gcc.h b/lib/libesp32_audio/mp3_shine_esp32/src/mult_sarm_gcc.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/mult_sarm_gcc.h rename to lib/libesp32_audio/mp3_shine_esp32/src/mult_sarm_gcc.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/reservoir.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/reservoir.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/reservoir.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/reservoir.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/reservoir.h b/lib/libesp32_audio/mp3_shine_esp32/src/reservoir.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/reservoir.h rename to lib/libesp32_audio/mp3_shine_esp32/src/reservoir.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/tables.cpp b/lib/libesp32_audio/mp3_shine_esp32/src/tables.cpp similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/tables.cpp rename to lib/libesp32_audio/mp3_shine_esp32/src/tables.cpp diff --git a/lib/lib_audio/mp3_shine_esp32/src/tables.h b/lib/libesp32_audio/mp3_shine_esp32/src/tables.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/tables.h rename to lib/libesp32_audio/mp3_shine_esp32/src/tables.h diff --git a/lib/lib_audio/mp3_shine_esp32/src/types.h b/lib/libesp32_audio/mp3_shine_esp32/src/types.h similarity index 100% rename from lib/lib_audio/mp3_shine_esp32/src/types.h rename to lib/libesp32_audio/mp3_shine_esp32/src/types.h diff --git a/lib/lib_audio/wm8960/library.json b/lib/libesp32_audio/wm8960/library.json similarity index 100% rename from lib/lib_audio/wm8960/library.json rename to lib/libesp32_audio/wm8960/library.json diff --git a/lib/lib_audio/wm8960/library.properties b/lib/libesp32_audio/wm8960/library.properties similarity index 100% rename from lib/lib_audio/wm8960/library.properties rename to lib/libesp32_audio/wm8960/library.properties diff --git a/lib/lib_audio/wm8960/src/wm8960.cpp b/lib/libesp32_audio/wm8960/src/wm8960.cpp similarity index 100% rename from lib/lib_audio/wm8960/src/wm8960.cpp rename to lib/libesp32_audio/wm8960/src/wm8960.cpp diff --git a/lib/lib_audio/wm8960/src/wm8960.h b/lib/libesp32_audio/wm8960/src/wm8960.h similarity index 100% rename from lib/lib_audio/wm8960/src/wm8960.h rename to lib/libesp32_audio/wm8960/src/wm8960.h